summaryrefslogtreecommitdiff
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
authorAmit Kumar <amitkma@e.email>2021-05-14 21:20:57 +0530
committerAmit Kumar <amitkma@e.email>2021-05-14 21:20:57 +0530
commitda842396556248654acacfdebbc01f5e20132eb6 (patch)
treef2953fe0c56fea020869d0dfed77f3a4e851d434 /app/src/main/res/layout
parent7c02e9a048319c10d7396e7ec094c368f27273fd (diff)
Extract toolbar implementation and add back navigation support
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/fragment_dashboard.xml9
-rw-r--r--app/src/main/res/layout/fragment_fake_location.xml23
-rw-r--r--app/src/main/res/layout/fragment_internet_activity_policy.xml9
-rw-r--r--app/src/main/res/layout/fragment_permission_apps.xml9
-rw-r--r--app/src/main/res/layout/fragment_permissions.xml9
-rw-r--r--app/src/main/res/layout/fragment_quick_protection.xml10
-rw-r--r--app/src/main/res/layout/toolbar.xml28
7 files changed, 34 insertions, 63 deletions
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 663c270..027945d 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -6,14 +6,7 @@
android:layout_height="match_parent"
>
- <Toolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?android:attr/actionBarSize"
- android:layout_gravity="top|center"
- android:background="@color/white"
- tools:layout_height="56dp"
- />
+ <include layout="@layout/toolbar"/>
<ProgressBar
android:id="@+id/loadingSpinner"
diff --git a/app/src/main/res/layout/fragment_fake_location.xml b/app/src/main/res/layout/fragment_fake_location.xml
index 7d32bfa..de62537 100644
--- a/app/src/main/res/layout/fragment_fake_location.xml
+++ b/app/src/main/res/layout/fragment_fake_location.xml
@@ -8,14 +8,7 @@
android:layout_width="match_parent"
>
- <Toolbar
- android:background="@color/white"
- android:id="@+id/toolbar"
- android:layout_gravity="top|center"
- android:layout_height="?android:attr/actionBarSize"
- android:layout_width="match_parent"
- tools:layout_height="56dp"
- />
+ <include layout="@layout/toolbar"/>
<androidx.core.widget.NestedScrollView
android:layout_height="match_parent"
@@ -57,20 +50,6 @@
android:textSize="14sp"
/>
- <TextView
- android:fontFamily="sans-serif-medium"
- android:id="@+id/my_location_header"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:paddingBottom="8dp"
- android:paddingTop="16dp"
- android:paddingLeft="32dp"
- android:paddingRight="32dp"
- android:text="@string/my_location_title"
- android:textColor="@color/black"
- android:textSize="14sp"
- />
-
<RadioGroup
android:id="@+id/location_choices"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_internet_activity_policy.xml b/app/src/main/res/layout/fragment_internet_activity_policy.xml
index 6a53498..66ff2b4 100644
--- a/app/src/main/res/layout/fragment_internet_activity_policy.xml
+++ b/app/src/main/res/layout/fragment_internet_activity_policy.xml
@@ -7,14 +7,7 @@
android:background="@color/white"
>
- <Toolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?android:attr/actionBarSize"
- android:layout_gravity="top|center"
- android:background="@color/white"
- tools:layout_height="56dp"
- />
+ <include layout="@layout/toolbar"/>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_permission_apps.xml b/app/src/main/res/layout/fragment_permission_apps.xml
index 2888af0..605b6ff 100644
--- a/app/src/main/res/layout/fragment_permission_apps.xml
+++ b/app/src/main/res/layout/fragment_permission_apps.xml
@@ -7,14 +7,7 @@
android:background="@color/white"
>
- <Toolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?android:attr/actionBarSize"
- android:layout_gravity="top|center"
- android:background="@color/white"
- tools:layout_height="56dp"
- />
+ <include layout="@layout/toolbar"/>
<LinearLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_permissions.xml b/app/src/main/res/layout/fragment_permissions.xml
index 9d1e972..72748b4 100644
--- a/app/src/main/res/layout/fragment_permissions.xml
+++ b/app/src/main/res/layout/fragment_permissions.xml
@@ -7,14 +7,7 @@
android:background="@color/white"
>
- <Toolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?android:attr/actionBarSize"
- android:layout_gravity="top|center"
- android:background="@color/white"
- tools:layout_height="56dp"
- />
+ <include layout="@layout/toolbar"/>
<LinearLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_quick_protection.xml b/app/src/main/res/layout/fragment_quick_protection.xml
index e8233ee..55d6f71 100644
--- a/app/src/main/res/layout/fragment_quick_protection.xml
+++ b/app/src/main/res/layout/fragment_quick_protection.xml
@@ -6,15 +6,7 @@
android:background="@color/white"
>
- <Toolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?android:attr/actionBarSize"
- android:layout_gravity="top|center"
- android:background="@color/white"
- tools:layout_height="56dp"
- />
-
+ <include layout="@layout/toolbar"/>
<LinearLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
new file mode 100644
index 0000000..29c1fa1
--- /dev/null
+++ b/app/src/main/res/layout/toolbar.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ ~ Copyright (C) 2021 E FOUNDATION
+ ~
+ ~ 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/>.
+ -->
+
+<Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:background="@color/white"
+ android:id="@+id/toolbar"
+ android:layout_gravity="top|center"
+ android:layout_height="?android:attr/actionBarSize"
+ android:layout_width="match_parent"
+ tools:layout_height="56dp"
+ /> \ No newline at end of file