Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/stefan-niedermann/nextcloud-notes.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Niedermann <info@niedermann.it>2024-01-20 13:19:10 +0300
committerAndy Scherzinger <info@andy-scherzinger.de>2024-01-21 18:08:09 +0300
commitbeaf01442fafef1bb5b95fa8c14ed7a8eb64bf6d (patch)
tree8b3dcd1a63f04a9a91c953e8dd8103ae6d29058e
parentfc827d71b81c5cb4cacfa4ed39bbad3e0bd97e0c (diff)
fix(lint): Fix 80 character line issues
Signed-off-by: Stefan Niedermann <info@niedermann.it>
-rw-r--r--app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java9
-rw-r--r--app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java4
-rw-r--r--app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java6
-rw-r--r--app/src/main/java/it/niedermann/owncloud/notes/edit/category/CategoryAdapter.java4
-rw-r--r--app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java4
-rw-r--r--app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java10
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 ed03bbeb..f7d63667 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 @@ public class AboutActivity extends LockedActivity {
// 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 a3f55c24..63429179 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 android.view.Menu;
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 @@ public abstract class BrandedActivity extends AppCompatActivity implements Brand
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 1ca1c5f5..9316157d 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.ColorInt;
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 abstract class SearchableBaseNoteFragment extends BaseNoteFragment {
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 c15c4019..0208205b 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 class CategoryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
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 995d926b..6f8ac2a8 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 class ItemAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> i
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 7ef9e19a..d24d6d27 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 class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFact
@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);
};
}