diff options
Diffstat (limited to 'app/src/main/res')
18 files changed, 375 insertions, 37 deletions
diff --git a/app/src/main/res/drawable/ic_baseline_folder_open_primary_24dp.xml b/app/src/main/res/drawable/ic_baseline_folder_open_primary_24dp.xml new file mode 100644 index 0000000..da24678 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_folder_open_primary_24dp.xml | |||
@@ -0,0 +1,29 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | |||
3 | <!-- | ||
4 | * Material design icon | ||
5 | * Copyright 2017 Google Inc. | ||
6 | * | ||
7 | * Licensed under the Apache License, Version 2.0 (the "License"); | ||
8 | * you may not use this file except in compliance with the License. | ||
9 | * You may obtain a copy of the License at | ||
10 | * | ||
11 | * http://www.apache.org/licenses/LICENSE-2.0 | ||
12 | * | ||
13 | * Unless required by applicable law or agreed to in writing, software | ||
14 | * distributed under the License is distributed on an "AS IS" BASIS, | ||
15 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
16 | * See the License for the specific language governing permissions and | ||
17 | * limitations under the License. | ||
18 | --> | ||
19 | |||
20 | <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
21 | android:width="24dp" | ||
22 | android:height="24dp" | ||
23 | android:tint="?attr/colorControlNormal" | ||
24 | android:viewportWidth="24" | ||
25 | android:viewportHeight="24"> | ||
26 | <path | ||
27 | android:fillColor="@color/textTitle" | ||
28 | android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z" /> | ||
29 | </vector> | ||
diff --git a/app/src/main/res/layout/configure_activity.xml b/app/src/main/res/layout/configure_activity.xml index 6097384..5d796fb 100644 --- a/app/src/main/res/layout/configure_activity.xml +++ b/app/src/main/res/layout/configure_activity.xml | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | <!-- | 3 | <!-- |
4 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon | 4 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon |
5 | * Copyright (C) 2017-2018 Pacien TRAN-GIRARD | 5 | * Copyright (C) 2017-2023 Pacien TRAN-GIRARD |
6 | * | 6 | * |
7 | * This program is free software: you can redistribute it and/or modify | 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 | 8 | * it under the terms of the GNU General Public License as published by |
@@ -28,23 +28,23 @@ | |||
28 | android:layout_height="wrap_content" | 28 | android:layout_height="wrap_content" |
29 | android:orientation="vertical"> | 29 | android:orientation="vertical"> |
30 | 30 | ||
31 | <TextView | 31 | <TextView |
32 | style="@style/AppTheme.SectionTitle" | 32 | style="@style/AppTheme.SectionTitle" |
33 | android:text="@string/configure_activity_title_path_info"/> | 33 | android:text="@string/configure_activity_title_tools"/> |
34 | 34 | ||
35 | <fragment | 35 | <fragment |
36 | android:id="@+id/configure_activity_path_info_fragment" | 36 | android:id="@+id/configure_activity_tools_fragment" |
37 | android:name="org.pacien.tincapp.activities.configure.PathInfoFragment" | 37 | android:name="org.pacien.tincapp.activities.configure.ToolsFragment" |
38 | android:layout_width="match_parent" | 38 | android:layout_width="match_parent" |
39 | android:layout_height="wrap_content"/> | 39 | android:layout_height="wrap_content"/> |
40 | 40 | ||
41 | <TextView | 41 | <TextView |
42 | style="@style/AppTheme.SectionTitle" | 42 | style="@style/AppTheme.SectionTitle" |
43 | android:text="@string/configure_activity_title_tools"/> | 43 | android:text="@string/configure_activity_title_internal_paths_info"/> |
44 | 44 | ||
45 | <fragment | 45 | <fragment |
46 | android:id="@+id/configure_activity_tools_fragment" | 46 | android:id="@+id/configure_activity_path_info_fragment" |
47 | android:name="org.pacien.tincapp.activities.configure.ToolsFragment" | 47 | android:name="org.pacien.tincapp.activities.configure.PathInfoFragment" |
48 | android:layout_width="match_parent" | 48 | android:layout_width="match_parent" |
49 | android:layout_height="wrap_content"/> | 49 | android:layout_height="wrap_content"/> |
50 | 50 | ||
diff --git a/app/src/main/res/layout/configure_tools_path_info_fragment.xml b/app/src/main/res/layout/configure_tools_path_info_fragment.xml index 376fa3d..c6d9777 100644 --- a/app/src/main/res/layout/configure_tools_path_info_fragment.xml +++ b/app/src/main/res/layout/configure_tools_path_info_fragment.xml | |||
@@ -51,7 +51,7 @@ | |||
51 | 51 | ||
52 | <TextView | 52 | <TextView |
53 | style="@style/AppTheme.BlockContent" | 53 | style="@style/AppTheme.BlockContent" |
54 | android:text="@{appPaths.cacheDir().absolutePath}" | 54 | android:text="@{appPaths.logDir().absolutePath}" |
55 | android:textIsSelectable="true"/> | 55 | android:textIsSelectable="true"/> |
56 | 56 | ||
57 | </LinearLayout> | 57 | </LinearLayout> |
diff --git a/app/src/main/res/layout/start_activity.xml b/app/src/main/res/layout/start_activity.xml index a5f22ad..f2069d5 100644 --- a/app/src/main/res/layout/start_activity.xml +++ b/app/src/main/res/layout/start_activity.xml | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | <!-- | 3 | <!-- |
4 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon | 4 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon |
5 | * Copyright (C) 2017-2018 Pacien TRAN-GIRARD | 5 | * Copyright (C) 2017-2023 Pacien TRAN-GIRARD |
6 | * | 6 | * |
7 | * This program is free software: you can redistribute it and/or modify | 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 | 8 | * it under the terms of the GNU General Public License as published by |
@@ -18,9 +18,28 @@ | |||
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 | <fragment | 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/start_activity_network_list_fragment" | 23 | android:id="@+id/start_network_list_wrapper" |
24 | android:name="org.pacien.tincapp.activities.start.NetworkListFragment" | ||
25 | android:layout_width="match_parent" | 24 | android:layout_width="match_parent" |
26 | android:layout_height="match_parent"/> | 25 | android:layout_height="match_parent" |
26 | android:orientation="vertical"> | ||
27 | |||
28 | <TextView | ||
29 | android:id="@+id/start_network_list_warning_text" | ||
30 | style="@style/AppTheme.ListBlock.Placeholder" | ||
31 | android:text="@string/start_network_list_warning_text"/> | ||
32 | |||
33 | <fragment | ||
34 | android:id="@+id/start_activity_error_notification_fragment" | ||
35 | android:name="org.pacien.tincapp.activities.start.ErrorNotificationFragment" | ||
36 | android:layout_width="match_parent" | ||
37 | android:layout_height="wrap_content"/> | ||
38 | |||
39 | <fragment | ||
40 | android:id="@+id/start_activity_network_list_fragment" | ||
41 | android:name="org.pacien.tincapp.activities.start.NetworkListFragment" | ||
42 | android:layout_width="match_parent" | ||
43 | android:layout_height="match_parent"/> | ||
44 | |||
45 | </LinearLayout> \ No newline at end of file | ||
diff --git a/app/src/main/res/layout/start_error_notification.xml b/app/src/main/res/layout/start_error_notification.xml new file mode 100644 index 0000000..3d2169d --- /dev/null +++ b/app/src/main/res/layout/start_error_notification.xml | |||
@@ -0,0 +1,69 @@ | |||
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-2023 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 | <layout xmlns:android="http://schemas.android.com/apk/res/android"> | ||
22 | |||
23 | <data> | ||
24 | |||
25 | <import type="android.view.View"/> | ||
26 | |||
27 | <variable | ||
28 | name="errorNotification" | ||
29 | type="org.pacien.tincapp.context.AppNotificationManager.ErrorNotification"/> | ||
30 | |||
31 | <!-- '<' escaping: https://stackoverflow.com/q/40970686 --> | ||
32 | <variable | ||
33 | name="openManualAction" | ||
34 | type="kotlin.jvm.functions.Function0<kotlin.Unit>"/> | ||
35 | |||
36 | </data> | ||
37 | |||
38 | <LinearLayout | ||
39 | android:layout_width="match_parent" | ||
40 | android:layout_height="wrap_content" | ||
41 | android:orientation="vertical" | ||
42 | and |