aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2018-07-21 15:08:38 +0530
committerJason A. Donenfeld <Jason@zx2c4.com>2018-07-22 18:21:39 +0200
commit3357be9557c0a74001a953018e67c2941b01dded (patch)
tree118fef165b5c9d1be98dc88a9040f407bc1f2426
parenttreewide: Optimize imports (diff)
downloadwireguard-android-3357be9557c0a74001a953018e67c2941b01dded.tar.xz
wireguard-android-3357be9557c0a74001a953018e67c2941b01dded.zip
RTL layout fixes
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
-rw-r--r--app/src/main/res/layout/tunnel_detail_fragment.xml1
-rw-r--r--app/src/main/res/layout/tunnel_list_fragment.xml4
-rw-r--r--app/src/main/res/layout/tunnel_list_item.xml1
-rw-r--r--app/src/main/res/values-ldrtl/fab.xml4
-rw-r--r--app/src/main/res/values/fab.xml1
5 files changed, 7 insertions, 4 deletions
diff --git a/app/src/main/res/layout/tunnel_detail_fragment.xml b/app/src/main/res/layout/tunnel_detail_fragment.xml
index ed43cc01..11cfafae 100644
--- a/app/src/main/res/layout/tunnel_detail_fragment.xml
+++ b/app/src/main/res/layout/tunnel_detail_fragment.xml
@@ -55,7 +55,6 @@
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- android:layout_toStartOf="@+id/tunnel_switch"
android:text="@string/interface_title" />
<com.wireguard.android.widget.ToggleSwitch
diff --git a/app/src/main/res/layout/tunnel_list_fragment.xml b/app/src/main/res/layout/tunnel_list_fragment.xml
index 34c6592c..dc85bf3f 100644
--- a/app/src/main/res/layout/tunnel_list_fragment.xml
+++ b/app/src/main/res/layout/tunnel_list_fragment.xml
@@ -39,13 +39,13 @@
<com.wireguard.android.widget.fab.FloatingActionsMenu
android:id="@+id/create_menu"
+ android:clipChildren="false"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:fab_labelStyle="@style/fab_label"
- android:clipChildren="false"
- app:fab_labelsPosition="left"
+ app:fab_labelsPosition="@integer/label_position"
app:layout_behavior="com.wireguard.android.widget.fab.FloatingActionButtonBehavior" >
<com.wireguard.android.widget.fab.LabeledFloatingActionButton
diff --git a/app/src/main/res/layout/tunnel_list_item.xml b/app/src/main/res/layout/tunnel_list_item.xml
index f0a5b88d..c1ea004a 100644
--- a/app/src/main/res/layout/tunnel_list_item.xml
+++ b/app/src/main/res/layout/tunnel_list_item.xml
@@ -39,7 +39,6 @@
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- android:layout_toStartOf="@+id/tunnel_switch"
android:ellipsize="end"
android:maxLines="1"
android:text="@{key}" />
diff --git a/app/src/main/res/values-ldrtl/fab.xml b/app/src/main/res/values-ldrtl/fab.xml
new file mode 100644
index 00000000..f612440c
--- /dev/null
+++ b/app/src/main/res/values-ldrtl/fab.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <integer name="label_position">1</integer>
+</resources> \ No newline at end of file
diff --git a/app/src/main/res/values/fab.xml b/app/src/main/res/values/fab.xml
index 0f373333..e1d10df1 100644
--- a/app/src/main/res/values/fab.xml
+++ b/app/src/main/res/values/fab.xml
@@ -27,4 +27,5 @@
<enum name="right" value="3"/>
</attr>
</declare-styleable>
+ <integer name="label_position">0</integer>
</resources>