Merge pull request #45 from Trendyol/selectionDialogUiBugFix

selection dialog ui and checked bug
Trendyol · May 29, 2020 · 7187e7c · 7187e7c
2 parents 44909d0 + 789d0b9
commit 7187e7c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/...s/dialogs/src/main/java/com/trendyol/uicomponents/dialogs/list/DialogListItemViewState.kt b/...s/dialogs/src/main/java/com/trendyol/uicomponents/dialogs/list/DialogListItemViewState.kt
@@ -31,7 +31,7 @@ data class DialogListItemViewState(
         if (selectedTextColor == null || isChecked.not()) R.color.primary_text_color else selectedTextColor
 
     fun getRadioButtonVisibility() =
-        if(showRadioButton) View.VISIBLE else View.GONE
+        if (showRadioButton) View.VISIBLE else View.GONE
 
-    fun getRadioButtonChecked() = (selectedTextColor == null || isChecked.not()).not()
+    fun getRadioButtonChecked() = isChecked
 }
diff --git a/libraries/dialogs/src/main/res/drawable/ic_radio_button_unchecked.xml b/libraries/dialogs/src/main/res/drawable/ic_radio_button_unchecked.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="?attr/colorAccent"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
 </vector>
diff --git a/libraries/dialogs/src/main/res/layout/item_list.xml b/libraries/dialogs/src/main/res/layout/item_list.xml
@@ -14,29 +14,31 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?selectableItemBackground"
-        android:padding="@dimen/dialogs_margin_outer">
+        android:paddingTop="@dimen/dialogs_margin_outer"
+        android:paddingEnd="@dimen/dialogs_margin_outer"
+        android:paddingBottom="@dimen/dialogs_margin_outer">
 
         <androidx.appcompat.widget.AppCompatRadioButton
             android:id="@+id/imageViewLeftImageDrawable"
             style="@style/Trendyol.UIComponents.Dialogs.RadioButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:checked="@{viewState.getRadioButtonChecked}"
-            android:paddingEnd="@dimen/dialogs_margin_inner"
-            android:visibility="@{viewState.getRadioButtonVisibility}"
             android:clickable="false"
+            android:visibility="@{viewState.getRadioButtonVisibility}"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/radioButtonItem"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/radioButtonItem"
-            tools:src="@tools:sample/avatars"/>
+            tools:src="@tools:sample/avatars" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/radioButtonItem"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_toStartOf="@+id/imageViewCheckedDrawable"
+            android:paddingStart="@dimen/dialogs_margin_inner"
             android:text="@{viewState.text}"
             android:textAppearance="@style/Trendyol.UIComponents.Dialogs.PrimaryText.Body"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -56,10 +58,10 @@
             android:src="@{viewState.getSelectedItemDrawable(context)}"
             android:visibility="@{viewState.selectedItemDrawableVisibility}"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/radioButtonItem"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintHorizontal_bias="1"
+            app:layout_constraintStart_toEndOf="@id/radioButtonItem"
+            app:layout_constraintTop_toTopOf="parent"
             tools:src="@tools:sample/avatars" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/libraries/dialogs/src/main/res/values/styles.xml b/libraries/dialogs/src/main/res/values/styles.xml
@@ -43,6 +43,7 @@
     <style name="Trendyol.UIComponents.Sample.Dialogs" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">#F27A1A</item>
+        <item name="colorAccent">#666666</item>
     </style>
 
 </resources>