From 439505ad0b82ddf506c72b875bb645c2324c1f7d Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Sat, 27 Jun 2020 19:27:52 +0200 Subject: #525 Adjust design to new style of Nextcloud app --- .../niedermann/nextcloud/deck/ui/MainActivity.java | 1 - .../deck/ui/PushNotificationActivity.java | 1 - .../nextcloud/deck/ui/about/AboutActivity.java | 1 - .../ui/archivedboards/ArchivedBoardsActvitiy.java | 2 +- .../ui/archivedcards/ArchivedCardsActvitiy.java | 2 +- .../deck/ui/branding/BrandedActivity.java | 38 ++++------------------ .../nextcloud/deck/ui/card/EditActivity.java | 1 - .../ui/manageaccounts/ManageAccountsActivity.java | 2 +- .../ui/preparecreate/PrepareCreateActivity.java | 1 - .../deck/ui/settings/SettingsActivity.java | 2 +- 10 files changed, 10 insertions(+), 41 deletions(-) (limited to 'app/src/main') diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java index 2f1b93e94..a6b5c009b 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java @@ -413,7 +413,6 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener @Override public void applyBrand(@ColorInt int mainColor) { - applyBrandToPrimaryToolbar(mainColor, binding.toolbar); applyBrandToPrimaryTabLayout(mainColor, binding.stackTitles); applyBrandToFAB(mainColor, binding.fab); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/PushNotificationActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/PushNotificationActivity.java index 4bf96b7aa..b98302b96 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/PushNotificationActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/PushNotificationActivity.java @@ -168,7 +168,6 @@ public class PushNotificationActivity extends BrandedActivity { @Override public void applyBrand(@ColorInt int mainColor) { if (brandingEnabled) { - applyBrandToPrimaryToolbar(mainColor, binding.toolbar); binding.cancel.setTextColor(getSecondaryForegroundColorDependingOnTheme(this, mainColor)); } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutActivity.java index d81b2a868..3d51908bf 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutActivity.java @@ -83,7 +83,6 @@ public class AboutActivity extends BrandedActivity { @Override public void applyBrand(int mainColor) { - applyBrandToPrimaryToolbar(mainColor, binding.toolbar); applyBrandToPrimaryTabLayout(mainColor, binding.tabLayout); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardsActvitiy.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardsActvitiy.java index be9725866..8782bbd7e 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardsActvitiy.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardsActvitiy.java @@ -68,7 +68,7 @@ public class ArchivedBoardsActvitiy extends BrandedActivity implements DeleteBoa @Override public void applyBrand(int mainColor) { - applyBrandToPrimaryToolbar(mainColor, binding.toolbar); + // Nothing to do... } @NonNull diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedcards/ArchivedCardsActvitiy.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedcards/ArchivedCardsActvitiy.java index 363b688ee..ed2ee7097 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedcards/ArchivedCardsActvitiy.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedcards/ArchivedCardsActvitiy.java @@ -66,7 +66,7 @@ public class ArchivedCardsActvitiy extends BrandedActivity { @Override public void applyBrand(int mainColor) { - applyBrandToPrimaryToolbar(mainColor, binding.toolbar); + // Nothing to do... } @NonNull diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandedActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandedActivity.java index 7e5e7cbe1..edc3070df 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandedActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandedActivity.java @@ -5,14 +5,12 @@ import android.content.res.ColorStateList; import android.graphics.Color; import android.os.Bundle; import android.util.TypedValue; -import android.view.Menu; import android.widget.EditText; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; import androidx.core.graphics.drawable.DrawableCompat; import com.google.android.material.floatingactionbutton.FloatingActionButton; @@ -23,6 +21,7 @@ import it.niedermann.nextcloud.deck.DeckLog; import it.niedermann.nextcloud.deck.R; import static it.niedermann.nextcloud.deck.util.ColorUtil.contrastRatioIsSufficient; +import static it.niedermann.nextcloud.deck.util.ColorUtil.getForegroundColorForBackgroundColor; public abstract class BrandedActivity extends AppCompatActivity implements Branded { @@ -50,41 +49,16 @@ public abstract class BrandedActivity extends AppCompatActivity implements Brand } } - @Override - public boolean onCreateOptionsMenu(Menu menu) { -// for (int i = 0; i < menu.size(); i++) { -// Drawable drawable = menu.getItem(i).getIcon(); -// if (drawable != null) { -// drawable = DrawableCompat.wrap(drawable); -// DrawableCompat.setTint(drawable, colorAccent); -// menu.getItem(i).setIcon(drawable); -// } -// } - return super.onCreateOptionsMenu(menu); - } - - public void applyBrandToPrimaryToolbar(@ColorInt int mainColor, @NonNull Toolbar toolbar) { -// final Drawable overflowDrawable = toolbar.getOverflowIcon(); -// if (overflowDrawable != null) { -// overflowDrawable.setColorFilter(colorAccent, PorterDuff.Mode.SRC_ATOP); -// toolbar.setOverflowIcon(overflowDrawable); -// } -// -// final Drawable navigationDrawable = toolbar.getNavigationIcon(); -// if (navigationDrawable != null) { -// navigationDrawable.setColorFilter(colorAccent, PorterDuff.Mode.SRC_ATOP); -// toolbar.setNavigationIcon(navigationDrawable); -// } - } - protected void applyBrandToPrimaryTabLayout(@ColorInt int mainColor, @NonNull TabLayout tabLayout) { - tabLayout.setTabTextColors(mainColor, mainColor); - tabLayout.setTabIconTint(ColorStateList.valueOf(mainColor)); - tabLayout.setSelectedTabIndicatorColor(mainColor); + @ColorInt int finalMainColor = getSecondaryForegroundColorDependingOnTheme(this, mainColor); + tabLayout.setTabTextColors(finalMainColor, finalMainColor); + tabLayout.setTabIconTint(ColorStateList.valueOf(finalMainColor)); + tabLayout.setSelectedTabIndicatorColor(finalMainColor); } public static void applyBrandToFAB(@ColorInt int mainColor, @NonNull FloatingActionButton fab) { fab.setSupportBackgroundTintList(ColorStateList.valueOf(mainColor)); + fab.setColorFilter(getForegroundColorForBackgroundColor(mainColor)); } public static void applyBrandToEditText(@ColorInt int mainColor, @NonNull EditText editText) { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java index 771d6302f..3f59bd008 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java @@ -290,7 +290,6 @@ public class EditActivity extends BrandedActivity { @Override public void applyBrand(int mainColor) { - applyBrandToPrimaryToolbar(mainColor, binding.toolbar); applyBrandToPrimaryTabLayout(mainColor, binding.tabLayout); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountsActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountsActivity.java index 67915fc46..d5c20ad71 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountsActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountsActivity.java @@ -80,6 +80,6 @@ public class ManageAccountsActivity extends BrandedActivity { @Override public void applyBrand(int mainColor) { - applyBrandToPrimaryToolbar(mainColor, binding.toolbar); + // Nothing to do... } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/PrepareCreateActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/PrepareCreateActivity.java index 8a168349a..b4fe87eb7 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/PrepareCreateActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/PrepareCreateActivity.java @@ -225,7 +225,6 @@ public class PrepareCreateActivity extends BrandedActivity { @Override public void applyBrand(int mainColor) { - applyBrandToPrimaryToolbar(mainColor, binding.toolbar); binding.submit.setBackgroundColor(mainColor); binding.submit.setTextColor(mainColor); binding.cancel.setTextColor(getSecondaryForegroundColorDependingOnTheme(this, mainColor)); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsActivity.java index 6cfd0d4b6..6f5a9a7e8 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsActivity.java @@ -38,6 +38,6 @@ public class SettingsActivity extends BrandedActivity { @Override public void applyBrand(int mainColor) { - applyBrandToPrimaryToolbar(mainColor, binding.toolbar); + // Nothing to do... } } -- cgit v1.2.3