From 42d56e470f652bde1853cb256b0a643ba73c4263 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Sun, 21 Jan 2024 09:51:23 +0100 Subject: chore(deps): Update dependencies and fix API changes Signed-off-by: Stefan Niedermann --- app/build.gradle | 2 +- .../it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java | 4 ++-- .../it/niedermann/owncloud/notes/exception/ExceptionActivity.java | 4 ++-- .../niedermann/owncloud/notes/exception/ExceptionDialogFragment.java | 4 ++-- app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java | 2 +- .../owncloud/notes/persistence/migration/Migration_20_21.java | 4 ++-- .../owncloud/notes/persistence/sync/CapabilitiesDeserializer.java | 4 ++-- .../java/it/niedermann/owncloud/notes/shared/util/NotesColorUtil.java | 4 ++-- build.gradle | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5cfa0091..a32873bb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -84,7 +84,7 @@ dependencies { // Nextcloud SSO implementation 'com.github.nextcloud.android-common:ui:0.13.0' implementation 'com.github.nextcloud:Android-SingleSignOn:1.0.0' - implementation 'com.github.stefan-niedermann:android-commons:0.4.0' + implementation 'com.github.stefan-niedermann:android-commons:1.0.0' implementation "com.github.stefan-niedermann.nextcloud-commons:sso-glide:$commonsVersion" implementation "com.github.stefan-niedermann.nextcloud-commons:exception:$commonsVersion" implementation("com.github.stefan-niedermann.nextcloud-commons:markdown:$commonsVersion") { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java index d3970b33..909a4c85 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java @@ -125,7 +125,7 @@ public class NotesViewThemeUtils extends ViewThemeUtilsBase { @ColorInt int colorPrimary, @ColorInt int colorAccent) { if (isDarkMode(context)) { // Dark background - if (ColorUtil.INSTANCE.isColorDark(mainColor)) { // Dark brand color + if (ColorUtil.isColorDark(mainColor)) { // Dark brand color if (NotesColorUtil.contrastRatioIsSufficient(mainColor, colorPrimary)) { // But also dark text return mainColor; } else { @@ -139,7 +139,7 @@ public class NotesViewThemeUtils extends ViewThemeUtilsBase { } } } else { // Light background - if (ColorUtil.INSTANCE.isColorDark(mainColor)) { // Dark brand color + if (ColorUtil.isColorDark(mainColor)) { // Dark brand color if (NotesColorUtil.contrastRatioIsSufficient(mainColor, colorAccent)) { // But also dark text return Color.argb(77, Color.red(mainColor), Color.green(mainColor), Color.blue(mainColor)); } else { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionActivity.java index 0761b603..68aa1d30 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionActivity.java @@ -38,14 +38,14 @@ public class ExceptionActivity extends AppCompatActivity { } final var adapter = new TipsAdapter(this::startActivity); - final String debugInfos = ExceptionUtil.INSTANCE.getDebugInfos(this, throwable, BuildConfig.FLAVOR); + final String debugInfos = ExceptionUtil.getDebugInfos(this, throwable, BuildConfig.FLAVOR); binding.tips.setAdapter(adapter); binding.tips.setNestedScrollingEnabled(false); binding.toolbar.setTitle(getString(R.string.simple_error)); binding.message.setText(throwable.getMessage()); binding.stacktrace.setText(debugInfos); - binding.copy.setOnClickListener((v) -> ClipboardUtil.INSTANCE.copyToClipboard(this, getString(R.string.simple_exception), "```\n" + debugInfos + "\n```")); + binding.copy.setOnClickListener((v) -> ClipboardUtil.copyToClipboard(this, getString(R.string.simple_exception), "```\n" + debugInfos + "\n```")); binding.close.setOnClickListener((v) -> finish()); adapter.setThrowables(Collections.singletonList(throwable)); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionDialogFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionDialogFragment.java index ca242a7f..dc0b003b 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionDialogFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/exception/ExceptionDialogFragment.java @@ -57,7 +57,7 @@ public class ExceptionDialogFragment extends AppCompatDialogFragment { final var adapter = new TipsAdapter((actionIntent) -> requireActivity().startActivity(actionIntent)); - final String debugInfos = ExceptionUtil.INSTANCE.getDebugInfos(requireContext(), throwables, BuildConfig.FLAVOR); + final String debugInfos = ExceptionUtil.getDebugInfos(requireContext(), throwables, BuildConfig.FLAVOR); binding.tips.setAdapter(adapter); binding.stacktrace.setText(debugInfos); @@ -67,7 +67,7 @@ public class ExceptionDialogFragment extends AppCompatDialogFragment { return new MaterialAlertDialogBuilder(requireActivity()) .setView(binding.getRoot()) .setTitle(R.string.error_dialog_title) - .setPositiveButton(android.R.string.copy, (a, b) -> ClipboardUtil.INSTANCE.copyToClipboard(requireContext(), getString(R.string.simple_exception), "```\n" + debugInfos + "\n```")) + .setPositiveButton(android.R.string.copy, (a, b) -> ClipboardUtil.copyToClipboard(requireContext(), getString(R.string.simple_exception), "```\n" + debugInfos + "\n```")) .setNegativeButton(R.string.simple_close, null) .create(); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java index 01401914..21c9058d 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java @@ -595,7 +595,7 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A util.notes.themeToolbarSearchView(binding.activityNotesListView.searchView); binding.headerView.setBackgroundColor(color); - @ColorInt final int headerTextColor = ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(color); + @ColorInt final int headerTextColor = ColorUtil.getForegroundColorForBackgroundColor(color); binding.appName.setTextColor(headerTextColor); DrawableCompat.setTint(binding.logo.getDrawable(), headerTextColor); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_20_21.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_20_21.java index 32ede8b1..db681f1b 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_20_21.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_20_21.java @@ -113,13 +113,13 @@ public final class Migration_20_21 extends Migration { values.put("MODIFIED", cursor.getLong(COLUMN_POSITION_MODIFIED) * 1_000); values.put("APIVERSION", cursor.getString(COLUMN_POSITION_API_VERSION)); try { - values.put("COLOR", Color.parseColor(ColorUtil.INSTANCE.formatColorToParsableHexString(cursor.getString(COLUMN_POSITION_COLOR)))); + values.put("COLOR", Color.parseColor(ColorUtil.formatColorToParsableHexString(cursor.getString(COLUMN_POSITION_COLOR)))); } catch (Exception e) { e.printStackTrace(); values.put("COLOR", -16743735); } try { - values.put("TEXTCOLOR", Color.parseColor(ColorUtil.INSTANCE.formatColorToParsableHexString(cursor.getString(COLUMN_POSITION_TEXT_COLOR)))); + values.put("TEXTCOLOR", Color.parseColor(ColorUtil.formatColorToParsableHexString(cursor.getString(COLUMN_POSITION_TEXT_COLOR)))); } catch (Exception e) { e.printStackTrace(); values.put("TEXTCOLOR", -16777216); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java index e3b268ab..3d422c50 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/sync/CapabilitiesDeserializer.java @@ -51,14 +51,14 @@ public class CapabilitiesDeserializer implements JsonDeserializer final var theming = capabilities.getAsJsonObject(CAPABILITIES_THEMING); if (theming.has(CAPABILITIES_THEMING_COLOR)) { try { - response.setColor(Color.parseColor(ColorUtil.INSTANCE.formatColorToParsableHexString(theming.get(CAPABILITIES_THEMING_COLOR).getAsString()))); + response.setColor(Color.parseColor(ColorUtil.formatColorToParsableHexString(theming.get(CAPABILITIES_THEMING_COLOR).getAsString()))); } catch (Exception e) { e.printStackTrace(); } } if (theming.has(CAPABILITIES_THEMING_COLOR_TEXT)) { try { - response.setTextColor(Color.parseColor(ColorUtil.INSTANCE.formatColorToParsableHexString(theming.get(CAPABILITIES_THEMING_COLOR_TEXT).getAsString()))); + response.setTextColor(Color.parseColor(ColorUtil.formatColorToParsableHexString(theming.get(CAPABILITIES_THEMING_COLOR_TEXT).getAsString()))); } catch (Exception e) { e.printStackTrace(); } 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 70c5316e..46bc4a18 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 @@ -21,7 +21,7 @@ public final class NotesColorUtil { 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; + ret = ColorUtil.getContrastRatio(colorOne, colorTwo) > 3d; CONTRAST_RATIO_SUFFICIENT_CACHE.put(key, ret); return ret; } @@ -32,7 +32,7 @@ public final class NotesColorUtil { final var key = new ColorPair(colorOne, colorTwo); var ret = CONTRAST_RATIO_SUFFICIENT_CACHE.get(key); if (ret == null) { - ret = ColorUtil.INSTANCE.getContrastRatio(colorOne, colorTwo) > 1.47d; + ret = ColorUtil.getContrastRatio(colorOne, colorTwo) > 1.47d; CONTRAST_RATIO_SUFFICIENT_CACHE.put(key, ret); return ret; } diff --git a/build.gradle b/build.gradle index ef8ab2c5..e8d669ad 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile buildscript { ext { kotlinVersion = '1.9.22' - commonsVersion = '1.9.0' + commonsVersion = '2.0.0' } repositories { mavenCentral() -- cgit v1.2.3