From a9dcfa7017764d3f01053485e03e8de3cc7da915 Mon Sep 17 00:00:00 2001 From: Mushegh98 Date: Fri, 12 Jun 2020 19:29:51 +0400 Subject: [PATCH] Refactor code. --- .../wireguard/android/activity/LoginActivity.java | 2 +- .../wireguard/android/activity/MainActivity.java | 14 +++++++------- ui/src/main/res/drawable/main_background.xml | 2 +- .../{sign_in_button.xml => sign_in_disable.xml} | 2 +- ui/src/main/res/drawable/sign_in_enable.xml | 2 +- ui/src/main/res/layout/activity_login.xml | 2 +- ui/src/main/res/layout/activity_main.xml | 10 +++++----- ui/src/main/res/values/colors.xml | 7 +++++++ ui/src/main/res/values/dimens.xml | 2 ++ 9 files changed, 26 insertions(+), 17 deletions(-) rename ui/src/main/res/drawable/{sign_in_button.xml => sign_in_disable.xml} (64%) diff --git a/ui/src/main/java/com/wireguard/android/activity/LoginActivity.java b/ui/src/main/java/com/wireguard/android/activity/LoginActivity.java index 8c202b4..ec3fdd9 100644 --- a/ui/src/main/java/com/wireguard/android/activity/LoginActivity.java +++ b/ui/src/main/java/com/wireguard/android/activity/LoginActivity.java @@ -162,7 +162,7 @@ public class LoginActivity extends BaseActivityBubble { sign.setEnabled(true); } else { - sign.setBackgroundDrawable(getDrawable(R.drawable.sign_in_button)); + sign.setBackgroundDrawable(getDrawable(R.drawable.sign_in_disable)); sign.setEnabled(false); } } diff --git a/ui/src/main/java/com/wireguard/android/activity/MainActivity.java b/ui/src/main/java/com/wireguard/android/activity/MainActivity.java index 127c607..9369910 100644 --- a/ui/src/main/java/com/wireguard/android/activity/MainActivity.java +++ b/ui/src/main/java/com/wireguard/android/activity/MainActivity.java @@ -25,11 +25,11 @@ public class MainActivity extends AppCompatActivity { private boolean connectionStateFlag; private static final int REQUEST_CODE_VPN_PERMISSION = 23491; - public static final int LEFT = 16; - public static final int RIGHT = 16; - public static final int TOP = 150; - public static final int BOTTOM_CONNECTED = 90; - public static final int BOTTOM_DISCONNECTED = 100; + public static final int CONNECTED_TEXT_VIEW_LEFT_MARGIN = 16; + public static final int CONNECTED_TEXT_VIEW_RIGHT_MARGIN = 16; + public static final int CONNECTED_TEXT_VIEW_TOP_MARGIN = 150; + public static final int DISCONNECTED_TEXT_VIEW_BOTTOM_MARGIN = 90; + public static final int CONNECTED_TEXT_VIEW_BOTTOM_MARGIN = 100; @Override protected void onCreate(Bundle savedInstanceState) { @@ -109,7 +109,7 @@ public class MainActivity extends AppCompatActivity { if (state) { bubbleStatus.setText(getString(R.string.connected_bubble)); bubbleStatus.setTextColor(getResources().getColor(R.color.connectedColor)); - bubbleStatus.setPadding(LEFT, TOP, RIGHT,BOTTOM_CONNECTED); + bubbleStatus.setPadding(CONNECTED_TEXT_VIEW_LEFT_MARGIN, CONNECTED_TEXT_VIEW_TOP_MARGIN, CONNECTED_TEXT_VIEW_RIGHT_MARGIN, DISCONNECTED_TEXT_VIEW_BOTTOM_MARGIN); connectButton.setText(getString(R.string.disconnect)); imageMyBubble.setImageResource(R.drawable.bubble_connected); mark.setVisibility(View.VISIBLE); @@ -117,7 +117,7 @@ public class MainActivity extends AppCompatActivity { } else { bubbleStatus.setText(getString(R.string.not_connected_bubble)); bubbleStatus.setTextColor(getResources().getColor(R.color.gray)); - bubbleStatus.setPadding(LEFT,TOP,RIGHT,BOTTOM_DISCONNECTED); + bubbleStatus.setPadding(CONNECTED_TEXT_VIEW_LEFT_MARGIN, CONNECTED_TEXT_VIEW_TOP_MARGIN, CONNECTED_TEXT_VIEW_RIGHT_MARGIN, CONNECTED_TEXT_VIEW_BOTTOM_MARGIN); connectButton.setText(getString(R.string.connect)); imageMyBubble.setImageResource(R.drawable.bubble_disconnected); mark.setVisibility(View.GONE); diff --git a/ui/src/main/res/drawable/main_background.xml b/ui/src/main/res/drawable/main_background.xml index b5c0aa8..82c9901 100644 --- a/ui/src/main/res/drawable/main_background.xml +++ b/ui/src/main/res/drawable/main_background.xml @@ -3,7 +3,7 @@ - + diff --git a/ui/src/main/res/drawable/sign_in_button.xml b/ui/src/main/res/drawable/sign_in_disable.xml similarity index 64% rename from ui/src/main/res/drawable/sign_in_button.xml rename to ui/src/main/res/drawable/sign_in_disable.xml index 78d7223..2905347 100644 --- a/ui/src/main/res/drawable/sign_in_button.xml +++ b/ui/src/main/res/drawable/sign_in_disable.xml @@ -3,7 +3,7 @@ - + diff --git a/ui/src/main/res/drawable/sign_in_enable.xml b/ui/src/main/res/drawable/sign_in_enable.xml index 4e43ce6..3caa94a 100644 --- a/ui/src/main/res/drawable/sign_in_enable.xml +++ b/ui/src/main/res/drawable/sign_in_enable.xml @@ -3,7 +3,7 @@ - + diff --git a/ui/src/main/res/layout/activity_login.xml b/ui/src/main/res/layout/activity_login.xml index 6d8ed64..6ad796f 100644 --- a/ui/src/main/res/layout/activity_login.xml +++ b/ui/src/main/res/layout/activity_login.xml @@ -190,7 +190,7 @@ android:id="@+id/signButton" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/sign_in_button" + android:background="@drawable/sign_in_disable" android:enabled="false" android:text="@string/sign_in" android:textAlignment="center" diff --git a/ui/src/main/res/layout/activity_main.xml b/ui/src/main/res/layout/activity_main.xml index 29b9656..c7066ed 100644 --- a/ui/src/main/res/layout/activity_main.xml +++ b/ui/src/main/res/layout/activity_main.xml @@ -30,7 +30,7 @@ android:letterSpacing="-0.02" android:text="@string/my_bubble" android:textColor="@color/black" - android:textSize="30sp" + android:textSize="@dimen/bubble_connection_title_text_size" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.498" @@ -136,8 +136,8 @@ #b5e6ff #FF4081 #17AEA6 + #19ACB0 + #1BB29C + #1DC39E + #F597C8 + #DF9BDF + #EC2F91 + #C037C0 diff --git a/ui/src/main/res/values/dimens.xml b/ui/src/main/res/values/dimens.xml index 166f2de..cf84765 100644 --- a/ui/src/main/res/values/dimens.xml +++ b/ui/src/main/res/values/dimens.xml @@ -14,4 +14,6 @@ 8dp 254dp 55dp + 30sp + 90dp