aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorpacien2018-08-20 16:52:49 +0200
committerpacien2018-08-20 16:52:49 +0200
commit957826db1e46bffcd99ee52f21101728279521b9 (patch)
tree4fb7b0a511c9b50dc8f174cd272c8719fcee380b /app/src/main/res
parentd6ea28ffe132807390721912f2310fd3f43d0405 (diff)
downloadtincapp-957826db1e46bffcd99ee52f21101728279521b9.tar.gz
Refactor start activity
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/start_activity.xml (renamed from app/src/main/res/layout/fragment_network_list_header.xml)19
-rw-r--r--app/src/main/res/layout/start_network_list.xml50
-rw-r--r--app/src/main/res/layout/start_network_list_header.xml (renamed from app/src/main/res/layout/fragment_list_view.xml)18
-rw-r--r--app/src/main/res/layout/start_network_list_item.xml (renamed from app/src/main/res/layout/fragment_list_item.xml)3
-rw-r--r--app/src/main/res/layout/status_node_list.xml2
-rw-r--r--app/src/main/res/layout/status_node_list_item.xml27
-rw-r--r--app/src/main/res/menu/menu_start.xml2
-rw-r--r--app/src/main/res/values-ja/strings.xml2
-rw-r--r--app/src/main/res/values-nb-rNO/strings.xml2
-rw-r--r--app/src/main/res/values-zh-rCN/strings.xml4
-rw-r--r--app/src/main/res/values-zh-rHK/strings.xml4
-rw-r--r--app/src/main/res/values-zh-rTW/strings.xml4
-rw-r--r--app/src/main/res/values/strings.xml8
13 files changed, 104 insertions, 41 deletions
diff --git a/app/src/main/res/layout/fragment_network_list_header.xml b/app/src/main/res/layout/start_activity.xml
index 1ce0490..97283cb 100644
--- a/app/src/main/res/layout/fragment_network_list_header.xml
+++ b/app/src/main/res/layout/start_activity.xml
@@ -18,18 +18,15 @@
18 * along with this program. If not, see <https://www.gnu.org/licenses/>. 18 * along with this program. If not, see <https://www.gnu.org/licenses/>.
19--> 19-->
20 20
21<LinearLayout 21<FrameLayout
22 xmlns:android="http://schemas.android.com/apk/res/android" 22 xmlns:android="http://schemas.android.com/apk/res/android"
23 android:layout_width="match_parent" 23 android:layout_width="match_parent"
24 android:layout_height="wrap_content" 24 android:layout_height="match_parent">
25 android:orientation="vertical">
26 25
27 <TextView 26 <fragment
28 style="@style/AppTheme.SectionTitle" 27 android:id="@+id/start_activity_network_list_fragment"
29 android:text="@string/title_connect_to_network"/> 28 android:name="org.pacien.tincapp.activities.start.NetworkListFragment"
29 android:layout_width="match_parent"
30 android:layout_height="match_parent"/>
30 31
31 <TextView 32</FrameLayout>
32 android:id="@+id/network_list_placeholder"
33 style="@style/AppTheme.ListBlock.Placeholder"/>
34
35</LinearLayout>
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 @@
1<?xml version="1.0" encoding="utf-8"?>
2
3<!--
4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
5 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
6 *
7 * This program is free software: you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation, either version 3 of the License, or
10 * (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program. If not, see <https://www.gnu.org/licenses/>.
19-->
20
21<LinearLayout
22 xmlns:android="http://schemas.android.com/apk/res/android"
23 android:id="@+id/start_network_list_wrapper"
24 android:layout_width="match_parent"
25 android:layout_height="match_parent"
26 android:orientation="vertical">
27
28 <ListView
29 android:id="@+id/start_network_list"
30 android:layout_width="match_parent"
31 android:layout_height="match_parent"
32 android:divider="@drawable/horizontal_line"/>
33
34 <LinearLayout
35 android:id="@+id/start_network_list_placeholder"
36 android:layout_width="match_parent"
37 android:layout_height="wrap_content"
38 android:orientation="vertical">
39
40 <include
41 layout="@layout/start_network_list_header"/>
42
43 <TextView
44 android:id="@+id/start_network_list_placeholder_text"
45 style="@style/AppTheme.ListBlock.Placeholder"
46 android:text="@string/start_network_list_empty_none_found"/>
47
48 </LinearLayout>
49
50</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_list_view.xml b/app/src/main/res/layout/start_network_list_header.xml
index 32dd361..5fc213a 100644
--- a/app/src/main/res/layout/fragment_list_view.xml
+++ b/app/src/main/res/layout/start_network_list_header.xml
@@ -18,19 +18,7 @@
18 * along with this program. If not, see <https://www.gnu.org/licenses/>. 18 * along with this program. If not, see <https://www.gnu.org/licenses/>.
19--> 19-->
20 20
21<android.support.v4.widget.SwipeRefreshLayout 21<TextView
22 xmlns:android="http://schemas.android.com/apk/res/android" 22 xmlns:android="http://schemas.android.com/apk/res/android"
23 android:id="@+id/list_wrapper" 23 style="@style/AppTheme.SectionTitle"
24 android:layout_width="match_parent" 24 android:text="@string/start_network_list_title"/>
25 android:layout_height="match_parent"
26 android:orientation="vertical">
27
28 <ListView
29 android:id="@+id/list"
30 android:layout_width="match_parent"
31 android:layout_height="match_parent"
32 android:divider="@drawable/horizontal_line"
33 android:footerDividersEnabled="false"
34 android:headerDividersEnabled="false"/>
35
36</android.support.v4.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/fragment_list_item.xml b/app/src/main/res/layout/start_network_list_item.xml
index 574dff7..dd1a842 100644
--- a/app/src/main/res/layout/fragment_list_item.xml
+++ b/app/src/main/res/layout/start_network_list_item.xml
@@ -24,5 +24,4 @@
24 android:paddingBottom="@dimen/activity_vertical_margin" 24 android:paddingBottom="@dimen/activity_vertical_margin"
25 android:paddingLeft="@dimen/activity_horizontal_margin" 25 android:paddingLeft="@dimen/activity_horizontal_margin"
26 android:paddingRight="@dimen/activity_horizontal_margin" 26 android:paddingRight="@dimen/activity_horizontal_margin"
27 android:paddingTop="@dimen/activity_vertical_margin"> 27 android:paddingTop="@dimen/activity_vertical_margin"/>
28</TextView>
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 @@
20 20
21<LinearLayout 21<LinearLayout
22 xmlns:android="http://schemas.android.com/apk/res/android" 22 xmlns:android="http://schemas.android.com/apk/res/android"
23 android:id="@+id/list_wrapper" 23 android:id="@+id/status_node_list_wrapper"
24 android:layout_width="match_parent" 24 android:layout_width="match_parent"
25 android:layout_height="match_parent" 25 android:layout_height="match_parent"
26 android:orientation="vertical"> 26 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 @@
1<?xml version="1.0" encoding="utf-8"?>
2
3<!--
4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
5 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
6 *
7 * This program is free software: you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation, either version 3 of the License, or
10 * (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program. If not, see <https://www.gnu.org/licenses/>.
19-->
20
21<TextView
22 xmlns:android="http://schemas.android.com/apk/res/android"
23 style="@style/AppTheme.BlockTitle"
24 android:paddingBottom="@dimen/activity_vertical_margin"
25 android:paddingLeft="@dimen/activity_horizontal_margin"
26 android:paddingRight="@dimen/activity_horizontal_margin"
27 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 @@
21<menu xmlns:android="http://schemas.android.com/apk/res/android" 21<menu xmlns:android="http://schemas.android.com/apk/res/android"
22 xmlns:app="http://schemas.android.com/apk/res-auto" 22 xmlns:app="http://schemas.android.com/apk/res-auto"
23 xmlns:tools="http://schemas.android.com/tools" 23 xmlns:tools="http://schemas.android.com/tools"
24 tools:context="org.pacien.tincapp.activities.StartActivity"> 24 tools:context="org.pacien.tincapp.activities.start.StartActivity">
25 25
26 <item 26 <item
27 android:id="@+id/menu_about" 27 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 @@
34 34
35 <string name="configure_tools_generate_config_net_name_hint">Tinc ネットワーク名</string> 35 <string name="configure_tools_generate_config_net_name_hint">Tinc ネットワーク名</string>
36 36
37 <string name="title_connect_to_network">ネットワークに接続</string> 37 <string name="start_network_list_title">ネットワークに接続</string>
38 <string name="title_request_vpn_permissions">VPN 権限のリクエスト</string> 38 <string name="title_request_vpn_permissions">VPN 権限のリクエスト</string>
39 39
40 <string name="action_close">閉じる</string> 40 <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 @@