From 85aa5fbd46aa7cae0b6b4bf4e97b52609646fb13 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Fri, 20 Mar 2020 02:50:47 -0600
Subject: [PATCH] AddTunnels: rearrange and relabel

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 .../res/layout/add_tunnels_bottom_sheet.xml   | 44 +++++++++----------
 ui/src/main/res/values-hi/strings.xml         |  2 -
 ui/src/main/res/values-id/strings.xml         |  2 -
 ui/src/main/res/values-it/strings.xml         |  2 -
 ui/src/main/res/values-ja/strings.xml         |  2 -
 ui/src/main/res/values-ru/strings.xml         |  2 -
 ui/src/main/res/values-zh-rCN/strings.xml     |  2 -
 ui/src/main/res/values/strings.xml            |  4 +-
 8 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/ui/src/main/res/layout/add_tunnels_bottom_sheet.xml b/ui/src/main/res/layout/add_tunnels_bottom_sheet.xml
index 62f168b1..295a8e40 100644
--- a/ui/src/main/res/layout/add_tunnels_bottom_sheet.xml
+++ b/ui/src/main/res/layout/add_tunnels_bottom_sheet.xml
@@ -7,27 +7,6 @@
     android:layout_height="wrap_content"
     android:paddingTop="@dimen/bottom_sheet_top_padding">
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/create_empty"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/bottom_sheet_item_height"
-        android:layout_marginLeft="@dimen/normal_margin"
-        android:layout_marginRight="@dimen/normal_margin"
-        android:layout_marginStart="@dimen/normal_margin"
-        android:layout_marginEnd="@dimen/normal_margin"
-        android:text="@string/create_empty"
-        android:textAlignment="viewStart"
-        android:textColor="?attr/colorOnSurface"
-        app:icon="@drawable/ic_action_edit"
-        app:iconPadding="@dimen/bottom_sheet_icon_padding"
-        app:iconTint="?attr/colorSecondary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/create_from_file"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:rippleColor="?attr/colorSecondary"
-        style="@style/Widget.MaterialComponents.Button.TextButton.Icon"/>
-
     <com.google.android.material.button.MaterialButton
         android:id="@+id/create_from_file"
         android:layout_width="match_parent"
@@ -42,7 +21,7 @@
         app:icon="@drawable/ic_action_open_white"
         app:iconPadding="@dimen/bottom_sheet_icon_padding"
         app:iconTint="?attr/colorSecondary"
-        app:layout_constraintTop_toBottomOf="@+id/create_empty"
+        app:layout_constraintTop_toBottomOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/create_from_qrcode"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -64,6 +43,27 @@
         app:iconPadding="@dimen/bottom_sheet_icon_padding"
         app:iconTint="?attr/colorSecondary"
         app:layout_constraintTop_toBottomOf="@+id/create_from_file"
+        app:layout_constraintBottom_toBottomOf="@+id/create_empty"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:rippleColor="?attr/colorSecondary"
+        style="@style/Widget.MaterialComponents.Button.TextButton.Icon"/>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/create_empty"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/bottom_sheet_item_height"
+        android:layout_marginLeft="@dimen/normal_margin"
+        android:layout_marginRight="@dimen/normal_margin"
+        android:layout_marginStart="@dimen/normal_margin"
+        android:layout_marginEnd="@dimen/normal_margin"
+        android:text="@string/create_empty"
+        android:textAlignment="viewStart"
+        android:textColor="?attr/colorOnSurface"
+        app:icon="@drawable/ic_action_edit"
+        app:iconPadding="@dimen/bottom_sheet_icon_padding"
+        app:iconTint="?attr/colorSecondary"
+        app:layout_constraintTop_toBottomOf="@+id/create_from_qrcode"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/ui/src/main/res/values-hi/strings.xml b/ui/src/main/res/values-hi/strings.xml
index 583d44e4..cd2d4eb8 100644
--- a/ui/src/main/res/values-hi/strings.xml
+++ b/ui/src/main/res/values-hi/strings.xml
@@ -55,8 +55,6 @@
     <string name="create_activity_title">वायरगार्ड टनल बनाएं</string>
     <string name="create_bin_dir_error">स्थानीय बाइनरी निर्देशिका नहीं बना सकते</string>
     <string name="create_empty">शुरू से बनाएँ</string>
-    <string name="create_from_file">फ़ाइल या संग्रह से बनाएँ</string>
-    <string name="create_from_qr_code">क्यूआर कोड से बनाएं</string>
     <string name="create_output_dir_error">आउटपुट निर्देशिका नहीं बना सकता</string>
     <string name="create_downloads_file_error">डाउनलोड निर्देशिका में फ़ाइल नहीं बना सकते</string>
     <string name="create_temp_dir_error">स्थानीय अस्थायी निर्देशिका नहीं बना सकते</string>
diff --git a/ui/src/main/res/values-id/strings.xml b/ui/src/main/res/values-id/strings.xml
index dff88cac..2c8bc486 100644
--- a/ui/src/main/res/values-id/strings.xml
+++ b/ui/src/main/res/values-id/strings.xml
@@ -55,8 +55,6 @@
     <string name="create_activity_title">Buat tunel WireGuard</string>
     <string name="create_bin_dir_error">Tidak dapat membuat direktori biner lokal</string>
     <string name="create_empty">Buat dari awal</string>
-    <string name="create_from_file">Buat dari file atau arsip</string>
-    <string name="create_from_qr_code">Buat dari kode QR</string>
     <string name="create_output_dir_error">Tidak dapat membuat direktori keluaran</string>
     <string name="create_downloads_file_error">Tidak dapat membuat file di direktori download</string>
     <string name="create_temp_dir_error">Tidak dapat membuat direktori lokal sementara</string>
diff --git a/ui/src/main/res/values-it/strings.xml b/ui/src/main/res/values-it/strings.xml
index f7b21919..5496f42e 100644
--- a/ui/src/main/res/values-it/strings.xml
+++ b/ui/src/main/res/values-it/strings.xml
@@ -55,8 +55,6 @@
     <string name="create_activity_title">Crea un tunnel WireGuard</string>
     <string name="create_bin_dir_error">Impossibile creare cartella locale binari</string>
     <string name="create_empty">Crea da zero</string>
-    <string name="create_from_file">Crea da un file o archivio</string>
-    <string name="create_from_qr_code">Crea da un codice QR</string>
     <string name="create_output_dir_error">Impossibile creare la cartella di output</string>
     <string name="create_downloads_file_error">Impossibile creare il file nella cartella di download</string>
     <string name="create_temp_dir_error">Impossibile creare la cartella locale temporanea</string>
diff --git a/ui/src/main/res/values-ja/strings.xml b/ui/src/main/res/values-ja/strings.xml
index 49a4ee0f..f743a9a5 100644
--- a/ui/src/main/res/values-ja/strings.xml
+++ b/ui/src/main/res/values-ja/strings.xml
@@ -49,8 +49,6 @@
     <string name="create_activity_title">WireGuard トンネルの作成</string>
     <string name="create_bin_dir_error">ローカルバイナリディレクトリを作成できません</string>
     <string name="create_empty">空の状態から作成</string>
-    <string name="create_from_file">ファイル、アーカイブから作成</string>
-    <string name="create_from_qr_code">QRコードから作成</string>
     <string name="create_output_dir_error">出力ディレクトリを作成できません</string>
     <string name="create_downloads_file_error">ダウンロードディレクトリにファイルを作成できません</string>
     <string name="create_temp_dir_error">ローカルに一時ディレクトリを作成できません</string>
diff --git a/ui/src/main/res/values-ru/strings.xml b/ui/src/main/res/values-ru/strings.xml
index df3d9a41..dc43e78d 100644
--- a/ui/src/main/res/values-ru/strings.xml
+++ b/ui/src/main/res/values-ru/strings.xml
@@ -55,8 +55,6 @@
     <string name="create_activity_title">Создать WireGuard туннель</string>
     <string name="create_bin_dir_error">Не удалось создать локальный двоичный каталог</string>
     <string name="create_empty">Создать вручную</string>
-    <string name="create_from_file">Создать из файла или архива</string>
-    <string name="create_from_qr_code">Создать из QR-кода</string>
     <string name="create_output_dir_error">Не удалось создать выходной каталог</string>
     <string name="create_downloads_file_error">Не удалось создать файл в каталоге загрузок</string>
     <string name="create_temp_dir_error">Не удалось создать временный локальный каталог</string>
diff --git a/ui/src/main/res/values-zh-rCN/strings.xml b/ui/src/main/res/values-zh-rCN/strings.xml
index dbbfa499..a47351c6 100644
--- a/ui/src/main/res/values-zh-rCN/strings.xml
+++ b/ui/src/main/res/values-zh-rCN/strings.xml
@@ -49,8 +49,6 @@
     <string name="create_activity_title">创建 WireGuard 隧道</string>
     <string name="create_bin_dir_error">无法创建本地二进制文件目录</string>
     <string name="create_empty">手动创建</string>
-    <string name="create_from_file">导入配置或压缩包</string>
-    <string name="create_from_qr_code">扫描二维码</string>
     <string name="create_output_dir_error">无法创建输出目录</string>
     <string name="create_downloads_file_error">无法在下载目录中创建文件</string>
     <string name="create_temp_dir_error">无法创建本地临时目录</string>
diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
index e88d0d12..47fd867a 100644
--- a/ui/src/main/res/values/strings.xml
+++ b/ui/src/main/res/values/strings.xml
@@ -55,8 +55,8 @@
     <string name="create_activity_title">Create WireGuard Tunnel</string>
     <string name="create_bin_dir_error">Cannot create local binary directory</string>
     <string name="create_empty">Create from scratch</string>
-    <string name="create_from_file">Create from file or archive</string>
-    <string name="create_from_qr_code">Create from QR code</string>
+    <string name="create_from_file">Import from file or archive</string>
+    <string name="create_from_qr_code">Scan from QR code</string>
     <string name="create_output_dir_error">Cannot create output directory</string>
     <string name="create_downloads_file_error">Cannot create file in downloads directory</string>
     <string name="create_temp_dir_error">Cannot create local temporary directory</string>