From cbe7631964a73a0622f0e93c17fce533a5a9b983 Mon Sep 17 00:00:00 2001
From: Darkempire <50015928+Darkempire78@users.noreply.github.com>
Date: Mon, 27 Feb 2023 21:55:01 +0100
Subject: [PATCH] fix #190

---
 app/build.gradle                              |  4 ++--
 .../res/layout-small-land/history_item.xml    | 24 +++++++++++++++++++
 .../main/res/layout-small/history_item.xml    | 24 +++++++++++++++++++
 .../main/res/layout-sw600dp/history_item.xml  | 24 +++++++++++++++++++
 .../res/layout-sw720dp-land/history_item.xml  | 24 +++++++++++++++++++
 .../main/res/layout-sw720dp/history_item.xml  | 24 +++++++++++++++++++
 .../metadata/android/en-US/changelogs/32.txt  |  2 ++
 7 files changed, 124 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/32.txt

diff --git a/app/build.gradle b/app/build.gradle
index f04a3850..34d60256 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         resConfigs 'ar', 'az', 'bn', 'de', 'el', 'es', 'fa', 'fr', 'hi', 'in', 'it', 'ja', 'pt-rBR', 'ru', 'tr', 'zh-rHK', 'zh-rTW'
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 31
-        versionName "2.1.2"
+        versionCode 32
+        versionName "2.1.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/res/layout-small-land/history_item.xml b/app/src/main/res/layout-small-land/history_item.xml
index 15a8b286..0f71bfe9 100644
--- a/app/src/main/res/layout-small-land/history_item.xml
+++ b/app/src/main/res/layout-small-land/history_item.xml
@@ -19,6 +19,7 @@
             android:background="?attr/history_background_color"
             android:textColor="?attr/text_color"
             android:textSize="16sp"
+            app:layout_constraintTop_toBottomOf="@+id/history_time"
             tools:ignore="MissingConstraints" />
 
         <TextView
@@ -34,7 +35,30 @@
             app:layout_constraintTop_toBottomOf="@+id/history_item_calculation"
             tools:ignore="MissingConstraints" />
 
+        <TextView
+            android:id="@+id/history_time"
+            style="@style/RobotoFontCondensedMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:paddingHorizontal="10dp"
+            android:paddingVertical="4dp"
+            android:background="?attr/history_background_color"
+            android:textColor="?attr/text_second_color"
+            android:textSize="12sp"
+            tools:ignore="MissingConstraints" />
+
+        <!-- Add more space when it's the same date than the next history element -->
+        <View
+            android:id="@+id/history_same_date_separator"
+            android:layout_width="match_parent"
+            android:layout_height="8dp"
+            android:background="?attr/history_background_color"
+            app:layout_constraintTop_toBottomOf="@+id/history_item_result"
+            tools:ignore="MissingConstraints" />
+
         <View
+            android:id="@+id/history_separator"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:background="?attr/foreground_color"
diff --git a/app/src/main/res/layout-small/history_item.xml b/app/src/main/res/layout-small/history_item.xml
index ebc74fd6..e848b3ef 100644
--- a/app/src/main/res/layout-small/history_item.xml
+++ b/app/src/main/res/layout-small/history_item.xml
@@ -19,6 +19,7 @@
             android:background="?attr/history_background_color"
             android:textColor="?attr/text_color"
             android:textSize="25sp"
+            app:layout_constraintTop_toBottomOf="@+id/history_time"
             tools:ignore="MissingConstraints" />
 
         <TextView
@@ -34,7 +35,30 @@
             app:layout_constraintTop_toBottomOf="@+id/history_item_calculation"
             tools:ignore="MissingConstraints" />
 
+        <TextView
+            android:id="@+id/history_time"
+            style="@style/RobotoFontCondensedMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:paddingHorizontal="10dp"
+            android:paddingVertical="4dp"
+            android:background="?attr/history_background_color"
+            android:textColor="?attr/text_second_color"
+            android:textSize="14sp"
+            tools:ignore="MissingConstraints" />
+
+        <!-- Add more space when it's the same date than the next history element -->
+        <View
+            android:id="@+id/history_same_date_separator"
+            android:layout_width="match_parent"
+            android:layout_height="10dp"
+            android:background="?attr/history_background_color"
+            app:layout_constraintTop_toBottomOf="@+id/history_item_result"
+            tools:ignore="MissingConstraints" />
+
         <View
+            android:id="@+id/history_separator"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:background="?attr/foreground_color"
diff --git a/app/src/main/res/layout-sw600dp/history_item.xml b/app/src/main/res/layout-sw600dp/history_item.xml
index 377b8c2b..b0349348 100644
--- a/app/src/main/res/layout-sw600dp/history_item.xml
+++ b/app/src/main/res/layout-sw600dp/history_item.xml
@@ -19,6 +19,7 @@
             android:background="?attr/history_background_color"
             android:textColor="?attr/text_color"
             android:textSize="55sp"
+            app:layout_constraintTop_toBottomOf="@+id/history_time"
             tools:ignore="MissingConstraints" />
 
         <TextView
@@ -34,7 +35,30 @@
             app:layout_constraintTop_toBottomOf="@+id/history_item_calculation"
             tools:ignore="MissingConstraints" />
 
+        <TextView
+            android:id="@+id/history_time"
+            style="@style/RobotoFontCondensedMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:paddingHorizontal="10dp"
+            android:paddingVertical="4dp"
+            android:background="?attr/history_background_color"
+            android:textColor="?attr/text_second_color"
+            android:textSize="44sp"
+            tools:ignore="MissingConstraints" />
+
+        <!-- Add more space when it's the same date than the next history element -->
+        <View
+            android:id="@+id/history_same_date_separator"
+            android:layout_width="match_parent"
+            android:layout_height="38dp"
+            android:background="?attr/history_background_color"
+            app:layout_constraintTop_toBottomOf="@+id/history_item_result"
+            tools:ignore="MissingConstraints" />
+
         <View
+            android:id="@+id/history_separator"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:background="?attr/foreground_color"
diff --git a/app/src/main/res/layout-sw720dp-land/history_item.xml b/app/src/main/res/layout-sw720dp-land/history_item.xml
index 90a06bad..30150b16 100644
--- a/app/src/main/res/layout-sw720dp-land/history_item.xml
+++ b/app/src/main/res/layout-sw720dp-land/history_item.xml
@@ -19,6 +19,7 @@
             android:background="?attr/history_background_color"
             android:textColor="?attr/text_color"
             android:textSize="75sp"
+            app:layout_constraintTop_toBottomOf="@+id/history_time"
             tools:ignore="MissingConstraints" />
 
         <TextView
@@ -34,7 +35,30 @@
             app:layout_constraintTop_toBottomOf="@+id/history_item_calculation"
             tools:ignore="MissingConstraints" />
 
+        <TextView
+            android:id="@+id/history_time"
+            style="@style/RobotoFontCondensedMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:paddingHorizontal="10dp"
+            android:paddingVertical="4dp"
+            android:background="?attr/history_background_color"
+            android:textColor="?attr/text_second_color"
+            android:textSize="60sp"
+            tools:ignore="MissingConstraints" />
+
+        <!-- Add more space when it's the same date than the next history element -->
+        <View
+            android:id="@+id/history_same_date_separator"
+            android:layout_width="match_parent"
+            android:layout_height="52dp"
+            android:background="?attr/history_background_color"
+            app:layout_constraintTop_toBottomOf="@+id/history_item_result"
+            tools:ignore="MissingConstraints" />
+
         <View
+            android:id="@+id/history_separator"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:background="?attr/foreground_color"
diff --git a/app/src/main/res/layout-sw720dp/history_item.xml b/app/src/main/res/layout-sw720dp/history_item.xml
index 17905a9a..f701faf8 100644
--- a/app/src/main/res/layout-sw720dp/history_item.xml
+++ b/app/src/main/res/layout-sw720dp/history_item.xml
@@ -19,6 +19,7 @@
             android:background="?attr/history_background_color"
             android:textColor="?attr/text_color"
             android:textSize="95sp"
+            app:layout_constraintTop_toBottomOf="@+id/history_time"
             tools:ignore="MissingConstraints" />
 
         <TextView
@@ -34,7 +35,30 @@
             app:layout_constraintTop_toBottomOf="@+id/history_item_calculation"
             tools:ignore="MissingConstraints" />
 
+        <TextView
+            android:id="@+id/history_time"
+            style="@style/RobotoFontCondensedMedium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:paddingHorizontal="10dp"
+            android:paddingVertical="4dp"
+            android:background="?attr/history_background_color"
+            android:textColor="?attr/text_second_color"
+            android:textSize="80sp"
+            tools:ignore="MissingConstraints" />
+
+        <!-- Add more space when it's the same date than the next history element -->
+        <View
+            android:id="@+id/history_same_date_separator"
+            android:layout_width="match_parent"
+            android:layout_height="70dp"
+            android:background="?attr/history_background_color"
+            app:layout_constraintTop_toBottomOf="@+id/history_item_result"
+            tools:ignore="MissingConstraints" />
+
         <View
+            android:id="@+id/history_separator"
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:background="?attr/foreground_color"
diff --git a/fastlane/metadata/android/en-US/changelogs/32.txt b/fastlane/metadata/android/en-US/changelogs/32.txt
new file mode 100644
index 00000000..d60492e7
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/32.txt
@@ -0,0 +1,2 @@
+Fixed:
+- Crash on small screens and tablets
\ No newline at end of file