@@ -162,7 +162,7 @@ public class LoginActivity extends BaseActivityBubble { | |||||
sign.setEnabled(true); | sign.setEnabled(true); | ||||
} | } | ||||
else { | else { | ||||
sign.setBackgroundDrawable(getDrawable(R.drawable.sign_in_button)); | |||||
sign.setBackgroundDrawable(getDrawable(R.drawable.sign_in_disable)); | |||||
sign.setEnabled(false); | sign.setEnabled(false); | ||||
} | } | ||||
} | } | ||||
@@ -25,11 +25,11 @@ public class MainActivity extends AppCompatActivity { | |||||
private boolean connectionStateFlag; | private boolean connectionStateFlag; | ||||
private static final int REQUEST_CODE_VPN_PERMISSION = 23491; | 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 | @Override | ||||
protected void onCreate(Bundle savedInstanceState) { | protected void onCreate(Bundle savedInstanceState) { | ||||
@@ -109,7 +109,7 @@ public class MainActivity extends AppCompatActivity { | |||||
if (state) { | if (state) { | ||||
bubbleStatus.setText(getString(R.string.connected_bubble)); | bubbleStatus.setText(getString(R.string.connected_bubble)); | ||||
bubbleStatus.setTextColor(getResources().getColor(R.color.connectedColor)); | 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)); | connectButton.setText(getString(R.string.disconnect)); | ||||
imageMyBubble.setImageResource(R.drawable.bubble_connected); | imageMyBubble.setImageResource(R.drawable.bubble_connected); | ||||
mark.setVisibility(View.VISIBLE); | mark.setVisibility(View.VISIBLE); | ||||
@@ -117,7 +117,7 @@ public class MainActivity extends AppCompatActivity { | |||||
} else { | } else { | ||||
bubbleStatus.setText(getString(R.string.not_connected_bubble)); | bubbleStatus.setText(getString(R.string.not_connected_bubble)); | ||||
bubbleStatus.setTextColor(getResources().getColor(R.color.gray)); | 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)); | connectButton.setText(getString(R.string.connect)); | ||||
imageMyBubble.setImageResource(R.drawable.bubble_disconnected); | imageMyBubble.setImageResource(R.drawable.bubble_disconnected); | ||||
mark.setVisibility(View.GONE); | mark.setVisibility(View.GONE); | ||||
@@ -3,7 +3,7 @@ | |||||
<item> | <item> | ||||
<shape android:shape="rectangle"> | <shape android:shape="rectangle"> | ||||
<gradient android:endColor="#1DC39E" android:centerColor="#1BB29C" android:startColor="#19ACB0" /> | |||||
<gradient android:endColor="@color/main_background_end_color" android:centerColor="@color/main_background_center_color" android:startColor="@color/main_background_start_color" /> | |||||
</shape> | </shape> | ||||
</item> | </item> | ||||
</selector> | </selector> |
@@ -3,7 +3,7 @@ | |||||
<item> | <item> | ||||
<shape android:shape="rectangle"> | <shape android:shape="rectangle"> | ||||
<gradient android:endColor="#DF9BDF" android:startColor="#F597C8" /> | |||||
<gradient android:endColor="@color/sign_in_disable_end_color" android:startColor="@color/sign_in_disable_start_color" /> | |||||
<corners android:radius="100dp" /> | <corners android:radius="100dp" /> | ||||
</shape> | </shape> | ||||
</item> | </item> |
@@ -3,7 +3,7 @@ | |||||
<item> | <item> | ||||
<shape android:shape="rectangle"> | <shape android:shape="rectangle"> | ||||
<gradient android:endColor="#C037C0" android:startColor="#EC2F91" /> | |||||
<gradient android:endColor="@color/sign_in_enable_end_color" android:startColor="@color/sign_in_enable_start_color" /> | |||||
<corners android:radius="100dp" /> | <corners android:radius="100dp" /> | ||||
</shape> | </shape> | ||||
</item> | </item> |
@@ -190,7 +190,7 @@ | |||||
android:id="@+id/signButton" | android:id="@+id/signButton" | ||||
android:layout_width="match_parent" | android:layout_width="match_parent" | ||||
android:layout_height="match_parent" | android:layout_height="match_parent" | ||||
android:background="@drawable/sign_in_button" | |||||
android:background="@drawable/sign_in_disable" | |||||
android:enabled="false" | android:enabled="false" | ||||
android:text="@string/sign_in" | android:text="@string/sign_in" | ||||
android:textAlignment="center" | android:textAlignment="center" | ||||
@@ -30,7 +30,7 @@ | |||||
android:letterSpacing="-0.02" | android:letterSpacing="-0.02" | ||||
android:text="@string/my_bubble" | android:text="@string/my_bubble" | ||||
android:textColor="@color/black" | android:textColor="@color/black" | ||||
android:textSize="30sp" | |||||
android:textSize="@dimen/bubble_connection_title_text_size" | |||||
android:textStyle="bold" | android:textStyle="bold" | ||||
app:layout_constraintEnd_toEndOf="parent" | app:layout_constraintEnd_toEndOf="parent" | ||||
app:layout_constraintHorizontal_bias="0.498" | app:layout_constraintHorizontal_bias="0.498" | ||||
@@ -136,8 +136,8 @@ | |||||
<ImageButton | <ImageButton | ||||
android:id="@+id/myBubbleImageView" | android:id="@+id/myBubbleImageView" | ||||
android:layout_width="90dp" | |||||
android:layout_height="90dp" | |||||
android:layout_width="@dimen/icons_size" | |||||
android:layout_height="@dimen/icons_size" | |||||
android:layout_marginStart="@dimen/margin_start_and_end" | android:layout_marginStart="@dimen/margin_start_and_end" | ||||
android:layout_marginBottom="44dp" | android:layout_marginBottom="44dp" | ||||
android:background="@drawable/my_bubble" | android:background="@drawable/my_bubble" | ||||
@@ -148,8 +148,8 @@ | |||||
<ImageButton | <ImageButton | ||||
android:id="@+id/accountImageView" | android:id="@+id/accountImageView" | ||||
android:layout_width="90dp" | |||||
android:layout_height="90dp" | |||||
android:layout_width="@dimen/icons_size" | |||||
android:layout_height="@dimen/icons_size" | |||||
android:layout_marginStart="@dimen/margin_start_and_end" | android:layout_marginStart="@dimen/margin_start_and_end" | ||||
android:layout_marginEnd="@dimen/margin_start_and_end" | android:layout_marginEnd="@dimen/margin_start_and_end" | ||||
android:background="@drawable/account" | android:background="@drawable/account" | ||||
@@ -35,4 +35,11 @@ | |||||
<color name="colorPrimaryDark">#b5e6ff</color> | <color name="colorPrimaryDark">#b5e6ff</color> | ||||
<color name="colorAccent">#FF4081</color> | <color name="colorAccent">#FF4081</color> | ||||
<color name="connectedColor">#17AEA6</color> | <color name="connectedColor">#17AEA6</color> | ||||
<color name="main_background_start_color">#19ACB0</color> | |||||
<color name="main_background_center_color">#1BB29C</color> | |||||
<color name="main_background_end_color">#1DC39E</color> | |||||
<color name="sign_in_disable_start_color">#F597C8</color> | |||||
<color name="sign_in_disable_end_color">#DF9BDF</color> | |||||
<color name="sign_in_enable_start_color">#EC2F91</color> | |||||
<color name="sign_in_enable_end_color">#C037C0</color> | |||||
</resources> | </resources> |
@@ -14,4 +14,6 @@ | |||||
<dimen name="margin_top">8dp</dimen> | <dimen name="margin_top">8dp</dimen> | ||||
<dimen name="edit_text_width">254dp</dimen> | <dimen name="edit_text_width">254dp</dimen> | ||||
<dimen name="edit_text_height">55dp</dimen> | <dimen name="edit_text_height">55dp</dimen> | ||||
<dimen name="bubble_connection_title_text_size">30sp</dimen> | |||||
<dimen name="icons_size">90dp</dimen> | |||||
</resources> | </resources> |