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

Commit 815c7694 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

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

Integrate elib

See merge request !51
parents 7c2aed24 ed4646f8

build.gradle

+3 −1
Original line number Diff line number Diff line
@@ -34,13 +34,14 @@ buildscript { 


    ext.androidBuildVersionTools = '33.0.0'



    ext.androidMinSdk = 14

    ext.androidMinSdk = 21

    ext.androidTargetSdk = 29

    ext.androidCompileSdk = 31



    repositories {

        mavenCentral()

        google()

        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}

    }



    dependencies {
@@ -99,5 +100,6 @@ subprojects { 
    repositories {

        mavenCentral()

        google()

        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}

    }

}

e-ui-sdk.jar

deleted100644 → 0
−113 KiB

File deleted.

View file

play-services-base-core-ui/src/main/res/drawable/ic_info_outline.xml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?attr/colorAccent"

    android:tint="?android:attr/textColorSecondary"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0">

    <path

play-services-core/build.gradle

+1 −5
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ configurations { 
}



dependencies {

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

    implementation "com.squareup.wire:wire-runtime:$wireVersion"

    implementation "de.hdodenhof:circleimageview:1.3.0"

    // TODO: Switch to upstream once raw requests are merged
@@ -80,6 +79,7 @@ dependencies { 


    implementation "androidx.lifecycle:lifecycle-service:$lifecycleVersion"

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"

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

}



android {
@@ -203,10 +203,6 @@ android { 
            useLegacyPackaging false

        }

    }



    aaptOptions {

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

    }

}



if (file('user.gradle').exists()) {

play-services-core/microg-ui-tools/src/main/res/drawable/self_check.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?attr/colorAccent"

    android:tint="?android:attr/textColorSecondary"

    android:viewportWidth="24"

    android:viewportHeight="24">