diff options
author | stefan-niedermann <info@niedermann.it> | 2020-03-01 20:24:16 +0300 |
---|---|---|
committer | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2020-03-04 22:42:44 +0300 |
commit | 4f1bb2eb08ed224f859dad31284798389bc92ac4 (patch) | |
tree | 3ceb0892499118ae1c4c1f39256061a0a01ebdf3 | |
parent | f1ef8ef4b388f0da8765767191bcbdda8f6e3958 (diff) |
Some refactoring
12 files changed, 43 insertions, 45 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/DrawerActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/DrawerActivity.java index a62fefbe0..e2cb858fb 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/DrawerActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/DrawerActivity.java @@ -74,16 +74,15 @@ public abstract class DrawerActivity extends AppCompatActivity implements Naviga protected ActivityMainBinding binding; - String accountIsGettingImported; - String accountAlreadyAdded; - String sharedPreferenceLastAccount; - String urlFragmentUpdateDeck; - String addBoard; - String noAccount; - String addAccount; - int minimumServerAppMajor; - int minimumServerAppMinor; - int minimumServerAppPatch; + private String accountAlreadyAdded; + private String sharedPreferenceLastAccount; + private String urlFragmentUpdateDeck; + private String addBoard; + private String noAccount; + private String addAccount; + private int minimumServerAppMajor; + private int minimumServerAppMinor; + private int minimumServerAppPatch; protected List<Account> accountsList = new ArrayList<>(); protected Account account; @@ -182,7 +181,6 @@ public abstract class DrawerActivity extends AppCompatActivity implements Naviga protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - accountIsGettingImported = getString(R.string.account_is_getting_imported); accountAlreadyAdded = getString(R.string.account_already_added); sharedPreferenceLastAccount = getString(R.string.shared_preference_last_account); urlFragmentUpdateDeck = getString(R.string.url_fragment_update_deck); @@ -196,7 +194,7 @@ public abstract class DrawerActivity extends AppCompatActivity implements Naviga Thread.setDefaultUncaughtExceptionHandler(new ExceptionHandler(this)); setSupportActionBar(binding.toolbar); - accountIsGettingImportedSnackbar = Snackbar.make(binding.coordinatorLayout, accountIsGettingImported, Snackbar.LENGTH_INDEFINITE); + accountIsGettingImportedSnackbar = Snackbar.make(binding.coordinatorLayout, R.string.account_is_getting_imported, Snackbar.LENGTH_INDEFINITE); ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java index 8bf20f828..4a7b0052f 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java @@ -60,14 +60,15 @@ public class MainActivity extends DrawerActivity implements private static final String TAG = MainActivity.class.getCanonicalName(); - String sharedPreferencesLastBoardForAccount_; - String sharedPreferencesLastStackForAccountAndBoard_; - String simpleSettings; - String simpleBoards; - String about; - String shareBoard; - String editBoard; - String addColumn; + private String sharedPreferencesLastBoardForAccount_; + private String sharedPreferencesLastStackForAccountAndBoard_; + private String simpleSettings; + private String simpleBoards; + private String about; + private String shareBoard; + private String editBoard; + private String addColumn; + private String addBoard; private StackAdapter stackAdapter; private List<Board> boardsList; @@ -93,6 +94,7 @@ public class MainActivity extends DrawerActivity implements shareBoard = getString(R.string.share_board); editBoard = getString(R.string.edit_board); addColumn = getString(R.string.add_column); + addBoard = getString(R.string.add_board); super.onCreate(savedInstanceState); Thread.currentThread().setUncaughtExceptionHandler(new ExceptionHandler(this)); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentLicenseTab.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentLicenseTab.java index c313073e3..d4a23ea1c 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentLicenseTab.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentLicenseTab.java @@ -17,14 +17,12 @@ import it.niedermann.nextcloud.deck.util.LinkUtil; public class AboutFragmentLicenseTab extends Fragment { - FragmentAboutLicenseTabBinding binding; - private String paragraphStart; private String paragraphEnd; @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - binding = FragmentAboutLicenseTabBinding.inflate(inflater, container, false); + FragmentAboutLicenseTabBinding binding = FragmentAboutLicenseTabBinding.inflate(inflater, container, false); Resources resources = getResources(); paragraphStart = getString(R.string.paragraph_start); paragraphEnd = getString(R.string.paragraph_end); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/AccessControlAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/AccessControlAdapter.java index b851fa853..0c606723f 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/AccessControlAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/AccessControlAdapter.java @@ -114,10 +114,10 @@ public class AccessControlAdapter extends RecyclerView.Adapter<RecyclerView.View return (position == 0) ? TYPE_HEADER : TYPE_ITEM; } - static class AccessControlViewHolder extends RecyclerView.ViewHolder { + private static class AccessControlViewHolder extends RecyclerView.ViewHolder { // @BindDrawable(R.drawable.ic_sync_blue_24dp) // Drawable syncIcon; - ItemAccessControlBinding binding; + private ItemAccessControlBinding binding; private AccessControlViewHolder(ItemAccessControlBinding binding) { super(binding.getRoot()); @@ -125,8 +125,8 @@ public class AccessControlAdapter extends RecyclerView.Adapter<RecyclerView.View } } - static class OwnerViewHolder extends RecyclerView.ViewHolder { - ItemAccessControlOwnerBinding binding; + private static class OwnerViewHolder extends RecyclerView.ViewHolder { + private ItemAccessControlOwnerBinding binding; private OwnerViewHolder(ItemAccessControlOwnerBinding binding) { super(binding.getRoot()); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/ActivityAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/ActivityAdapter.java index 96b05577b..ab43b7634 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/ActivityAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/ActivityAdapter.java @@ -68,7 +68,7 @@ public class ActivityAdapter extends RecyclerView.Adapter<ActivityAdapter.Activi } static class ActivitiesViewHolder extends RecyclerView.ViewHolder { - ItemActivityBinding binding; + private ItemActivityBinding binding; private ActivitiesViewHolder(ItemActivityBinding binding) { super(binding.getRoot()); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AttachmentAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AttachmentAdapter.java index 66610543b..1ea2c43e1 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AttachmentAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AttachmentAdapter.java @@ -163,11 +163,11 @@ public class AttachmentAdapter extends RecyclerView.Adapter<AttachmentAdapter.At super(itemView); } - abstract View getRootView(); + abstract protected View getRootView(); - abstract ImageView getPreview(); + abstract protected ImageView getPreview(); - abstract void setNotSyncedYetStatus(boolean synced); + abstract protected void setNotSyncedYetStatus(boolean synced); } static class DefaultAttachmentViewHolder extends AttachmentViewHolder { @@ -179,23 +179,23 @@ public class AttachmentAdapter extends RecyclerView.Adapter<AttachmentAdapter.At } @Override - View getRootView() { + protected View getRootView() { return binding.getRoot(); } @Override - ImageView getPreview() { + protected ImageView getPreview() { return binding.preview; } @Override - void setNotSyncedYetStatus(boolean synced) { + protected void setNotSyncedYetStatus(boolean synced) { binding.notSyncedYet.setVisibility(synced ? View.GONE : View.VISIBLE); } } static class ImageAttachmentViewHolder extends AttachmentViewHolder { - ItemAttachmentImageBinding binding; + private ItemAttachmentImageBinding binding; private ImageAttachmentViewHolder(ItemAttachmentImageBinding binding) { super(binding.getRoot()); @@ -203,17 +203,17 @@ public class AttachmentAdapter extends RecyclerView.Adapter<AttachmentAdapter.At } @Override - View getRootView() { + protected View getRootView() { return binding.getRoot(); } @Override - ImageView getPreview() { + protected ImageView getPreview() { return binding.preview; } @Override - void setNotSyncedYetStatus(boolean synced) { + protected void setNotSyncedYetStatus(boolean synced) { binding.notSyncedYet.setVisibility(synced ? View.GONE : View.VISIBLE); } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AttachmentDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AttachmentDialogFragment.java index eb57b30a4..f6455a699 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AttachmentDialogFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AttachmentDialogFragment.java @@ -35,7 +35,7 @@ public class AttachmentDialogFragment extends DialogFragment { @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - it.niedermann.nextcloud.deck.databinding.DialogAttachmentBinding binding = DialogAttachmentBinding.inflate(getLayoutInflater()); + DialogAttachmentBinding binding = DialogAttachmentBinding.inflate(getLayoutInflater()); Glide.with(this) // .addDefaultRequestListener(new RequestListener<Object>() { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java index df7265c52..f02538be3 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java @@ -393,7 +393,7 @@ public class CardAdapter extends RecyclerView.Adapter<CardAdapter.ItemCardViewHo } static class ItemCardViewHolder extends RecyclerView.ViewHolder { - ItemCardBinding binding; + private ItemCardBinding binding; private ItemCardViewHolder(ItemCardBinding binding) { super(binding.getRoot()); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java index 8e02b02e9..266b3699b 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java @@ -155,7 +155,7 @@ public class LabelAutoCompleteAdapter extends BaseAdapter implements Filterable } static class ViewHolder { - ItemAutocompleteDropdownBinding binding; + private ItemAutocompleteDropdownBinding binding; ViewHolder(ItemAutocompleteDropdownBinding binding) { this.binding = binding; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java index 78e5202d0..0dedbfd84 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java @@ -151,7 +151,7 @@ public class UserAutoCompleteAdapter extends BaseAdapter implements Filterable { } static class ViewHolder { - ItemAutocompleteDropdownBinding binding; + private ItemAutocompleteDropdownBinding binding; ViewHolder(ItemAutocompleteDropdownBinding binding) { this.binding = binding; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java index d7c1fba7e..f82d58e41 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java @@ -76,7 +76,7 @@ public class ExceptionActivity extends AppCompatActivity { return sw.toString(); } - void copyStacktraceToClipboard() { + private void copyStacktraceToClipboard() { final android.content.ClipboardManager clipboardManager = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE); ClipData clipData = ClipData.newPlainText(getString(R.string.simple_exception), "```\n" + binding.stacktrace.getText() + "\n```"); clipboardManager.setPrimaryClip(clipData); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/colorchooser/ColorChooser.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/colorchooser/ColorChooser.java index df977efe3..806553f70 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/colorchooser/ColorChooser.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/colorchooser/ColorChooser.java @@ -21,11 +21,11 @@ import it.niedermann.nextcloud.deck.util.ViewUtil; public class ColorChooser extends LinearLayout { + private WidgetColorChooserBinding binding; + private Context context; private String[] colors; - WidgetColorChooserBinding binding; - private String selectedColor; private String previouslySelectedColor; private ImageView previouslySelectedImageView; |