diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-06-16 20:24:40 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-01 19:12:29 +0000 |
| commit | 40ab283b2bd438612adc919947ba9f2378f4ab8d (patch) | |
| tree | 72c912b4eb679167047a40baca2698eb35762cb5 /android/src | |
| parent | cc95151cf5055f2abc49bae58e6386ecbd776dde (diff) | |
| download | mullvadvpn-40ab283b2bd438612adc919947ba9f2378f4ab8d.tar.xz mullvadvpn-40ab283b2bd438612adc919947ba9f2378f4ab8d.zip | |
Remove `ViewSwitcher`
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt | 11 | ||||
| -rw-r--r-- | android/src/main/res/layout/select_location.xml | 23 |
2 files changed, 4 insertions, 30 deletions
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 3a04eab410..de2915ab0d 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt @@ -8,7 +8,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ImageButton -import android.widget.ViewSwitcher import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.model.Constraint import net.mullvad.mullvadvpn.model.KeygenEvent @@ -23,7 +22,6 @@ import net.mullvad.mullvadvpn.util.AdapterWithHeader class SelectLocationFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { private lateinit var relayListAdapter: RelayListAdapter - private lateinit var relayListContainer: ViewSwitcher override fun onAttach(context: Context) { super.onAttach(context) @@ -51,9 +49,6 @@ class SelectLocationFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc view.findViewById<ImageButton>(R.id.close).setOnClickListener { close() } - relayListContainer = view.findViewById<ViewSwitcher>(R.id.relay_list_container) - relayListContainer.showNext() - configureRelayList(view.findViewById<RecyclerView>(R.id.relay_list)) return view @@ -93,12 +88,6 @@ class SelectLocationFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc private fun updateRelayList(relayList: RelayList, selectedItem: RelayItem?) { relayListAdapter.onRelayListChange(relayList, selectedItem) - - if (relayList.countries.isEmpty()) { - relayListContainer.showPrevious() - } else if (relayListContainer.displayedChild == 0) { - relayListContainer.showNext() - } } private fun maybeConnect() { diff --git a/android/src/main/res/layout/select_location.xml b/android/src/main/res/layout/select_location.xml index 284880c410..c3cad97b72 100644 --- a/android/src/main/res/layout/select_location.xml +++ b/android/src/main/res/layout/select_location.xml @@ -12,23 +12,8 @@ android:padding="12dp" android:background="?android:attr/selectableItemBackground" android:src="@drawable/icon_close" /> - <ViewSwitcher android:id="@+id/relay_list_container" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:inAnimation="@anim/fade_in" - android:outAnimation="@anim/fade_out"> - <ProgressBar android:layout_width="60dp" - android:layout_height="60dp" - android:layout_gravity="center" - android:indeterminate="true" - android:indeterminateOnly="true" - android:indeterminateDuration="600" - android:indeterminateDrawable="@drawable/icon_spinner" - android:visibility="invisible" /> - <android.support.v7.widget.RecyclerView android:id="@+id/relay_list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scrollbars="vertical" /> - </ViewSwitcher> + <android.support.v7.widget.RecyclerView android:id="@+id/relay_list" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:scrollbars="vertical" /> </LinearLayout> |