diff options
Diffstat (limited to 'app/src')
27 files changed, 49 insertions, 424 deletions
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt index 4d191bd..f0eda52 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt @@ -160,7 +160,7 @@ class DashboardFragment : binding.stateTrackers.setTextColor( getColor( requireContext(), - if (trackersEnabled) R.color.green_on + if (trackersEnabled) R.color.green_valid else R.color.red_off ) ) @@ -173,7 +173,7 @@ class DashboardFragment : binding.stateGeolocation.setTextColor( getColor( requireContext(), - if (geolocEnabled) R.color.green_on + if (geolocEnabled) R.color.green_valid else R.color.red_off ) ) @@ -194,7 +194,7 @@ class DashboardFragment : binding.stateIpAddress.setTextColor( getColor( requireContext(), - if (ipAddressEnabled) R.color.green_on + if (ipAddressEnabled) R.color.green_valid else R.color.red_off ) ) diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt index e77b61f..9ffdd12 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt @@ -52,7 +52,7 @@ class ToggleTrackersAdapter( spannable.setSpan(UnderlineSpan(), 0, spannable.length, 0) title.text = spannable } else { - title.setTextColor(ContextCompat.getColor(title.context, R.color.black)) + title.setTextColor(ContextCompat.getColor(title.context, R.color.primary_text)) title.text = text } diff --git a/app/src/main/res/drawable/bg_graph_bar.xml b/app/src/main/res/drawable/bg_graph_bar.xml deleted file mode 100644 index cdeae6e..0000000 --- a/app/src/main/res/drawable/bg_graph_bar.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?><!-- - ~ Copyright (C) 2022 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/>. - --> - -<shape xmlns:android="http://schemas.android.com/apk/res/android"> - <solid android:color="@color/purple_200" /> -</shape>
\ No newline at end of file diff --git a/app/src/main/res/drawable/bg_outlined.xml b/app/src/main/res/drawable/bg_outlined.xml index 2040f18..d33886a 100644 --- a/app/src/main/res/drawable/bg_outlined.xml +++ b/app/src/main/res/drawable/bg_outlined.xml @@ -17,6 +17,6 @@ <shape xmlns:android="http://schemas.android.com/apk/res/android"> - <stroke android:width="1dp" android:color="@color/grey_divider" /> + <stroke android:width="1dp" android:color="@color/divider" /> <corners android:radius="4dp" /> </shape> diff --git a/app/src/main/res/drawable/ic_body_monitor.xml b/app/src/main/res/drawable/ic_body_monitor.xml deleted file mode 100644 index cbf0d27..0000000 --- a/app/src/main/res/drawable/ic_body_monitor.xml +++ /dev/null @@ -1,19 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24" - android:tint="@color/black"> - <path - android:fillColor="@android:color/white" - android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM12,12c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3s3,1.34 3,3S13.66,12 12,12z"/> - <path - android:fillColor="@android:color/white" - android:pathData="M10,8.5h1v1h-1z"/> - <path - android:fillColor="@android:color/white" - android:pathData="M11.5,8.5h1v1h-1z"/> - <path - android:fillColor="@android:color/white" - android:pathData="M13,8.5h1v1h-1z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_calendar.xml b/app/src/main/res/drawable/ic_calendar.xml deleted file mode 100644 index 376c5a4..0000000 --- a/app/src/main/res/drawable/ic_calendar.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" - android:tint="@color/black"> - <path - android:fillColor="@android:color/white" - android:pathData="M9,11L7,11v2h2v-2zM13,11h-2v2h2v-2zM17,11h-2v2h2v-2zM19,4h-1L18,2h-2v2L8,4L8,2L6,2v2L5,4c-1.11,0 -1.99,0.9 -1.99,2L3,20c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.9,-2 -2,-2zM19,20L5,20L5,9h14v11z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_call.xml b/app/src/main/res/drawable/ic_call.xml deleted file mode 100644 index 41d8b40..0000000 --- a/app/src/main/res/drawable/ic_call.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" - android:tint="@color/black"> - <path - android:fillColor="@android:color/white" - android:pathData="M13,9h-2v2h2L13,9zM17,9h-2v2h2L17,9zM20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.35,-0.11 -0.74,-0.03 -1.02,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.58l2.2,-2.21c0.28,-0.27 0.36,-0.66 0.25,-1.01C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1L4,3c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1zM19,9v2h2L21,9h-2z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml deleted file mode 100644 index e117e22..0000000 --- a/app/src/main/res/drawable/ic_location.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" - android:tint="@color/black"> - <path - android:fillColor="@android:color/white" - android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/> -</vector> diff --git a/app/src/main/res/layout/apptrackers_fragment.xml b/app/src/main/res/layout/apptrackers_fragment.xml index 17d992e..87fbc51 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/white" + android:background="@color/primary" android:layout_height="match_parent" android:layout_width="match_parent" > @@ -68,7 +68,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/grey_divider" + android:background="@color/divider" /> <TextView android:id="@+id/trackers_list_title" diff --git a/app/src/main/res/layout/dashboard_item_submenu_button.xml b/app/src/main/res/layout/dashboard_item_submenu_button.xml index 8802bca..9129d07 100644 --- a/app/src/main/res/layout/dashboard_item_submenu_button.xml +++ b/app/src/main/res/layout/dashboard_item_submenu_button.xml @@ -61,7 +61,7 @@ app:layout_constraintBottom_toTopOf="@+id/subtitle" app:layout_constraintVertical_chainStyle="packed" android:layout_marginStart="24dp" - android:textColor="@color/black" + android:textColor="@color/primary_text" android:textSize="16sp" /> @@ -75,7 +75,7 @@ app:layout_constraintBottom_toBottomOf="parent" android:layout_marginStart="24dp" android:text="@{subTitle}" - android:textColor="@color/grey_text" + android:textColor="@color/secondary_text" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index 97751a1..97fdae3 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/white" + android:background="@color/primary" android:gravity="center_horizontal" android:layout_height="match_parent" android:layout_width="match_parent" @@ -41,7 +41,7 @@ android:layout_weight="1" android:text="@string/dashboard_state_title_off" android:textSize="14sp" - android:textColor="@color/grey_text" + android:textColor="@color/secondary_text" /> <Switch android:id="@+id/toggle_privacy_central" @@ -53,7 +53,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/grey_divider" + android:background="@color/divider" /> @@ -77,7 +77,7 @@ android:layout_height="wrap_content" android:text="@string/dashboard_state_trackers_label" android:textSize="12sp" - android:textColor="@color/grey_text" + android:textColor="@color/secondary_text" android:layout_marginBottom="8dp" /> <TextView @@ -86,7 +86,7 @@ android:layout_height="wrap_content" android:text="@string/dashboard_state_trackers_off" android:textSize="12sp" - android:textColor="@color/black_text" + android:textColor="@color/primary_text" android:textAllCaps="true" /> </LinearLayout> @@ -102,7 +102,7 @@ android:layout_height="wrap_content" android:text="@string/dashboard_state_geolocation_label" android:textSize="12sp" - android:textColor="@color/grey_text" + android:textColor="@color/secondary_text" android:layout_marginBottom="8dp" /> <TextView @@ -111,7 +111,7 @@ android:layout_height="wrap_content" android:text="@string/dashboard_state_geolocation_off" android:textSize="12sp" - android:textColor="@color/black_text" + android:textColor="@color/primary_text" android:textAllCaps="true" /> </LinearLayout> @@ -127,7 +127,7 @@ android:layout_height="wrap_content" android:text="@string/dashboard_state_ipaddress_label" android:textSize="12sp" - android:textColor="@color/grey_text" + android:textColor="@color/secondary_text" android:layout_marginBottom="8dp" /> <TextView @@ -136,7 +136,7 @@ android:layout_height="wrap_content" android:text="@string/dashboard_state_ipaddress_off" android:textSize="12sp" - android:textColor="@color/black_text" + android:textColor="@color/primary_text" android:textAllCaps="true" android:visibility="gone" /> @@ -199,7 +199,7 @@ android:text="@string/dashboard_state_ipaddress_off" android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginStart="48dp" - android:background="@color/grey_divider" + android:background="@color/divider" /> <include @@ -214,7 +214,7 @@ android:text="@string/dashboard_state_ipaddress_off" android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginStart="48dp" - android:background="@color/grey_divider" + android:background="@color/divider" /> <include @@ -230,7 +230,7 @@ android:text="@string/dashboard_state_ipaddress_off" android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginStart="48dp" - android:background="@color/grey_divider" + android:background="@color/divider" /> <include diff --git a/app/src/main/res/layout/fragment_fake_location.xml b/app/src/main/res/layout/fragment_fake_location.xml index 851a7c4..cec5af0 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/white" + android:background="@color/primary" 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 44ea823..943c5dd 100644 --- a/app/src/main/res/layout/fragment_internet_activity_policy.xml +++ b/app/src/main/res/layout/fragment_internet_activity_policy.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/white" + android:background="@color/primary" android:layout_height="match_parent" android:layout_width="match_parent" > @@ -63,7 +63,7 @@ android:layout_width="match_parent" android:padding="4dp" android:textSize="12sp" - android:textColor="@color/black_text_2" + android:textColor="@color/secondary_text" android:text="@string/ipscrambling_tor_disclaimer" /> @@ -83,7 +83,7 @@ android:layout_width="match_parent" android:layout_marginTop="16dp" android:text="@string/ipscrambling_location_label" - android:textColor="@color/black_text" + android:textColor="@color/primary_text" android:textFontWeight="500" android:textSize="14sp" /> @@ -108,7 +108,7 @@ android:layout_marginTop="32dp" android:layout_marginBottom="16dp" android:text="@string/ipscrambling_select_app" - android:textColor="@color/black_text" + android:textColor="@color/primary_text" android:textFontWeight="500" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/fragment_permission_apps.xml b/app/src/main/res/layout/fragment_permission_apps.xml deleted file mode 100644 index db61e93..0000000 --- a/app/src/main/res/layout/fragment_permission_apps.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<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/white" - android:layout_height="match_parent" - android:layout_width="match_parent" - > - - <include layout="@layout/topbar" /> - - <androidx.core.widget.NestedScrollView - android:layout_height="match_parent" - android:layout_width="match_parent" - app:layout_behavior="@string/appbar_scrolling_view_behavior" - > - - <LinearLayout - android:layout_height="match_parent" - android:layout_width="match_parent" - android:orientation="vertical" - tools:context=".main.MainActivity" - > - - <TextView - android:id="@+id/permission_control" - android:layout_gravity="center_horizontal" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:paddingBottom="16dp" - android:paddingLeft="32dp" - android:paddingRight="32dp" - android:paddingTop="16dp" - android:textColor="@color/black" - android:textSize="14sp" - /> - - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/recylcer_view_permission_apps" - android:layout_height="match_parent" - android:layout_width="match_parent" - tools:listitem="@layout/item_app_toggle" - /> - </LinearLayout> - </androidx.core.widget.NestedScrollView> -</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_permissions.xml b/app/src/main/res/layout/fragment_permissions.xml deleted file mode 100644 index 7ca4b43..0000000 --- a/app/src/main/res/layout/fragment_permissions.xml +++ /dev/null @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<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/white" - android:layout_height="match_parent" - android:layout_width="match_parent" - > - - <include layout="@layout/topbar" /> - - <androidx.core.widget.NestedScrollView - android:layout_height="match_parent" - android:layout_width="match_parent" - app:layout_behavior="@string/appbar_scrolling_view_behavior" - > - - <LinearLayout - android:layout_height="match_parent" - android:layout_width="match_parent" - android:orientation="vertical" - android:paddingLeft="32dp" - android:paddingRight="32dp" - tools:context=".main.MainActivity" - > - - <TextView - android:id="@+id/permission_control" - android:layout_gravity="center_horizontal" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:paddingTop="16dp" - android:text="@string/permission_control_info" - android:textColor="@color/black" - android:textSize="14sp" - /> - - <TextView - android:fontFamily="sans-serif-medium" - android:gravity="center_vertical" - android:id="@+id/learn_more_permissions" - android:layout_height="48dp" - android:layout_width="wrap_content" - android:text="@string/learn_more" - android:textColor="#007fff" - android:textSize="14sp" - /> - - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/recylcer_view_permissions" - android:layout_height="match_parent" - android:layout_width="match_parent" - tools:listitem="@layout/item_permission" - /> - </LinearLayout> - </androidx.core.widget.NestedScrollView> -</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_quick_protection.xml b/app/src/main/res/layout/fragment_quick_protection.xml deleted file mode 100644 index 569f9b1..0000000 --- a/app/src/main/res/layout/fragment_quick_protection.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<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/white" - android:layout_height="match_parent" - android:layout_width="match_parent" - > - - <include layout="@layout/topbar" /> - - <androidx.core.widget.NestedScrollView - android:layout_height="match_parent" - android:layout_width="match_parent" - app:layout_behavior="@string/appbar_scrolling_view_behavior" - > - - <LinearLayout - android:layout_height="match_parent" - android:layout_marginBottom="56dp" - android:layout_width="match_parent" - android:orientation="vertical" - tools:context=".main.MainActivity" - > - - <TextView - android:id="@+id/quick_protection_info" - android:layout_gravity="center_horizontal" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:paddingLeft="32dp" - android:paddingRight="32dp" - android:paddingTop="16dp" - android:text="@string/quick_protection_info" - android:textColor="@color/black" - android:textSize="14sp" - /> - - <TextView - android:fontFamily="sans-serif-medium" - android:id="@+id/quick_protection_settings_list" - android:layout_gravity="center_horizontal" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:paddingBottom="16dp" - android:paddingLeft="32dp" - android:paddingRight="32dp" - android:paddingTop="16dp" - android:text="@string/quick_protection_settings_list" - android:textColor="@color/black" - android:textSize="14sp" - /> - </LinearLayout> - - </androidx.core.widget.NestedScrollView> - - <TextView - android:fontFamily="sans-serif-medium" - android:gravity="center_vertical|end" - android:id="@+id/learn_more" - android:layout_gravity="bottom|end" - android:layout_height="56dp" - android:layout_width="wrap_content" - android:paddingLeft="32dp" - android:paddingRight="32dp" - android:text="@string/learn_more" - android:textColor="#007fff" - android:textSize="14sp" - /> -</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_trackers.xml b/app/src/main/res/layout/fragment_trackers.xml index 599d68d..04fcfb1 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/white" + android:background="@color/primary" android:layout_height="match_parent" android:layout_width="match_parent" > diff --git a/app/src/main/res/layout/ipscrambling_item_app_toggle.xml b/app/src/main/res/layout/ipscrambling_item_app_toggle.xml index 117b834..1fbffa0 100644 --- a/app/src/main/res/layout/ipscrambling_item_app_toggle.xml +++ b/app/src/main/res/layout/ipscrambling_item_app_toggle.xml @@ -14,7 +14,6 @@ android:id="@+id/icon" android:layout_height="32dp" android:layout_width="32dp" - android:src="@drawable/ic_facebook" /> <TextView diff --git a/app/src/main/res/layout/ipscrambling_item_selectmode.xml b/app/src/main/res/layout/ipscrambling_item_selectmode.xml index 4758d56..a012f6d 100644 --- a/app/src/main/res/layout/ipscrambling_item_selectmode.xml +++ b/app/src/main/res/layout/ipscrambling_item_selectmode.xml @@ -48,7 +48,7 @@ android:layout_width="wrap_content" android:text="@{subtitle}" android:textSize="14sp" - android:textColor="@color/grey_text" + android:textColor="@color/secondary_text" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/title" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/item_app_toggle.xml b/app/src/main/res/layout/item_app_toggle.xml deleted file mode 100644 index 8bee0e2..0000000 --- a/app/src/main/res/layout/item_app_toggle.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/item_permission_apps" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:paddingBottom="16dp" - android:paddingLeft="32dp" - android:paddingRight="32dp" - android:paddingTop="16dp" - > - - <ImageView - android:id="@+id/app_icon" - android:layout_alignParentStart="true" - android:layout_centerVertical="true" - android:layout_height="36dp" - android:layout_width="36dp" - android:src="@drawable/ic_facebook" - /> - - <TextView - android:fontFamily="sans-serif-medium" - android:id="@+id/app_title" - android:layout_centerVertical="true" - android:layout_height="wrap_content" - android:layout_toEndOf="@+id/app_icon" - android:layout_toStartOf="@+id/toggle" - android:layout_width="match_parent" - android:paddingEnd="32dp" - android:paddingStart="32dp" - android:textColor="@color/black" - android:textSize="16sp" - tools:text="Body sensor" - /> - - <Switch - android:id="@+id/toggle" - android:layout_alignParentEnd="true" - android:layout_centerVertical="true" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - /> - -</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_permission.xml b/app/src/main/res/layout/item_permission.xml deleted file mode 100644 index 66d4213..0000000 --- a/app/src/main/res/layout/item_permission.xml +++ /dev/null @@ -1,73 +0,0 @@ -<?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/>. - --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/item_permission" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:paddingBottom="16dp" - android:paddingTop="16dp" - > - - <ImageView - android:id="@+id/permission_icon" - android:layout_alignParentStart="true" - android:layout_centerVertical="true" - android:layout_height="24dp" - android:layout_width="24dp" - android:src="@drawable/ic_body_monitor" - /> - - <LinearLayout - android:layout_height="wrap_content" - android:layout_toEndOf="@+id/permission_icon" - android:layout_toStartOf="@+id/chevron" - android:layout_width="match_parent" - android:orientation="vertical" - android:paddingEnd="32dp" - android:paddingStart="32dp" - > - - <TextView - android:fontFamily="sans-serif-medium" - android:id="@+id/permission_title" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:textColor="@color/black" - android:textSize="16sp" - tools:text="Body sensor" - /> - - <TextView - android:id="@+id/permission_count" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:textSize="14sp" - tools:text="3 of 8 apps allowed" - /> - </LinearLayout> - - <ImageView - android:id="@+id/chevron" - android:layout_alignParentEnd="true" - android:layout_centerVertical="true" - android:layout_height="24dp" - android:layout_width="24dp" - android:padding="4dp" - android:src="@drawable/ic_chevron_right_24dp" - /> -</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/topbar.xml b/app/src/main/res/layout/topbar.xml index a493b3b..90fb29a 100644 --- a/app/src/main/res/layout/topbar.xml +++ b/app/src/main/res/layout/topbar.xml @@ -26,7 +26,7 @@ > <com.google.android.material.appbar.MaterialToolbar - android:background="@color/white" + android:background="@color/primary" android:elevation="0dp" android:id="@+id/toolbar" android:layout_height="?android:attr/actionBarSize" diff --git a/app/src/main/res/layout/trackers_item_app.xml b/app/src/main/res/layout/trackers_item_app.xml index 310c792..6af43ea 100644 --- a/app/src/main/res/layout/trackers_item_app.xml +++ b/app/src/main/res/layout/trackers_item_app.xml @@ -15,7 +15,6 @@ android:id="@+id/icon" android:layout_height="32dp" android:layout_width="32dp" - android:src="@drawable/ic_facebook" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" @@ -29,7 +28,7 @@ android:ellipsize="end" android:layout_marginStart="16dp" android:textSize="14sp" - android:textColor="@color/black_text" + android:textColor="@color/primary_text" tools:text="Body sensor" app:layout_constraintLeft_toRightOf="@+id/icon" app:layout_constraintTop_toTopOf="parent" @@ -45,7 +44,7 @@ android:ellipsize="end" android:layout_marginStart="16dp" android:textSize="14sp" - android:textColor="@color/grey_text_2" + android:textColor="@color/secondary_text" tools:text="1 tracker blocked out of 4" app:layout_constraintLeft_toRightOf="@+id/icon" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/trackers_item_graph.xml b/app/src/main/res/layout/trackers_item_graph.xml index e7245f9..5a2714c 100644 --- a/app/src/main/res/layout/trackers_item_graph.xml +++ b/app/src/main/res/layout/trackers_item_graph.xml @@ -41,7 +41,7 @@ android:id="@+id/graph_period_label" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:textColor="@color/grey_text_2" + android:textColor="@color/secondary_text" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" android:layout_marginRight="16dp" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 2bf09cc..1ffc641 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,36 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="purple_200">#FFBB86FC</color> - <color name="purple_500">#FF6200EE</color> - <color name="purple_700">#FF3700B3</color> - <color name="teal_200">#FF03DAC5</color> - <color name="teal_700">#FF018786</color> - <color name="black">#FF000000</color> - <color name="white">#FFFFFFFF</color> - + <!--themable --> + <color name="primary">@lineageos.platform:color/color_default_primary</color> <color name="accent">@lineageos.platform:color/color_default_accent</color> - <color name="black_text">#DE000000</color> - <color name="black_text_2">#BD000000</color> + <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="grey_text">#99000000</color> - <color name="grey_text_2">#61000000</color> - <color name="grey_divider">#14212121</color> - <color name="grey_overlay">#66FFFFFF</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="green_on">#169659</color> - <color name="green_valid">#2CC766</color> - <color name="e_blue2">@lineageos.platform:color/color_default_blue1</color> + <!-- Custom --> <color name="dark_color">#263238</color> - <color name="blue_unselected">#AADCFE</color> - <color name="light_blue_50">#FFE1F5FE</color> - <color name="light_blue_200">#FF81D4FA</color> - <color name="light_blue_600">#FF039BE5</color> - <color name="light_blue_900">#FF01579B</color> - + <color name="white">#FFFFFFFF</color> + <color name="grey_overlay">#66FFFFFF</color> + <color name="green_valid">#2CC766</color> + <color name="blue_unselected">#AADCFE</color> <!-- used in combination with accent color ! --> + <color name="divider">#14212121</color> <!-- Widget --> <color name="on_surface_high_emphasis">#DEFFFFFF</color> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2a6d21d..4024175 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -118,7 +118,7 @@ <string name="app_widget_description">This is an app widget description</string> <!-- Widget --> - <string name="widget_title">@id/app_title</string> + <string name="widget_title">@string/app_name</string> <string name="widget_state_title_on">Your online privacy is protected</string> <string name="widget_state_title_off">Your online privacy is unprotected</string> <string name="widget_state_trackers_label">@string/dashboard_state_trackers_label</string> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 1e20ab1..9bc2442 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -2,13 +2,12 @@ <!-- Base application theme. --> <style name="Theme.PrivacyCentralApp" parent="Theme.MaterialComponents.DayNight.NoActionBar"> <!-- Primary brand color. --> - <item name="colorPrimary">#007fff</item> - <item name="colorAccent">#007fff</item> - <item name="colorSecondary">#007fff</item> - <item name="colorControlNormal">#007fff</item> + <item name="colorPrimary">@color/primary</item> + <item name="colorAccent">@color/accent</item> + <!-- Status bar color. --> <!-- Customize your theme here. --> - <item name="android:textColor">@color/black_text</item> + <item name="android:textColor">@color/primary_text</item> <item name="android:textSize">16sp</item> </style> |