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

Commit 57b88301 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'epic34-s-app_redesign' into 'v1-oreo' 

Integrate elib

See merge request !177
parents 0fe8456c c50663fb

app/build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ dependencies { 
    implementation "androidx.work:work-runtime:2.7.1"

    implementation 'androidx.test:core:1.4.0'

    implementation 'com.jakewharton.timber:timber:5.0.1'

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



    androidTestImplementation 'androidx.test:runner:1.4.0'

    androidTestImplementation 'androidx.test:rules:1.4.0'

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

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

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

    <solid android:color="#4D666666"/>

    <solid android:color="@color/widget_background"/>

    <corners android:radius="15dp"/>

    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />

</shape>
 
 No newline at end of file

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:navigationIcon="@drawable/ic_arrow_back" />

        app:navigationIcon="@drawable/e_ic_back" />



    <androidx.constraintlayout.widget.ConstraintLayout

        android:id="@+id/header"

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

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

<resources>

    <bool name="isDay">false</bool>

</resources>
 
 No newline at end of file

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

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

<resources>

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

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

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

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

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

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

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

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

</resources>
 
 No newline at end of file