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

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

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

Integrate elib

See merge request !119
parents 9b2df8a7 7110b2bd

app/k9mail/build.gradle

+2 −5
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ if (rootProject.testCoverage) { 
}



dependencies {

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

    implementation project(":app:ui:legacy")

    implementation project(":app:core")

    implementation project(":app:storage")
@@ -39,6 +38,8 @@ dependencies { 
    testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"

    testImplementation "io.insert-koin:koin-test:${versions.koin}"

    testImplementation "io.insert-koin:koin-test-junit4:${versions.koin}"



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

}



android {
@@ -150,10 +151,6 @@ android { 
            includeAndroidResources = true

        }

    }



    aaptOptions {

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

    }

}



if (project.hasProperty('keyAlias')) {

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

deleted100644 → 0
+0 −27
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>

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

    <color name="color_message_list_unread_background">#2F2F2F</color>

    <color name="color_message_list_thread_count_background">#1FFFFFFF</color>

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

    <color name="color_default_secondary_text">#99FFFFFF</color>

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



    <color name="color_dialog_backgronund">#383838</color>

    <color name="color_contact_token_background">#4b4b4b</color>

</resources>
 
 No newline at end of file

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

deleted100644 → 0
+0 −36
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>

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

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

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

    <color name="color_default_background">@android:color/white</color>

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

    <color name="color_default_primary_text">#DE000000</color>

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

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

    <color name="color_default_divider">#14212121</color>

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

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



    <color name="color_message_list_selected_background">@lineageos.platform:color/color_default_selector_background</color>

    <color name="color_message_list_unread_background">#DCDCDC</color>

    <color name="color_message_list_thread_count_background">#14212121</color>

    <color name="color_dialog_backgronund">@android:color/white</color>



    <color name="color_contact_token_background">#ededed</color>

</resources>
 
 No newline at end of file

app/ui/base/src/main/res/color/star_color.xml

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_checked="true" android:color="@lineageos.platform:color/color_default_orange1" />

    <item android:state_checked="false" android:color="@lineageos.platform:color/color_default_secondary_text" />

</selector>

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

deleted100644 → 0
+0 −24
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>

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

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

    <color name="color_default_secondary_text">#99FFFFFF</color>

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

    <color name="color_avatar_background">#474747</color>

    <color name="color_avatar_foreground">#cfcfcf</color>

</resources>
 
 No newline at end of file