From 525173558538c9673ffa8fbbcb7d5ef17166449b Mon Sep 17 00:00:00 2001
From: Stefan Niedermann <info@niedermann.it>
Date: Tue, 3 Aug 2021 11:45:33 +0200
Subject: Make use of var keyword for complex class instances

Signed-off-by: Stefan Niedermann <info@niedermann.it>
---
 .../deck/ui/filter/FilterDialogFragment.java       | 16 +++++++--------
 .../deck/ui/filter/FilterDueTypeFragment.java      |  6 +++---
 .../deck/ui/filter/FilterLabelsAdapter.java        |  2 +-
 .../deck/ui/filter/FilterLabelsFragment.java       | 10 ++++-----
 .../deck/ui/filter/FilterUserFragment.java         | 10 ++++-----
 .../nextcloud/deck/ui/filter/FilterViewModel.java  | 24 +++++++++++-----------
 6 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'app/src/main/java/it/niedermann/nextcloud/deck/ui/filter')

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java
index 6bdd7a588..94101fff9 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java
@@ -1,5 +1,7 @@
 package it.niedermann.nextcloud.deck.ui.filter;
 
+import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.getSecondaryForegroundColorDependingOnTheme;
+
 import android.app.Dialog;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
@@ -11,7 +13,6 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.LiveData;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
 import androidx.viewpager2.widget.ViewPager2;
@@ -22,11 +23,8 @@ import it.niedermann.android.util.ColorUtil;
 import it.niedermann.nextcloud.deck.R;
 import it.niedermann.nextcloud.deck.databinding.DialogFilterBinding;
 import it.niedermann.nextcloud.deck.model.enums.EDueType;
-import it.niedermann.nextcloud.deck.model.internal.FilterInformation;
 import it.niedermann.nextcloud.deck.ui.branding.BrandedDialogFragment;
 
-import static it.niedermann.nextcloud.deck.ui.branding.BrandingUtil.getSecondaryForegroundColorDependingOnTheme;
-
 public class FilterDialogFragment extends BrandedDialogFragment {
 
     private DialogFilterBinding binding;
@@ -44,19 +42,21 @@ public class FilterDialogFragment extends BrandedDialogFragment {
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        indicator = ContextCompat.getDrawable(requireContext(), R.drawable.circle_grey600_8dp);
+        final var context = requireContext();
+
+        indicator = ContextCompat.getDrawable(context, R.drawable.circle_grey600_8dp);
         assert indicator != null;
-        indicator.setColorFilter(ContextCompat.getColor(getContext(), R.color.defaultBrand), PorterDuff.Mode.SRC_ATOP);
+        indicator.setColorFilter(ContextCompat.getColor(context, R.color.defaultBrand), PorterDuff.Mode.SRC_ATOP);
 
         filterViewModel = new ViewModelProvider(requireActivity()).get(FilterViewModel.class);
 
-        final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(requireContext());
+        final var dialogBuilder = new AlertDialog.Builder(context);
 
         binding = DialogFilterBinding.inflate(requireActivity().getLayoutInflater());
         binding.viewPager.setAdapter(new TabsPagerAdapter(this));
         binding.viewPager.setOffscreenPageLimit(tabTitles.length);
 
-        LiveData<FilterInformation> filterInformationDraft = filterViewModel.getFilterInformationDraft();
+        final var filterInformationDraft = filterViewModel.getFilterInformationDraft();
         new TabLayoutMediator(binding.tabLayout, binding.viewPager, (tab, position) -> {
             filterInformationDraft.observe(this, (draft) -> {
                 switch (position) {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDueTypeFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDueTypeFragment.java
index 01ba1a966..5134498b2 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDueTypeFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDueTypeFragment.java
@@ -1,5 +1,7 @@
 package it.niedermann.nextcloud.deck.ui.filter;
 
+import static java.util.Objects.requireNonNull;
+
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,8 +15,6 @@ import androidx.lifecycle.ViewModelProvider;
 import it.niedermann.nextcloud.deck.databinding.DialogFilterDuedateBinding;
 import it.niedermann.nextcloud.deck.model.enums.EDueType;
 
-import static java.util.Objects.requireNonNull;
-
 public class FilterDueTypeFragment extends Fragment implements SelectionListener<EDueType> {
 
     private FilterViewModel filterViewModel;
@@ -23,7 +23,7 @@ public class FilterDueTypeFragment extends Fragment implements SelectionListener
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-        final DialogFilterDuedateBinding binding = DialogFilterDuedateBinding.inflate(requireActivity().getLayoutInflater());
+        final var binding = DialogFilterDuedateBinding.inflate(requireActivity().getLayoutInflater());
 
         filterViewModel = new ViewModelProvider(requireActivity()).get(FilterViewModel.class);
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java
index 39fb791be..83b8f8f3e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java
@@ -43,7 +43,7 @@ public class FilterLabelsAdapter extends RecyclerView.Adapter<FilterLabelsAdapte
 
     @Override
     public long getItemId(int position) {
-        @Nullable final Label label = labels.get(position);
+        @Nullable final var label = labels.get(position);
         return label == null ? -1L : label.getLocalId();
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsFragment.java
index e7d693185..b4eb17d0e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsFragment.java
@@ -1,5 +1,8 @@
 package it.niedermann.nextcloud.deck.ui.filter;
 
+import static java.util.Objects.requireNonNull;
+import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper.observeOnce;
+
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,9 +17,6 @@ import it.niedermann.nextcloud.deck.databinding.DialogFilterLabelsBinding;
 import it.niedermann.nextcloud.deck.model.Label;
 import it.niedermann.nextcloud.deck.ui.MainViewModel;
 
-import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper.observeOnce;
-import static java.util.Objects.requireNonNull;
-
 public class FilterLabelsFragment extends Fragment implements SelectionListener<Label> {
 
     private FilterViewModel filterViewModel;
@@ -25,8 +25,8 @@ public class FilterLabelsFragment extends Fragment implements SelectionListener<
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-        final DialogFilterLabelsBinding binding = DialogFilterLabelsBinding.inflate(requireActivity().getLayoutInflater());
-        final MainViewModel mainViewModel = new ViewModelProvider(requireActivity()).get(MainViewModel.class);
+        final var binding = DialogFilterLabelsBinding.inflate(requireActivity().getLayoutInflater());
+        final var mainViewModel = new ViewModelProvider(requireActivity()).get(MainViewModel.class);
 
         filterViewModel = new ViewModelProvider(requireActivity()).get(FilterViewModel.class);
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterUserFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterUserFragment.java
index 6ffaec6a6..708e2e541 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterUserFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterUserFragment.java
@@ -1,5 +1,8 @@
 package it.niedermann.nextcloud.deck.ui.filter;
 
+import static java.util.Objects.requireNonNull;
+import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper.observeOnce;
+
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,9 +19,6 @@ import it.niedermann.nextcloud.deck.databinding.DialogFilterAssigneesBinding;
 import it.niedermann.nextcloud.deck.model.User;
 import it.niedermann.nextcloud.deck.ui.MainViewModel;
 
-import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper.observeOnce;
-import static java.util.Objects.requireNonNull;
-
 public class FilterUserFragment extends Fragment implements SelectionListener<User> {
 
     private FilterViewModel filterViewModel;
@@ -27,8 +27,8 @@ public class FilterUserFragment extends Fragment implements SelectionListener<Us
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-        final DialogFilterAssigneesBinding binding = DialogFilterAssigneesBinding.inflate(requireActivity().getLayoutInflater());
-        final MainViewModel mainViewModel = new ViewModelProvider(requireActivity()).get(MainViewModel.class);
+        final var binding = DialogFilterAssigneesBinding.inflate(requireActivity().getLayoutInflater());
+        final var mainViewModel = new ViewModelProvider(requireActivity()).get(MainViewModel.class);
 
         filterViewModel = new ViewModelProvider(requireActivity()).get(FilterViewModel.class);
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterViewModel.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterViewModel.java
index 7cd3c1c80..acdab52e7 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterViewModel.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterViewModel.java
@@ -1,5 +1,8 @@
 package it.niedermann.nextcloud.deck.ui.filter;
 
+import static androidx.lifecycle.Transformations.distinctUntilChanged;
+import static androidx.lifecycle.Transformations.map;
+
 import android.app.Application;
 
 import androidx.annotation.IntRange;
@@ -17,9 +20,6 @@ import it.niedermann.nextcloud.deck.model.enums.EDueType;
 import it.niedermann.nextcloud.deck.model.internal.FilterInformation;
 import it.niedermann.nextcloud.deck.persistence.sync.SyncManager;
 
-import static androidx.lifecycle.Transformations.distinctUntilChanged;
-import static androidx.lifecycle.Transformations.map;
-
 @SuppressWarnings("WeakerAccess")
 public class FilterViewModel extends AndroidViewModel {
 
@@ -43,7 +43,7 @@ public class FilterViewModel extends AndroidViewModel {
     }
 
     public void clearFilterInformation(boolean alsoFilterText) {
-        final FilterInformation newFilterInformation = new FilterInformation();
+        final var newFilterInformation = new FilterInformation();
         if (alsoFilterText) {
             final FilterInformation oldFilterInformation = this.filterInformation.getValue();
             newFilterInformation.setFilterText(oldFilterInformation != null ? oldFilterInformation.getFilterText() : "");
@@ -73,43 +73,43 @@ public class FilterViewModel extends AndroidViewModel {
     }
 
     public void setFilterInformationDraftDueType(@NonNull EDueType dueType) {
-        FilterInformation newDraft = new FilterInformation(filterInformationDraft.getValue());
+        final var newDraft = new FilterInformation(filterInformationDraft.getValue());
         newDraft.setDueType(dueType);
         this.filterInformationDraft.postValue(newDraft);
     }
 
     public void addFilterInformationDraftLabel(@NonNull Label label) {
-        FilterInformation newDraft = new FilterInformation(filterInformationDraft.getValue());
+        final var newDraft = new FilterInformation(filterInformationDraft.getValue());
         newDraft.addLabel(label);
         this.filterInformationDraft.postValue(newDraft);
     }
 
     public void addFilterInformationUser(@NonNull User user) {
-        FilterInformation newDraft = new FilterInformation(filterInformationDraft.getValue());
+        final var newDraft = new FilterInformation(filterInformationDraft.getValue());
         newDraft.addUser(user);
         this.filterInformationDraft.postValue(newDraft);
     }
 
     public void setNotAssignedUser(boolean notAssignedUser) {
-        FilterInformation newDraft = new FilterInformation(filterInformationDraft.getValue());
+        final var newDraft = new FilterInformation(filterInformationDraft.getValue());
         newDraft.setNoAssignedUser(notAssignedUser);
         this.filterInformationDraft.postValue(newDraft);
     }
 
     public void setNotAssignedLabel(boolean notAssignedLabel) {
-        FilterInformation newDraft = new FilterInformation(filterInformationDraft.getValue());
+        final var newDraft = new FilterInformation(filterInformationDraft.getValue());
         newDraft.setNoAssignedLabel(notAssignedLabel);
         this.filterInformationDraft.postValue(newDraft);
     }
 
     public void removeFilterInformationLabel(@NonNull Label label) {
-        FilterInformation newDraft = new FilterInformation(filterInformationDraft.getValue());
+        final var newDraft = new FilterInformation(filterInformationDraft.getValue());
         newDraft.removeLabel(label);
         this.filterInformationDraft.postValue(newDraft);
     }
 
     public void removeFilterInformationUser(@NonNull User user) {
-        FilterInformation newDraft = new FilterInformation(filterInformationDraft.getValue());
+        final var newDraft = new FilterInformation(filterInformationDraft.getValue());
         newDraft.removeUser(user);
         this.filterInformationDraft.postValue(newDraft);
     }
@@ -120,7 +120,7 @@ public class FilterViewModel extends AndroidViewModel {
 
     public void setFilterText(@NonNull String filterText) {
         DeckLog.info("New filterText:", filterText);
-        FilterInformation newDraft = new FilterInformation(filterInformation.getValue());
+        final var newDraft = new FilterInformation(filterInformation.getValue());
         newDraft.setFilterText(filterText);
         this.filterInformation.postValue(newDraft);
     }
-- 
cgit v1.2.3