[chore] #15 themes, PingleChip 되돌리기

TeamPINGLE · Jan 7, 2024 · 9163fd6 · 9163fd6
1 parent a8005a7
commit 9163fd6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/src/main/java/org/sopt/pingle/util/component/PingleChip.kt b/app/src/main/java/org/sopt/pingle/util/component/PingleChip.kt
@@ -14,25 +14,25 @@ import org.sopt.pingle.util.view.stringOf
 class PingleChip @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
-    defStyleAttr: Int = R.style.Theme_Pingle_Chip,
+    defStyleAttr: Int = R.style.Theme_Pingle_Chip_All,
 ) : Chip(context, attrs, defStyleAttr) {
     private lateinit var _categoryType: CategoryType
     val categoryType get() = _categoryType
 
     private fun setColorStateList(
         context: Context,
         activatedColorRes: Int,
-        inactivatedColorRes: Int,
+        inactivatedColorRes: Int
     ) =
         ColorStateList(
             arrayOf(
                 intArrayOf(android.R.attr.state_checked),
-                intArrayOf(-android.R.attr.state_checked),
+                intArrayOf(-android.R.attr.state_checked)
             ),
             intArrayOf(
                 colorOf(activatedColorRes),
                 colorOf(inactivatedColorRes)
-            )
+            ),
         )
 
     fun setChipCategoryType(categoryType: CategoryType) {
@@ -51,13 +51,13 @@ class PingleChip @JvmOverloads constructor(
         chipBackgroundColor = setColorStateList(
             context = context,
             activatedColorRes = categoryType.backgroundChipColor,
-            inactivatedColorRes = inactivatedChipColor,
+            inactivatedColorRes = inactivatedChipColor
         )
         setTextColor(
             setColorStateList(
                 context = context,
                 activatedColorRes = categoryType.textColor,
-                inactivatedColorRes = inactivatedTextColor,
+                inactivatedColorRes = inactivatedTextColor
             ),
         )
     }

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -7,6 +7,7 @@
     </style>
 
     <style name="Theme.Pingle" parent="Base.Theme.Pingle" />
+
     <!-- Button -->
     <style name="Theme.Pingle.Button" parent="Widget.Material3.Button">
         <item name="android:insetTop">0dp</item>