diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-03-30 20:21:00 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-04-27 16:21:51 +0000 |
| commit | 65cbd62c637ea83bfce6a85affa63615f7459069 (patch) | |
| tree | 91f956ac9961e905ec654bc9d8dc296cb04bf7f9 | |
| parent | b336d02cca696492571da56875900c73a86b4b4b (diff) | |
| download | mullvadvpn-65cbd62c637ea83bfce6a85affa63615f7459069.tar.xz mullvadvpn-65cbd62c637ea83bfce6a85affa63615f7459069.zip | |
Change style of public key and key generated texts
| -rw-r--r-- | android/src/main/res/layout/wireguard_key.xml | 62 | ||||
| -rw-r--r-- | android/src/main/res/values/strings.xml | 1 |
2 files changed, 36 insertions, 27 deletions
diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml index 9fba6b8307..07cfc72ec7 100644 --- a/android/src/main/res/layout/wireguard_key.xml +++ b/android/src/main/res/layout/wireguard_key.xml @@ -31,53 +31,61 @@ android:layout_weight="0" android:layout_marginLeft="24dp" android:layout_marginTop="4dp" - android:layout_marginBottom="24dp" + android:layout_marginBottom="12dp" android:text="@string/wireguard_key" android:textColor="@color/white" android:textSize="32sp" android:textStyle="bold" /> - <LinearLayout android:id="@+id/wireguard_public_key_layout" + <LinearLayout android:id="@+id/public_key_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="0" - android:background="@drawable/cell_button_background" - android:clickable="true" - android:gravity="center" + android:paddingHorizontal="24dp" + android:paddingVertical="12dp" android:orientation="vertical" - android:paddingHorizontal="4dp"> + android:background="?android:attr/selectableItemBackground" + android:clickable="true"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingTop="10dp" - android:paddingBottom="5dp" + android:layout_marginBottom="9dp" android:text="@string/wireguard_public_key" - android:textColor="@color/white" - android:textSize="20sp" + android:textColor="@color/white60" + android:textSize="13sp" android:textStyle="bold" /> <TextView android:id="@+id/wireguard_public_key" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="center" - android:textAllCaps="false" - android:textColor="@color/white60" - android:textSize="14sp" + android:textColor="@color/white" + android:textSize="16sp" android:textStyle="bold" /> - <TextView android:id="@+id/wireguard_key_age" - android:layout_width="wrap_content" + </LinearLayout> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingVertical="2dp" - android:textSize="14sp" - android:gravity="center" /> - <TextView android:id="@+id/wireguard_key_status" - android:layout_width="wrap_content" + android:paddingHorizontal="24dp" + android:paddingVertical="12dp" + android:orientation="vertical"> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingBottom="5dp" - android:textColor="@color/red" - android:textSize="20sp" + android:layout_marginBottom="9dp" + android:textColor="@color/white60" + android:textSize="13sp" android:textStyle="bold" - android:visibility="gone" /> + android:text="@string/wireguard_key_generated" /> + <TextView android:id="@+id/wireguard_key_age" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white" + android:textSize="16sp" + android:textStyle="bold" /> </LinearLayout> + <TextView android:id="@+id/wireguard_key_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingBottom="5dp" + android:textColor="@color/red" + android:textSize="20sp" + android:textStyle="bold" + android:visibility="gone" /> <Space android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" /> diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 744ae5a0c1..8bcbbf3cd9 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -153,6 +153,7 @@ <string name="wireguard_key_copied_to_clibpoard">Key copied to clipboard</string> <string name="wireguard_public_key">Public key</string> + <string name="wireguard_key_generated">Key generated</string> <string name="wireguard_verify_key">Verify key</string> <string name="wireguard_generate_key">Generate key</string> <string name="wireguard_replace_key">Regenerate key</string> |