# Conflicts:

# app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt # app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt # app/src/main/res/layout/activity_show_on_app_launch_setting.xml
duckduckgo · Nov 4, 2024 · 6333b47 · 6333b47
1 parent 71d32a0
commit 6333b47
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 0 deletions.
diff --git a/app/src/main/res/layout/activity_show_on_app_launch_setting.xml b/app/src/main/res/layout/activity_show_on_app_launch_setting.xml
@@ -40,18 +40,21 @@
                 android:id="@+id/lastOpenedTabCheckListItem"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:minHeight="@dimen/oneLineItemHeight"
                 app:primaryText="Last Opened Tab" />
 
             <com.duckduckgo.common.ui.view.listitem.RadioListItem
                 android:id="@+id/newTabCheckListItem"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:minHeight="@dimen/oneLineItemHeight"
                 app:primaryText="New Tab Page" />
 
             <com.duckduckgo.common.ui.view.listitem.RadioListItem
                 android:id="@+id/specificPageCheckListItem"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:minHeight="@dimen/oneLineItemHeight"
                 app:primaryText="Specific Page" />
 
             <com.duckduckgo.common.ui.view.text.DaxTextInput

diff --git a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/RadioListItem.kt b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/RadioListItem.kt
@@ -55,6 +55,13 @@ class RadioListItem @JvmOverloads constructor(
             0,
             R.style.Widget_DuckDuckGo_TwoLineListItem,
         ).apply {
+            if (hasValue(R.styleable.RadioListItem_android_minHeight)) {
+                binding.itemContainer.minHeight =
+                    getDimensionPixelSize(R.styleable.RadioListItem_android_minHeight, resources.getDimensionPixelSize(R.dimen.oneLineItemHeight))
+            } else {
+                binding.itemContainer.minHeight = resources.getDimensionPixelSize(R.dimen.oneLineItemHeight)
+            }
+
             binding.radioButton.isChecked = getBoolean(R.styleable.RadioListItem_android_checked, false)
 
             binding.primaryText.text = getString(R.styleable.RadioListItem_primaryText)

diff --git a/common/common-ui/src/main/res/layout/view_radio_list_item.xml b/common/common-ui/src/main/res/layout/view_radio_list_item.xml
@@ -32,6 +32,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/keyline_3"
         android:minWidth="0dp"
+        android:minHeight="0dp"
         android:padding="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/common/common-ui/src/main/res/values/attrs-radio-list-item.xml b/common/common-ui/src/main/res/values/attrs-radio-list-item.xml
@@ -27,5 +27,6 @@
         <attr name="leadingIconBackground" />
         <attr name="leadingEmojiIcon" format="string" />
         <attr name="showTrailingIcon" format="boolean" />
+        <attr name="android:minHeight"/>
     </declare-styleable>
 </resources>
diff --git a/network-protection/network-protection-impl/src/main/res/layout/item_geoswitching_country.xml b/network-protection/network-protection-impl/src/main/res/layout/item_geoswitching_country.xml
@@ -18,4 +18,5 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:minHeight="@dimen/twoLineItemWithLargeImageHeight"
     app:leadingIconBackground="circular" />