Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82a45020 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'use_system_resources' into 'main' 

Use system theme colors. #5082

See merge request e/privacy-central/privacycentralapp!31
parents 335e5047 a9d8b2e6

app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt

+3 −3
Original line number Diff line number Diff line
@@ -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

            )

        )

app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt

+1 −1
Original line number Diff line number Diff line
@@ -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

            }

app/src/main/res/drawable/bg_graph_bar.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?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

app/src/main/res/drawable/bg_outlined.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

app/src/main/res/drawable/ic_body_monitor.xml

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
<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>