Update dependencies and build components

cyb3rko · cyb3rko · commit 1bb042dc851a · 2022-09-18T22:29:38.000+02:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.google.gms.google-services'
-apply plugin: 'com.mikepenz.aboutlibraries.plugin'
+//apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply plugin: 'kotlin-android'
 
 android {
@@ -17,12 +17,12 @@ android {
         }
     }
 
-    compileSdkVersion 31
-    buildToolsVersion "30.0.3"
+    compileSdk 33
+
     defaultConfig {
         applicationId "com.cyb3rko.logviewerforopenhab"
-        minSdkVersion 19
-        targetSdkVersion 31
+        minSdk 19
+        targetSdk 33
         versionCode 20
         versionName "2.3.1"
         multiDexEnabled true
@@ -42,11 +42,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
     packagingOptions {
         pickFirst 'META-INF/library_release.kotlin_module'
@@ -57,28 +57,29 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
-    implementation 'androidx.core:core-ktx:1.7.0'
+    def navigation_version = "2.5.2"
+
+    implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
+    implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
+//    implementation "com.mikepenz:aboutlibraries-core:$aboutLibsVersion"
+//    implementation "com.mikepenz:aboutlibraries:$aboutLibsVersion"
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
-    implementation "androidx.preference:preference-ktx:1.1.1"
+    implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'com.afollestad.material-dialogs:bottomsheets:3.3.0'
     implementation 'com.afollestad.material-dialogs:core:3.3.0'
-    implementation 'com.airbnb.android:lottie:3.7.0'
+    implementation 'com.airbnb.android:lottie:4.0.0'
     implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0'
     implementation 'com.github.AppIntro:AppIntro:6.0.0'
-    implementation 'com.github.cyb3rko:about-icons:1.4.0'
     implementation 'com.github.GrenderG:Toasty:1.5.0'
+    implementation 'com.github.cyb3rko:about-icons:1.5.0'
     implementation 'com.github.mardous:DiscreteSeekBar:1.1.1'
-    implementation 'io.github.medyo:android-about-page:2.0.0'
-    implementation 'com.google.android.material:material:1.6.0-alpha01'
+    implementation 'com.google.android.material:material:1.6.1'
     implementation 'com.google.android.play:core-ktx:1.8.1'
-    implementation 'com.google.firebase:firebase-analytics-ktx:20.0.1'
-    implementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.6'
-    implementation "com.mikepenz:aboutlibraries-core:$about_libraries_version"
-    implementation "com.mikepenz:aboutlibraries:$about_libraries_version"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'com.google.firebase:firebase-analytics-ktx' // BOM versioning
+    implementation 'com.google.firebase:firebase-crashlytics-ktx' // BOM versioning
+    implementation 'io.github.medyo:android-about-page:2.0.0'
+    implementation platform('com.google.firebase:firebase-bom:30.4.1')
 }
diff --git a/app/src/main/java/com/cyb3rko/logviewerforopenhab/Utils.kt b/app/src/main/java/com/cyb3rko/logviewerforopenhab/Utils.kt
@@ -63,21 +63,23 @@ internal fun showConnections(mySPR: SharedPreferences, connections: MutableList<
         val navController = activity.findNavController(R.id.nav_host_fragment)
         val drawer = activity.findViewById<DrawerLayout>(R.id.drawer_layout)
         val connectionsMenu = navView.menu.findItem(R.id.nav_connections).subMenu
-        connectionsMenu.clear()
+        connectionsMenu?.clear()
 
         connections.forEach { connection ->
-            val item = connectionsMenu.add(connection.toCaption())
-            item.setIcon(R.drawable._ic_connection)
-            item.setOnMenuItemClickListener {
-                connection.apply {
-                    editor.putBoolean(HTTPS_ACTIVATED, httpsActivated)
-                    editor.putString(LINK, toLink())
-                    editor.putString(HOSTNAME_STRING, hostName)
-                    editor.putInt(PORT_INT, port).apply()
+            connectionsMenu?.let {
+                val item = connectionsMenu.add(connection.toCaption())
+                item.setIcon(R.drawable._ic_connection)
+                item.setOnMenuItemClickListener {
+                    connection.apply {
+                        editor.putBoolean(HTTPS_ACTIVATED, httpsActivated)
+                        editor.putString(LINK, toLink())
+                        editor.putString(HOSTNAME_STRING, hostName)
+                        editor.putInt(PORT_INT, port).apply()
+                    }
+                    navController.navigate(R.id.nav_webview)
+                    drawer.close()
+                    true
                 }
-                navController.navigate(R.id.nav_webview)
-                drawer.close()
-                true
             }
         }
     }
@@ -87,7 +89,7 @@ internal fun hideConnections(activity: Activity?) {
     if (activity != null) {
         val navView = activity.findViewById<NavigationView>(R.id.nav_view)
         val connectionsMenu = navView.menu.findItem(R.id.nav_connections).subMenu
-        connectionsMenu.clear()
+        connectionsMenu?.clear()
     }
 }
 
diff --git a/app/src/main/java/com/cyb3rko/logviewerforopenhab/fragments/AboutFragment.kt b/app/src/main/java/com/cyb3rko/logviewerforopenhab/fragments/AboutFragment.kt
@@ -10,20 +10,24 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import com.cyb3rko.logviewerforopenhab.BuildConfig
 import com.cyb3rko.logviewerforopenhab.R
-import com.mikepenz.aboutlibraries.LibsBuilder
+//import com.mikepenz.aboutlibraries.LibsBuilder
 import mehdi.sakout.aboutpage.AboutPage
 import mehdi.sakout.aboutpage.Element
 
 class AboutFragment : Fragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val githubIcon = mehdi.sakout.aboutpage.R.drawable.about_icon_github
+        val emailIcon = mehdi.sakout.aboutpage.R.drawable.about_icon_email
+        val instagramIcon = mehdi.sakout.aboutpage.R.drawable.about_icon_instagram
+        val instagramColor = mehdi.sakout.aboutpage.R.color.about_instagram_color
 
         return AboutPage(context)
             .setImage(R.mipmap.ic_launcher_foreground)
             .setDescription(getString(R.string.about_description))
             .addItem(
                 Element().setTitle(String.format(getString(R.string.about_element_version), BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE))
-                    .setIconDrawable(R.drawable.about_icon_github).setOnClickListener(showChangelog())
+                    .setIconDrawable(githubIcon).setOnClickListener(showChangelog())
             )
             .addGroup(getString(R.string.about_group_legal))
             .addItem(
@@ -39,20 +43,20 @@ class AboutFragment : Fragment() {
             )
             .addGroup(getString(R.string.about_group_connect))
             .addItem(
-                Element().setTitle(getString(R.string.about_element_feedback_text)).setIconDrawable(R.drawable.about_icon_github)
+                Element().setTitle(getString(R.string.about_element_feedback_text)).setIconDrawable(githubIcon)
                     .setOnClickListener(openGithubFeedback())
             )
             .addItem(
-                Element().setTitle(getString(R.string.about_element_email_text)).setIconDrawable(R.drawable.about_icon_email)
+                Element().setTitle(getString(R.string.about_element_email_text)).setIconDrawable(emailIcon)
                     .setOnClickListener(writeEmail())
             )
             .addItem(
                 Element().setTitle(getString(R.string.about_element_github_text))
-                    .setIconDrawable(R.drawable.about_icon_github).setOnClickListener(openGithubProfile())
+                    .setIconDrawable(githubIcon).setOnClickListener(openGithubProfile())
             )
             .addItem(
-                Element().setTitle(getString(R.string.about_element_instagram_text)).setIconDrawable(R.drawable.about_icon_instagram)
-                    .setIconTint(R.color.about_instagram_color).setOnClickListener(openInstaPage())
+                Element().setTitle(getString(R.string.about_element_instagram_text)).setIconDrawable(instagramIcon)
+                    .setIconTint(instagramColor).setOnClickListener(openInstaPage())
             )
             .create()
     }
@@ -63,21 +67,21 @@ class AboutFragment : Fragment() {
 
     private fun showLibraries(): View.OnClickListener {
         return View.OnClickListener {
-            context?.let { trueContext ->
-                LibsBuilder()
-                    .withShowLoadingProgress(true)
-                    .withAboutVersionShownCode(false)
-                    .withAboutVersionShownName(false)
-                    .withAutoDetect(true)
-                    .withAboutIconShown(false)
-                    .withAboutVersionShown(false)
-                    .withVersionShown(true)
-                    .withLicenseDialog(true)
-                    .withLicenseShown(true)
-                    .withCheckCachedDetection(true)
-                    .withSortEnabled(true)
-                    .start(trueContext)
-            }
+//            context?.let { trueContext ->
+//                LibsBuilder()
+//                    .withShowLoadingProgress(true)
+//                    .withAboutVersionShownCode(false)
+//                    .withAboutVersionShownName(false)
+//                    .withAutoDetect(true)
+//                    .withAboutIconShown(false)
+//                    .withAboutVersionShown(false)
+//                    .withVersionShown(true)
+//                    .withLicenseDialog(true)
+//                    .withLicenseShown(true)
+//                    .withCheckCachedDetection(true)
+//                    .withSortEnabled(true)
+//                    .start(trueContext)
+//            }
         }
     }
 
diff --git a/app/src/main/java/com/cyb3rko/logviewerforopenhab/fragments/IconCreditsFragment.kt b/app/src/main/java/com/cyb3rko/logviewerforopenhab/fragments/IconCreditsFragment.kt
@@ -11,6 +11,6 @@ import com.cyb3rko.logviewerforopenhab.R
 class IconCreditsFragment : Fragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return context?.let { AboutIcons(it, R.drawable::class.java).get() }
+        return context?.let { AboutIcons(it, R.drawable::class.java, parentFragmentManager).get() }
     }
 }
diff --git a/app/src/main/java/com/cyb3rko/logviewerforopenhab/fragments/PreferenceFragment.kt b/app/src/main/java/com/cyb3rko/logviewerforopenhab/fragments/PreferenceFragment.kt
@@ -42,7 +42,7 @@ class PreferenceFragment : PreferenceFragmentCompat() {
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.preferences)
         preferenceManager.sharedPreferencesName = SHARED_PREFERENCE
-        mySPR = preferenceManager.sharedPreferences
+        mySPR = preferenceManager.sharedPreferences!!
         openhabVersionList = findPreference(OPENHAB_VERSION)!!
         hideTopbarSwitch = findPreference(HIDE_TOPBAR)!!
         orientationList = findPreference(ORIENTATION)!!
@@ -62,8 +62,8 @@ class PreferenceFragment : PreferenceFragmentCompat() {
         crashlyticsCollectionSwitch.isChecked = mySPR.getBoolean(CRASHLYTICS_COLLECTION, true)
     }
 
-    override fun onPreferenceTreeClick(preference: Preference?): Boolean {
-        return when (preference?.key) {
+    override fun onPreferenceTreeClick(preference: Preference): Boolean {
+        return when (preference.key) {
             ORIENTATION -> {
                 val myActivity = activity
                 if (myActivity != null) {
diff --git a/build.gradle b/build.gradle
@@ -1,36 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
-    ext.about_libraries_version = "8.3.0"
-    ext.kotlin_version = "1.5.10"
-    repositories {
-        google()
-        jcenter()
-    }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
-        classpath 'com.google.gms:google-services:4.3.8'
-        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries_version"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
+        classpath 'com.google.gms:google-services:4.3.14'
     }
 }
 
-configurations.all {
-    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-        maven {
-            url "https://jitpack.io"
-        }
-    }
+plugins {
+    id 'com.android.application' version '7.2.2' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
+//    id 'com.mikepenz.aboutlibraries.plugin' version "$aboutLibsVersion" apply false
 }
 
 task clean(type: Delete) {
diff --git a/gradle.properties b/gradle.properties
@@ -1,16 +1,28 @@
-## For more details on how to configure your build environment visit
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx1024m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-#
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-#Tue Jun 22 22:35:15 CEST 2021
-org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-android.enableJetifier=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
+
+##############################
+# Dependency versions
+##############################
+aboutLibsVersion=8.3.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Oct 26 17:09:48 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,18 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        maven { url 'https://jitpack.io' }
+        jcenter()
+    }
+}
+rootProject.name = "LogViewer for openHAB"
 include ':app'

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ import com.cyb3rko.logviewerforopenhab.R`
`11`	`11`	`class IconCreditsFragment : Fragment() {`
`12`	`12`
`13`	`13`	`override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {`
`14`		`- return context?.let { AboutIcons(it, R.drawable::class.java).get() }`
	`14`	`+ return context?.let { AboutIcons(it, R.drawable::class.java, parentFragmentManager).get() }`
`15`	`15`	`}`
`16`	`16`	`}`