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 ++++++++++++
 9 files changed, 161 insertions(+), 100 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/layout')

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"/>
-- 
cgit v1.2.3