diff options
Diffstat (limited to 'app/src/main')
6 files changed, 15 insertions, 30 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherDialog.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherDialog.java index 09592b7b7..67b4dcbc3 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherDialog.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherDialog.java @@ -3,7 +3,6 @@ package it.niedermann.nextcloud.deck.ui.accountswitcher; import android.app.Dialog; import android.content.Context; import android.content.Intent; -import android.graphics.drawable.LayerDrawable; import android.net.Uri; import android.os.Bundle; @@ -28,7 +27,6 @@ import it.niedermann.nextcloud.deck.util.ExceptionUtil; import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper.observeOnce; import static it.niedermann.nextcloud.deck.ui.MainActivity.ACTIVITY_MANAGE_ACCOUNTS; -import static it.niedermann.nextcloud.deck.ui.branding.BrandedActivity.applyBrandToLayerDrawable; public class AccountSwitcherDialog extends BrandedDialogFragment { @@ -61,6 +59,7 @@ public class AccountSwitcherDialog extends BrandedDialogFragment { public Dialog onCreateDialog(Bundle savedInstanceState) { binding = DialogAccountSwitcherBinding.inflate(requireActivity().getLayoutInflater()); binding.accountItemLabel.setText(viewModel.getCurrentAccount().getName()); + binding.check.setSelected(true); Glide.with(requireContext()) .load(viewModel.getCurrentAccount().getUrl() + "/index.php/avatar/" + Uri.encode(viewModel.getCurrentAccount().getUserName()) + "/64") @@ -115,6 +114,6 @@ public class AccountSwitcherDialog extends BrandedDialogFragment { @Override public void applyBrand(int mainColor, int textColor) { - applyBrandToLayerDrawable((LayerDrawable) binding.check.getDrawable(), R.id.area, mainColor); +// applyBrandToLayerDrawable((LayerDrawable) binding.check.getDrawable(), R.id.area, mainColor); } } 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 9ca2f80e9..6278ac1f5 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,7 +5,6 @@ import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.graphics.drawable.LayerDrawable; import android.os.Bundle; import android.view.Menu; import android.view.View; @@ -13,7 +12,6 @@ import android.view.Window; import android.widget.EditText; import androidx.annotation.ColorInt; -import androidx.annotation.IdRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; @@ -157,13 +155,4 @@ public abstract class BrandedActivity extends AppCompatActivity implements Brand return mainColor; } } - - public static void applyBrandToLayerDrawable(@NonNull LayerDrawable check, @IdRes int areaToColor, @ColorInt int mainColor) { - final Drawable drawable = check.findDrawableByLayerId(areaToColor); - if (drawable == null) { - DeckLog.error("Could not find areaToColor (" + areaToColor + "). Cannot apply brand."); - } else { - DrawableCompat.setTint(drawable, mainColor); - } - } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java index de7bee4fa..77794dd5a 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java @@ -1,7 +1,5 @@ package it.niedermann.nextcloud.deck.ui.manageaccounts; -import android.graphics.Color; -import android.graphics.drawable.LayerDrawable; import android.net.Uri; import android.view.View; @@ -19,7 +17,6 @@ import it.niedermann.nextcloud.deck.model.Account; import static android.view.View.GONE; import static android.view.View.VISIBLE; -import static it.niedermann.nextcloud.deck.ui.branding.BrandedActivity.applyBrandToLayerDrawable; public class ManageAccountViewHolder extends RecyclerView.ViewHolder { @@ -37,10 +34,8 @@ public class ManageAccountViewHolder extends RecyclerView.ViewHolder { .error(R.drawable.ic_person_grey600_24dp) .apply(RequestOptions.circleCropTransform()) .into(binding.accountItemAvatar); - itemView.setOnClickListener((v) -> { - applyBrandToLayerDrawable((LayerDrawable) binding.currentAccountIndicator.getDrawable(), R.id.area, Color.parseColor(localAccount.getColor())); - onAccountClick.accept(localAccount); - }); + binding.currentAccountIndicator.setSelected(isCurrentAccount); + itemView.setOnClickListener((v) -> onAccountClick.accept(localAccount)); if (onAccountDelete == null) { binding.delete.setVisibility(GONE); } else { diff --git a/app/src/main/res/drawable/circle_alpha_check_36dp.xml b/app/src/main/res/drawable/circle_alpha_check_36dp.xml index 52acf0403..57991dafc 100644 --- a/app/src/main/res/drawable/circle_alpha_check_36dp.xml +++ b/app/src/main/res/drawable/circle_alpha_check_36dp.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:id="@+id/area"> - <shape android:shape="oval"> - <solid android:color="@color/primary" /> - <stroke - android:width="1dp" - android:color="@android:color/white" /> + <item> + <shape + android:shape="oval"> + <solid android:color="#55ffffff" /> + <size + android:width="36dp" + android:height="36dp"/> </shape> </item> <item android:drawable="@drawable/ic_check_white_24dp" /> diff --git a/app/src/main/res/layout/dialog_account_switcher.xml b/app/src/main/res/layout/dialog_account_switcher.xml index ec28130a2..91d60e05d 100644 --- a/app/src/main/res/layout/dialog_account_switcher.xml +++ b/app/src/main/res/layout/dialog_account_switcher.xml @@ -46,7 +46,7 @@ android:contentDescription="@null" android:focusable="false" android:scaleType="center" - app:srcCompat="@drawable/circle_alpha_check_36dp" /> + app:srcCompat="@drawable/selected" /> </LinearLayout> <View @@ -84,7 +84,7 @@ android:contentDescription="@null" android:focusable="false" android:scaleType="center" - app:srcCompat="@drawable/ic_person_grey600_24dp" /> + app:srcCompat="@drawable/ic_person_add_black_24dp" /> <TextView android:layout_width="wrap_content" diff --git a/app/src/main/res/layout/item_account_choose.xml b/app/src/main/res/layout/item_account_choose.xml index 4562f0dbc..a40af62f4 100644 --- a/app/src/main/res/layout/item_account_choose.xml +++ b/app/src/main/res/layout/item_account_choose.xml @@ -29,7 +29,8 @@ android:layout_height="12dp" android:layout_gravity="end|bottom" android:visibility="gone" - app:srcCompat="@drawable/circle_alpha_check_36dp" + app:srcCompat="@drawable/selected" + tools:src="@drawable/ic_check_grey600_24dp" tools:visibility="visible" /> </FrameLayout> |