summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2021-07-23 23:50:02 +0200
committercyBerta <cyberta@riseup.net>2021-11-14 19:22:16 +0100
commitff427f2863dd2c3c46030968f4d034553f09d0bf (patch)
treef157595d0ac71b748f4383ce27ea9990fc74de67 /app/src/main
parent1e9202c3d929083220924f7c76ea01a2b6f6af9f (diff)
add click listener to gateway selection button, open the gateway selection fragment
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java7
-rw-r--r--app/src/main/res/layout/v_location_button.xml2
2 files changed, 7 insertions, 2 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
index cc822463..af34b7a5 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
@@ -56,6 +56,7 @@ import de.blinkt.openvpn.core.OpenVPNService;
import de.blinkt.openvpn.core.VpnStatus;
import se.leap.bitmaskclient.R;
import se.leap.bitmaskclient.base.FragmentManagerEnhanced;
+import se.leap.bitmaskclient.base.MainActivity;
import se.leap.bitmaskclient.base.models.Provider;
import se.leap.bitmaskclient.base.models.ProviderObservable;
import se.leap.bitmaskclient.base.views.LocationButton;
@@ -168,6 +169,7 @@ public class EipFragment extends Fragment implements Observer {
gatewaysManager = new GatewaysManager(getContext());
+
}
@Override
@@ -189,6 +191,11 @@ public class EipFragment extends Fragment implements Observer {
}
restoreFromSavedInstance(savedInstanceState);
+ locationButton.setOnClickListener(v -> {
+ FragmentManagerEnhanced fragmentManager = new FragmentManagerEnhanced(getActivity().getSupportFragmentManager());
+ Fragment fragment = new GatewaySelectionFragment();
+ fragmentManager.replace(R.id.main_container, fragment, MainActivity.TAG);
+ });
return view;
}
diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml
index 7425231e..9e5445a4 100644
--- a/app/src/main/res/layout/v_location_button.xml
+++ b/app/src/main/res/layout/v_location_button.xml
@@ -4,8 +4,6 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_gravity="center_vertical"
- android:clickable="true"
- android:focusable="true"
android:padding="@dimen/stdpadding"
android:background="@drawable/cust_button_primary_rect"
android:layout_height="wrap_content">