Merge pull request #189 from boostcampwm2023/feat/and/accessibility-i…

…mprovements 접근성 개선
boostcampwm2023 · Dec 7, 2023 · b9b9b83 · b9b9b83
2 parents 49a464e + b747cf3
commit b9b9b83
Show file tree

Hide file tree

Showing 15 changed files with 74 additions and 19 deletions.
diff --git a/android/app/src/main/java/app/priceguard/ui/additem/setprice/SetTargetPriceFragment.kt b/android/app/src/main/java/app/priceguard/ui/additem/setprice/SetTargetPriceFragment.kt
@@ -76,14 +76,16 @@ class SetTargetPriceFragment : Fragment() {
 
         setTargetPriceViewModel.updateTargetPrice((price * 0.8).toInt())
 
-        binding.tvSetPriceCurrentPrice.text =
+        tvSetPriceCurrentPrice.text =
             String.format(
                 resources.getString(R.string.won),
                 NumberFormat.getNumberInstance().format(price)
             )
+        tvSetPriceCurrentPrice.contentDescription =
+            getString(R.string.current_price_info, tvSetPriceCurrentPrice.text)
 
         setTargetPriceViewModel.setProductInfo(productCode, title, price)
-        binding.etTargetPrice.setText((price * 0.8).toInt().toString())
+        etTargetPrice.setText((price * 0.8).toInt().toString())
     }
 
     private fun FragmentSetTargetPriceBinding.initListener() {
@@ -133,6 +135,12 @@ class SetTargetPriceFragment : Fragment() {
             binding.tvTargetPricePercent.text =
                 String.format(getString(R.string.current_price_percent), percent)
 
+            binding.tvTargetPricePercent.contentDescription = getString(
+                R.string.target_price_percent_and_price,
+                binding.tvTargetPricePercent.text,
+                binding.tvSetPriceCurrentPrice.text
+            )
+
             binding.updateSlideValueWithPrice(targetPrice, percent.roundAtFirstDigit())
         }
     }

diff --git a/android/app/src/main/java/app/priceguard/ui/home/ProductSummaryAdapter.kt b/android/app/src/main/java/app/priceguard/ui/home/ProductSummaryAdapter.kt
@@ -56,12 +56,12 @@ class ProductSummaryAdapter(private val productSummaryClickListener: ProductSumm
                     msProduct.visibility = View.VISIBLE
                     tvProductDiscountPercent.visibility = View.VISIBLE
                     setDisCount(item.discountPercent)
-                    setSwitchListener()
+                    setSwitchListener(item)
                 }
             }
         }
 
-        private fun ItemProductSummaryBinding.setSwitchListener() {
+        private fun ItemProductSummaryBinding.setSwitchListener(item: ProductSummary) {
             if (msProduct.isChecked.not()) {
                 msProduct.setThumbIconResource(R.drawable.ic_notifications_off)
             }
@@ -74,6 +74,7 @@ class ProductSummaryAdapter(private val productSummaryClickListener: ProductSumm
                     msProduct.setThumbIconResource(R.drawable.ic_notifications_off)
                 }
             }
+            msProduct.contentDescription = msProduct.context.getString(R.string.single_product_notification_toggle, item.title)
         }
 
         private fun ItemProductSummaryBinding.setDisCount(discount: Float) {
@@ -96,12 +97,14 @@ class ProductSummaryAdapter(private val productSummaryClickListener: ProductSumm
                 true
             )
             tvProductDiscountPercent.setTextColor(value.data)
+            tvProductDiscountPercent.contentDescription = tvProductDiscountPercent.context.getString(R.string.target_price_delta, tvProductDiscountPercent.text)
         }
 
         private fun ItemProductSummaryBinding.setRecommendRank(item: ProductSummary.RecommendedProductSummary) {
             tvProductRecommendRank.text = tvProductRecommendRank.context.getString(
                 R.string.recommand_rank, item.recommendRank
             )
+            tvProductRecommendRank.contentDescription = tvProductRecommendRank.context.getString(R.string.current_rank_info, item.recommendRank)
         }
 
         private fun ItemProductSummaryBinding.setClickListener(code: String) {

diff --git a/android/app/src/main/res/layout/activity_add_item.xml b/android/app/src/main/res/layout/activity_add_item.xml
@@ -5,8 +5,8 @@
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-        android:fillViewport="true">
+        android:fillViewport="true"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/fcv_add_item"

diff --git a/android/app/src/main/res/layout/activity_detail.xml b/android/app/src/main/res/layout/activity_detail.xml
@@ -30,6 +30,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:minHeight="?attr/actionBarSize"
+                app:navigationContentDescription="@string/go_back"
                 app:navigationIcon="@drawable/ic_back" />
 
         </com.google.android.material.appbar.AppBarLayout>
@@ -94,6 +95,7 @@
                             android:layout_height="48dp"
                             android:layout_marginTop="12dp"
                             android:layout_marginEnd="12dp"
+                            android:contentDescription="@string/share_product"
                             app:icon="@drawable/ic_share"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/iv_detail_product" />
@@ -118,6 +120,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="8dp"
+                            android:contentDescription="@{@string/current_price_info(@string/price(viewModel.state.formattedPrice))}"
                             android:text="@{@string/price(viewModel.state.formattedPrice)}"
                             android:textAppearance="?attr/textAppearanceTitleMedium"
                             app:layout_constraintStart_toEndOf="@id/gl_vertical_start_nested"
@@ -210,6 +213,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="8dp"
+                            android:importantForAccessibility="no"
                             android:text="@string/lowest_price"
                             android:textAppearance="?attr/textAppearanceTitleSmall"
                             app:layout_constraintStart_toEndOf="@id/gl_vertical_start_nested"
@@ -220,6 +224,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="8dp"
+                            android:contentDescription="@{@string/lowest_price_info(@string/price(viewModel.state.formattedLowestPrice))}"
                             android:text="@{@string/price(viewModel.state.formattedLowestPrice)}"
                             android:textAppearance="?attr/textAppearanceTitleSmall"
                             android:textStyle="bold"
@@ -232,6 +237,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="8dp"
+                            android:importantForAccessibility="no"
                             android:text="@string/target_price"
                             android:textAppearance="?attr/textAppearanceTitleSmall"
                             android:visibility="@{viewModel.state.isTracking ? View.VISIBLE : View.GONE}"
@@ -243,6 +249,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="8dp"
+                            android:contentDescription="@{@string/target_price_info(@string/price(viewModel.state.formattedTargetPrice))}"
                             android:text="@{@string/price(viewModel.state.formattedTargetPrice)}"
                             android:textAppearance="?attr/textAppearanceTitleSmall"
                             android:textStyle="bold"
@@ -267,6 +274,7 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="8dp"
+                            android:contentDescription="@string/edit_period"
                             app:checkedButton="@+id/btn_period_day"
                             app:layout_constraintEnd_toStartOf="@id/gl_vertical_end_nested"
                             app:layout_constraintStart_toEndOf="@id/gl_vertical_start_nested"
@@ -314,6 +322,7 @@
                             android:layout_width="0dp"
                             android:layout_height="300dp"
                             android:layout_marginTop="8dp"
+                            android:contentDescription="@string/price_track_graph"
                             app:layout_constraintEnd_toStartOf="@id/gl_vertical_end_nested"
                             app:layout_constraintStart_toEndOf="@id/gl_vertical_start_nested"
                             app:layout_constraintTop_toBottomOf="@id/mbtg_graph_period" />

diff --git a/android/app/src/main/res/layout/activity_login.xml b/android/app/src/main/res/layout/activity_login.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 

diff --git a/android/app/src/main/res/layout/activity_signup.xml b/android/app/src/main/res/layout/activity_signup.xml
@@ -37,6 +37,7 @@
                     android:fitsSystemWindows="true"
                     android:minHeight="?attr/actionBarSize"
                     app:layout_collapseMode="pin"
+                    app:navigationContentDescription="@string/go_back"
                     app:navigationIcon="@drawable/ic_back"
                     app:title="@string/sign_up" />
 

diff --git a/android/app/src/main/res/layout/activity_splash_screen.xml b/android/app/src/main/res/layout/activity_splash_screen.xml
@@ -13,11 +13,11 @@
             android:id="@+id/iv_splash_logo"
             android:layout_width="160dp"
             android:layout_height="160dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            android:src="@drawable/ic_priceguard_original"
             app:layout_constraintBottom_toBottomOf="parent"
-            android:src="@drawable/ic_priceguard_original" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/android/app/src/main/res/layout/fragment_confirm_item_link.xml b/android/app/src/main/res/layout/fragment_confirm_item_link.xml
@@ -60,6 +60,7 @@
                     android:id="@+id/iv_confirm_item"
                     android:layout_width="0dp"
                     android:layout_height="248dp"
+                    android:contentDescription="@string/selected_product_image"
                     android:scaleType="fitXY"
                     app:imageFromUrl="@{viewModel.state.imageUrl}"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -72,6 +73,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginHorizontal="16dp"
                     android:layout_marginTop="16dp"
+                    android:contentDescription="@{@string/product_name_info(viewModel.state.name)}"
                     android:maxLines="3"
                     android:text="@{viewModel.state.name}"
                     android:textAppearance="?attr/textAppearanceBodyLarge"
@@ -84,6 +86,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
+                    android:contentDescription="@{@string/shopping_mall_name_info(viewModel.state.brand)}"
                     android:text="@{viewModel.state.brand}"
                     android:textAppearance="?attr/textAppearanceBodyMedium"
                     app:layout_constraintStart_toStartOf="@id/tv_confirm_item_item_title"
@@ -94,6 +97,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="36dp"
+                    android:contentDescription="@string/product_11st"
+                    android:visibility="gone"
                     app:layout_constraintStart_toStartOf="@id/tv_confirm_item_brand"
                     app:layout_constraintTop_toBottomOf="@id/tv_confirm_item_brand" />
 
@@ -102,6 +107,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="16dp"
+                    android:contentDescription="@{@string/current_price_info(@string/won(@string/comma_number(viewModel.state.price)))}"
                     android:text="@{@string/won(@string/comma_number(viewModel.state.price))}"
                     android:textAppearance="?attr/textAppearanceTitleMedium"
                     app:layout_constraintEnd_toEndOf="parent"

diff --git a/android/app/src/main/res/layout/fragment_my_page.xml b/android/app/src/main/res/layout/fragment_my_page.xml
@@ -74,6 +74,7 @@
                             android:layout_margin="16dp"
                             android:background="@drawable/bg_circle"
                             android:gravity="center"
+                            android:importantForAccessibility="no"
                             android:text="@{viewModel.state.firstName}"
                             android:textAppearance="?attr/textAppearanceTitleMedium"
                             android:textColor="?attr/colorSurface"
@@ -86,6 +87,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="16dp"
+                            android:contentDescription="@{@string/my_name_info(viewModel.state.name)}"
                             android:text="@{viewModel.state.name}"
                             android:textAppearance="?attr/textAppearanceBodyLarge"
                             app:layout_constraintBottom_toTopOf="@id/tv_my_page_email"
@@ -96,6 +98,7 @@
                             android:id="@+id/tv_my_page_email"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:contentDescription="@{@string/my_email_info(viewModel.state.email)}"
                             android:text="@{viewModel.state.email}"
                             android:textAppearance="?attr/textAppearanceBodyMedium"
                             app:layout_constraintBottom_toBottomOf="parent"
@@ -114,7 +117,8 @@
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/view_my_page_background" />
+                    app:layout_constraintTop_toBottomOf="@id/view_my_page_background"
+                    tools:listitem="@layout/item_my_page_list" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 

diff --git a/android/app/src/main/res/layout/fragment_product_list.xml b/android/app/src/main/res/layout/fragment_product_list.xml
@@ -54,8 +54,8 @@
                 android:id="@+id/rv_product_list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior"
                 tools:listitem="@layout/item_product_summary" />
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton

diff --git a/android/app/src/main/res/layout/fragment_register_item_link.xml b/android/app/src/main/res/layout/fragment_register_item_link.xml
@@ -56,6 +56,7 @@
             android:layout_marginHorizontal="24dp"
             android:background="#00000000"
             android:hint="@string/register_link"
+            android:importantForAutofill="no"
             android:inputType="textUri"
             android:onTextChanged="@{(content, s, b, c) -> viewModel.updateLink(content.toString())}"
             app:layout_constraintBottom_toBottomOf="@id/view_edit_text_background"
@@ -71,6 +72,7 @@
             android:layout_marginEnd="8dp"
             android:enabled="@{viewModel.state.nextReady}"
             android:onClick="@{()->viewModel.verifyLink()}"
+            android:contentDescription="@string/link_confirm_button"
             app:icon="@drawable/ic_next"
             app:layout_constraintBottom_toBottomOf="@id/et_register_item_link"
             app:layout_constraintEnd_toStartOf="@+id/gl_vertical_end"

diff --git a/android/app/src/main/res/layout/fragment_set_target_price.xml b/android/app/src/main/res/layout/fragment_set_target_price.xml
@@ -38,6 +38,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="96dp"
+                android:labelFor="@+id/et_target_price"
                 android:text="@string/set_price_title"
                 android:textAppearance="?attr/textAppearanceHeadlineMedium"
                 app:layout_constraintStart_toEndOf="@id/gl_vertical_start"
@@ -72,8 +73,10 @@
                 android:layout_height="56dp"
                 android:layout_marginTop="80dp"
                 android:background="@drawable/bg_round_corner"
+                android:contentDescription="@string/target_price_input"
                 android:gravity="end|center_vertical"
                 android:imeOptions="actionDone"
+                android:importantForAutofill="no"
                 android:inputType="number"
                 android:paddingHorizontal="24dp"
                 android:textSize="22sp"
@@ -101,7 +104,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical|end"
                 android:paddingHorizontal="16dp"
-                android:text="현재 가격의 80%"
+                android:text="@string/target_price_80"
                 android:textSize="16sp"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toStartOf="@id/gl_vertical_end"
@@ -113,8 +116,8 @@
                 style="@style/Widget.Material3.Button.TextButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
                 android:layout_marginTop="32dp"
+                android:layout_marginBottom="16dp"
                 android:text="@string/back"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toEndOf="@id/gl_vertical_start"

diff --git a/android/app/src/main/res/layout/item_my_page_list.xml b/android/app/src/main/res/layout/item_my_page_list.xml
@@ -19,9 +19,9 @@
         android:id="@+id/layout_setting"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="8dp"
         android:background="?android:attr/selectableItemBackground"
-        android:onClick="@{() -> listener.onClick(settingItemInfo.id)}">
+        android:onClick="@{() -> listener.onClick(settingItemInfo.id)}"
+        android:paddingHorizontal="8dp">
 
         <ImageView
             android:id="@+id/iv_my_page_item_icon"

diff --git a/android/app/src/main/res/layout/item_product_summary.xml b/android/app/src/main/res/layout/item_product_summary.xml
@@ -37,6 +37,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
                 android:layout_marginStart="16dp"
+                android:contentDescription="@string/product_11st"
                 android:src="@drawable/ic_11st_logo"
                 app:layout_constraintBottom_toBottomOf="@id/tv_my_page_item_title"
                 app:layout_constraintStart_toStartOf="parent"
@@ -63,6 +64,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
+                android:contentDescription="@{@string/current_price_info(@string/won(@string/comma_number(summary.price)))}"
                 android:text="@{@string/won(@string/comma_number(summary.price))}"
                 android:textAppearance="?attr/textAppearanceBodyMedium"
                 app:layout_constraintStart_toStartOf="@+id/iv_item_icon"