From 4579b0e760db5f5b5c28a3e7ea07d158f78fc0f9 Mon Sep 17 00:00:00 2001
From: Nathania Calista <nathania.calista01@gmail.com>
Date: Tue, 2 Apr 2024 16:05:46 +0700
Subject: [PATCH] feat : accessibility
---
app/src/main/res/layout/activity_login.xml | 11 +++++++---
app/src/main/res/layout/activity_main.xml | 10 +++++++--
app/src/main/res/layout/fragment_scan.xml | 9 +++++---
.../main/res/layout/fragment_transaksi.xml | 5 ++++-
app/src/main/res/layout/fragment_twibbon.xml | 21 ++++++++++++++-----
app/src/main/res/menu/menu_nav.xml | 3 ++-
app/src/main/res/values/colors.xml | 8 +++----
app/src/main/res/values/strings.xml | 9 +++++++-
app/src/main/res/values/styles.xml | 8 ++++++-
9 files changed, 63 insertions(+), 21 deletions(-)
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 085884f..4a69b13 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -76,12 +76,16 @@
android:textSize="14sp" />
<EditText
android:layout_width="match_parent"
- android:layout_height="40dp"
+ android:minHeight="50dp"
+ android:layout_height="wrap_content"
android:id="@+id/email"
android:inputType="textEmailAddress"
android:background="@drawable/input_bg"
android:layout_marginTop="10dp"
android:paddingHorizontal="15dp"
+ android:hint="example@gmail.com"
+ android:labelFor="@id/email"
+ android:textColor="@color/black"
/>
</LinearLayout>
<LinearLayout
@@ -106,12 +110,13 @@
<EditText
android:layout_width="match_parent"
- android:layout_height="40dp"
- android:id="@+id/password"
+ android:minHeight="50dp"
+ android:layout_height="wrap_content" android:id="@+id/password"
android:background="@drawable/input_bg"
android:layout_marginTop="10dp"
android:paddingHorizontal="15dp"
android:inputType="textPassword"
+ android:hint="@string/password"
/>
</com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index be2dba8..3616898 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -31,7 +31,10 @@
android:background="?android:attr/windowBackground"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
- app:menu="@menu/menu_nav"/>
+ app:menu="@menu/menu_nav"
+ app:itemTextAppearanceActive="@style/BottomNavigationTextAppearance"
+ app:itemTextAppearanceInactive="@style/BottomNavigationTextAppearance"
+ />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_navigation_view"
@@ -48,5 +51,8 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
- app:menu="@menu/menu_nav"/>
+ app:menu="@menu/menu_nav"
+ app:itemTextAppearanceActive="@style/BottomNavigationTextAppearance"
+ app:itemTextAppearanceInactive="@style/BottomNavigationTextAppearance"
+ />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_scan.xml b/app/src/main/res/layout/fragment_scan.xml
index b47b56b..746ad69 100644
--- a/app/src/main/res/layout/fragment_scan.xml
+++ b/app/src/main/res/layout/fragment_scan.xml
@@ -21,20 +21,23 @@
android:background="@drawable/ellipse1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent" />
+ app:layout_constraintEnd_toEndOf="parent"
+ android:contentDescription="@string/camera_button"
+ />
<Button
android:id="@+id/pick_image"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginStart="30dp"
-
android:background="@drawable/gallery"
android:elevation="2dp"
app:layout_constraintTop_toTopOf="@+id/captureButton"
app:layout_constraintBottom_toBottomOf="@+id/captureButton"
app:layout_constraintStart_toStartOf="@id/vertical_centerline"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintVertical_bias="0.5" />
+ app:layout_constraintVertical_bias="0.5"
+ android:contentDescription="@string/gallery_button"
+ />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/vertical_centerline"
diff --git a/app/src/main/res/layout/fragment_transaksi.xml b/app/src/main/res/layout/fragment_transaksi.xml
index 0ea9128..5e67b59 100644
--- a/app/src/main/res/layout/fragment_transaksi.xml
+++ b/app/src/main/res/layout/fragment_transaksi.xml
@@ -19,7 +19,10 @@
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
android:src="@drawable/plus"
- app:backgroundTint="@color/green" />
+ app:backgroundTint="@color/green"
+ android:labelFor="@id/add_button"
+ android:contentDescription="add transaction"
+ />
</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_twibbon.xml b/app/src/main/res/layout/fragment_twibbon.xml
index 0a2e513..611f280 100644
--- a/app/src/main/res/layout/fragment_twibbon.xml
+++ b/app/src/main/res/layout/fragment_twibbon.xml
@@ -76,13 +76,16 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/twibbon_1"
- android:layout_marginEnd="10dp"/>
+ android:layout_marginEnd="10dp"
+ android:contentDescription="@string/twibbon_1"
+ />
<Button
android:id="@+id/button2"
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/twibbon_2"
+ android:contentDescription="@string/twibbon_2"
android:layout_marginEnd="10dp"/>
<Button
@@ -90,6 +93,7 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/twibbon_3"
+ android:contentDescription="@string/twibbon_3"
android:layout_marginEnd="10dp"/>
<Button
@@ -97,12 +101,16 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:background="@drawable/twibbon_4"
- android:layout_marginEnd="10dp"/>
+ android:layout_marginEnd="10dp"
+ android:contentDescription="@string/twibbon_4"
+ />
<Button
android:id="@+id/button5"
android:layout_width="80dp"
android:layout_height="80dp"
- android:background="@drawable/twibbon_5"/>
+ android:background="@drawable/twibbon_5"
+ android:contentDescription="@string/twibbon_5"
+ />
<!-- Add more buttons as needed -->
@@ -111,8 +119,10 @@
<Button
android:id="@+id/image_capture_button"
- android:layout_width="90dp"
- android:layout_height="50dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:minWidth="90dp"
+ android:minHeight="50dp"
android:layout_marginTop="20dp"
android:background="@drawable/button_green"
android:textColor="@color/white"
@@ -120,6 +130,7 @@
android:text="CAPTURE"
app:layout_constraintTop_toBottomOf="@id/viewFinder"/>
+
</LinearLayout>
</ScrollView>
diff --git a/app/src/main/res/menu/menu_nav.xml b/app/src/main/res/menu/menu_nav.xml
index cdd76e3..b198e37 100644
--- a/app/src/main/res/menu/menu_nav.xml
+++ b/app/src/main/res/menu/menu_nav.xml
@@ -3,7 +3,8 @@
<item
android:id="@+id/transaksiFragment"
android:title="Transaction"
- android:icon="@drawable/menu_transaction"/>
+ android:icon="@drawable/menu_transaction"
+ />
<item
android:id="@+id/scanFragment"
android:title="Scan"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 03a2e28..17cd4a6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,9 +2,9 @@
<resources>
<color name="bg_color">#FFFFFF</color>
<color name="primary_color">#F1E4C3</color>
- <color name="secondary_color">#597E52</color>
+ <color name="secondary_color">#3b5237</color>
+ <color name="secondary_green">#3b5237</color>
<color name="text_color">#000000</color>
-<!-- <color name="white">#FFFFFF</color>-->
<color name="shadow_color">#D9D9D9</color>
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
@@ -15,6 +15,6 @@
<color name="white">#FFFFFFFF</color>
<color name="gray">#D9D9D9</color>
<color name="brown_1">#F1E4C3</color>
- <color name="brown_2">#C6A969</color>
- <color name="green">#597E52</color>
+ <color name="brown_2">#473205</color>
+ <color name="green">#3b5237</color>
</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 f76093b..6a7cd91 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,5 @@
<resources>
<string name="app_name">BondoMan</string>
- <!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="save_button_text">Export transaction list</string>
<string name="send_button_text">Send transaction to email</string>
@@ -8,4 +7,12 @@
<string name="data_transaksi_title">Transaction Data</string>
<string name="randomize_buton_text">Randomize transaction</string>
<string name="items">Items</string>
+ <string name="camera_button">Capture photo</string>
+ <string name="gallery_button">Pick image from gallery</string>
+ <string name="password">Password</string>
+ <string name="twibbon_1">First Twibbon</string>
+ <string name="twibbon_2">Second Twibbon</string>
+ <string name="twibbon_3">Third Twibbon</string>
+ <string name="twibbon_4">Fourth Twibbon</string>
+ <string name="twibbon_5">Fifth Twibbon</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5e4c951..39fb772 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,9 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="BottomNavigationTheme" parent="Theme.AppCompat.Light">
- <item name="colorPrimary">@color/green</item>
+ <item name="colorPrimary">@color/secondary_green</item>
<item name="android:textColorSecondary">@color/brown_2</item>
+ <item name="android:textSize">16sp</item> <!-- Adjust the text size as needed -->
+
</style>
+ <style name="BottomNavigationTextAppearance" parent="TextAppearance.Design.Tab">
+ <item name="android:textSize">14sp</item>
+ <item name="colorPrimary">@color/secondary_green</item>
+ </style>
</resources>
\ No newline at end of file
--
GitLab