Cosmetic

Author: hannesa2

.github/workflows/Android-CI.yml

@@ -23,7 +23,7 @@ jobs:
           java-version: ${{ matrix.java_version }}
       - uses: gradle/actions/wrapper-validation@v5
       - name: Build with Gradle
-        run: ./gradlew assembleDebug lint testDebugUnitTest
+        run: ./gradlew assembleDebug lint
       - name: Archive Lint report
         uses: actions/upload-artifact@v4
         with:

ChangeLogLib/src/main/java/info/hannes/changelog/ChangeLog.kt

@@ -9,15 +9,14 @@ import android.os.Handler
 import android.os.Looper
 import android.preference.PreferenceManager
 import android.util.Log
-import android.util.Log.i
 import android.util.SparseArray
+import androidx.core.util.size
 import info.hannes.changeloglib.R
+import kotlinx.serialization.json.Json
 import org.xmlpull.v1.XmlPullParser
 import org.xmlpull.v1.XmlPullParserException
 import java.io.IOException
 import java.util.Collections
-import androidx.core.util.size
-import kotlinx.serialization.json.Json
 
 
 /**
@@ -160,11 +159,11 @@ open class ChangeLog @JvmOverloads constructor(
         try {
             val packageInfo = context.packageManager.getPackageInfo(context.packageName, 0)
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                currentVersionCode = packageInfo.longVersionCode.toInt()
+            currentVersionCode = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                packageInfo.longVersionCode.toInt()
             } else {
                 @Suppress("DEPRECATION")
-                currentVersionCode = packageInfo.versionCode
+                packageInfo.versionCode
             }
             currentVersionName = packageInfo.versionName
         } catch (e: NameNotFoundException) {
@@ -204,7 +203,7 @@ open class ChangeLog @JvmOverloads constructor(
                 else
                     R.string.changelog_title
             )
-        )    .setView(webView)
+        ).setView(webView)
             .setCancelable(false)
             // OK button
             .setPositiveButton(
@@ -219,7 +218,7 @@ open class ChangeLog @JvmOverloads constructor(
             // Show "More…" button if we're only displaying a partial change log.
             builder.setNegativeButton(
                 R.string.changelog_show_full
-            ) { _, _ -> Handler(Looper.getMainLooper()).post{fullLogDialog.show()} }
+            ) { _, _ -> Handler(Looper.getMainLooper()).post { fullLogDialog.show() } }
         }
 
         return builder.create()

ChangeLogLib/src/main/java/info/hannes/changelog/LollipopFixedWebView.kt

@@ -1,6 +1,5 @@
 package info.hannes.changelog
 
-import android.annotation.TargetApi
 import android.content.Context
 import android.content.res.Configuration
 import android.os.Build
@@ -16,7 +15,6 @@ class LollipopFixedWebView : WebView {
 
     constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(getFixedContext(context), attrs, defStyleAttr) {}
 
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(getFixedContext(context), attrs, defStyleAttr, defStyleRes) {
     }
 

app/src/main/java/info/hannes/changelog/sample/MainActivity.kt

@@ -2,7 +2,6 @@ package info.hannes.changelog.sample
 
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.view.ContextThemeWrapper
@@ -15,16 +14,17 @@ import androidx.drawerlayout.widget.DrawerLayout
 import com.google.android.material.navigation.NavigationView
 import info.hannes.changelog.ChangeLog
 import info.hannes.changelog.ChangeLog.Companion.DEFAULT_CSS
+import androidx.core.net.toUri
 
 class MainActivity : AppCompatActivity() {
 
-    private lateinit var mDrawerLayout: DrawerLayout
+    private lateinit var drawerLayout: DrawerLayout
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        mDrawerLayout = findViewById(R.id.drawer_layout)
+        drawerLayout = findViewById(R.id.drawer_layout)
 
         val toolbar = findViewById<Toolbar>(R.id.toolbar)
         setSupportActionBar(toolbar)
@@ -49,7 +49,7 @@ class MainActivity : AppCompatActivity() {
         navigationView.setNavigationItemSelectedListener { menuItem ->
             menuItem.isChecked = true
             selectNavigationItem(menuItem.itemId)
-            mDrawerLayout.closeDrawers()
+            drawerLayout.closeDrawers()
             true
         }
     }
@@ -64,9 +64,9 @@ class MainActivity : AppCompatActivity() {
             R.id.nav_whats_new -> DarkThemeChangeLog(this).logDialog.show()
             R.id.nav_other_github -> {
                 val url = "https://github.com/hannesa2/ChangeLog"
-                val i = Intent(Intent.ACTION_VIEW)
-                i.data = Uri.parse(url)
-                startActivity(i)
+                val intent = Intent(Intent.ACTION_VIEW)
+                intent.data = url.toUri()
+                startActivity(intent)
             }
         }
     }
@@ -78,7 +78,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            android.R.id.home -> mDrawerLayout.openDrawer(GravityCompat.START)
+            android.R.id.home -> drawerLayout.openDrawer(GravityCompat.START)
             R.id.nav_whats_new -> DarkThemeChangeLog(this).logDialog.show()
             R.id.nav_full_changelog -> ChangeLog(this, callback = {
                 Log.d("log", "dialog dismiss")