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

Commit 820655cb authored by Guillaume Jacquart's avatar Guillaume Jacquart
Browse files

Fix colors and launcher for standalone mode.

parent 1dd479d3

app/build.gradle

+15 −5
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ android { 


        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"



        manifestPlaceholders = [ persistent: "false" ]

        manifestPlaceholders = [

            persistent: "false",

            mainActivityIntentFilterCategory: "android.intent.category.LAUNCHER"

        ]



        resValue("string", "mapbox_key", MAPBOX_KEY)

    }
@@ -58,17 +61,23 @@ android { 
            applicationIdSuffix '.standalone'

            minSdkVersion 26

            targetSdkVersion 31

            manifestPlaceholders = [ persistent: "false" ]



            manifestPlaceholders = [

                persistent: "false",

                mainActivityIntentFilterCategory: "android.intent.category.LAUNCHER"

            ]

        }

    }



    buildTypes {

        debug {

            signingConfig null  // Set signing config to null as we use signingConfig per variant.

            signingConfig signingConfigs.debug

            // Set signing config to null as we use signingConfig per variant.

        }

        release {

            manifestPlaceholders = [ persistent: "true" ]

            manifestPlaceholders = [

                persistent: "true",

                mainActivityIntentFilterCategory: "android.intent.category.INFO"

            ]



            minifyEnabled false

            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -121,6 +130,7 @@ dependencies { 
    e30CompileOnly files('libs/e-ui-sdk-1.0.1-q.jar')

    e30Implementation files('libs/lineage-sdk.jar')



    implementation project(':fakelocation')

    implementation 'foundation.e:privacymodule.trackerfilter:0.7.0'

    implementation 'foundation.e:privacymodule.api:1.1.0'

    implementation 'foundation.e:privacymodule.tor:0.2.4'

app/src/google/res/values/strings.xml

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
<resources>

    <string name="app_name">google - PrivacyModulesDemo</string>

</resources>

app/src/main/AndroidManifest.xml

+13 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
        >

        <receiver

            android:name=".common.BootCompletedReceiver"

            android:exported="true"

            >

            <intent-filter>

                <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -53,19 +54,28 @@ 
                android:resource="@xml/widget_info"

                />

        </receiver>

        <receiver android:name=".widget.WidgetCommandReceiver">

        <receiver android:name=".widget.WidgetCommandReceiver"

            android:exported="true">

            <intent-filter>

                <action android:name="toggle_privacy" />

            </intent-filter>

        </receiver>



        <activity android:name=".main.MainActivity"

            android:launchMode="singleTask">

            android:launchMode="singleTask"

            android:exported="true"

            >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.INFO"/>

                <category android:name="${mainActivityIntentFilterCategory}"/>

            </intent-filter>

        </activity>



        <service

            android:name="org.torproject.android.service.OrbotService"

            android:exported="false"



            />

    </application>



</manifest>
 
 No newline at end of file

app/src/main/java/foundation/e/privacycentralapp/DependencyContainer.kt

+2 −3
Original line number Diff line number Diff line
@@ -40,16 +40,15 @@ import foundation.e.privacycentralapp.features.location.FakeLocationViewModel 
import foundation.e.privacycentralapp.features.trackers.TrackersViewModel

import foundation.e.privacycentralapp.features.trackers.apptrackers.AppTrackersFragment

import foundation.e.privacycentralapp.features.trackers.apptrackers.AppTrackersViewModel

import foundation.e.privacymodules.fakelocation.FakeLocationModule

import foundation.e.privacymodules.ipscrambler.IpScramblerModule

import foundation.e.privacymodules.ipscramblermodule.IIpScramblerModule

import foundation.e.privacymodules.location.FakeLocationModule

import foundation.e.privacymodules.location.IFakeLocationModule

import foundation.e.privacymodules.permissions.PermissionsPrivacyModule

import foundation.e.privacymodules.permissions.data.ApplicationDescription

import foundation.e.privacymodules.trackers.api.BlockTrackersPrivacyModule

import foundation.e.privacymodules.trackers.api.TrackTrackersPrivacyModule

import kotlinx.coroutines.DelicateCoroutinesApi

import kotlinx.coroutines.FlowPreview

import kotlinx.coroutines.GlobalScope



/**
@@ -61,7 +60,7 @@ class DependencyContainer(val app: Application) { 
    val context: Context by lazy { app.applicationContext }



    // Drivers

    private val fakeLocationModule: IFakeLocationModule by lazy { FakeLocationModule(app.applicationContext) }

    private val fakeLocationModule: FakeLocationModule by lazy { FakeLocationModule(app.applicationContext) }

    private val permissionsModule by lazy { PermissionsPrivacyModule(app.applicationContext) }

    private val ipScramblerModule: IIpScramblerModule by lazy { IpScramblerModule(app.applicationContext) }

app/src/standalone/res/values-night/colors.xml

0 → 100644
+28 −0
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/>.

  -->



<resources>

    <!--themable -->

    <color name="primary">#272727</color>

    <color name="accent">#5DB2FF</color>



    <color name="primary_text">#CCFFFFFF</color>

    <color name="secondary_text">#8CFFFFFF</color>



    <color name="background">#121212</color>



</resources>
 
 No newline at end of file