From 8dcddbafe54d30c16c41291481296ca041f20350 Mon Sep 17 00:00:00 2001
From: Light2288 <davide.aliti@gmail.com>
Date: Tue, 1 Jun 2021 10:35:15 +0200
Subject: [PATCH] feat: ui improvements

added version to home
---
 .../verificaC19/ui/FirstActivity.kt              |  2 ++
 app/src/main/res/layout/activity_first.xml       | 16 +++++++++++++++-
 app/src/main/res/values/strings.xml              |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/ministerodellasalute/verificaC19/ui/FirstActivity.kt b/app/src/main/java/it/ministerodellasalute/verificaC19/ui/FirstActivity.kt
index 9d256179..190830df 100644
--- a/app/src/main/java/it/ministerodellasalute/verificaC19/ui/FirstActivity.kt
+++ b/app/src/main/java/it/ministerodellasalute/verificaC19/ui/FirstActivity.kt
@@ -68,6 +68,8 @@ class FirstActivity : AppCompatActivity(), View.OnClickListener {
 
         binding.qrButton.setOnClickListener(this)
 
+        binding.versionText.text = getString(R.string.version, BuildConfig.VERSION_NAME)
+
         viewModel.getDateLastSync().let{
             binding.dateLastSyncText.text = getString(R.string.lastSyncDate, if (it == -1L) getString(R.string.notAvailable) else it.parseTo(FORMATTED_DATE_LAST_SYNC))
         }
diff --git a/app/src/main/res/layout/activity_first.xml b/app/src/main/res/layout/activity_first.xml
index 52a79d44..7ed73319 100644
--- a/app/src/main/res/layout/activity_first.xml
+++ b/app/src/main/res/layout/activity_first.xml
@@ -56,7 +56,7 @@
                         style="@style/H2.Bold"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:fontFamily="@font/titilliumweb_bold"
+                        android:fontFamily="@font/titiliumfont"
                         android:text="@string/controlCertificate"
                         android:textSize="23sp"
                         app:layout_constraintStart_toStartOf="parent"
@@ -167,6 +167,7 @@
         android:id="@+id/date_last_sync_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="14dp"
         android:padding="@dimen/padding_20dp"
         android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -174,6 +175,19 @@
         app:layout_constraintStart_toStartOf="parent"
         tools:text="Last sync" />
 
+    <TextView
+        android:id="@+id/version_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/padding_20dp"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/date_last_sync_text"
+        app:layout_constraintVertical_bias="0.7"
+        tools:text="Version" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d630eb57..4c3fdd0a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -51,5 +51,6 @@
     <string name="noKeyAlertTitle">Impossibile scansionare</string>
     <string name="noKeyAlertMessage">L\'applicazione deve connettersi alla rete almeno una volta per essere utilizzata</string>
     <string name="ok">OK</string>
+    <string name="version">v. %1$s</string>
 
 </resources>
\ No newline at end of file