diff options
Diffstat (limited to 'app/src/main/java/it/niedermann/owncloud/notes/shared')
6 files changed, 13 insertions, 11 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/ApiVersion.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/ApiVersion.java index b35daaca..7ac09d66 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/ApiVersion.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/ApiVersion.java @@ -57,7 +57,7 @@ public class ApiVersion implements Comparable<ApiVersion> { } private static int extractNumber(String containsNumbers) { - final Matcher matcher = NUMBER_EXTRACTION_PATTERN.matcher(containsNumbers); + final var matcher = NUMBER_EXTRACTION_PATTERN.matcher(containsNumbers); if (matcher.find()) { return Integer.parseInt(matcher.group()); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/CategorySortingMethod.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/CategorySortingMethod.java index 6a36ade1..b743fcab 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/CategorySortingMethod.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/CategorySortingMethod.java @@ -38,7 +38,7 @@ public enum CategorySortingMethod { * @return the corresponding enum item with the index (ordinal) */ public static CategorySortingMethod findById(int id) { - for (CategorySortingMethod csm : values()) { + for (final var csm : values()) { if (csm.getId() == id) { return csm; } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ApiVersionUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ApiVersionUtil.java index 57788472..e6444658 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ApiVersionUtil.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/ApiVersionUtil.java @@ -43,10 +43,10 @@ public class ApiVersionUtil { } } - final Collection<ApiVersion> result = new ArrayList<>(); + final var result = new ArrayList<ApiVersion>(); for (int i = 0; i < a.length(); i++) { try { - final ApiVersion version = ApiVersion.of(a.getString(i)); + final var version = ApiVersion.of(a.getString(i)); if (version.getMajor() != 0 || version.getMinor() != 0) { result.add(version); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DeviceCredentialUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DeviceCredentialUtil.java index 14163e91..d0a60fcf 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DeviceCredentialUtil.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DeviceCredentialUtil.java @@ -16,7 +16,7 @@ public class DeviceCredentialUtil { } public static boolean areCredentialsAvailable(Context context) { - KeyguardManager keyguardManager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE); + final var keyguardManager = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE); if (keyguardManager != null) { return keyguardManager.isKeyguardSecure(); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DisplayUtils.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DisplayUtils.java index 06cbf57d..10884631 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DisplayUtils.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/DisplayUtils.java @@ -1,5 +1,6 @@ package it.niedermann.owncloud.notes.shared.util; +import android.annotation.SuppressLint; import android.content.Context; import android.content.res.Resources; import android.graphics.Rect; @@ -34,8 +35,8 @@ public class DisplayUtils { } public static NavigationItem.CategoryNavigationItem convertToCategoryNavigationItem(@NonNull Context context, @NonNull CategoryWithNotesCount counter) { - Resources res = context.getResources(); - String category = counter.getCategory().toLowerCase(); + final var res = context.getResources(); + final String category = counter.getCategory().toLowerCase(); int icon = NavigationAdapter.ICON_FOLDER; if (category.equals(res.getString(R.string.category_music).toLowerCase())) { icon = R.drawable.ic_library_music_grey600_24dp; @@ -54,6 +55,7 @@ public class DisplayUtils { * @param parentView View * @return keyboardVisibility Boolean */ + @SuppressLint("WrongConstant") public static boolean isSoftKeyboardVisible(@NonNull View parentView) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { final WindowInsetsCompat insets = ViewCompat.getRootWindowInsets(parentView); @@ -64,8 +66,8 @@ public class DisplayUtils { //Arbitrary keyboard height final int defaultKeyboardHeightDP = 100; - final int EstimatedKeyboardDP = defaultKeyboardHeightDP + (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ? 48 : 0); - final Rect rect = new Rect(); + final int EstimatedKeyboardDP = defaultKeyboardHeightDP + 48; + final var rect = new Rect(); final int estimatedKeyboardHeight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, EstimatedKeyboardDP, parentView.getResources().getDisplayMetrics()); parentView.getWindowVisibleDisplayFrame(rect); final int heightDiff = parentView.getRootView().getHeight() - (rect.bottom - rect.top); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/NotesColorUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/NotesColorUtil.java index 42aaf79d..035aab9a 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/NotesColorUtil.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/NotesColorUtil.java @@ -18,7 +18,7 @@ public final class NotesColorUtil { } public static boolean contrastRatioIsSufficient(@ColorInt int colorOne, @ColorInt int colorTwo) { - ColorPair key = new ColorPair(colorOne, colorTwo); + final var key = new ColorPair(colorOne, colorTwo); Boolean ret = CONTRAST_RATIO_SUFFICIENT_CACHE.get(key); if (ret == null) { ret = ColorUtil.INSTANCE.getContrastRatio(colorOne, colorTwo) > 3d; @@ -37,7 +37,7 @@ public final class NotesColorUtil { @SuppressWarnings({"EqualsWhichDoesntCheckParameterClass", "NumberEquality"}) @Override public boolean equals(Object o) { - final ColorPair colorPair = (ColorPair) o; + final var colorPair = (ColorPair) o; if (first != colorPair.first) return false; return second == colorPair.second; } |