diff options
author | Stefan Niedermann <info@niedermann.it> | 2020-06-30 18:42:48 +0300 |
---|---|---|
committer | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2020-06-30 20:47:30 +0300 |
commit | bf846b06cacc531956f02ef6a856e6a7813a139b (patch) | |
tree | dea128429fd37fd71ad78358ab04d637e38cafe5 /app | |
parent | 6ebaf2df7a22e9d3f7a1c9f2549b7681ece7e233 (diff) |
#525 Adjust design to new style of Nextcloud app
SelectCardForWidgetActivity
Diffstat (limited to 'app')
-rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java | 3 | ||||
-rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SelectCardForWidgetActivity.java | 7 |
2 files changed, 9 insertions, 1 deletions
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 94cc180b8..976a0f42f 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 @@ -90,9 +90,9 @@ public class EditActivity extends BrandedActivity { @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); + applyBrand(colorAccent); setIntent(intent); loadDataFromIntent(); - applyBrand(parseColor(viewModel.getAccount().getColor())); } private void loadDataFromIntent() { @@ -120,6 +120,7 @@ public class EditActivity extends BrandedActivity { final long boardId = args.getLong(BUNDLE_KEY_BOARD_ID); observeOnce(syncManager.getFullBoardById(account.getId(), boardId), EditActivity.this, (fullBoard -> { + applyBrand(parseColor('#' + fullBoard.getBoard().getColor())); viewModel.setCanEdit(fullBoard.getBoard().isPermissionEdit()); invalidateOptionsMenu(); if (viewModel.isCreateMode()) { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SelectCardForWidgetActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SelectCardForWidgetActivity.java index cda805450..8c1fbe1fa 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SelectCardForWidgetActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SelectCardForWidgetActivity.java @@ -6,17 +6,22 @@ import android.os.Bundle; import android.view.Menu; import android.view.View; +import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import it.niedermann.nextcloud.deck.R; import it.niedermann.nextcloud.deck.model.Board; import it.niedermann.nextcloud.deck.model.full.FullCard; import it.niedermann.nextcloud.deck.ui.MainActivity; +import it.niedermann.nextcloud.deck.ui.branding.BrandingUtil; import it.niedermann.nextcloud.deck.ui.card.SelectCardListener; +import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.saveBrandColors; + public class SelectCardForWidgetActivity extends MainActivity implements SelectCardListener { private int appWidgetId; + @ColorInt private int originalBrandColor; @Override protected void onCreate(Bundle savedInstanceState) { @@ -35,6 +40,7 @@ public class SelectCardForWidgetActivity extends MainActivity implements SelectC if (appWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) { finish(); } + originalBrandColor = BrandingUtil.readBrandMainColor(this); } @Override @@ -45,6 +51,7 @@ public class SelectCardForWidgetActivity extends MainActivity implements SelectC .putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId); setResult(RESULT_OK, updateIntent); getApplicationContext().sendBroadcast(updateIntent); + saveBrandColors(this, originalBrandColor); finish(); } |