Fixes icon layout in load game activity

meikpiep · Oct 23, 2023 · dc67cdf · dc67cdf
1 parent a47df3d
commit dc67cdf
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 25 deletions.
diff --git a/gauguin-app/src/main/res/drawable/hourglass_24.xml b/gauguin-app/src/main/res/drawable/hourglass_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M320,800L640,800L640,680Q640,614 593,567Q546,520 480,520Q414,520 367,567Q320,614 320,680L320,800ZM480,440Q546,440 593,393Q640,346 640,280L640,160L320,160L320,280Q320,346 367,393Q414,440 480,440ZM160,880L160,800L240,800L240,680Q240,619 268.5,565.5Q297,512 348,480Q297,448 268.5,394.5Q240,341 240,280L240,160L160,160L160,80L800,80L800,160L720,160L720,280Q720,341 691.5,394.5Q663,448 612,480Q663,512 691.5,565.5Q720,619 720,680L720,800L800,800L800,880L160,880ZM480,800L480,800Q480,800 480,800Q480,800 480,800Q480,800 480,800Q480,800 480,800L480,800L480,800ZM480,160Q480,160 480,160Q480,160 480,160L480,160L480,160L480,160Q480,160 480,160Q480,160 480,160Z"/>
+</vector>
diff --git a/gauguin-app/src/main/res/drawable/outline_timer_20.xml b/gauguin-app/src/main/res/drawable/outline_timer_20.xml
diff --git a/gauguin-app/src/main/res/drawable/schedule_24.xml b/gauguin-app/src/main/res/drawable/schedule_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M612,668L668,612L520,464L520,280L440,280L440,496L612,668ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM480,800Q613,800 706.5,706.5Q800,613 800,480Q800,347 706.5,253.5Q613,160 480,160Q347,160 253.5,253.5Q160,347 160,480Q160,613 253.5,706.5Q347,800 480,800Z"/>
+</vector>
diff --git a/gauguin-app/src/main/res/layout/view_savegame.xml b/gauguin-app/src/main/res/layout/view_savegame.xml
@@ -12,8 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
-    >
-        <!-- Media -->
+        >
+
         <org.piepmeyer.gauguin.ui.grid.GridUI
             android:id="@+id/saveGridView"
             android:scaleType="centerCrop"
@@ -40,9 +40,7 @@
             android:id="@+id/saveGameDurationIcon"
             android:layout_width="20dp"
             android:layout_height="20dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="8dp"
-            app:srcCompat="@drawable/outline_timer_20"
+            app:srcCompat="@drawable/hourglass_24"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/saveGameTitle"
             />
@@ -51,7 +49,6 @@
             android:id="@+id/saveGameDuration"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:layout_marginStart="8dp"
             android:textAppearance="?attr/textAppearanceBody2"
             android:textColor="?android:attr/textColorSecondary"
@@ -65,6 +62,7 @@
             android:layout_height="20dp"
             android:layout_marginEnd="8dp"
             android:layout_marginBottom="8dp"
+            android:layout_marginTop="8dp"
             app:srcCompat="@drawable/outline_calendar_today_24"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/saveGameDurationIcon"
@@ -74,25 +72,32 @@
             android:id="@+id/saveDate"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:layout_marginStart="8dp"
             android:textAppearance="?attr/textAppearanceBody2"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintStart_toEndOf="@id/saveDateIcon"
             app:layout_constraintTop_toTopOf="@id/saveDateIcon"
             />
 
+        <ImageView
+            android:id="@+id/saveTimeIcon"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginEnd="8dp"
+            app:srcCompat="@drawable/schedule_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/saveDateIcon"
+            />
 
         <TextView
             android:id="@+id/saveTime"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
             android:layout_marginStart="8dp"
             android:textAppearance="?attr/textAppearanceBody2"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintStart_toEndOf="@id/saveDateIcon"
-            app:layout_constraintTop_toBottomOf="@id/saveDate"
+            app:layout_constraintTop_toTopOf="@id/saveTimeIcon"
             />
 
         <com.google.android.material.button.MaterialButton