mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-11-26 06:47:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

Branding for selected account

Browse source
This commit is contained in:
Stefan Niedermann 2020-06-04 21:57:25 +02:00
parent caf63c4a07
commit a207574e20
4 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java
View file

@ -3,6 +3,7 @@ package it.niedermann.owncloud.notes.accountswitcher;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
@ -63,8 +64,10 @@ public class AccountSwitcherDialog extends DialogFragment {
.apply(RequestOptions.circleCropTransform()) .apply(RequestOptions.circleCropTransform())
.into(binding.currentAccountItemAvatar); .into(binding.currentAccountItemAvatar);
binding.accountLayout.setOnClickListener((v) -> dismiss()); binding.accountLayout.setOnClickListener((v) -> dismiss());
final Drawable wrapped = DrawableCompat.wrap(binding.check.getDrawable()).mutate();
DrawableCompat.setTint(wrapped, currentLocalAccount.getColor()); LayerDrawable ld = (LayerDrawable) binding.check.getDrawable();
Drawable ldDrawable = ld.findDrawableByLayerId(R.id.area);
DrawableCompat.setTint(ldDrawable, currentLocalAccount.getColor());
AccountSwitcherAdapter adapter = new AccountSwitcherAdapter((localAccount -> { AccountSwitcherAdapter adapter = new AccountSwitcherAdapter((localAccount -> {
accountSwitcherListener.onAccountChosen(localAccount); accountSwitcherListener.onAccountChosen(localAccount);
@ -72,6 +75,12 @@ public class AccountSwitcherDialog extends DialogFragment {
}), (localAccount) -> accountSwitcherListener.onAccountDeleted(localAccount)); }), (localAccount) -> accountSwitcherListener.onAccountDeleted(localAccount));
binding.accountsList.setAdapter(adapter); binding.accountsList.setAdapter(adapter);
List<LocalAccount> localAccounts = db.getAccounts(); List<LocalAccount> localAccounts = db.getAccounts();
for (LocalAccount localAccount : localAccounts) {
if (localAccount.getId() == currentLocalAccount.getId()) {
localAccounts.remove(localAccount);
break;
}
}
adapter.setLocalAccounts(localAccounts); adapter.setLocalAccounts(localAccounts);
binding.addAccount.setOnClickListener((v) -> accountSwitcherListener.addAccount()); binding.addAccount.setOnClickListener((v) -> accountSwitcherListener.addAccount());

4
app/src/main/res/drawable/check.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item> <item android:id="@+id/area">
<shape android:shape="oval"> <shape android:shape="oval">
<solid android:color="@android:color/holo_green_light" /> <solid android:color="@color/defaultBrand" />
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@android:color/white" /> android:color="@android:color/white" />

8
app/src/main/res/layout/dialog_account_switcher.xml
View file

@ -69,9 +69,15 @@
android:id="@+id/add_account" android:id="@+id/add_account"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/spacer_2x"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="@dimen/spacer_3x"> android:paddingStart="@dimen/spacer_3x"
android:paddingLeft="@dimen/spacer_3x"
android:paddingTop="@dimen/spacer_1x"
android:paddingEnd="@dimen/spacer_3x"
android:paddingRight="@dimen/spacer_3x"
android:paddingBottom="@dimen/spacer_1x">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:layout_width="36dp" android:layout_width="36dp"

1
app/src/main/res/layout/item_account_choose.xml
View file

@ -38,6 +38,7 @@
android:id="@+id/delete" android:id="@+id/delete"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@null" android:contentDescription="@null"
android:focusable="false" android:focusable="false"
android:scaleType="center" android:scaleType="center"