Merge branch 'main_btn' into simply_secure_UI_changes

1 files changed, 12 insertions, 20 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 d8be1cc5..18e97411 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
@@ -27,6 +27,7 @@ import android.graphics.ColorMatrixColorFilter;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Vibrator;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -37,6 +38,7 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.AppCompatButton;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.fragment.app.DialogFragment;
@@ -61,7 +63,7 @@ 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;
-import se.leap.bitmaskclient.base.views.VpnStateImage;
+import se.leap.bitmaskclient.base.views.MainButton;
 import se.leap.bitmaskclient.eip.EipCommand;
 import se.leap.bitmaskclient.eip.EipStatus;
 import se.leap.bitmaskclient.eip.GatewaysManager;
@@ -105,8 +107,8 @@ public class EipFragment extends Fragment implements Observer {
     @BindView(R.id.background)
     AppCompatImageView background;
 
-    @BindView(R.id.vpn_state_image)
-    VpnStateImage vpnStateImage;
+    @BindView(R.id.main_button)
+    MainButton mainButton;
 
     @BindView(R.id.gateway_location_button)
     LocationButton locationButton;
@@ -267,16 +269,11 @@ public class EipFragment extends Fragment implements Observer {
         preferences.edit().putBoolean(EIP_RESTART_ON_BOOT, restartOnBoot).apply();
     }
 
-    @OnClick(R.id.gateway_location_button)
+    @OnClick(R.id.main_button)
     void onButtonClick() {
         handleIcon();
     }
 
-    @OnClick(R.id.vpn_state_image)
-    void onVpnStateImageClick() {
-        handleIcon();
-    }
-
     void handleIcon() {
         if (isOpenVpnRunningWithoutNetwork() || eipStatus.isConnected() || eipStatus.isConnecting())
             handleSwitchOff();
@@ -323,7 +320,7 @@ public class EipFragment extends Fragment implements Observer {
 
     private void setMainButtonEnabled(boolean enabled) {
         locationButton.setEnabled(enabled);
-        vpnStateImage.setEnabled(enabled);
+        mainButton.setEnabled(enabled);
     }
 
     public void startEipFromScratch() {
@@ -431,8 +428,7 @@ public class EipFragment extends Fragment implements Observer {
             locationButton.setLocationLoad(UNKNOWN);
         } else if (eipStatus.isConnected()) {
             setMainButtonEnabled(true);
-            vpnStateImage.setStateIcon(R.drawable.ic_btn_on_primary_color);
-            vpnStateImage.stopProgress(false);
+            mainButton.updateState(true, false, false);
             locationButton.setLocationLoad(gatewaysManager.getLoadForLocation(VpnStatus.getLastConnectedVpnName()));
             locationButton.setText(VpnStatus.getLastConnectedVpnName());
             locationButton.setVisibility(VISIBLE);
@@ -444,8 +440,7 @@ public class EipFragment extends Fragment implements Observer {
         } else if(isOpenVpnRunningWithoutNetwork()){
             Log.d(TAG, "eip fragment eipStatus - isOpenVpnRunningWithoutNetwork");
             setMainButtonEnabled(true);
-            vpnStateImage.setStateIcon(R.drawable.ic_btn_on_primary_color);
-            vpnStateImage.stopProgress(false);
+            mainButton.updateState(true, false, true);
             locationButton.setVisibility(VISIBLE);
             locationButton.setText(VpnStatus.getCurrentlyConnectingVpnName());
             colorBackgroundALittle();
@@ -466,8 +461,7 @@ public class EipFragment extends Fragment implements Observer {
             subDescription.setText(R.string.connection_not_connected);
         } else if (eipStatus.isBlocking()) {
             setMainButtonEnabled(true);
-            vpnStateImage.setStateIcon(R.drawable.ic_btn_on_primary_color);
-            vpnStateImage.stopProgress(false);
+            mainButton.updateState(true, false, true);
             colorBackgroundALittle();
             locationButton.setText(getString(R.string.finding_best_connection));
             locationButton.setVisibility(VISIBLE);
@@ -477,8 +471,7 @@ public class EipFragment extends Fragment implements Observer {
         } else {
             locationButton.setText(activity.getString(R.string.vpn_button_turn_on));
             setMainButtonEnabled(true);
-            vpnStateImage.setStateIcon(R.drawable.ic_btn_on_disabled);
-            vpnStateImage.stopProgress(false);
+            mainButton.updateState(false, false, false);
             greyscaleBackground();
             locationButton.setLocationLoad(UNKNOWN);
             locationButton.setVisibility(INVISIBLE);
@@ -517,8 +510,7 @@ public class EipFragment extends Fragment implements Observer {
     }
 
     private void showConnectionTransitionLayout(boolean isConnecting) {
-        vpnStateImage.setStateIcon(R.drawable.ic_btn_on_connecting);
-        vpnStateImage.showProgress();
+        mainButton.updateState(true, true, false);
         if (isConnecting) {
             colorBackgroundALittle();
         } else {