Fix branding of AccessControl dialog

Signed-off-by: Stefan Niedermann <info@niedermann.it>

2 files changed, 21 insertions, 11 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java
index f3232c95e..099b16cd9 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java
@@ -7,6 +7,7 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
@@ -25,15 +26,14 @@ import it.niedermann.nextcloud.deck.model.User;
 import it.niedermann.nextcloud.deck.model.full.FullBoard;
 import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
 import it.niedermann.nextcloud.deck.ui.MainViewModel;
-import it.niedermann.nextcloud.deck.ui.branding.BrandedDialogFragment;
 import it.niedermann.nextcloud.deck.ui.branding.BrandedSnackbar;
 import it.niedermann.nextcloud.deck.ui.card.UserAutoCompleteAdapter;
 import it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment;
 
 import static it.niedermann.nextcloud.deck.ui.board.accesscontrol.AccessControlAdapter.HEADER_ITEM_LOCAL_ID;
-import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandToEditText;
+import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.applyBrandToEditTextInputLayout;
 
-public class AccessControlDialogFragment extends BrandedDialogFragment implements AccessControlChangedListener, OnItemClickListener {
+public class AccessControlDialogFragment extends DialogFragment implements AccessControlChangedListener, OnItemClickListener {
 
     private MainViewModel viewModel;
     private DialogBoardShareBinding binding;
@@ -84,6 +84,7 @@ public class AccessControlDialogFragment extends BrandedDialogFragment implement
                     binding.people.setAdapter(userAutoCompleteAdapter);
                     binding.people.setOnItemClickListener(this);
                 });
+                applyBrand(fullBoard.getBoard().getColor());
             } else {
                 // Happens when someone revokes his own access → board gets deleted locally → LiveData fires, but no board
                 // see https://github.com/stefan-niedermann/nextcloud-deck/issues/410
@@ -159,9 +160,8 @@ public class AccessControlDialogFragment extends BrandedDialogFragment implement
         userAutoCompleteAdapter.exclude(user);
     }
 
-    @Override
-    public void applyBrand(int mainColor) {
-        applyBrandToEditText(mainColor, binding.people);
+    public void applyBrand(@ColorInt int mainColor) {
+        applyBrandToEditTextInputLayout(mainColor, binding.peopleWrapper);
         this.adapter.applyBrand(mainColor);
     }
 
diff --git a/app/src/main/res/layout/dialog_board_share.xml b/app/src/main/res/layout/dialog_board_share.xml
index e2b58c20f..c4b5014e7 100644
--- a/app/src/main/res/layout/dialog_board_share.xml
+++ b/app/src/main/res/layout/dialog_board_share.xml
@@ -7,14 +7,24 @@
     android:orientation="vertical"
     android:padding="?attr/dialogPreferredPadding">
 
-    <it.niedermann.nextcloud.deck.ui.view.ToggleAutoCompleteTextView
-        android:id="@+id/people"
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/peopleWrapper"
+        style="@style/TextInputLayoutStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/spacer_2x"
-        android:completionThreshold="1"
         android:hint="@string/hint_assign_people"
-        android:inputType="text" />
+        android:labelFor="@id/people">
+
+        <it.niedermann.nextcloud.deck.ui.view.ToggleAutoCompleteTextView
+            android:id="@+id/people"
+            style="@style/Widget.MaterialComponents.AutoCompleteTextView.OutlinedBox.Dense"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/spacer_2x"
+            android:completionThreshold="1"
+            android:inputType="text" />
+
+    </com.google.android.material.textfield.TextInputLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/peopleList"