From 7d78d1bacccd853d5b69b576d1145e1cc15fb7eb Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Tue, 27 Sep 2022 17:18:58 +0530 Subject: [PATCH] Theme app according to our palette --- app/build.gradle | 6 +---- app/src/main/res/drawable/ic_error.xml | 2 +- .../main/res/layout/account_carddav_item.xml | 3 +-- .../layout/fragment_eelo_authenticator.xml | 2 +- .../res/layout/fragment_invite_successful.xml | 2 +- .../main/res/layout/fragment_send_invite.xml | 2 +- app/src/main/res/values-night/colors.xml | 5 ---- app/src/main/res/values/colors.xml | 10 ++++---- app/src/main/res/values/styles.xml | 24 +++++++++--------- build.gradle | 1 + e-ui-sdk.jar | Bin 115532 -> 0 bytes 11 files changed, 24 insertions(+), 33 deletions(-) delete mode 100644 app/src/main/res/values-night/colors.xml delete mode 100644 e-ui-sdk.jar diff --git a/app/build.gradle b/app/build.gradle index bbfdd10ba..329a9db91 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,10 +13,6 @@ android { compileSdkVersion 32 buildToolsVersion '32.0.0' - aaptOptions { - additionalParameters '-I', 'e-ui-sdk.jar' - } - defaultConfig { applicationId "foundation.e.accountmanager" @@ -106,7 +102,6 @@ android { } dependencies { - compileOnly files("../e-ui-sdk.jar") implementation project(':cert4android') implementation project(':ical4android') @@ -161,6 +156,7 @@ dependencies { implementation "org.apache.commons:commons-text:${versions.commonsText}" implementation 'net.openid:appauth:0.11.1' implementation 'junit:junit:4.13.2' + implementation 'foundation.e:elib:0.0.1-alpha11' // for tests androidTestImplementation "com.google.dagger:hilt-android-testing:${versions.hilt}" diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml index 4d90bc237..a375cc26b 100644 --- a/app/src/main/res/drawable/ic_error.xml +++ b/app/src/main/res/drawable/ic_error.xml @@ -12,6 +12,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/layout/account_carddav_item.xml b/app/src/main/res/layout/account_carddav_item.xml index 570ae7039..889b9df53 100644 --- a/app/src/main/res/layout/account_carddav_item.xml +++ b/app/src/main/res/layout/account_carddav_item.xml @@ -54,7 +54,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingEnd="0dp" - app:tint="@color/accentColor" - android:src="@lineageos.platform:drawable/ic_menu" /> + android:src="@drawable/e_ic_more" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_eelo_authenticator.xml b/app/src/main/res/layout/fragment_eelo_authenticator.xml index b831702ff..7be63935b 100644 --- a/app/src/main/res/layout/fragment_eelo_authenticator.xml +++ b/app/src/main/res/layout/fragment_eelo_authenticator.xml @@ -111,7 +111,7 @@ android:layout_marginTop="24dp" android:layout_marginEnd="16dp" android:text="@string/sign_in" - android:textColor="@android:color/white" + android:textColor="@color/backgroundColor" app:backgroundTint="@color/accentColor" />