Merge pull request #22 from Parseus/dev

Dev -> master: version 2.3.0

.gitignore

@@ -1,20 +1,61 @@
+# Built application files
+*.apk
+*.aar
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
 *.iml
-.gradle
-/local.properties
-/.idea/caches/build_file_checksums.ser
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
+.idea/kotlinc.xml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+
+# Version control
+vcs.xml
+
 .DS_Store
-/build
-/captures
 .externalNativeBuild
-.idea/assetWizardSettings.xml
+.cxx
+
 app/build
 app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/androidx/asynclayoutinflater/R.java
 app/nonFree
 app/nonFreeMobile
 app/standardMobile
 app/standardTv
 app/standard
-.idea/kotlinc.xml
+.idea/deploymentTargetDropDown.xml

app/build.gradle

@@ -3,13 +3,13 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         applicationId "com.parseus.codecinfo"
         minSdkVersion 16
-        targetSdkVersion 30
-        versionCode 20
-        versionName "2.2.2"
+        targetSdkVersion 31
+        versionCode 21
+        versionName "2.3.0"
         resConfigs "en"
 
         vectorDrawables.useSupportLibrary = true
@@ -64,12 +64,12 @@ 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 {
@@ -95,9 +95,9 @@ configurations {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2'
 
-    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation "androidx.core:core-ktx:1.6.0"
     implementation 'androidx.preference:preference-ktx:1.1.1'
 
@@ -110,15 +110,17 @@ dependencies {
     standardMobileDebugImplementation 'androidx.multidex:multidex:2.0.1'
     nonFreeMobileDebugImplementation 'androidx.multidex:multidex:2.0.1'
 
-    tvImplementation 'androidx.leanback:leanback:1.1.0-rc01'
-    tvImplementation 'androidx.leanback:leanback-preference:1.1.0-rc01'
+    tvImplementation 'androidx.leanback:leanback:1.2.0-alpha01'
+    tvImplementation 'androidx.leanback:leanback-preference:1.2.0-alpha01'
 
-    mobileImplementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    mobileImplementation 'com.github.ditacristianionut:AppInfoBadge:1.3'
-    mobileImplementation 'com.google.android.material:material:1.4.0'
+    mobileImplementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    mobileImplementation 'androidx.core:core-splashscreen:1.0.0-alpha01'
+    mobileImplementation 'androidx.webkit:webkit:1.4.0'
+    mobileImplementation 'com.github.marcoscgdev:Licenser:2.0.0'
+    mobileImplementation 'com.google.android.material:material:1.5.0-alpha03'
 
     nonFreeMobileImplementation fileTree(include: ['*.jar'], dir: 'libs')
-    nonFreeMobileImplementation 'com.google.android.play:core:1.10.0'
+    nonFreeMobileImplementation 'com.google.android.play:core:1.10.1'
     nonFreeMobileImplementation ('com.google.android.play:core-ktx:1.8.1') {
         exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
     }

app/src/main/AndroidManifest.xml

@@ -4,8 +4,6 @@
     android:installLocation="preferExternal"
     package="com.parseus.codecinfo">
 
-    <uses-sdk tools:overrideLibrary="com.dci.dev.appinfobadge, com.afollestad.recyclical" />
-
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
 
     <queries>

app/src/main/assets/changelog.html

@@ -1,6 +1,12 @@
 <html>
 <body>
 
+<h2>Version 2.3.0</h2>
+<p>Added detecting features introduced in Android 12.</p>
+<p>Added optional dynamic theming on Android 12 and newer.</p>
+<p>Input channel count now shows both minimal and maximal values.</p>
+<p>Bugfixes and general improvements.</p>
+
 <h2>Version 2.2.2</h2>
 <p>Bugfixes and general improvements.</p>
 

app/src/main/java/com/parseus/codecinfo/data/codecinfo/CodecUtils.kt

@@ -263,6 +263,9 @@ fun getDetailedCodecInfo(context: Context, codecId: String, codecName: String):
             if (SDK_INT >= 24) {
                 propertyList.addFeature(context, capabilities, FEATURE_IntraRefresh, R.string.intra_refresh)
             }
+            if (SDK_INT >= 31) {
+                propertyList.addFeature(context, capabilities, FEATURE_QpBounds, R.string.qp_bounds)
+            }
         }
     }
 
@@ -281,13 +284,17 @@ fun getDetailedCodecInfo(context: Context, codecId: String, codecName: String):
 
     if (isEncoder && SDK_INT >= 21) {
         val encoderCapabilities = capabilities.encoderCapabilities
-        val bitrateModesString =
+        var bitrateModesString =
                 "${context.getString(R.string.cbr)}: " +
                         "${encoderCapabilities.isBitrateModeSupported(MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CBR)}" +
                         "\n${context.getString(R.string.cq)}: " +
                         "${encoderCapabilities.isBitrateModeSupported(MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CQ)}" +
                         "\n${context.getString(R.string.vbr)}: " +
                         "${encoderCapabilities.isBitrateModeSupported(MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_VBR)}"
+        if (SDK_INT >= 31) {
+            bitrateModesString += "\n${context.getString(R.string.cbr_fd)}: " +
+                    "${encoderCapabilities.isBitrateModeSupported(MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CBR_FD)}"
+        }
         propertyList.add(DetailsProperty(propertyList.size.toLong(),
                 context.getString(R.string.bitrate_modes), bitrateModesString))
 
@@ -375,9 +382,21 @@ private fun getAudioCapabilities(context: Context, codecId: String, codecName: S
                                  propertyList: MutableList<DetailsProperty>) {
     val audioCapabilities = capabilities.audioCapabilities
 
+    var minChannelCount = 1
+    val maxChannelCount = adjustMaxInputChannelCount(codecId, codecName,
+        audioCapabilities.maxInputChannelCount, capabilities)
+
+    if (SDK_INT >= 31) {
+        minChannelCount = audioCapabilities.minInputChannelCount
+    }
+
     propertyList.add(DetailsProperty(propertyList.size.toLong(), context.getString(R.string.input_channels),
-            adjustMaxInputChannelCount(codecId, codecName,
-                audioCapabilities.maxInputChannelCount, capabilities).toString()))
+        if (minChannelCount != maxChannelCount) {
+            "$minChannelCount \u2014 $maxChannelCount"
+        } else {
+            maxChannelCount.toString()
+        }
+    ))
 
     val bitrateRangeString = when {
         codecId == "audio/amr-wb-plus" -> // Source: http://www.voiceage.com/AMR-WBplus.html

app/src/main/java/com/parseus/codecinfo/utils/Extensions.kt

@@ -1,7 +1,9 @@
 package com.parseus.codecinfo.utils
 
+import android.app.Activity
 import android.app.UiModeManager
 import android.content.Context
+import android.content.ContextWrapper
 import android.content.res.Configuration
 import android.media.MediaCodecInfo
 import java.util.*
@@ -35,4 +37,7 @@ fun ByteArray.toHexString(): String {
 
 fun MediaCodecInfo.isAudioCodec(): Boolean {
     return supportedTypes.joinToString().contains("audio")
-}
+}
+
+tailrec fun Context.getActivity(): Activity? = this as? Activity
+    ?: (this as? ContextWrapper)?.baseContext?.getActivity()