summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2023-02-23 10:01:47 +0100
committerAlbin <albin@mullvad.net>2023-02-23 10:01:47 +0100
commit95192db40326e2fc698e74c38dc7eb9c33c35018 (patch)
treee367273a4ebfe4cf108944a028787fe45a0f6660
parent6e822465471c2189576bec66e654da8d76960834 (diff)
parent677f564d475089b6eecb2362f51547c2a4cefde4 (diff)
downloadmullvadvpn-95192db40326e2fc698e74c38dc7eb9c33c35018.tar.xz
mullvadvpn-95192db40326e2fc698e74c38dc7eb9c33c35018.zip
Merge branch 'change-city-and-country-order-in-android-connect-view'
-rw-r--r--android/app/src/main/res/layout/connect.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/app/src/main/res/layout/connect.xml b/android/app/src/main/res/layout/connect.xml
index d6ac999d43..595832397e 100644
--- a/android/app/src/main/res/layout/connect.xml
+++ b/android/app/src/main/res/layout/connect.xml
@@ -49,7 +49,7 @@
android:textColor="@color/red"
android:textSize="@dimen/text_medium"
android:textStyle="bold" />
- <TextView android:id="@+id/city"
+ <TextView android:id="@+id/country"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/side_margin"
@@ -57,7 +57,7 @@
android:textColor="@color/white"
android:textSize="@dimen/text_huge"
android:textStyle="bold" />
- <TextView android:id="@+id/country"
+ <TextView android:id="@+id/city"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/side_margin"