From e6fe5f59c2a940490be0ce9f61b077eb2206f0e6 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sat, 3 Aug 2019 10:35:04 +0200 Subject: [PATCH] Change drawable borders --- app/build.gradle | 8 ++++---- .../activities/ShowAccountActivity.java | 15 +++++++++++++++ .../res/drawable/account_pp_border_black.xml | 18 ++++++++++++++++++ .../res/drawable/account_pp_border_dark.xml | 18 ++++++++++++++++++ ..._border.xml => account_pp_border_light.xml} | 0 .../layout-sw600dp/activity_show_account.xml | 2 +- .../main/res/layout/activity_show_account.xml | 2 +- 7 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 app/src/main/res/drawable/account_pp_border_black.xml create mode 100644 app/src/main/res/drawable/account_pp_border_dark.xml rename app/src/main/res/drawable/{account_pp_border.xml => account_pp_border_light.xml} (100%) diff --git a/app/build.gradle b/app/build.gradle index 799f75443..a9d457926 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 28 - buildToolsVersion "28.0.3" + compileSdkVersion 29 + buildToolsVersion "29.0.0" defaultConfig { minSdkVersion 18 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 298 versionName "2.13.0-beta-1" multiDexEnabled true @@ -54,7 +54,7 @@ allprojects { maven { url "https://oss.sonatype.org/content/repositories/snapshots" } } } -ext.supportLibraryVersion = '28.0.0' +ext.supportLibraryVersion = '29.0.0' ext.glideLibraryVersion = '4.9.0' ext.conscryptLibraryVersion = '2.1.0' ext.evernoteLibraryVersion = '1.3.0-rc1' diff --git a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java index 8ee65897d..74a21eb4a 100644 --- a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java @@ -105,6 +105,9 @@ import app.fedilab.android.interfaces.OnRetrieveFeedsAccountInterface; import app.fedilab.android.interfaces.OnRetrieveFeedsInterface; import app.fedilab.android.interfaces.OnRetrieveRelationshipInterface; +import static app.fedilab.android.helper.Helper.THEME_BLACK; +import static app.fedilab.android.helper.Helper.THEME_DARK; +import static app.fedilab.android.helper.Helper.THEME_LIGHT; import static app.fedilab.android.helper.Helper.changeDrawableColor; @@ -183,6 +186,18 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt account_un = findViewById(R.id.account_un); account_type = findViewById(R.id.account_type); account_bot = findViewById(R.id.account_bot); + switch (theme){ + case THEME_LIGHT: + account_pp.setBackgroundResource(R.drawable.account_pp_border_light); + break; + case THEME_DARK: + account_pp.setBackgroundResource(R.drawable.account_pp_border_dark); + break; + case THEME_BLACK: + account_pp.setBackgroundResource(R.drawable.account_pp_border_black); + break; + } + if(b != null){ account = b.getParcelable("account"); if( account == null){ diff --git a/app/src/main/res/drawable/account_pp_border_black.xml b/app/src/main/res/drawable/account_pp_border_black.xml new file mode 100644 index 000000000..abfa2d495 --- /dev/null +++ b/app/src/main/res/drawable/account_pp_border_black.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/account_pp_border_dark.xml b/app/src/main/res/drawable/account_pp_border_dark.xml new file mode 100644 index 000000000..84bf6669c --- /dev/null +++ b/app/src/main/res/drawable/account_pp_border_dark.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/account_pp_border.xml b/app/src/main/res/drawable/account_pp_border_light.xml similarity index 100% rename from app/src/main/res/drawable/account_pp_border.xml rename to app/src/main/res/drawable/account_pp_border_light.xml diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml index b0afab99e..e35ae4488 100644 --- a/app/src/main/res/layout-sw600dp/activity_show_account.xml +++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml @@ -61,7 +61,7 @@ android:layout_width="100dp" android:layout_height="100dp" android:layout_margin="10dp" - android:background="@drawable/account_pp_border" + android:background="@drawable/account_pp_border_light" android:contentDescription="@string/profile_picture" android:padding="2dp" app:layout_constraintBottom_toBottomOf="@id/banner_pp" diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml index b8ef2a910..d23e83310 100644 --- a/app/src/main/res/layout/activity_show_account.xml +++ b/app/src/main/res/layout/activity_show_account.xml @@ -60,7 +60,7 @@ android:layout_width="100dp" android:layout_height="100dp" android:layout_margin="10dp" - android:background="@drawable/account_pp_border" + android:background="@drawable/account_pp_border_light" android:contentDescription="@string/profile_picture" android:padding="2dp" app:layout_constraintBottom_toBottomOf="@id/banner_pp"