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 6b867c4..127c607 100644
--- a/ui/src/main/java/com/wireguard/android/activity/MainActivity.java
+++ b/ui/src/main/java/com/wireguard/android/activity/MainActivity.java
@@ -27,6 +27,9 @@ public class MainActivity extends AppCompatActivity {
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;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -106,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, 160, RIGHT,100);
+ bubbleStatus.setPadding(LEFT, TOP, RIGHT,BOTTOM_CONNECTED);
connectButton.setText(getString(R.string.disconnect));
imageMyBubble.setImageResource(R.drawable.bubble_connected);
mark.setVisibility(View.VISIBLE);
@@ -114,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,140,RIGHT,130);
+ bubbleStatus.setPadding(LEFT,TOP,RIGHT,BOTTOM_DISCONNECTED);
connectButton.setText(getString(R.string.connect));
imageMyBubble.setImageResource(R.drawable.bubble_disconnected);
mark.setVisibility(View.GONE);
diff --git a/ui/src/main/res/drawable-hdpi/union.png b/ui/src/main/res/drawable-hdpi/union.png
new file mode 100644
index 0000000..4efcf05
Binary files /dev/null and b/ui/src/main/res/drawable-hdpi/union.png differ
diff --git a/ui/src/main/res/drawable-ldpi/union.png b/ui/src/main/res/drawable-ldpi/union.png
new file mode 100644
index 0000000..b0bbce8
Binary files /dev/null and b/ui/src/main/res/drawable-ldpi/union.png differ
diff --git a/ui/src/main/res/drawable-mdpi/union.png b/ui/src/main/res/drawable-mdpi/union.png
new file mode 100644
index 0000000..d6eeb63
Binary files /dev/null and b/ui/src/main/res/drawable-mdpi/union.png differ
diff --git a/ui/src/main/res/drawable-xhdpi/union.png b/ui/src/main/res/drawable-xhdpi/union.png
new file mode 100644
index 0000000..446b913
Binary files /dev/null and b/ui/src/main/res/drawable-xhdpi/union.png differ
diff --git a/ui/src/main/res/drawable-xxhdpi/union.png b/ui/src/main/res/drawable-xxhdpi/union.png
new file mode 100644
index 0000000..e9b8f9d
Binary files /dev/null and b/ui/src/main/res/drawable-xxhdpi/union.png differ
diff --git a/ui/src/main/res/drawable/main_background.xml b/ui/src/main/res/drawable/main_background.xml
new file mode 100644
index 0000000..b5c0aa8
--- /dev/null
+++ b/ui/src/main/res/drawable/main_background.xml
@@ -0,0 +1,9 @@
+
+
+
+ -
+
+
+
+
+
diff --git a/ui/src/main/res/layout/activity_main.xml b/ui/src/main/res/layout/activity_main.xml
index 50394bf..29b9656 100644
--- a/ui/src/main/res/layout/activity_main.xml
+++ b/ui/src/main/res/layout/activity_main.xml
@@ -5,75 +5,89 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@drawable/main_background"
tools:context="com.wireguard.android.activity.MainActivity">
-
-
+ app:layout_constraintStart_toStartOf="parent" />
+
+
+
+
+ app:layout_constraintTop_toTopOf="@+id/constraints" />
+ app:layout_constraintStart_toStartOf="@+id/imageMyBubble" />
@@ -83,12 +97,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_start_and_end"
- android:layout_marginTop="140dp"
+ android:layout_marginTop="150dp"
android:layout_marginEnd="@dimen/margin_start_and_end"
- android:layout_marginBottom="130dp"
+ android:layout_marginBottom="120dp"
android:text="@string/not_connected_bubble"
android:textColor="@color/gray"
- android:textSize="@dimen/text_title"
+ android:textSize="12sp"
app:layout_constraintBottom_toTopOf="@+id/linearLayout"
app:layout_constraintEnd_toEndOf="@+id/imageMyBubble"
app:layout_constraintStart_toStartOf="@+id/imageMyBubble"
@@ -99,13 +113,13 @@
android:layout_width="@dimen/edit_text_width"
android:layout_height="@dimen/edit_text_height"
android:layout_marginStart="@dimen/margin_start_and_end"
- android:layout_marginTop="300dp"
+ android:layout_marginTop="100dp"
android:layout_marginEnd="@dimen/margin_start_and_end"
- android:background="@color/white"
+ android:background="@android:color/transparent"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="@+id/imageMyBubble">
+ app:layout_constraintTop_toBottomOf="@+id/constraints">
+ app:layout_constraintEnd_toStartOf="@+id/accountImageView"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toStartOf="parent" />
-
+
+ app:layout_constraintTop_toTopOf="@+id/myBubbleImageView" />
+