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

Commit abac0288 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'epic34-s-app_redesign' into 'main' 

Integrate elib

See merge request !92
parents 46c15170 c0c28280

app/build.gradle

+1 −5
Original line number Diff line number Diff line
@@ -111,10 +111,6 @@ android { 
        targetCompatibility JavaVersion.VERSION_1_8

    }



    aaptOptions {

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

    }



    buildFeatures {

        dataBinding true

        viewBinding true
@@ -128,7 +124,6 @@ dependencies { 


    implementation project(':fakelocation')



    eCompileOnly files('libs/e-ui-sdk-1.0.1-q.jar')

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



    implementation project(':trackers')
@@ -157,6 +152,7 @@ dependencies { 
    testImplementation 'junit:junit:4.+'

    androidTestImplementation 'androidx.test.ext:junit:1.1.2'

    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'

    implementation 'foundation.e:elib:0.0.1-alpha11'

}



static def log(Object val) {

app/libs/e-ui-sdk-1.0.1-q.jar

deleted100644 → 0
−113 KiB

File deleted.

View file

app/src/main/res/layout/topbar.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,6 +32,6 @@ 
        android:layout_height="?android:attr/actionBarSize"

        android:layout_width="match_parent"

        tools:layout_height="56dp"

        app:navigationIcon="@drawable/ic_back_24dp"

        app:navigationIcon="@drawable/e_ic_back"

        />

</com.google.android.material.appbar.AppBarLayout>

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

+0 −1
Original line number Diff line number Diff line
@@ -17,6 +17,5 @@ 
  -->



<resources>

    <color name="iconInvertedColor">#FFFFFF</color>

    <color name="green_valid">#169659</color>

</resources>

app/src/main/res/values/colors.xml

+15 −15
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>

    <!--themable -->

    <color name="primary">@lineageos.platform:color/color_default_primary</color>

    <color name="accent">@lineageos.platform:color/color_default_accent</color>

    <color name="primary">@color/e_action_bar</color>

    <color name="accent">@color/e_accent</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="primary_text">@color/e_primary_text_color</color>

    <color name="secondary_text">@color/e_secondary_text_color</color>



    <color name="background">@lineageos.platform:color/color_default_background</color>

    <color name="iconInvertedColor">#000000</color>

    <color name="background">@color/e_background</color>

    <color name="iconInvertedColor">@color/e_alpha_base</color>



    <!-- Custom -->

    <color name="dark_color">#263238</color>

    <color name="white">#FFFFFFFF</color>

    <color name="grey_overlay">#66FFFFFF</color>

    <color name="grey_overlay">@color/e_disabled_color</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>

    <color name="divider">@color/e_background_overlay</color>



    <!-- Widget -->

    <color name="on_surface_high_emphasis">#DEFFFFFF</color>

    <color name="on_primary_medium_emphasis">#BDFFFFFF</color>

    <color name="on_primary_high_emphasis">#FFFFFF</color>

    <color name="on_primary_disabled">#61FFFFFF</color>

    <color name="on_surface_high_emphasis">@color/e_primary_text_color_dark</color>

    <color name="on_primary_medium_emphasis">@color/e_secondary_text_color_dark</color>

    <color name="on_primary_high_emphasis">@color/e_primary_text_color_dark</color>

    <color name="on_primary_disabled">@color/e_disabled_color_dark</color>



    <color name="widget_background">#4D666666</color>

    <color name="widget_background">@color/e_launcher_widget_background</color>



    <color name="launcher_icon_background">#2CCF69</color>



    <color name="on_surface_medium_emphasis_light">#99000000</color>

    <color name="on_surface_disabled_light">#61000000</color>

    <color name="on_surface_medium_emphasis_light">@color/e_secondary_text_color_dark</color>

    <color name="on_surface_disabled_light">@color/e_disabled_color_dark</color>

</resources>
 
 No newline at end of file