summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/foundation/e/privacycentralapp/common/NavToolbarFragment.kt1
-rw-r--r--app/src/main/res/drawable/ic_back_24dp.xml27
-rw-r--r--app/src/main/res/drawable/ic_chevron_right_24dp.xml2
-rw-r--r--app/src/main/res/drawable/ic_ic_chevron_left_24dp.xml10
-rw-r--r--app/src/main/res/drawable/ic_shield_off.xml7
-rw-r--r--app/src/main/res/layout/apptrackers_fragment.xml2
-rw-r--r--app/src/main/res/layout/fragment_dashboard.xml2
-rw-r--r--app/src/main/res/layout/fragment_fake_location.xml2
-rw-r--r--app/src/main/res/layout/fragment_internet_activity_policy.xml3
-rw-r--r--app/src/main/res/layout/fragment_trackers.xml2
-rw-r--r--app/src/main/res/layout/topbar.xml2
-rw-r--r--app/src/main/res/values-night/bools.xml20
-rw-r--r--app/src/main/res/values-night/colors.xml22
-rw-r--r--app/src/main/res/values/bools.xml20
-rw-r--r--app/src/main/res/values/colors.xml10
-rw-r--r--app/src/main/res/values/themes.xml7
16 files changed, 110 insertions, 29 deletions
diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/NavToolbarFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/common/NavToolbarFragment.kt
index 5930fff..c28c871 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/common/NavToolbarFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/common/NavToolbarFragment.kt
@@ -26,7 +26,6 @@ abstract class NavToolbarFragment(@LayoutRes contentLayoutId: Int) : ToolbarFrag
override fun setupToolbar(toolbar: MaterialToolbar) {
super.setupToolbar(toolbar)
toolbar.apply {
- setNavigationIcon(R.drawable.ic_ic_chevron_left_24dp)
setNavigationOnClickListener {
requireActivity().onBackPressed()
}
diff --git a/app/src/main/res/drawable/ic_back_24dp.xml b/app/src/main/res/drawable/ic_back_24dp.xml
new file mode 100644
index 0000000..ec67587
--- /dev/null
+++ b/app/src/main/res/drawable/ic_back_24dp.xml
@@ -0,0 +1,27 @@
+<!--
+ ~ 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/>.
+ -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:autoMirrored="true">
+ <path
+ android:fillColor="@color/accent"
+ android:pathData="M20,11H7.83l5.59-5.59L12,4l-8,8l8,8l1.41-1.41L7.83,13H20V11z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_chevron_right_24dp.xml b/app/src/main/res/drawable/ic_chevron_right_24dp.xml
index c0a38c1..28f1352 100644
--- a/app/src/main/res/drawable/ic_chevron_right_24dp.xml
+++ b/app/src/main/res/drawable/ic_chevron_right_24dp.xml
@@ -21,7 +21,7 @@
android:width="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0"
- android:tint="#000">
+ android:tint="@color/iconInvertedColor">
<path android:fillColor="#FF000000"
android:pathData="M9.71,18.71l-1.42,-1.42l5.3,-5.29l-5.3,-5.29l1.42,-1.42l6.7,6.71z"/>
</vector>
diff --git a/app/src/main/res/drawable/ic_ic_chevron_left_24dp.xml b/app/src/main/res/drawable/ic_ic_chevron_left_24dp.xml
deleted file mode 100644
index e88ab33..0000000
--- a/app/src/main/res/drawable/ic_ic_chevron_left_24dp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path
- android:pathData="M17.885,3.77L16.115,2L6.115,12L16.115,22L17.885,20.23L9.655,12L17.885,3.77Z"
- android:fillColor="#000000"
- android:fillAlpha="0.87"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_shield_off.xml b/app/src/main/res/drawable/ic_shield_off.xml
index 7c2fc8e..8f811a2 100644
--- a/app/src/main/res/drawable/ic_shield_off.xml
+++ b/app/src/main/res/drawable/ic_shield_off.xml
@@ -2,14 +2,15 @@
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
- android:viewportHeight="24">
+ android:viewportHeight="24"
+ android:tint="@color/red_off">
<path
android:pathData="M4,11V5.6499L12,2.0943L20,5.6499V11C20,16.0434 16.556,20.7257 12,21.9673C7.444,20.7257 4,16.0434 4,11Z"
android:strokeWidth="2"
android:fillColor="#00000000"
- android:strokeColor="#F8432E"/>
+ android:strokeColor="#000000"/>
<path
android:pathData="M15.1213,10.1213L15.8284,9.4142L14.4142,8L13.7071,8.7071L11.9142,10.5L10.1213,8.7071L9.4142,8L8,9.4142L8.7071,10.1213L10.5,11.9142L8.7071,13.7071L8,14.4142L9.4142,15.8284L10.1213,15.1213L11.9142,13.3284L13.7071,15.1213L14.4142,15.8284L15.8284,14.4142L15.1213,13.7071L13.3284,11.9142L15.1213,10.1213Z"
- android:fillColor="#F8432E"
+ android:fillColor="#000000"
android:fillType="evenOdd"/>
</vector>
diff --git a/app/src/main/res/layout/apptrackers_fragment.xml b/app/src/main/res/layout/apptrackers_fragment.xml
index 87fbc51..b0b9e71 100644
--- a/app/src/main/res/layout/apptrackers_fragment.xml
+++ b/app/src/main/res/layout/apptrackers_fragment.xml
@@ -22,7 +22,7 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
- android:background="@color/primary"
+ android:background="@color/background"
android:layout_height="match_parent"
android:layout_width="match_parent"
>
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index ec69575..83932b1 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -15,7 +15,7 @@
>
<LinearLayout
- android:background="@color/primary"
+ android:background="@color/background"
android:gravity="center_horizontal"
android:layout_height="match_parent"
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_fake_location.xml b/app/src/main/res/layout/fragment_fake_location.xml
index cec5af0..065d222 100644
--- a/app/src/main/res/layout/fragment_fake_location.xml
+++ b/app/src/main/res/layout/fragment_fake_location.xml
@@ -4,7 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:mapbox="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:background="@color/primary"
+ android:background="@color/background"
android:layout_height="match_parent"
android:layout_width="match_parent"
>
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 943c5dd..328eeae 100644
--- a/app/src/main/res/layout/fragment_internet_activity_policy.xml
+++ b/app/src/main/res/layout/fragment_internet_activity_policy.xml
@@ -2,8 +2,7 @@
<layout>
<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
- android:background="@color/primary"
+ android:background="@color/background"
android:layout_height="match_parent"
android:layout_width="match_parent"
>
diff --git a/app/src/main/res/layout/fragment_trackers.xml b/app/src/main/res/layout/fragment_trackers.xml
index 04fcfb1..2122816 100644
--- a/app/src/main/res/layout/fragment_trackers.xml
+++ b/app/src/main/res/layout/fragment_trackers.xml
@@ -3,7 +3,7 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
- android:background="@color/primary"
+ android:background="@color/background"
android:layout_height="match_parent"
android:layout_width="match_parent"
>
diff --git a/app/src/main/res/layout/topbar.xml b/app/src/main/res/layout/topbar.xml
index 90fb29a..eaebce1 100644
--- a/app/src/main/res/layout/topbar.xml
+++ b/app/src/main/res/layout/topbar.xml
@@ -31,7 +31,7 @@
android:id="@+id/toolbar"
android:layout_height="?android:attr/actionBarSize"
android:layout_width="match_parent"
- app:titleCentered="true"
tools:layout_height="56dp"
+ app:navigationIcon="@drawable/ic_back_24dp"
/>
</com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/values-night/bools.xml b/app/src/main/res/values-night/bools.xml
new file mode 100644
index 0000000..179bb0e
--- /dev/null
+++ b/app/src/main/res/values-night/bools.xml
@@ -0,0 +1,20 @@
+<!--
+ ~ 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/>.
+ -->
+
+<resources>
+ <bool name="is_day">false</bool>
+</resources>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..bbf2357
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,22 @@
+<?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/>.
+ -->
+
+<resources>
+ <color name="iconInvertedColor">#FFFFFF</color>
+ <color name="green_valid">#169659</color>
+</resources>
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
new file mode 100644
index 0000000..bdf8531
--- /dev/null
+++ b/app/src/main/res/values/bools.xml
@@ -0,0 +1,20 @@
+<!--
+ ~ 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/>.
+ -->
+
+<resources>
+ <bool name="is_day">true</bool>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1ffc641..b77a233 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,17 +7,15 @@
<color name="primary_text">@lineageos.platform:color/color_default_primary_text</color>
<color name="secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
-<!-- <color name="divider">@lineageos.platform:color/color_default_divider</color>-->
-
- <!-- fixed -->
- <color name="red_off">@lineageos.platform:color/color_default_red1</color>
-
+ <color name="background">@lineageos.platform:color/color_default_background</color>
+ <color name="iconInvertedColor">#000000</color>
<!-- Custom -->
<color name="dark_color">#263238</color>
<color name="white">#FFFFFFFF</color>
<color name="grey_overlay">#66FFFFFF</color>
- <color name="green_valid">#2CC766</color>
+ <color name="green_valid">#28C97C</color>
+ <color name="red_off">#F8432E</color>
<color name="blue_unselected">#AADCFE</color> <!-- used in combination with accent color ! -->
<color name="divider">#14212121</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 9bc2442..60cd9e4 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -6,10 +6,15 @@
<item name="colorAccent">@color/accent</item>
<!-- Status bar color. -->
+ <item name="android:statusBarColor">@color/primary</item>
+ <item name="android:navigationBarColor">@color/primary</item>
+ <item name="android:navigationBarDividerColor">@color/primary</item>
+ <item name="android:windowLightNavigationBar">@bool/is_day</item>
+ <item name="android:windowLightStatusBar">@bool/is_day</item>
+
<!-- Customize your theme here. -->
<item name="android:textColor">@color/primary_text</item>
<item name="android:textSize">16sp</item>
</style>
- <!-- fonts : roboto 400 -->
</resources> \ No newline at end of file
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-24 14:06:08 +0000