diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java | 8 | ||||
| -rw-r--r-- | app/src/main/res/layout/v_location_button.xml | 14 |
2 files changed, 10 insertions, 12 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 a5ccb81d..02feafd3 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 @@ -547,16 +547,16 @@ public class EipFragment extends Fragment implements Observer { setActivityBarColor(R.color.bg_disconnected_top, R.color.bg_disconnected_top_light_transparent); } else if (eipStatus.isBlocking()) { setMainButtonEnabled(true); - mainButton.updateState(true, false, true); + mainButton.updateState(false, true, true); locationButton.setText(R.string.no_location); locationButton.setLocationLoad(UNKNOWN); locationButton.showBridgeIndicator(false); locationButton.showRecommendedIndicator(false); mainDescription.setText(R.string.eip_state_connected); subDescription.setText(getString(R.string.eip_state_blocking, getString(R.string.app_name))); - background.setImageResource(R.drawable.bg_disconnected); - animateState(R.drawable.state_disconnected); - setActivityBarColor(R.color.bg_disconnected_top, R.color.bg_disconnected_top_light_transparent); + background.setImageResource(R.drawable.bg_connecting); + animateState(R.drawable.state_connecting); + setActivityBarColor(R.color.bg_connecting_top, R.color.bg_connecting_top_light_transparent); } else { locationButton.setText(R.string.vpn_button_turn_on); setMainButtonEnabled(true); diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml index 8aaf4978..22712b79 100644 --- a/app/src/main/res/layout/v_location_button.xml +++ b/app/src/main/res/layout/v_location_button.xml @@ -6,7 +6,8 @@ android:layout_width="match_parent" android:layout_gravity="center_vertical" android:layout_height="match_parent" - android:padding="@dimen/stdpadding" + android:paddingLeft="@dimen/stdpadding" + android:paddingRight="@dimen/stdpadding" android:background="@drawable/cust_button_light_rect" > @@ -86,18 +87,15 @@ <se.leap.bitmaskclient.base.views.LocationIndicator android:id="@+id/load_indicator" - android:layout_marginBottom="4dp" android:layout_width="48dp" - android:layout_height="40dp" + android:layout_height="28dp" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:paddingTop="@dimen/stdpadding" - android:paddingBottom="@dimen/stdpadding" - android:visibility="visible" android:layout_gravity="center_vertical" - app:tint="@color/colorLocationButtonTintTransparent" - /> + android:paddingBottom="4dp" + android:visibility="visible" + app:tint="@color/colorLocationButtonTintTransparent" /> |