From 957826db1e46bffcd99ee52f21101728279521b9 Mon Sep 17 00:00:00 2001
From: pacien
Date: Mon, 20 Aug 2018 16:52:49 +0200
Subject: Refactor start activity

---
 app/src/main/res/layout/fragment_list_item.xml     | 28 ------------
 app/src/main/res/layout/fragment_list_view.xml     | 36 ----------------
 .../res/layout/fragment_network_list_header.xml    | 35 ---------------
 app/src/main/res/layout/start_activity.xml         | 32 ++++++++++++++
 app/src/main/res/layout/start_network_list.xml     | 50 ++++++++++++++++++++++
 .../main/res/layout/start_network_list_header.xml  | 24 +++++++++++
 .../main/res/layout/start_network_list_item.xml    | 27 ++++++++++++
 app/src/main/res/layout/status_node_list.xml       |  2 +-
 app/src/main/res/layout/status_node_list_item.xml  | 27 ++++++++++++
 app/src/main/res/menu/menu_start.xml               |  2 +-
 app/src/main/res/values-ja/strings.xml             |  2 +-
 app/src/main/res/values-nb-rNO/strings.xml         |  2 +-
 app/src/main/res/values-zh-rCN/strings.xml         |  4 +-
 app/src/main/res/values-zh-rHK/strings.xml         |  4 +-
 app/src/main/res/values-zh-rTW/strings.xml         |  4 +-
 app/src/main/res/values/strings.xml                |  8 ++--
 16 files changed, 175 insertions(+), 112 deletions(-)
 delete mode 100644 app/src/main/res/layout/fragment_list_item.xml
 delete mode 100644 app/src/main/res/layout/fragment_list_view.xml
 delete mode 100644 app/src/main/res/layout/fragment_network_list_header.xml
 create mode 100644 app/src/main/res/layout/start_activity.xml
 create mode 100644 app/src/main/res/layout/start_network_list.xml
 create mode 100644 app/src/main/res/layout/start_network_list_header.xml
 create mode 100644 app/src/main/res/layout/start_network_list_item.xml
 create mode 100644 app/src/main/res/layout/status_node_list_item.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/fragment_list_item.xml b/app/src/main/res/layout/fragment_list_item.xml
deleted file mode 100644
index 574dff7..0000000
--- a/app/src/main/res/layout/fragment_list_item.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<TextView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	style="@style/AppTheme.BlockTitle"
-	android:paddingBottom="@dimen/activity_vertical_margin"
-	android:paddingLeft="@dimen/activity_horizontal_margin"
-	android:paddingRight="@dimen/activity_horizontal_margin"
-	android:paddingTop="@dimen/activity_vertical_margin">
-</TextView>
diff --git a/app/src/main/res/layout/fragment_list_view.xml b/app/src/main/res/layout/fragment_list_view.xml
deleted file mode 100644
index 32dd361..0000000
--- a/app/src/main/res/layout/fragment_list_view.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<android.support.v4.widget.SwipeRefreshLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/list_wrapper"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical">
-
-	<ListView
-		android:id="@+id/list"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:divider="@drawable/horizontal_line"
-		android:footerDividersEnabled="false"
-		android:headerDividersEnabled="false"/>
-
-</android.support.v4.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/fragment_network_list_header.xml b/app/src/main/res/layout/fragment_network_list_header.xml
deleted file mode 100644
index 1ce0490..0000000
--- a/app/src/main/res/layout/fragment_network_list_header.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical">
-
-	<TextView
-		style="@style/AppTheme.SectionTitle"
-		android:text="@string/title_connect_to_network"/>
-
-	<TextView
-		android:id="@+id/network_list_placeholder"
-		style="@style/AppTheme.ListBlock.Placeholder"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/start_activity.xml b/app/src/main/res/layout/start_activity.xml
new file mode 100644
index 0000000..97283cb
--- /dev/null
+++ b/app/src/main/res/layout/start_activity.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<FrameLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<fragment
+		android:id="@+id/start_activity_network_list_fragment"
+		android:name="org.pacien.tincapp.activities.start.NetworkListFragment"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"/>
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/start_network_list.xml b/app/src/main/res/layout/start_network_list.xml
new file mode 100644
index 0000000..02a78d1
--- /dev/null
+++ b/app/src/main/res/layout/start_network_list.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/start_network_list_wrapper"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<ListView
+		android:id="@+id/start_network_list"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:divider="@drawable/horizontal_line"/>
+
+	<LinearLayout
+		android:id="@+id/start_network_list_placeholder"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<include
+			layout="@layout/start_network_list_header"/>
+
+		<TextView
+			android:id="@+id/start_network_list_placeholder_text"
+			style="@style/AppTheme.ListBlock.Placeholder"
+			android:text="@string/start_network_list_empty_none_found"/>
+
+	</LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/start_network_list_header.xml b/app/src/main/res/layout/start_network_list_header.xml
new file mode 100644
index 0000000..5fc213a
--- /dev/null
+++ b/app/src/main/res/layout/start_network_list_header.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<TextView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	style="@style/AppTheme.SectionTitle"
+	android:text="@string/start_network_list_title"/>
diff --git a/app/src/main/res/layout/start_network_list_item.xml b/app/src/main/res/layout/start_network_list_item.xml
new file mode 100644
index 0000000..dd1a842
--- /dev/null
+++ b/app/src/main/res/layout/start_network_list_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<TextView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	style="@style/AppTheme.BlockTitle"
+	android:paddingBottom="@dimen/activity_vertical_margin"
+	android:paddingLeft="@dimen/activity_horizontal_margin"
+	android:paddingRight="@dimen/activity_horizontal_margin"
+	android:paddingTop="@dimen/activity_vertical_margin"/>
diff --git a/app/src/main/res/layout/status_node_list.xml b/app/src/main/res/layout/status_node_list.xml
index d3c4831..923d20e 100644
--- a/app/src/main/res/layout/status_node_list.xml
+++ b/app/src/main/res/layout/status_node_list.xml
@@ -20,7 +20,7 @@
 
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/list_wrapper"
+	android:id="@+id/status_node_list_wrapper"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:orientation="vertical">
diff --git a/app/src/main/res/layout/status_node_list_item.xml b/app/src/main/res/layout/status_node_list_item.xml
new file mode 100644
index 0000000..dd1a842
--- /dev/null
+++ b/app/src/main/res/layout/status_node_list_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<TextView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	style="@style/AppTheme.BlockTitle"
+	android:paddingBottom="@dimen/activity_vertical_margin"
+	android:paddingLeft="@dimen/activity_horizontal_margin"
+	android:paddingRight="@dimen/activity_horizontal_margin"
+	android:paddingTop="@dimen/activity_vertical_margin"/>
diff --git a/app/src/main/res/menu/menu_start.xml b/app/src/main/res/menu/menu_start.xml
index 9d2ba25..311c36a 100644
--- a/app/src/main/res/menu/menu_start.xml
+++ b/app/src/main/res/menu/menu_start.xml
@@ -21,7 +21,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 			xmlns:app="http://schemas.android.com/apk/res-auto"
 			xmlns:tools="http://schemas.android.com/tools"
-			tools:context="org.pacien.tincapp.activities.StartActivity">
+			tools:context="org.pacien.tincapp.activities.start.StartActivity">
 
 	<item
 		android:id="@+id/menu_about"
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4d6cc80..b7f6f85 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -34,7 +34,7 @@
 
 	<string name="configure_tools_generate_config_net_name_hint">Tinc ネットワーク名</string>
 
-	<string name="title_connect_to_network">ネットワークに接続</string>
+	<string name="start_network_list_title">ネットワークに接続</string>
 	<string name="title_request_vpn_permissions">VPN 権限のリクエスト</string>
 
 	<string name="action_close">閉じる</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 4952beb..2af33d2 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -34,7 +34,7 @@
 
 	<string name="configure_tools_generate_config_net_name_hint">Tinc-nettverksnavn</string>
 
-	<string name="title_connect_to_network">Koble til nettverk</string>
+	<string name="start_network_list_title">Koble til nettverk</string>
 	<string name="title_request_vpn_permissions">Forespør VPN-tilganger</string>
 
 	<string name="action_close">Lukk</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index f9a2a7d..650e010 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -43,7 +43,7 @@
 	<string name="configure_tools_generate_config_optional_passphrase_hint">密码（可选）</string>
 	<string name="field_passphrase">密码</string>
 
-	<string name="title_connect_to_network">连接到网络</string>
+	<string name="start_network_list_title">连接到网络</string>
 	<string name="title_request_vpn_permissions">请求 VPN 权限</string>
 	<string name="configure_activity_title_path_info">路径信息</string>
 	<string name="status_node_info_dialog_title">节点信息</string>
@@ -82,7 +82,7 @@
 	<string name="configure_tools_private_keys_encryption_action">应用</string>
 	<string name="configure_tools_action_encrypt_decrypt_private_keys">加密或解密私钥</string>
 
-	<string name="message_no_network_configuration_found">未找到网络配置。</string>
+	<string name="start_network_list_empty_none_found">未找到网络配置。</string>
 	<string name="configure_tools_generate_config_generating">生成节点配置…</string>
 	<string name="configure_tools_join_network_joining">加入网络…</string>
 	<string name="message_network_configuration_written">网络配置写入成功。</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 4804d29..13054fa 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -43,7 +43,7 @@
 	<string name="configure_tools_generate_config_optional_passphrase_hint">密碼（可選）</string>
 	<string name="field_passphrase">密碼</string>
 
-	<string name="title_connect_to_network">連接到網絡</string>
+	<string name="start_network_list_title">連接到網絡</string>
 	<string name="title_request_vpn_permissions">請求 VPN 權限</string>
 	<string name="configure_activity_title_path_info">路徑信息</string>
 	<string name="status_node_info_dialog_title">節點信息</string>
@@ -82,7 +82,7 @@
 	<string name="configure_tools_private_keys_encryption_action">應用</string>
 	<string name="configure_tools_action_encrypt_decrypt_private_keys">加密或解密私鑰</string>
 
-	<string name="message_no_network_configuration_found">未找到網絡配置。</string>
+	<string name="start_network_list_empty_none_found">未找到網絡配置。</string>
 	<string name="configure_tools_generate_config_generating">生成節點配置…</string>
 	<string name="configure_tools_join_network_joining">加入網絡…</string>
 	<string name="message_network_configuration_written">網絡配置寫入成功。</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index a7e37d5..cbf3cca 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -43,7 +43,7 @@
 	<string name="configure_tools_generate_config_optional_passphrase_hint">密碼（可選）</string>
 	<string name="field_passphrase">密碼</string>
 
-	<string name="title_connect_to_network">連線到網路</string>
+	<string name="start_network_list_title">連線到網路</string>
 	<string name="title_request_vpn_permissions">請求 VPN 許可權</string>
 	<string name="configure_activity_title_path_info">路徑資訊</string>
 	<string name="status_node_info_dialog_title">節點資訊</string>
@@ -82,7 +82,7 @@
 	<string name="configure_tools_private_keys_encryption_action">應用</string>
 	<string name="configure_tools_action_encrypt_decrypt_private_keys">加密或解密私鑰</string>
 
-	<string name="message_no_network_configuration_found">未找到網路配置。</string>
+	<string name="start_network_list_empty_none_found">未找到網路配置。</string>
 	<string name="configure_tools_generate_config_generating">生成節點配置…</string>
 	<string name="configure_tools_join_network_joining">加入網路…</string>
 	<string name="message_network_configuration_written">網路配置寫入成功。</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9be3d5a..e5dc2f5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,7 +41,6 @@
 
 	<string name="field_passphrase">Passphrase</string>
 
-	<string name="title_connect_to_network">Connect to network</string>
 	<string name="title_request_vpn_permissions">Request VPN permissions</string>
 	<string name="title_error">Error</string>
 	<string name="title_unable_to_start_tinc">Unable to start tinc</string>
@@ -60,14 +59,12 @@
 	<string name="action_send_email">Send e-mail</string>
 	<string name="action_send_report">Send report</string>
 
-	<string name="message_no_network_configuration_found">No network configuration has been found.</string>
 	<string name="message_network_configuration_written">Network configuration successfully written.</string>
 	<string name="message_no_network_name_provided">No network name has been provided.</string>
 	<string name="message_no_configuration_for_network_format">No configuration has been found for network \"%1$s\".</string>
 	<string name="message_network_config_not_found_format">Network configuration file not found at \"%1$s\".</string>
 	<string name="message_network_config_invalid_format">Invalid network configuration in network.conf:\n%1$s</string>
 	<string name="message_could_not_decrypt_private_keys_format">Could not decrypt private keys:\n%1$s</string>
-	<string name="message_storage_unavailable">Storage directory is unavailable.</string>
 	<string name="message_starting_vpn">Starting VPN…</string>
 	<string name="message_disconnecting_vpn">Disconnecting VPN…</string>
 	<string name="message_passphrase_required">A passphrase is required to unlock the keyring.</string>
@@ -81,6 +78,11 @@
 	<string name="message_could_not_read_network_configuration_format">Could not read network interface configuration:\n%1$s</string>
 	<string name="message_could_not_read_private_key_format">Could not read tinc private keys:\n%1$s</string>
 
+	<!-- Start activity -->
+	<string name="start_network_list_title">Connect to network</string>
+	<string name="start_network_list_empty_none_found">No network configuration has been found.</string>
+	<string name="start_network_list_empty_storage_not_available">Storage directory is unavailable.</string>
+
 	<!-- Configure activity -->
 	<string name="configure_activity_title_path_info">Path info</string>
 	<string name="configure_path_info_title_configuration_directory">Configuration directory</string>
-- 
cgit v1.2.3