Move CheckListItem to common-ui

duckduckgo · Dec 4, 2023 · 260818b · 260818b
1 parent ce9405d
commit 260818b
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 16 deletions.
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
@@ -52,6 +52,7 @@ import com.duckduckgo.autoconsent.impl.ui.AutoconsentSettingsActivity
 import com.duckduckgo.autofill.api.AutofillScreens.AutofillSettingsScreenNoParams
 import com.duckduckgo.common.ui.DuckDuckGoActivity
 import com.duckduckgo.common.ui.view.gone
+import com.duckduckgo.common.ui.view.listitem.CheckListItem
 import com.duckduckgo.common.ui.view.listitem.TwoLineListItem
 import com.duckduckgo.common.ui.view.show
 import com.duckduckgo.common.ui.viewbinding.viewBinding

diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsViewModel.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsViewModel.kt
@@ -27,14 +27,15 @@ import com.duckduckgo.anvil.annotations.ContributesViewModel
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.browser.defaultbrowsing.DefaultBrowserDetector
 import com.duckduckgo.app.pixels.AppPixelName.*
-import com.duckduckgo.app.settings.CheckListItem.CheckItemStatus
 import com.duckduckgo.app.settings.SettingsViewModel.NetPEntryState.Hidden
 import com.duckduckgo.app.settings.SettingsViewModel.NetPEntryState.Pending
 import com.duckduckgo.app.settings.SettingsViewModel.NetPEntryState.ShowState
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.autoconsent.api.Autoconsent
 import com.duckduckgo.autofill.api.AutofillCapabilityChecker
 import com.duckduckgo.autofill.api.email.EmailManager
+import com.duckduckgo.common.ui.view.listitem.CheckListItem
+import com.duckduckgo.common.ui.view.listitem.CheckListItem.CheckItemStatus
 import com.duckduckgo.common.utils.ConflatedJob
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.di.scopes.ActivityScope

diff --git a/app/src/main/res/layout/content_settings_privacy.xml b/app/src/main/res/layout/content_settings_privacy.xml
@@ -27,14 +27,14 @@
         android:layout_height="wrap_content"
         app:primaryText="@string/settingsHeadingPrivacy" />
 
-    <com.duckduckgo.app.settings.CheckListItem
+    <com.duckduckgo.common.ui.view.listitem.CheckListItem
         android:id="@+id/setAsDefaultBrowserSetting"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:primaryText="@string/settingsDefaultBrowserTitle"
         app:secondaryText="@string/settingsDefaultBrowserNotSetDescription"/>
 
-    <com.duckduckgo.app.settings.CheckListItem
+    <com.duckduckgo.common.ui.view.listitem.CheckListItem
         android:id="@+id/privateSearchSetting"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
         app:primaryTextTruncated="false"
         app:secondaryText="@string/settingsPrivateSearchDescription" />
 
-    <com.duckduckgo.app.settings.CheckListItem
+    <com.duckduckgo.common.ui.view.listitem.CheckListItem
         android:id="@+id/webTrackingProtectionSetting"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -52,7 +52,7 @@
         app:primaryTextTruncated="false"
         app:secondaryText="@string/settingsWebTrackingProtectionDescription" />
 
-    <com.duckduckgo.app.settings.CheckListItem
+    <com.duckduckgo.common.ui.view.listitem.CheckListItem
         android:id="@+id/cookiePopupProtectionSetting"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -61,7 +61,7 @@
         app:primaryTextTruncated="false"
         app:secondaryText="@string/cookiePopupProtectionDescription" />
 
-    <com.duckduckgo.app.settings.CheckListItem
+    <com.duckduckgo.common.ui.view.listitem.CheckListItem
         android:id="@+id/emailSetting"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
         app:secondaryText="@string/settingsEmailProtectionSubtitle"
         app:showBetaPill="true" />
 
-    <com.duckduckgo.app.settings.CheckListItem
+    <com.duckduckgo.common.ui.view.listitem.CheckListItem
         android:id="@+id/vpnSetting"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
         app:secondaryText="@string/atp_SettingsDeviceShieldDisabled"
         app:showBetaPill="true" />
 
-    <com.duckduckgo.app.settings.CheckListItem
+    <com.duckduckgo.common.ui.view.listitem.CheckListItem
         android:id="@+id/netpPSetting"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

diff --git a/app/src/test/java/com/duckduckgo/app/settings/SettingsViewModelTest.kt b/app/src/test/java/com/duckduckgo/app/settings/SettingsViewModelTest.kt
@@ -31,6 +31,7 @@ import com.duckduckgo.autoconsent.api.Autoconsent
 import com.duckduckgo.autofill.api.AutofillCapabilityChecker
 import com.duckduckgo.autofill.api.email.EmailManager
 import com.duckduckgo.common.test.CoroutineTestRule
+import com.duckduckgo.common.ui.view.listitem.CheckListItem
 import com.duckduckgo.mobile.android.app.tracking.AppTrackingProtection
 import com.duckduckgo.navigation.api.GlobalActivityStarter.ActivityParams
 import com.duckduckgo.networkprotection.api.NetworkProtectionState

diff --git a/.../duckduckgo/app/settings/CheckListItem.kt → .../common/ui/view/listitem/CheckListItem.kt b/.../duckduckgo/app/settings/CheckListItem.kt → .../common/ui/view/listitem/CheckListItem.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.duckduckgo.app.settings
+package com.duckduckgo.common.ui.view.listitem
 
 import android.content.Context
 import android.text.TextUtils
@@ -23,13 +23,16 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.children
-import com.duckduckgo.app.browser.R
-import com.duckduckgo.app.browser.databinding.ViewCheckListItemBinding
 import com.duckduckgo.common.ui.view.gone
+import com.duckduckgo.common.ui.view.listitem.CheckListItem.CheckItemStatus.DISABLED
+import com.duckduckgo.common.ui.view.listitem.CheckListItem.CheckItemStatus.ENABLED
+import com.duckduckgo.common.ui.view.listitem.CheckListItem.CheckItemStatus.WARNING
 import com.duckduckgo.common.ui.view.setEnabledOpacity
 import com.duckduckgo.common.ui.view.show
 import com.duckduckgo.common.ui.viewbinding.viewBinding
 import com.duckduckgo.mobile.android.R as CommonR
+import com.duckduckgo.mobile.android.R.styleable
+import com.duckduckgo.mobile.android.databinding.ViewCheckListItemBinding
 
 class CheckListItem @JvmOverloads constructor(
     context: Context,
@@ -67,9 +70,9 @@ class CheckListItem @JvmOverloads constructor(
             }
 
             val status = if (hasValue(CommonR.styleable.CheckListItem_itemState)) {
-                CheckItemStatus.from(getInt(CommonR.styleable.CheckListItem_itemState, 0))
+                CheckItemStatus.from(getInt(styleable.CheckListItem_itemState, 0))
             } else {
-                CheckItemStatus.DISABLED
+                DISABLED
             }
             setItemStatus(status)
 
@@ -106,9 +109,9 @@ class CheckListItem @JvmOverloads constructor(
     /** Sets the status: enabled, disabled, warning */
     fun setItemStatus(status: CheckItemStatus) {
         when (status) {
-            CheckItemStatus.DISABLED -> binding.leadingIcon.setImageResource(R.drawable.ic_check_grey_round_16)
-            CheckItemStatus.ENABLED -> binding.leadingIcon.setImageResource(R.drawable.ic_check_green_round_16)
-            CheckItemStatus.WARNING -> binding.leadingIcon.setImageResource(R.drawable.ic_exclamation_yellow_16)
+            DISABLED -> binding.leadingIcon.setImageResource(CommonR.drawable.ic_check_grey_round_16)
+            ENABLED -> binding.leadingIcon.setImageResource(CommonR.drawable.ic_check_green_round_16)
+            WARNING -> binding.leadingIcon.setImageResource(CommonR.drawable.ic_exclamation_yellow_16)
         }
     }
 

diff --git a/.../res/drawable/ic_check_green_round_16.xml → .../res/drawable/ic_check_green_round_16.xml b/.../res/drawable/ic_check_green_round_16.xml → .../res/drawable/ic_check_green_round_16.xml
diff --git a/...n/res/drawable/ic_check_grey_round_16.xml → ...n/res/drawable/ic_check_grey_round_16.xml b/...n/res/drawable/ic_check_grey_round_16.xml → ...n/res/drawable/ic_check_grey_round_16.xml
diff --git a/...res/drawable/ic_exclamation_yellow_16.xml → ...res/drawable/ic_exclamation_yellow_16.xml b/...res/drawable/ic_exclamation_yellow_16.xml → ...res/drawable/ic_exclamation_yellow_16.xml
diff --git a/.../main/res/layout/view_check_list_item.xml → .../main/res/layout/view_check_list_item.xml b/.../main/res/layout/view_check_list_item.xml → .../main/res/layout/view_check_list_item.xml