diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-06-27 20:36:48 +0300 |
|---|---|---|
| committer | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2020-06-30 13:58:19 +0300 |
| commit | cb955ce77b7825c9b94f6faa3b4f9585c7e12ffb (patch) | |
| tree | 1ddfdff0f2b52b850971d700bb50e6d7c61005ff /app/src/main/java/it | |
| parent | 439505ad0b82ddf506c72b875bb645c2324c1f7d (diff) | |
#525 Adjust design to new style of Nextcloud app
primary TabLayout background color
Diffstat (limited to 'app/src/main/java/it')
| -rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java | 8 | ||||
| -rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandedActivity.java | 2 |
2 files changed, 2 insertions, 8 deletions
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 a6b5c009b..654b325e3 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 @@ -415,14 +415,6 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener public void applyBrand(@ColorInt int mainColor) { applyBrandToPrimaryTabLayout(mainColor, binding.stackTitles); applyBrandToFAB(mainColor, binding.fab); - - - // Is null as soon as the avatar has been set -// @Nullable -// Drawable accountSwitcherDrawable = binding.accountSwitcher.getDrawable(); -// if (accountSwitcherDrawable != null) { -// DrawableCompat.setTint(accountSwitcherDrawable, textColor); -// } DrawableCompat.setTint(headerBinding.logo.getDrawable(), ColorUtil.contrastRatioIsSufficient(mainColor, Color.WHITE) ? Color.WHITE : Color.BLACK); headerBinding.headerView.setBackgroundColor(mainColor); headerBinding.appName.setTextColor(ColorUtil.contrastRatioIsSufficient(mainColor, Color.WHITE) ? Color.WHITE : Color.BLACK); 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 edc3070df..54730ecdd 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 @@ -11,6 +11,7 @@ import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; import androidx.core.graphics.drawable.DrawableCompat; import com.google.android.material.floatingactionbutton.FloatingActionButton; @@ -51,6 +52,7 @@ public abstract class BrandedActivity extends AppCompatActivity implements Brand protected void applyBrandToPrimaryTabLayout(@ColorInt int mainColor, @NonNull TabLayout tabLayout) { @ColorInt int finalMainColor = getSecondaryForegroundColorDependingOnTheme(this, mainColor); + tabLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.primary)); tabLayout.setTabTextColors(finalMainColor, finalMainColor); tabLayout.setTabIconTint(ColorStateList.valueOf(finalMainColor)); tabLayout.setSelectedTabIndicatorColor(finalMainColor); |