From bd232af1a6a075b26e79e6f9c2c895e28dde5856 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Sat, 20 Jan 2024 11:19:10 +0100 Subject: [PATCH] fix(lint): Fix 80 character line issues Signed-off-by: Stefan Niedermann --- .../niedermann/owncloud/notes/about/AboutActivity.java | 9 ++++++--- .../owncloud/notes/branding/BrandedActivity.java | 4 ++-- .../notes/edit/SearchableBaseNoteFragment.java | 6 ++++-- .../owncloud/notes/edit/category/CategoryAdapter.java | 4 +++- .../owncloud/notes/main/items/ItemAdapter.java | 4 +++- .../notes/widget/notelist/NoteListWidgetFactory.java | 10 ++++++---- 6 files changed, 24 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java index ed03bbeb9..f7d636675 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java @@ -35,9 +35,12 @@ protected void onCreate(Bundle savedInstanceState) { // generate title based on given position new TabLayoutMediator(binding.tabs, binding.pager, (tab, position) -> { switch (position) { // Fall-through to credits tab - default -> tab.setText(R.string.about_credits_tab_title); - case POS_CONTRIB -> tab.setText(R.string.about_contribution_tab_title); - case POS_LICENSE -> tab.setText(R.string.about_license_tab_title); + default -> + tab.setText(R.string.about_credits_tab_title); + case POS_CONTRIB -> + tab.setText(R.string.about_contribution_tab_title); + case POS_LICENSE -> + tab.setText(R.string.about_license_tab_title); } }).attach(); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java index a3f55c24b..634291796 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java @@ -8,7 +8,7 @@ import androidx.annotation.ColorInt; import androidx.appcompat.app.AppCompatActivity; -import it.niedermann.owncloud.notes.R; +import com.google.android.material.R; public abstract class BrandedActivity extends AppCompatActivity implements Branded { @@ -20,7 +20,7 @@ protected void onStart() { super.onStart(); final var typedValue = new TypedValue(); - getTheme().resolveAttribute(com.google.android.material.R.attr.colorAccent, typedValue, true); + getTheme().resolveAttribute(R.attr.colorAccent, typedValue, true); colorAccent = typedValue.data; readBrandMainColorLiveData(this).observe(this, this::applyBrand); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java index 1ca1c5f57..9316157df 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java @@ -14,6 +14,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.widget.SearchView; +import androidx.core.content.ContextCompat; import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton; @@ -47,7 +48,7 @@ public abstract class SearchableBaseNoteFragment extends BaseNoteFragment { @Override public void onStart() { - this.color = getResources().getColor(R.color.defaultBrand); + this.color = ContextCompat.getColor(requireContext(), R.color.defaultBrand); super.onStart(); } @@ -117,7 +118,8 @@ public void onPrepareOptionsMenu(@NonNull Menu menu) { searchMenuItem.collapseActionView(); - final var searchEditFrame = searchView.findViewById(androidx.appcompat.R.id.search_edit_frame); + final var searchEditFrame = searchView.findViewById( + androidx.appcompat.R.id.search_edit_frame); searchEditFrame.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { int oldVisibility = -1; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/category/CategoryAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/category/CategoryAdapter.java index c15c40195..0208205bc 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/edit/category/CategoryAdapter.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/category/CategoryAdapter.java @@ -52,7 +52,9 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi switch (category.id) { case addItemId -> { - final var wrapDrawable = DrawableCompat.wrap(Objects.requireNonNull(ContextCompat.getDrawable(context, category.icon))); + final var wrapDrawable = DrawableCompat.wrap( + Objects.requireNonNull(ContextCompat.getDrawable( + context, category.icon))); DrawableCompat.setTint(wrapDrawable, ContextCompat.getColor(context, R.color.icon_color_default)); categoryViewHolder.getIcon().setImageDrawable(wrapDrawable); categoryViewHolder.getCategoryWrapper().setOnClickListener((v) -> listener.onCategoryAdded()); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java index 995d926b9..6f8ac2a8a 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java @@ -144,7 +144,9 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int switch (getItemViewType(position)) { case TYPE_SECTION -> ((SectionViewHolder) holder).bind((SectionItem) itemList.get(position)); - case TYPE_NOTE_WITH_EXCERPT, TYPE_NOTE_WITHOUT_EXCERPT, TYPE_NOTE_ONLY_TITLE -> + case TYPE_NOTE_WITH_EXCERPT, + TYPE_NOTE_WITHOUT_EXCERPT, + TYPE_NOTE_ONLY_TITLE -> ((NoteViewHolder) holder).bind(isSelected, (Note) itemList.get(position), showCategory, color, searchQuery); } } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java index 7ef9e19ab..d24d6d27e 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java @@ -142,10 +142,12 @@ public RemoteViews getViewAt(int position) { @NonNull private static String getCategoryTitle(@NonNull Context context, int displayMode, String category) { return switch (displayMode) { - case MODE_DISPLAY_STARRED -> context.getString(R.string.label_favorites); - case MODE_DISPLAY_CATEGORY -> "".equals(category) - ? context.getString(R.string.action_uncategorized) - : category; + case MODE_DISPLAY_STARRED -> + context.getString(R.string.label_favorites); + case MODE_DISPLAY_CATEGORY -> + "".equals(category) + ? context.getString(R.string.action_uncategorized) + : category; default -> context.getString(R.string.app_name); }; }