aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2018-09-05 18:33:42 -0500
committerSamuel Holland <samuel@sholland.org>2018-11-11 21:50:23 -0600
commita264f7ab36bf1335999d53cb4a0d753c54b231d0 (patch)
tree8adb020e43111ff0420569c16c8c529f69b6a0e5 /app/src/main/res/layout
parenttools: wg-quick: bump (diff)
downloadwireguard-android-a264f7ab36bf1335999d53cb4a0d753c54b231d0.tar.xz
wireguard-android-a264f7ab36bf1335999d53cb4a0d753c54b231d0.zip
Auto-format the source directories
Blame Jason for writing Java in vim. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/app_list_dialog_fragment.xml4
-rw-r--r--app/src/main/res/layout/app_list_item.xml9
-rw-r--r--app/src/main/res/layout/config_naming_dialog_fragment.xml1
-rw-r--r--app/src/main/res/layout/tunnel_editor_fragment.xml6
-rw-r--r--app/src/main/res/layout/tunnel_editor_peer.xml3
-rw-r--r--app/src/main/res/layout/tunnel_list_fragment.xml38
6 files changed, 32 insertions, 29 deletions
diff --git a/app/src/main/res/layout/app_list_dialog_fragment.xml b/app/src/main/res/layout/app_list_dialog_fragment.xml
index 25879b6b..c975778a 100644
--- a/app/src/main/res/layout/app_list_dialog_fragment.xml
+++ b/app/src/main/res/layout/app_list_dialog_fragment.xml
@@ -20,7 +20,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:minHeight="200dp" >
+ android:minHeight="200dp">
<ProgressBar
android:id="@+id/progress_bar"
@@ -28,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:indeterminate="true"
- android:visibility="@{appData.isEmpty() ? View.VISIBLE : View.GONE}"/>
+ android:visibility="@{appData.isEmpty() ? View.VISIBLE : View.GONE}" />
<android.support.v7.widget.RecyclerView
android:id="@+id/app_list"
diff --git a/app/src/main/res/layout/app_list_item.xml b/app/src/main/res/layout/app_list_item.xml
index 4519a3a4..825b828b 100644
--- a/app/src/main/res/layout/app_list_item.xml
+++ b/app/src/main/res/layout/app_list_item.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
@@ -23,10 +22,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_item_background"
- android:padding="16dp"
- android:orientation="horizontal"
android:gravity="center_vertical"
- android:onClick="@{(view) -> item.setExcludedFromTunnel(!item.excludedFromTunnel)}">
+ android:onClick="@{(view) -> item.setExcludedFromTunnel(!item.excludedFromTunnel)}"
+ android:orientation="horizontal"
+ android:padding="16dp">
<ImageView
android:id="@+id/app_icon"
diff --git a/app/src/main/res/layout/config_naming_dialog_fragment.xml b/app/src/main/res/layout/config_naming_dialog_fragment.xml
index 12871a85..bf8b4267 100644
--- a/app/src/main/res/layout/config_naming_dialog_fragment.xml
+++ b/app/src/main/res/layout/config_naming_dialog_fragment.xml
@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
+
<import type="com.wireguard.android.widget.NameInputFilter" />
</data>
diff --git a/app/src/main/res/layout/tunnel_editor_fragment.xml b/app/src/main/res/layout/tunnel_editor_fragment.xml
index 1020e34c..f7976459 100644
--- a/app/src/main/res/layout/tunnel_editor_fragment.xml
+++ b/app/src/main/res/layout/tunnel_editor_fragment.xml
@@ -100,8 +100,8 @@
app:filter="@{KeyInputFilter.newInstance()}" />
<Button
- style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:id="@+id/generate_private_key_button"
+ style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="96dp"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/private_key_text"
@@ -217,12 +217,12 @@
android:textAlignment="center" />
<Button
- style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:id="@+id/set_excluded_applications"
+ style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="-8dp"
android:layout_below="@+id/dns_servers_text"
+ android:layout_marginLeft="-8dp"
android:onClick="@{fragment::onRequestSetExcludedApplications}"
android:text="@{@plurals/set_excluded_applications(config.interfaceSection.excludedApplicationsCount, config.interfaceSection.excludedApplicationsCount)}" />
</RelativeLayout>
diff --git a/app/src/main/res/layout/tunnel_editor_peer.xml b/app/src/main/res/layout/tunnel_editor_peer.xml
index 472b4cac..e270b71a 100644
--- a/app/src/main/res/layout/tunnel_editor_peer.xml
+++ b/app/src/main/res/layout/tunnel_editor_peer.xml
@@ -4,7 +4,8 @@
<data>
- <import type="android.view.View"/>
+ <import type="android.view.View" />
+
<import type="com.wireguard.android.widget.KeyInputFilter" />
<variable
diff --git a/app/src/main/res/layout/tunnel_list_fragment.xml b/app/src/main/res/layout/tunnel_list_fragment.xml
index a442c3be..ccc1c5ae 100644
--- a/app/src/main/res/layout/tunnel_list_fragment.xml
+++ b/app/src/main/res/layout/tunnel_list_fragment.xml
@@ -30,65 +30,67 @@
android:id="@+id/tunnel_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingBottom="@{@dimen/design_fab_size_normal * 1.1f}"
- android:clipToPadding="false"
android:choiceMode="multipleChoiceModal"
+ android:clipToPadding="false"
+ android:paddingBottom="@{@dimen/design_fab_size_normal * 1.1f}"
android:visibility="@{tunnels.size() > 0 ? android.view.View.VISIBLE : android.view.View.GONE}"
+ app:configurationHandler="@{rowConfigurationHandler}"
app:items="@{tunnels}"
- app:layout="@{@layout/tunnel_list_item}"
- app:configurationHandler="@{rowConfigurationHandler}" />
+ app:layout="@{@layout/tunnel_list_item}" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_gravity="center"
android:orientation="vertical"
- android:visibility="@{tunnels.size() == 0 ? android.view.View.VISIBLE : android.view.View.GONE}"
- android:layout_gravity="center">
+ android:visibility="@{tunnels.size() == 0 ? android.view.View.VISIBLE : android.view.View.GONE}">
+
<android.support.v7.widget.AppCompatImageView
android:id="@+id/logo_placeholder"
android:layout_width="140dp"
android:layout_height="140dp"
android:layout_gravity="center"
- android:alpha="0.3333333"
- android:layout_marginTop="-70dp"
android:layout_marginBottom="20dp"
+ android:layout_marginTop="-70dp"
+ android:alpha="0.3333333"
android:src="@mipmap/ic_launcher" />
+
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:textSize="20sp"
- android:text="@string/tunnel_list_placeholder" />
+ android:text="@string/tunnel_list_placeholder"
+ android:textSize="20sp" />
</LinearLayout>
<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"
+ android:clipChildren="false"
app:fab_labelStyle="@style/fab_label"
app:fab_labelsPosition="@integer/label_position"
- app:layout_behavior="com.wireguard.android.widget.fab.FloatingActionButtonBehavior" >
+ app:layout_behavior="com.wireguard.android.widget.fab.FloatingActionButtonBehavior">
<com.wireguard.android.widget.fab.LabeledFloatingActionButton
android:id="@+id/create_from_file"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="@{fragment::onRequestImportConfig}"
- app:srcCompat="@drawable/ic_action_open_white"
app:fabSize="mini"
- app:fab_title="@string/create_from_file" />
+ app:fab_title="@string/create_from_file"
+ app:srcCompat="@drawable/ic_action_open_white" />
<com.wireguard.android.widget.fab.LabeledFloatingActionButton
android:id="@+id/scan_qr_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="@{fragment::onRequestScanQRCode}"
- app:srcCompat="@drawable/ic_action_scan_qr_code_white"
app:fabSize="mini"
- app:fab_title="@string/create_from_qrcode" />
+ app:fab_title="@string/create_from_qrcode"
+ app:srcCompat="@drawable/ic_action_scan_qr_code_white" />
<com.wireguard.android.widget.fab.LabeledFloatingActionButton
android:id="@+id/create_empty"
@@ -96,8 +98,8 @@
android:layout_height="wrap_content"
android:onClick="@{fragment::onRequestCreateConfig}"
app:fabSize="mini"
- app:srcCompat="@drawable/ic_action_edit_white"
- app:fab_title="@string/create_empty" />
+ app:fab_title="@string/create_empty"
+ app:srcCompat="@drawable/ic_action_edit_white" />
</com.wireguard.android.widget.fab.FloatingActionsMenu>
</android.support.design.widget.CoordinatorLayout>