From e9bcbd8067c0f02babe0addea28482f4c746e084 Mon Sep 17 00:00:00 2001
From: BGbaderguet <48762010+BGbaderguet@users.noreply.github.com>
Date: Sun, 8 Nov 2020 17:12:39 +0100
Subject: [PATCH] MainActivity class : make the connection between first and
 second screen for the moment with the plus button - FINAL DESIGN DONE

---
 app/src/main/res/layout/activity_main.xml | 33 ++++++++++++-----------
 build.gradle                              |  1 -
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0087f00..065a6fb 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,46 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity"
-    android:orientation="vertical">
+    tools:context=".MainActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/Theme.MyWeather.AppBarOverlay">
+        android:theme="@style/Theme.MyWeather.AppBarOverlay"
+        app:layout_constraintBottom_toTopOf="parent">
 
     </com.google.android.material.appbar.AppBarLayout>
 
     <ImageView
         android:id="@+id/imageView"
-        android:layout_width="match_parent"
-        android:layout_height="530dp"
+        android:layout_width="388dp"
+        android:layout_height="461dp"
+        app:layout_constraintBottom_toTopOf="@+id/textView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:srcCompat="@drawable/ic_baseline_umbrella_24" />
 
     <TextView
         android:id="@+id/textView"
         android:layout_width="match_parent"
         android:layout_height="51dp"
-        android:textSize="20sp"
         android:gravity="center"
-        android:layout_marginRight="10dp"
-        android:layout_marginLeft="10dp"
-        android:text="Please click on the 'Add' button in order to add a city"
-        tools:layout_editor_absoluteX="89dp"
-        tools:layout_editor_absoluteY="566dp" />
+        android:text="@string/firstAction"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toTopOf="@+id/fab"
+        tools:layout_editor_absoluteX="89dp" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
-        android:layout_marginRight="10dp"
+        android:layout_marginEnd="10dp"
         app:backgroundTint="#FF0202"
         app:rippleColor="#FFFFFF"
-        app:srcCompat="@android:drawable/ic_input_add" />
+        app:srcCompat="@android:drawable/ic_input_add"/>
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c8d7712..67dd8c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,6 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:4.1.0"
-
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }