From 751f1137565a3836bb770a281057f51bc186f0a7 Mon Sep 17 00:00:00 2001
From: Pavel Baksy <beval@centrum.cz>
Date: Mon, 19 Feb 2024 12:09:53 +0100
Subject: [PATCH] Add descriptions to images

---
 app/build.gradle.kts                      |  4 +--
 app/src/main/res/layout/activity_main.xml | 43 +++++------------------
 app/src/main/res/values-cs/strings.xml    |  3 ++
 app/src/main/res/values/strings.xml       |  3 ++
 4 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index ea582bf..1e6e684 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
         applicationId = "cz.bugsy.passwordzebra"
         minSdk = 29
         targetSdk = 34
-        versionCode = 7
-        versionName = "1.6.0"
+        versionCode = 8
+        versionName = "1.6.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0526c81..40ba40e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,34 +7,6 @@
     tools:layout_editor_absoluteX="0dp"
     tools:layout_editor_absoluteY="2dp">
 
-    <!--
-    <TextView
-        android:id="@+id/titleTextView"
-        android:layout_width="409dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="32dp"
-        android:gravity="center"
-        android:text="@string/app_name"
-        android:textSize="24sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-    -->
-    <!--
-    <ImageView
-        android:id="@+id/iconImageView"
-        android:layout_width="161dp"
-        android:layout_height="126dp"
-        android:layout_marginTop="32dp"
-        android:contentDescription="@string/info_text"
-        android:src="@drawable/zebra_shield"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/titleTextView"
-        app:tint="@color/design_default_color_primary" />
-    -->
-
     <TextView
         android:id="@+id/passwordTextView"
         android:layout_width="0dp"
@@ -127,17 +99,18 @@
         app:layout_constraintGuide_begin="20dp" />
 
     <ImageView
-        android:id="@+id/imageView"
+        android:id="@+id/imageViewPwLength"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="@+id/passwordLengthLabel"
         app:layout_constraintStart_toStartOf="@+id/guideline3"
         app:layout_constraintTop_toTopOf="@+id/passwordLengthLabel"
         app:layout_constraintVertical_bias="0.0"
-        app:srcCompat="@drawable/pw_straighten" />
+        app:srcCompat="@drawable/pw_straighten"
+        android:contentDescription="@string/image_length_desc" />
 
     <ImageView
-        android:id="@+id/imageView2"
+        android:id="@+id/imageViewWithoutSpaces"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="32dp"
@@ -147,10 +120,11 @@
         app:layout_constraintStart_toStartOf="@+id/guideline3"
         app:layout_constraintTop_toTopOf="@+id/switchWithoutSpaces"
         app:layout_constraintVertical_bias="0.8"
-        app:srcCompat="@drawable/pw_letter_spacing" />
+        app:srcCompat="@drawable/pw_letter_spacing"
+        android:contentDescription="@string/image_wospaces" />
 
     <ImageView
-        android:id="@+id/imageView3"
+        android:id="@+id/imageViewAddSpecialChars"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="32dp"
@@ -160,7 +134,8 @@
         app:layout_constraintStart_toStartOf="@+id/guideline3"
         app:layout_constraintTop_toTopOf="@+id/switchSpecialChars"
         app:layout_constraintVertical_bias="0.625"
-        app:srcCompat="@drawable/pw_special_character" />
+        app:srcCompat="@drawable/pw_special_character"
+        android:contentDescription="@string/image_specialchars" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline3"
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 0f590d9..cc52451 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -7,4 +7,7 @@
     <string name="switch_without_spaces">Kopírovat bez mezer</string>
     <string name="switch_special_characters">Přidat speciální znaky</string>
     <string name="button_generate_description">Vytvořit nové heslo</string>
+    <string name="image_length_desc">Vybrat délku hesla</string>
+    <string name="image_wospaces">Kopírovat bez mezer</string>
+    <string name="image_specialchars">Přidat speciální znaky</string>
 </resources>
\ 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 6286617..688543f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,4 +6,7 @@
     <string name="switch_without_spaces">Copy Without Spaces</string>
     <string name="switch_special_characters">Add Special Characters</string>
     <string name="button_generate_description">Generate new password</string>
+    <string name="image_length_desc">Select password length</string>
+    <string name="image_wospaces">Copy password without spaces</string>
+    <string name="image_specialchars">Add special characters</string>
 </resources>
\ No newline at end of file