From 536af42e273500dda988ae409905c51f4053fd1c Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 17 Nov 2022 19:03:36 +0100 Subject: [PATCH] Comment #467 #464 - fix some theme colors / bugs --- .../android/activities/FilterActivity.java | 21 +++++++++++++++---- app/src/main/res/layout/drawer_filter.xml | 4 ++++ app/src/main/res/layout/popup_add_filter.xml | 15 +++++++------ 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/FilterActivity.java b/app/src/main/java/app/fedilab/android/activities/FilterActivity.java index d2f78cb7..78de94ef 100644 --- a/app/src/main/java/app/fedilab/android/activities/FilterActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/FilterActivity.java @@ -109,7 +109,8 @@ public class FilterActivity extends BaseActivity implements FilterAdapter.Delete popupAddFilterBinding.addKeyword.setOnClickListener(v -> { KeywordsLayoutBinding keywordsLayoutBinding = KeywordsLayoutBinding.inflate(LayoutInflater.from(context)); - keywordsLayoutBinding.deleteKeyword.setOnClickListener(v2 -> popupAddFilterBinding.keywordsContainer.removeView(keywordsLayoutBinding.deleteKeyword)); + keywordsLayoutBinding.deleteKeyword.setOnClickListener(v2 -> popupAddFilterBinding.keywordsContainer.removeView(keywordsLayoutBinding.getRoot())); + keywordsLayoutBinding.deleteKeyword.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(context)); popupAddFilterBinding.keywordsContainer.addView(keywordsLayoutBinding.getRoot()); }); @@ -140,14 +141,22 @@ public class FilterActivity extends BaseActivity implements FilterAdapter.Delete KeywordsLayoutBinding keywordsLayoutBinding = KeywordsLayoutBinding.inflate(LayoutInflater.from(context)); keywordsLayoutBinding.keywordPhrase.setText(filterKeyword.keyword); keywordsLayoutBinding.wholeWord.setChecked(filterKeyword.whole_word); - keywordsLayoutBinding.deleteKeyword.setOnClickListener(v -> popupAddFilterBinding.keywordsContainer.removeView(keywordsLayoutBinding.deleteKeyword)); + keywordsLayoutBinding.deleteKeyword.setOnClickListener(v -> popupAddFilterBinding.keywordsContainer.removeView(keywordsLayoutBinding.getRoot())); + keywordsLayoutBinding.deleteKeyword.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(context)); popupAddFilterBinding.keywordsContainer.addView(keywordsLayoutBinding.getRoot()); } } + if (popupAddFilterBinding.keywordsContainer.getChildCount() == 0) { + KeywordsLayoutBinding keywordsLayoutBinding = KeywordsLayoutBinding.inflate(LayoutInflater.from(context)); + keywordsLayoutBinding.deleteKeyword.setOnClickListener(v -> popupAddFilterBinding.keywordsContainer.removeView(keywordsLayoutBinding.getRoot())); + keywordsLayoutBinding.deleteKeyword.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(context)); + popupAddFilterBinding.keywordsContainer.addView(keywordsLayoutBinding.getRoot()); + } } else { //Add at least a view KeywordsLayoutBinding keywordsLayoutBinding = KeywordsLayoutBinding.inflate(LayoutInflater.from(context)); - keywordsLayoutBinding.deleteKeyword.setOnClickListener(v -> popupAddFilterBinding.keywordsContainer.removeView(keywordsLayoutBinding.deleteKeyword)); + keywordsLayoutBinding.deleteKeyword.setOnClickListener(v -> popupAddFilterBinding.keywordsContainer.removeView(keywordsLayoutBinding.getRoot())); + keywordsLayoutBinding.deleteKeyword.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(context)); popupAddFilterBinding.keywordsContainer.addView(keywordsLayoutBinding.getRoot()); } popupAddFilterBinding.actionRemove.setOnClickListener(v -> { @@ -186,7 +195,10 @@ public class FilterActivity extends BaseActivity implements FilterAdapter.Delete keywordsAttributes.add(keywordsAttr); } } - + if (popupAddFilterBinding.addTitle.getText().toString().trim().isEmpty()) { + popupAddFilterBinding.addTitle.setError(context.getString(R.string.cannot_be_empty)); + canBeSent = false; + } if (!popupAddFilterBinding.contextConversation.isChecked() && !popupAddFilterBinding.contextHome.isChecked() && !popupAddFilterBinding.contextPublic.isChecked() && !popupAddFilterBinding.contextNotification.isChecked() && !popupAddFilterBinding.contextProfiles.isChecked()) { popupAddFilterBinding.contextDescription.setError(context.getString(R.string.cannot_be_empty)); canBeSent = false; @@ -212,6 +224,7 @@ public class FilterActivity extends BaseActivity implements FilterAdapter.Delete } else { filterSent.expires_at = null; } + filterSent.title = popupAddFilterBinding.addTitle.getText().toString().trim(); filterSent.filter_action = popupAddFilterBinding.actionHide.isChecked() ? "hide" : "warn"; if (filter != null) { filtersVM.editFilter(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, filter.id, filterSent.title, filterSent.expires_at, filterSent.context, filterSent.filter_action, keywordsAttributes) diff --git a/app/src/main/res/layout/drawer_filter.xml b/app/src/main/res/layout/drawer_filter.xml index 2c26bf6e..b68cba97 100644 --- a/app/src/main/res/layout/drawer_filter.xml +++ b/app/src/main/res/layout/drawer_filter.xml @@ -46,6 +46,8 @@ android:layout_margin="5dp" android:contentDescription="@string/action_update_filter" android:padding="6dp" + app:iconTint="@color/cyanea_accent_dark_reference" + app:strokeColor="@color/cyanea_accent_dark_reference" app:icon="@drawable/ic_baseline_edit_24" /> \ No newline at end of file diff --git a/app/src/main/res/layout/popup_add_filter.xml b/app/src/main/res/layout/popup_add_filter.xml index e23769af..6ca55917 100644 --- a/app/src/main/res/layout/popup_add_filter.xml +++ b/app/src/main/res/layout/popup_add_filter.xml @@ -133,6 +133,7 @@ - + android:text="@string/hide_with_warning" /> @@ -184,20 +183,20 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/hide_completely" - android:textSize="16sp" - android:checked="true" - android:textStyle="bold" /> + android:checked="true" /> @@ -235,7 +234,7 @@ android:text="@string/add_keyword" android:textColor="@color/cyanea_accent_dark_reference" app:icon="@drawable/ic_baseline_add_24" - app:iconTint="@color/cyanea_primary_dark_reference" + app:iconTint="@color/cyanea_accent_dark_reference" app:strokeColor="@color/cyanea_accent_dark_reference" />