diff options
5 files changed, 18 insertions, 20 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemDividerDecoration.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemDividerDecoration.kt index 26dcebe86d..16e1caad17 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemDividerDecoration.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemDividerDecoration.kt @@ -12,11 +12,6 @@ class ListItemDividerDecoration(private val context: Context) : ItemDecoration() private val dividerHeight = context.resources.getDimensionPixelSize(R.dimen.list_item_divider) override fun getItemOffsets(offsets: Rect, view: View, parent: RecyclerView, state: State) { - val position = parent.getChildAdapterPosition(view) - val lastItem = parent.adapter!!.itemCount - 1 - - if (position != lastItem) { - offsets.bottom = dividerHeight - } + offsets.bottom = dividerHeight } } diff --git a/android/src/main/res/layout/advanced.xml b/android/src/main/res/layout/advanced.xml index 29175969d0..c96c1b3d03 100644 --- a/android/src/main/res/layout/advanced.xml +++ b/android/src/main/res/layout/advanced.xml @@ -55,7 +55,7 @@ <net.mullvad.mullvadvpn.ui.widget.NavigateCell android:id="@+id/split_tunneling" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/vertical_space" + android:layout_marginTop="1dp" mullvad:text="@string/split_tunneling" /> </LinearLayout> </net.mullvad.mullvadvpn.ui.widget.ListenableScrollView> diff --git a/android/src/main/res/layout/app_list_item.xml b/android/src/main/res/layout/app_list_item.xml index 49a15d06a8..c705db1085 100644 --- a/android/src/main/res/layout/app_list_item.xml +++ b/android/src/main/res/layout/app_list_item.xml @@ -1,25 +1,26 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingHorizontal="16dp" + android:paddingHorizontal="@dimen/side_margin" android:background="@drawable/app_list_item_background" android:orientation="horizontal" android:gravity="center" android:clickable="true"> <ProgressBar android:id="@+id/loading" - android:layout_width="40dp" - android:layout_height="40dp" + android:layout_width="@dimen/app_list_item_icon_size" + android:layout_height="@dimen/app_list_item_icon_size" android:layout_gravity="center" + android:layout_marginRight="4dp" android:indeterminate="true" android:indeterminateOnly="true" android:indeterminateDuration="600" android:indeterminateDrawable="@drawable/icon_spinner" android:visibility="visible" /> <ImageView android:id="@+id/icon" - android:layout_width="40dp" - android:layout_height="40dp" + android:layout_width="@dimen/app_list_item_icon_size" + android:layout_height="@dimen/app_list_item_icon_size" android:layout_gravity="center" - android:layout_marginLeft="8dp" + android:layout_marginRight="4dp" android:visibility="gone" /> <TextView android:id="@+id/name" android:layout_width="wrap_content" @@ -31,7 +32,7 @@ android:textSize="@dimen/text_medium" android:text="" /> <net.mullvad.mullvadvpn.ui.widget.CellSwitch android:id="@+id/excluded" - android:layout_width="52dp" - android:layout_height="32dp" + android:layout_width="@dimen/cell_switch_width" + android:layout_height="@dimen/cell_switch_height" android:layout_weight="0" /> </LinearLayout> diff --git a/android/src/main/res/layout/split_tunneling_header.xml b/android/src/main/res/layout/split_tunneling_header.xml index 12fb12c4f3..c58bd44c0e 100644 --- a/android/src/main/res/layout/split_tunneling_header.xml +++ b/android/src/main/res/layout/split_tunneling_header.xml @@ -18,7 +18,7 @@ android:paddingTop="8dp" android:paddingHorizontal="@dimen/side_margin" android:text="@string/split_tunneling_description" - android:textColor="@color/white60" + android:textColor="@color/white" android:textSize="@dimen/text_small" /> <net.mullvad.mullvadvpn.ui.widget.ToggleCell android:id="@+id/enabled" android:layout_width="match_parent" @@ -29,17 +29,18 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/vertical_space" - android:paddingHorizontal="16dp" + android:paddingLeft="@dimen/cell_left_padding" + android:paddingRight="@dimen/cell_right_padding" android:background="@drawable/cell_button_background" android:visibility="gone" android:gravity="center"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:paddingHorizontal="8dp" - android:paddingVertical="17dp" + android:paddingRight="@dimen/cell_inner_spacing" + android:paddingVertical="@dimen/cell_label_vertical_padding" android:textColor="@color/white" - android:textSize="@dimen/text_medium_plus" + android:textSize="@dimen/text_medium" android:textStyle="bold" android:text="@string/exclude_applications" /> </LinearLayout> diff --git a/android/src/main/res/values/dimensions.xml b/android/src/main/res/values/dimensions.xml index f02292476c..d06f80e517 100644 --- a/android/src/main/res/values/dimensions.xml +++ b/android/src/main/res/values/dimensions.xml @@ -37,4 +37,5 @@ <dimen name="half_vertical_space">10dp</dimen> <dimen name="button_separation">18dp</dimen> <dimen name="screen_vertical_margin">22dp</dimen> + <dimen name="app_list_item_icon_size">35dp</dimen> </resources> |