From f7bc19d236513a4309961c476a29d24e48eb08bb Mon Sep 17 00:00:00 2001 From: Lukas Sturm Date: Wed, 23 Jul 2025 17:13:47 +0200 Subject: [PATCH 1/9] chore: remove jcenter + bump dependencies it compiles, but does not work --- app/build.gradle.kts | 54 ++++++++++-------- .../opennotescanner/SettingsFragment.kt | 2 +- .../opennotescanner/helpers/AboutFragment.kt | 16 +++++- .../todobom/opennotescanner/helpers/Utils.kt | 23 +++----- app/src/main/res/layout/about_view.xml | 4 +- build.gradle.kts | 7 +-- gradle/wrapper/gradle-wrapper.jar | Bin 61608 -> 43462 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 29 ++++++---- settings.gradle.kts | 1 - 10 files changed, 78 insertions(+), 62 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ca30cb67..42ff6c55 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,20 +4,20 @@ plugins { } android { - compileSdk = 33 - buildToolsVersion = "33.0.0" + compileSdk = 36 namespace = "com.todobom.opennotescanner" - compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + + buildFeatures { + buildConfig = true } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } defaultConfig { applicationId = "com.todobom.opennotescanner" minSdk = 21 - targetSdk = 31 + targetSdk = 36 versionCode = 36 versionName = "1.0.36" } @@ -45,28 +45,34 @@ android { } } -dependencies { - implementation(fileTree(mapOf("include" to listOf("*.jar"), "dir" to "libs"))) +kotlin { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) + } +} - implementation("androidx.core:core-ktx:1.9.0") - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10") +dependencies { + implementation("androidx.core:core-ktx:1.16.0") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20") - implementation("androidx.exifinterface:exifinterface:1.3.6") + implementation("androidx.exifinterface:exifinterface:1.4.1") testImplementation("junit:junit:4.13.2") - implementation("androidx.appcompat:appcompat:1.6.1") - implementation("androidx.fragment:fragment-ktx:1.5.5") - implementation("com.google.android.material:material:1.8.0") - implementation("com.google.zxing:core:3.5.1") + implementation("androidx.appcompat:appcompat:1.7.1") + implementation("androidx.fragment:fragment-ktx:1.8.8") + implementation("com.google.android.material:material:1.12.0") + implementation("com.google.zxing:core:3.5.3") implementation("com.github.ctodobom:OpenCV-3.1.0-Android:9e00ee4218ca0c9e60a905c9f09bf499f9dc5115") - implementation("us.feras.mdv:markdownview:1.1.0") +// implementation("org.opencv:opencv:4.12.0") + implementation("io.noties.markwon:core:4.6.2") + implementation("io.noties.markwon:html:4.6.2") implementation("com.github.ctodobom:drag-select-recyclerview:0.3.4.ctodobom.sections") implementation("com.github.allgood:Android-Universal-Image-Loader:717a00c") implementation("com.github.ctodobom:FabToolbar:3c5f0e0ff1b6d5089e20b7da7157a604075ae943") - implementation("com.github.matomo-org:matomo-sdk-android:4.1.4") - implementation("com.github.MikeOrtiz:TouchImageView:3.3") + implementation("com.github.matomo-org:matomo-sdk-android:4.3.4") + implementation("com.github.MikeOrtiz:TouchImageView:3.7.1") - val itextpdf_version = "7.2.5" - implementation("com.itextpdf:kernel:$itextpdf_version") - implementation("com.itextpdf:layout:$itextpdf_version") - implementation("com.itextpdf:io:$itextpdf_version") + val itextpdfVersion = "9.2.0" + implementation("com.itextpdf:kernel:$itextpdfVersion") + implementation("com.itextpdf:layout:$itextpdfVersion") + implementation("com.itextpdf:io:$itextpdfVersion") } diff --git a/app/src/main/java/com/todobom/opennotescanner/SettingsFragment.kt b/app/src/main/java/com/todobom/opennotescanner/SettingsFragment.kt index 2e0292a2..30a58a0d 100644 --- a/app/src/main/java/com/todobom/opennotescanner/SettingsFragment.kt +++ b/app/src/main/java/com/todobom/opennotescanner/SettingsFragment.kt @@ -34,7 +34,7 @@ class SettingsFragment : PreferenceFragment(), OnSharedPreferenceChangeListener } } - override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) { + override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) { updatePreference(findPreference(key), key) } diff --git a/app/src/main/java/com/todobom/opennotescanner/helpers/AboutFragment.kt b/app/src/main/java/com/todobom/opennotescanner/helpers/AboutFragment.kt index 8d36940c..bf203941 100644 --- a/app/src/main/java/com/todobom/opennotescanner/helpers/AboutFragment.kt +++ b/app/src/main/java/com/todobom/opennotescanner/helpers/AboutFragment.kt @@ -8,7 +8,8 @@ import androidx.fragment.app.DialogFragment import com.todobom.opennotescanner.OpenNoteScannerApplication import com.todobom.opennotescanner.R import org.matomo.sdk.extra.TrackHelper -import us.feras.mdv.MarkdownView +import io.noties.markwon.Markwon +import android.widget.TextView class AboutFragment : DialogFragment() { override fun onCreateView( @@ -27,8 +28,17 @@ class AboutFragment : DialogFragment() { val activity = activity ?: return val window = dialog?.window ?: return - val markdownView = view.findViewById(R.id.about_markdown) - markdownView.loadMarkdownFile("file:///android_asset/" + getString(R.string.about_filename)) + val markdownView = view.findViewById(R.id.about_markdown) + val markwon = Markwon.create(activity) + + // Load markdown content from assets + try { + val inputStream = activity.assets.open(getString(R.string.about_filename)) + val markdownContent = inputStream.bufferedReader().use { it.readText() } + markwon.setMarkdown(markdownView, markdownContent) + } catch (e: Exception) { + markdownView.text = "Error loading about content" + } val size = Point() activity.windowManager.defaultDisplay.getRealSize(size) window.setLayout((size.x * 0.9).toInt(), (size.y * 0.9).toInt()) diff --git a/app/src/main/java/com/todobom/opennotescanner/helpers/Utils.kt b/app/src/main/java/com/todobom/opennotescanner/helpers/Utils.kt index 430b4861..2e207f70 100644 --- a/app/src/main/java/com/todobom/opennotescanner/helpers/Utils.kt +++ b/app/src/main/java/com/todobom/opennotescanner/helpers/Utils.kt @@ -34,10 +34,9 @@ class Utils( Environment.getExternalStorageDirectory() .toString() + File.separator + mSharedPref.getString("storage_folder", "OpenNoteScanner")) - // check for directory - if (directory.isDirectory) { - // getting list of file paths - val listFiles = directory.listFiles() + // getting list of file paths + val listFiles = directory.listFiles() + if (listFiles != null) { Arrays.sort(listFiles) { f1, f2 -> f2.name.compareTo(f1.name) } // Check for count @@ -68,7 +67,7 @@ class Utils( private fun isSupportedFile(filePath: String): Boolean { val ext = filePath.substring(filePath.lastIndexOf(".") + 1, filePath.length) - return AppConstant.FILE_EXTN.contains(ext.toLowerCase(Locale.getDefault())) + return AppConstant.FILE_EXTN.contains(ext.lowercase(Locale.getDefault())) }// Older device /* @@ -133,7 +132,7 @@ class Utils( } @JvmStatic - fun isMatch(s: String?, pattern: String?): Boolean { + fun isMatch(s: String, pattern: String): Boolean { return try { val patt = Pattern.compile(pattern) val matcher = patt.matcher(s) @@ -195,16 +194,12 @@ class Utils( @JvmStatic fun isPackageInstalled(context: Context, packagename: String): Boolean { - val pm = context.packageManager - var app_installed = false - app_installed = try { - val info = pm.getPackageInfo(packagename, PackageManager.GET_ACTIVITIES) - val label = info.applicationInfo.loadLabel(pm) as String - label != null - } catch (e: PackageManager.NameNotFoundException) { + return try { + context.packageManager.getPackageInfo(packagename, PackageManager.GET_ACTIVITIES) + true + } catch (_: PackageManager.NameNotFoundException) { false } - return app_installed } diff --git a/app/src/main/res/layout/about_view.xml b/app/src/main/res/layout/about_view.xml index d1d6f07c..d47af84a 100644 --- a/app/src/main/res/layout/about_view.xml +++ b/app/src/main/res/layout/about_view.xml @@ -10,13 +10,15 @@ android:layout_height="fill_parent" android:gravity="top"> -