Style adjustments

app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java

@@ -198,7 +198,6 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
         setContentView(R.layout.drawer_layout);
         ButterKnife.bind(this);
 
-
         String categoryAdapterSelectedItem = ADAPTER_KEY_RECENT;
         if (savedInstanceState == null) {
             if (ACTION_RECENT.equals(getIntent().getAction())) {

app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java

@@ -32,8 +32,11 @@ import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundExce
 import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
 import com.nextcloud.android.sso.helper.SingleAccountHelper;
 
+import java.util.Objects;
+
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.android.activity.EditNoteActivity;
+import it.niedermann.owncloud.notes.android.fragment.CategoryDialogFragment.CategoryDialogListener;
 import it.niedermann.owncloud.notes.model.CloudNote;
 import it.niedermann.owncloud.notes.model.DBNote;
 import it.niedermann.owncloud.notes.model.LocalAccount;
@@ -44,7 +47,7 @@ import it.niedermann.owncloud.notes.util.ICallback;
 import static androidx.core.content.pm.ShortcutManagerCompat.isRequestPinShortcutSupported;
 import static it.niedermann.owncloud.notes.android.activity.EditNoteActivity.ACTION_SHORTCUT;
 
-public abstract class BaseNoteFragment extends Fragment implements CategoryDialogFragment.CategoryDialogListener {
+public abstract class BaseNoteFragment extends Fragment implements CategoryDialogListener {
 
     private static final String TAG = BaseNoteFragment.class.getSimpleName();
 
@@ -273,7 +276,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
                 showCategorySelector();
                 return true;
             case R.id.menu_move:
-                AccountChooserDialogFragment.newInstance().show(getFragmentManager(), BaseNoteFragment.class.getCanonicalName());
+                AccountChooserDialogFragment.newInstance().show(Objects.requireNonNull(getFragmentManager()), BaseNoteFragment.class.getCanonicalName());
                 return true;
             case R.id.menu_share:
                 Intent shareIntent = new Intent();
@@ -293,7 +296,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
                 return false;
             case MENU_ID_PIN:
                 if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    ShortcutManager shortcutManager = getActivity().getSystemService(ShortcutManager.class);
+                    ShortcutManager shortcutManager = Objects.requireNonNull(getActivity()).getSystemService(ShortcutManager.class);
 
                     if (shortcutManager.isRequestPinShortcutSupported()) {
                         Intent intent = new Intent(getActivity(), EditNoteActivity.class);
@@ -349,7 +352,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
         }
     }
 
-    protected float getFontSizeFromPreferences(SharedPreferences sp) {
+    float getFontSizeFromPreferences(SharedPreferences sp) {
         final String prefValueSmall = getString(R.string.pref_value_font_size_small);
         final String prefValueMedium = getString(R.string.pref_value_font_size_medium);
         // final String prefValueLarge = getString(R.string.pref_value_font_size_large);
@@ -372,7 +375,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
      */
     private void showCategorySelector() {
         final String fragmentId = "fragment_category";
-        FragmentManager manager = getFragmentManager();
+        FragmentManager manager = Objects.requireNonNull(getFragmentManager());
         Fragment frag = manager.findFragmentByTag(fragmentId);
         if (frag != null) {
             manager.beginTransaction().remove(frag).commit();

app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryDialogFragment.java

@@ -17,6 +17,7 @@ import androidx.fragment.app.Fragment;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -46,8 +47,8 @@ public class CategoryDialogFragment extends DialogFragment {
         void onCategoryChosen(String category);
     }
 
-    public static final String PARAM_ACCOUNT_ID = "account_id";
+    static final String PARAM_ACCOUNT_ID = "account_id";
-    public static final String PARAM_CATEGORY = "category";
+    static final String PARAM_CATEGORY = "category";
 
     private long accountId;
 
@@ -56,13 +57,25 @@ public class CategoryDialogFragment extends DialogFragment {
 
     private FolderArrayAdapter adapter;
 
+    @Override
+    public void onAttach(@NonNull Context context) {
+        super.onAttach(context);
+        if(getArguments() != null && getArguments().containsKey(PARAM_ACCOUNT_ID)) {
+            accountId = getArguments().getLong(PARAM_ACCOUNT_ID);
+        } else {
+            throw new IllegalArgumentException("Provide at least \"" + PARAM_ACCOUNT_ID + "\"");
+        }
+    }
+
+    @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        View dialogView = getActivity().getLayoutInflater().inflate(R.layout.dialog_change_category, null);
+        View dialogView = Objects.requireNonNull(getActivity()).getLayoutInflater().inflate(R.layout.dialog_change_category, null);
         ButterKnife.bind(this, dialogView);
         if (savedInstanceState == null) {
-            textCategory.setText(getArguments().getString(PARAM_CATEGORY));
+            if(getArguments() != null && getArguments().containsKey(PARAM_CATEGORY)) {
-            accountId = getArguments().getLong(PARAM_ACCOUNT_ID);
+                textCategory.setText(getArguments().getString(PARAM_CATEGORY));
+            }
         }
         adapter = new FolderArrayAdapter(getActivity(), android.R.layout.simple_spinner_dropdown_item);
         textCategory.setAdapter(adapter);

app/src/main/res/layout/activity_exception.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -28,11 +27,15 @@
         android:layout_height="0dp"
         android:layout_marginBottom="@dimen/activity_margin"
         android:layout_weight="1"
+        android:background="@color/bg_highlighted"
+        android:padding="8dp"
         android:scrollbars="horizontal|vertical"
         android:textIsSelectable="true"
-        app:fontFamily="monospace" />
+        android:typeface="monospace"
+        tools:text="@string/android_get_accounts_permission_not_granted_exception_message" />
 
     <LinearLayout
+        style="?android:buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="end"
@@ -41,17 +44,25 @@
 
         <Button
             android:id="@+id/close"
+            style="?android:buttonBarButtonStyle"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_weight=".5"
             android:text="@string/simple_close" />
 
         <Button
             android:id="@+id/copy"
+            style="?android:buttonBarButtonStyle"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginTop="6dp"
+            android:layout_marginBottom="6dp"
             android:layout_weight=".5"
-            android:text="@string/simple_copy" />
+            android:background="@color/primary"
+            android:foreground="?attr/selectableItemBackground"
+            android:text="@string/simple_copy"
+            android:textColor="@color/fg_contrast"
+            tools:ignore="UnusedAttribute" />
 
     </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/dialog_change_category.xml

@@ -5,12 +5,11 @@
     android:orientation="vertical"
     android:padding="?dialogPreferredPadding">
 
-	<it.niedermann.owncloud.notes.android.AlwaysAutoCompleteTextView
+    <it.niedermann.owncloud.notes.android.AlwaysAutoCompleteTextView
-		android:id="@+id/editCategory"
+        android:id="@+id/editCategory"
-		android:layout_width="match_parent"
+        android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+        android:layout_height="wrap_content"
-		android:completionThreshold="1"
+        android:completionThreshold="1"
-		android:inputType="text"
+        android:inputType="text"
-		android:textColor="@color/fg_default"
+        android:textColor="@color/fg_default" />
-		/>
 </LinearLayout>

app/src/main/res/values/styles.xml

@@ -2,15 +2,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="AppTheme" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
-        <!-- Main theme colors -->
-        <!-- App Bar -->
         <item name="colorPrimary">@color/primary</item>
-        <!-- Status Bar and contextual Status Bars -->
         <item name="colorPrimaryDark">@color/primary</item>
-        <!-- Snackbar Action Link -->
         <item name="colorAccent">@color/primary</item>
         <item name="windowActionModeOverlay">true</item>
-        <item name="android:buttonStyle">@style/cloudbutton</item>
         <item name="android:windowBackground">@color/bg_normal</item>
     </style>
 
@@ -24,19 +19,11 @@
         <item name="android:textColorSecondary">@color/fg_default_low</item>
     </style>
 
-    <!--
-        cert4android is using these styles and we want the same button style in the trust activity
-    -->
-    <style name="Widget.AppCompat.Button.Borderless" parent="cloudbutton">
-        <item name="android:layout_margin">2dp</item>
-    </style>
-
     <style name="ncAlertDialog" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="colorAccent">@color/primary</item>
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary</item>
         <item name="android:textColorPrimary">@color/fg_default</item>
-        <item name="android:alertDialogTheme">@style/cloudbutton</item>
         <item name="android:windowBackground">@color/bg_normal</item>
     </style>
 
@@ -49,13 +36,6 @@
         <item name="android:layout_alignParentRight">true</item>
     </style>
 
-    <style name="cloudbutton" parent="android:style/Widget.Button">
-        <item name="android:background">@color/primary</item>
-        <item name="android:textColor">@drawable/button_selector</item>
-        <item name="android:padding">@dimen/button_padding</item>
-        <item name="android:elevation">@dimen/button_elevation</item>
-    </style>
-
     <style name="SplashTheme" parent="AppTheme">
         <item name="android:windowBackground">@drawable/splashscreen</item>
     </style>