From 1a116d0b262e5f58b1f4fa2789236ee13a360c87 Mon Sep 17 00:00:00 2001
From: BGbaderguet <48762010+BGbaderguet@users.noreply.github.com>
Date: Sun, 8 Nov 2020 01:27:07 +0100
Subject: [PATCH] MainActivity class : make the connection between first and
 second screen for the moment

---
 .../romanet/vj/apps/myweather/MainActivity.java   | 15 ++++++++-------
 app/src/main/res/layout/activity_main.xml         |  8 --------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/fr/romanet/vj/apps/myweather/MainActivity.java b/app/src/main/java/fr/romanet/vj/apps/myweather/MainActivity.java
index f1160c1..81c28e3 100644
--- a/app/src/main/java/fr/romanet/vj/apps/myweather/MainActivity.java
+++ b/app/src/main/java/fr/romanet/vj/apps/myweather/MainActivity.java
@@ -1,25 +1,26 @@
 package fr.romanet.vj.apps.myweather;
 
-import android.widget.Button;
 import android.content.*;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 import android.os.Bundle;
 import android.view.View;
 
-public class MainActivity extends AppCompatActivity {
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
-    private Button buttonAddCity;
+public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
-        buttonAddCity = (Button) findViewById(R.id.fab);
+        FloatingActionButton buttonAddCity = (FloatingActionButton) findViewById(R.id.fab);
         buttonAddCity.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view) {
+            public void onClick(View view)
+            {
                 openAddCityPage();
             }
         });
@@ -27,7 +28,7 @@ public class MainActivity extends AppCompatActivity {
 
     public void openAddCityPage()
     {
-        Intent intent = new Intent(this, AddCity.class);
+        Intent intent = new Intent(MainActivity.this, AddCity.class);
         startActivity(intent);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 39a4888..0087f00 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -12,14 +12,6 @@
         android:layout_height="wrap_content"
         android:theme="@style/Theme.MyWeather.AppBarOverlay">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="75dp"
-            android:background="?attr/colorPrimary"
-            app:title="MyWeather"
-            app:popupTheme="@style/Theme.MyWeather.PopupOverlay" />
-
     </com.google.android.material.appbar.AppBarLayout>
 
     <ImageView