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

Commit 0c3a8519 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'issue_1865_apps' into 'master' 

Issue 1865 apps

See merge request e/apps/apps!37
parents a2bdcb47 c71bbb36

app/build.gradle

+6 −0
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ android { 
    androidExtensions {

        experimental = true

    }

    aaptOptions{

        additionalParameters '-I', 'app/e-ui-sdk.jar'

    }



}



dependencies {
@@ -84,4 +88,6 @@ dependencies { 
    implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.11.1"



    implementation 'com.github.chrisbanes:PhotoView:2.3.0'



    compileOnly files("e-ui-sdk.jar")

}

app/e-ui-sdk.jar

0 → 100644
+116 KiB

File added.

Preview suppressed by a .gitattributes entry or the file's encoding is unsupported.

View file

app/src/main/java/foundation/e/apps/MainActivity.kt

+4 −7
Original line number Diff line number Diff line
@@ -318,13 +318,10 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS 
    *  */

    private fun getAccentColor() {



        val typedValue = TypedValue()

        val contextThemeWrapper = ContextThemeWrapper(this,

                android.R.style.Theme_DeviceDefault)

        contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,

                typedValue, true)

        @ColorInt val color = typedValue.data

        accentColorOS=color;

        accentColorOS=this.resources.getColor(R.color.colorAccent);







    }



}
 
 No newline at end of file

app/src/main/java/foundation/e/apps/application/ApplicationActivity.kt

+1 −7
Original line number Diff line number Diff line
@@ -762,12 +762,6 @@ class ApplicationActivity : 
    }



    private fun getAccentColor() {

        val typedValue = TypedValue()

        val contextThemeWrapper = ContextThemeWrapper(this,

                android.R.style.Theme_DeviceDefault)

        contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,

                typedValue, true)

        @ColorInt val color = typedValue.data

        accentColorOS=color;

        accentColorOS=this.resources.getColor(R.color.colorAccent);

    }

}

app/src/main/java/foundation/e/apps/application/model/Application.kt

+2 −6
Original line number Diff line number Diff line
@@ -451,12 +451,8 @@ class Application(val packageName: String, private val applicationManager: Appli 
   *

   */

    fun getAccentColor(context: Context): Int {

        val typedValue = TypedValue()

        val contextThemeWrapper = ContextThemeWrapper(context,

                R.style.Theme_DeviceDefault)

        contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent,

                typedValue, true)

        @ColorInt val color = typedValue.data



        val color =context.resources.getColor(foundation.e.apps.R.color.colorAccent);

        return color;



    }