From 3427cea5385b09103b2f25e2bc52ebb3f89b304a Mon Sep 17 00:00:00 2001
From: Maksymilian Jopek <maks@jopek.eu>
Date: Wed, 28 Sep 2022 22:56:02 +0200
Subject: v0.9.0 - all / {no_error_msg, no_loading_msg}

---
 .../res/drawable/ic_baseline_arrow_back_24.xml     |   5 +
 .../res/drawable/ic_baseline_location_city_24.xml  |   5 +
 .../main/res/drawable/ic_baseline_search_24.xml    |   5 +
 app/src/main/res/layout/fragment_first.xml         |  37 ++++++-
 app/src/main/res/layout/fragment_second.xml        | 118 +++++++++++++++------
 app/src/main/res/menu/menu_main.xml                |  10 +-
 6 files changed, 141 insertions(+), 39 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_baseline_arrow_back_24.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_location_city_24.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_search_24.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml
new file mode 100644
index 0000000..8452791
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_arrow_back_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#000000" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_location_city_24.xml b/app/src/main/res/drawable/ic_baseline_location_city_24.xml
new file mode 100644
index 0000000..7324708
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_location_city_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M15,11L15,5l-3,-3 -3,3v2L3,7v14h18L21,11h-6zM7,19L5,19v-2h2v2zM7,15L5,15v-2h2v2zM7,11L5,11L5,9h2v2zM13,19h-2v-2h2v2zM13,15h-2v-2h2v2zM13,11h-2L11,9h2v2zM13,7h-2L11,5h2v2zM19,19h-2v-2h2v2zM19,15h-2v-2h2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_search_24.xml b/app/src/main/res/drawable/ic_baseline_search_24.xml
new file mode 100644
index 0000000..a5687c6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_search_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_first.xml b/app/src/main/res/layout/fragment_first.xml
index d876bf5..a1a66d5 100644
--- a/app/src/main/res/layout/fragment_first.xml
+++ b/app/src/main/res/layout/fragment_first.xml
@@ -9,6 +9,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/purple_700"
         android:orientation="vertical">
 
         <TextView
@@ -16,9 +17,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="5dp"
+            android:textColor="@color/white"
             android:text="Mountain View, US"
+            android:textFontWeight="600"
             android:textAlignment="center"
-            android:textSize="25sp" />
+            android:textSize="27sp" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -45,8 +48,9 @@
                     android:layout_marginTop="30dp"
                     android:layout_marginBottom="20dp"
                     android:textAlignment="center"
+                    android:textColor="@color/white"
                     android:text="14.03 *C"
-                    android:textFontWeight="700"
+                    android:textFontWeight="800"
                     android:textSize="40sp" />
 
                 <TextView
@@ -55,6 +59,8 @@
                     android:textAlignment="center"
                     android:id="@+id/weather_text"
                     android:text="overcast clouds"
+                    android:textColor="@color/white"
+                    android:textFontWeight="600"
                     android:textSize="23sp" />
             </LinearLayout>
         </LinearLayout>
@@ -64,6 +70,8 @@
             android:layout_height="wrap_content"
             android:padding="5dp"
             android:text="Details:"
+            android:textColor="@color/white"
+            android:textFontWeight="600"
             android:textSize="25sp" />
 
         <GridLayout
@@ -76,52 +84,73 @@
             <TextView
                 android:padding="3dip"
                 android:text="Humidity: "
+                android:textColor="#808080"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
 
             <TextView
                 android:padding="3dip"
                 android:id="@+id/humidity"
                 android:text="85%"
+                android:textColor="@color/white"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
 
             <TextView
                 android:padding="3dip"
                 android:text="Max Temp: "
+                android:textColor="#808080"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
 
             <TextView
                 android:padding="3dip"
                 android:text="15.47 *C"
+                android:textColor="@color/white"
+                android:textFontWeight="600"
                 android:id="@+id/max_temp"
                 android:textSize="23dp" />
             <TextView
                 android:padding="3dip"
                 android:text="Min Temp: "
+                android:textColor="#808080"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
 
             <TextView
                 android:padding="3dip"
                 android:text="11.29 *C"
                 android:id="@+id/min_temp"
+                android:textColor="@color/white"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
             <TextView
                 android:padding="3dip"
-                android:text="Pressure"
+                android:text="Pressure: "
+                android:textColor="#808080"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
 
             <TextView
                 android:padding="3dip"
                 android:text="1013hPa"
+                android:textColor="@color/white"
+                android:textFontWeight="600"
                 android:id="@+id/pressure"
                 android:textSize="23dp" />
             <TextView
                 android:padding="3dip"
-                android:text="Wind speed"
+                android:text="Wind speed: "
+                android:textColor="#808080"
+                android:layout_marginRight="10sp"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
 
             <TextView
                 android:padding="3dip"
                 android:text="2.06 km/h"
+                android:textColor="@color/white"
+                android:textFontWeight="600"
                 android:id="@+id/wind_speed"
                 android:textSize="23dp" />
         </GridLayout>
diff --git a/app/src/main/res/layout/fragment_second.xml b/app/src/main/res/layout/fragment_second.xml
index 0acfa7f..b3a38aa 100644
--- a/app/src/main/res/layout/fragment_second.xml
+++ b/app/src/main/res/layout/fragment_second.xml
@@ -9,43 +9,71 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/purple_500"
+        android:weightSum="12"
         android:orientation="vertical">
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/filledTextField"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:layout_marginTop="32dp"
-            android:layout_marginEnd="32dp"
-            android:hint="Enter something">
-
-            <!--this is the actual edit text which takes the input-->
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/edit_text"
+            android:layout_weight="5"
+            android:gravity="center"
+            android:layout_height="match_parent">
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/filledTextField"
+                android:layout_weight="1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="32dp"
+                android:layout_marginEnd="32dp"
+                app:startIconDrawable="@drawable/ic_baseline_location_city_24"
+                app:boxCornerRadiusTopStart="30dp"
+                app:boxCornerRadiusTopEnd="30dp"
+                app:boxCornerRadiusBottomStart="30dp"
+                app:boxCornerRadiusBottomEnd="30dp"
+                app:boxStrokeWidth="0dp"
+                app:boxStrokeWidthFocused="0dp"
+                android:hint="Enter the city name">
+                <!--this is the actual edit text which takes the input-->
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/edit_text"
+                    android:layout_width="match_parent"
+                    android:singleLine="true"
+                    android:layout_height="wrap_content" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.button.MaterialButton
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_weight="6"
+                app:iconTint="@color/teal_200"
+                app:iconSize="35sp"
+                app:icon="@drawable/ic_baseline_search_24"
+                android:background="#00000000"
+                android:id="@+id/city_btn"
+                android:layout_height="match_parent" />
+        </LinearLayout>
 
-        </com.google.android.material.textfield.TextInputLayout>
         <TextView
             android:id="@+id/city_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="5dp"
+            android:layout_weight="0"
             android:text="Mountain View, US"
             android:textAlignment="center"
-            android:textSize="25sp" />
+            android:textColor="@color/white"
+            android:textFontWeight="600"
+            android:textSize="27sp" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_weight="2">
+            android:layout_weight="4">
 
             <ImageView
+                android:id="@+id/weather_img"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="2"
-                android:id="@+id/weather_img"
                 android:src="@drawable/ic_baseline_wb_sunny_24" />
 
             <LinearLayout
@@ -55,22 +83,25 @@
                 android:orientation="vertical">
 
                 <TextView
+                    android:id="@+id/temp"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:id="@+id/temp"
                     android:layout_marginTop="30dp"
                     android:layout_marginBottom="20dp"
-                    android:textAlignment="center"
                     android:text="14.03 *C"
-                    android:textFontWeight="700"
+                    android:textAlignment="center"
+                    android:textColor="@color/white"
+                    android:textFontWeight="800"
                     android:textSize="40sp" />
 
                 <TextView
+                    android:id="@+id/weather_text"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textAlignment="center"
-                    android:id="@+id/weather_text"
                     android:text="overcast clouds"
+                    android:textAlignment="center"
+                    android:textColor="@color/white"
+                    android:textFontWeight="600"
                     android:textSize="23sp" />
             </LinearLayout>
         </LinearLayout>
@@ -80,65 +111,92 @@
             android:layout_height="wrap_content"
             android:padding="5dp"
             android:text="Details:"
+            android:layout_weight="0"
+            android:textColor="@color/white"
+            android:textFontWeight="600"
             android:textSize="25sp" />
 
         <GridLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:layout_weight="1"
+            android:layout_weight="4"
             android:columnCount="2">
 
             <TextView
                 android:padding="3dip"
                 android:text="Humidity: "
+                android:textColor="#808080"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
 
             <TextView
-                android:padding="3dip"
                 android:id="@+id/humidity"
+                android:padding="3dip"
                 android:text="85%"
+                android:textColor="@color/white"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
 
             <TextView
                 android:padding="3dip"
                 android:text="Max Temp: "
+                android:textColor="#808080"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
 
             <TextView
+                android:id="@+id/max_temp"
                 android:padding="3dip"
                 android:text="15.47 *C"
-                android:id="@+id/max_temp"
+                android:textColor="@color/white"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
+
             <TextView
                 android:padding="3dip"
                 android:text="Min Temp: "
+                android:textColor="#808080"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
 
             <TextView
+                android:id="@+id/min_temp"
                 android:padding="3dip"
                 android:text="11.29 *C"
-                android:id="@+id/min_temp"
+                android:textColor="@color/white"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
+
             <TextView
                 android:padding="3dip"
-                android:text="Pressure"
+                android:text="Pressure: "
+                android:textColor="#808080"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
 
             <TextView
+                android:id="@+id/pressure"
                 android:padding="3dip"
                 android:text="1013hPa"
-                android:id="@+id/pressure"
+                android:textColor="@color/white"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
+
             <TextView
+                android:layout_marginRight="10sp"
                 android:padding="3dip"
-                android:text="Wind speed"
+                android:text="Wind speed: "
+                android:textColor="#808080"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
 
             <TextView
+                android:id="@+id/wind_speed"
                 android:padding="3dip"
                 android:text="2.06 km/h"
-                android:id="@+id/wind_speed"
+                android:textColor="@color/white"
+                android:textFontWeight="600"
                 android:textSize="23dp" />
         </GridLayout>
     </LinearLayout>
@@ -151,5 +209,5 @@
         android:text="@string/next"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:srcCompat="@drawable/ic_baseline_arrow_forward_24" />
+        app:srcCompat="@drawable/ic_baseline_arrow_back_24" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 4cb5ffb..752543a 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -2,9 +2,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="com.jopek.kanakaeiwa.MainActivity">
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:title="@string/action_settings"
-        app:showAsAction="never" />
+<!--    <item-->
+<!--        android:id="@+id/action_settings"-->
+<!--        android:orderInCategory="100"-->
+<!--        android:title="@string/action_settings"-->
+<!--        app:showAsAction="never" />-->
 </menu>
\ No newline at end of file
-- 
cgit v1.3.1