diff options
| author | Aleksandr Granin <aleksandr@mullvad.net> | 2021-03-12 08:29:56 +0100 |
|---|---|---|
| committer | Aleksandr Granin <aleksandr@mullvad.net> | 2021-03-12 14:57:41 +0100 |
| commit | 6a247fe70f7c8b5db2a95c674ca8ce3a21edc84a (patch) | |
| tree | 8e5a7ce6ddfd37ab5ccddaeeaffd8e5e0de647ae /android | |
| parent | 3251d457d0f1da0dc5e9500708399c0ba4d2cb5b (diff) | |
| download | mullvadvpn-6a247fe70f7c8b5db2a95c674ca8ce3a21edc84a.tar.xz mullvadvpn-6a247fe70f7c8b5db2a95c674ca8ce3a21edc84a.zip | |
Create extra dimen alias for widget padding
Diffstat (limited to 'android')
4 files changed, 6 insertions, 6 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/TwoActionListItemView.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/TwoActionListItemView.kt index dcc3597749..8f349c0548 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/TwoActionListItemView.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/listitemview/TwoActionListItemView.kt @@ -9,14 +9,13 @@ class TwoActionListItemView(context: Context) : ActionListItemView(ContextThemeWrapper(context, R.style.ListItem_Action_Double)) { override val layoutRes: Int get() = R.layout.list_item_two_action + private val container: ViewGroup = findViewById(R.id.container_without_widget) init { isClickable = false isFocusable = false } - private val container: ViewGroup = findViewById(R.id.container_without_widget) - override fun updateAction() { if (itemData.action == null) { container.setOnClickListener(null) diff --git a/android/src/main/res/layout/list_item_action.xml b/android/src/main/res/layout/list_item_action.xml index d1ebee41c7..9b9fc806f0 100644 --- a/android/src/main/res/layout/list_item_action.xml +++ b/android/src/main/res/layout/list_item_action.xml @@ -8,8 +8,8 @@ <FrameLayout android:id="@+id/widgetContainer" android:layout_width="wrap_content" android:layout_height="0dp" - android:paddingStart="@dimen/cell_right_padding" - android:paddingEnd="@dimen/cell_right_padding" + android:paddingStart="@dimen/widget_padding" + android:paddingEnd="@dimen/widget_padding" android:visibility="invisible" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/android/src/main/res/layout/list_item_two_action.xml b/android/src/main/res/layout/list_item_two_action.xml index 4928fef27b..81e6a5c652 100644 --- a/android/src/main/res/layout/list_item_two_action.xml +++ b/android/src/main/res/layout/list_item_two_action.xml @@ -19,8 +19,8 @@ android:layout_width="wrap_content" android:layout_height="0dp" android:background="?android:attr/selectableItemBackground" - android:paddingStart="@dimen/cell_right_padding" - android:paddingEnd="@dimen/cell_right_padding" + android:paddingStart="@dimen/widget_padding" + android:paddingEnd="@dimen/widget_padding" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" android:visibility="visible" diff --git a/android/src/main/res/values/dimensions.xml b/android/src/main/res/values/dimensions.xml index ac8e3c5843..3d42e74afd 100644 --- a/android/src/main/res/values/dimensions.xml +++ b/android/src/main/res/values/dimensions.xml @@ -44,6 +44,7 @@ <dimen name="app_list_item_icon_size">35dp</dimen> <dimen name="progress_size">60dp</dimen> <dimen name="icon_size">24dp</dimen> + <dimen name="widget_padding">16dp</dimen> <!-- Switch Dimens--> <dimen name="switch_width">46dp</dimen> <dimen name="switch_height">30dp</dimen> |