diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-02 18:18:09 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-15 12:52:17 +0000 |
| commit | 8606b71424db58577ec3d7a56e247b518843e57a (patch) | |
| tree | 733e1d8e1525168db508d1504d7542823742b987 /android/src | |
| parent | afc0127d0bdc3032c7a4c85c026e3aa107403cb0 (diff) | |
| download | mullvadvpn-8606b71424db58577ec3d7a56e247b518843e57a.tar.xz mullvadvpn-8606b71424db58577ec3d7a56e247b518843e57a.zip | |
Rename decoration to `ListItemDividerDecoration`
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemDividerDecoration.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemDividerDecoration.kt) | 6 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt | 3 | ||||
| -rw-r--r-- | android/src/main/res/values/dimensions.xml | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemDividerDecoration.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemDividerDecoration.kt index a1fbb8983f..26dcebe86d 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemDividerDecoration.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ListItemDividerDecoration.kt @@ -1,4 +1,4 @@ -package net.mullvad.mullvadvpn.relaylist +package net.mullvad.mullvadvpn.ui import android.content.Context import android.graphics.Rect @@ -8,8 +8,8 @@ import android.support.v7.widget.RecyclerView.State import android.view.View import net.mullvad.mullvadvpn.R -class RelayItemDividerDecoration(private val context: Context) : ItemDecoration() { - private val dividerHeight = context.resources.getDimensionPixelSize(R.dimen.relay_list_divider) +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) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt index 1ba8948375..a920e96a93 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt @@ -18,7 +18,6 @@ import net.mullvad.mullvadvpn.model.LocationConstraint import net.mullvad.mullvadvpn.model.RelayConstraintsUpdate import net.mullvad.mullvadvpn.model.RelaySettingsUpdate import net.mullvad.mullvadvpn.relaylist.RelayItem -import net.mullvad.mullvadvpn.relaylist.RelayItemDividerDecoration import net.mullvad.mullvadvpn.relaylist.RelayList import net.mullvad.mullvadvpn.relaylist.RelayListAdapter import net.mullvad.mullvadvpn.ui.widget.CustomRecyclerView @@ -75,7 +74,7 @@ class SelectLocationFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc } } - addItemDecoration(RelayItemDividerDecoration(parentActivity)) + addItemDecoration(ListItemDividerDecoration(parentActivity)) } return view diff --git a/android/src/main/res/values/dimensions.xml b/android/src/main/res/values/dimensions.xml index 4342bec6c5..197cb92ecb 100644 --- a/android/src/main/res/values/dimensions.xml +++ b/android/src/main/res/values/dimensions.xml @@ -2,7 +2,7 @@ <dimen name="country_row_padding">20dp</dimen> <dimen name="city_row_padding">40dp</dimen> <dimen name="relay_row_padding">60dp</dimen> - <dimen name="relay_list_divider">1dp</dimen> + <dimen name="list_item_divider">1dp</dimen> <dimen name="dialog_margin">14dp</dimen> <dimen name="account_input_corner_radius">4dp</dimen> <dimen name="edit_text_corner_radius">4dp</dimen> |