Merge pull request #19 from Parseus/dev

Dev -> master: version 2.1.0
Parseus · Feb 4, 2021 · fd01567 · fd01567
2 parents 093d473 + 22614f1
commit fd01567
Show file tree

Hide file tree

Showing 97 changed files with 1,715 additions and 218 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,6 @@
 .idea/assetWizardSettings.xml
 app/build
 app/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r/androidx/asynclayoutinflater/R.java
-app/full
-app/openSource
+app/nonFree
+app/standard
 .idea/kotlinc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,14 +1,15 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion 30
     defaultConfig {
         applicationId "com.parseus.codecinfo"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 16
-        versionName "2.0.0"
+        versionCode 17
+        versionName "2.1.0"
         resConfigs "en"
 
         vectorDrawables.useSupportLibrary = true
@@ -28,24 +29,35 @@ android {
         }
     }
 
-    flavorDimensions "app"
+    flavorDimensions "app", "platform"
 
     productFlavors {
-        full {
+        nonFree {
             dimension "app"
 
             dependenciesInfo {
                 includeInApk = false
             }
         }
 
-        openSource {
+        standard {
             dimension "app"
 
             dependenciesInfo {
                 includeInApk = false
             }
         }
+
+        mobile {
+            dimension "platform"
+            versionCode 10000 + android.defaultConfig.versionCode
+        }
+
+        tv {
+            dimension "platform"
+            minSdkVersion 21
+            versionCode 20000 + android.defaultConfig.versionCode
+        }
     }
 
     compileOptions {
@@ -63,6 +75,17 @@ android {
         exclude 'META-INF/*.kotlin_module'
         exclude 'META-INF/*.version'
     }
+
+    variantFilter { variant ->
+        def names = variant.flavors*.name
+        if (names.contains("nonFree") && names.contains("tv")) {
+            setIgnore(true)
+        }
+    }
+}
+
+configurations {
+    nonFreeMobileImplementation {}
 }
 
 dependencies {
@@ -71,20 +94,24 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation "androidx.core:core-ktx:1.5.0-beta01"
-    implementation 'androidx.leanback:leanback:1.1.0-beta01'
-    implementation 'androidx.leanback:leanback-preference:1.1.0-beta01'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'com.google.android.material:material:1.3.0-rc01'
 
     implementation 'com.github.ditacristianionut:AppInfoBadge:1.3'
     implementation "com.squareup.leakcanary:plumber-android:$leakCanary_version"
+    implementation "com.squareup.moshi:moshi:$moshi_version"
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"
+    implementation "com.squareup.okio:okio:2.10.0"
 
     debugImplementation 'androidx.multidex:multidex:2.0.1'
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanary_version"
 
-    fullImplementation fileTree(include: ['*.jar'], dir: 'libs')
-    fullImplementation 'com.google.android.play:core:1.9.0'
-    fullImplementation ('com.google.android.play:core-ktx:1.8.1') {
+    tvImplementation 'androidx.leanback:leanback:1.1.0-beta01'
+    tvImplementation 'androidx.leanback:leanback-preference:1.1.0-beta01'
+
+    nonFreeMobileImplementation fileTree(include: ['*.jar'], dir: 'libs')
+    nonFreeMobileImplementation 'com.google.android.play:core:1.9.1'
+    nonFreeMobileImplementation ('com.google.android.play:core-ktx:1.8.1') {
         exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -4,10 +4,9 @@
     android:installLocation="preferExternal"
     package="com.parseus.codecinfo">
 
-    <uses-sdk tools:overrideLibrary="androidx.leanback, androidx.leanback.preference, com.dci.dev.appinfobadge, com.afollestad.recyclical" />
+    <uses-sdk tools:overrideLibrary="com.dci.dev.appinfobadge, com.afollestad.recyclical" />
 
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
-    <uses-feature android:name="android.software.leanback" android:required="false" />
 
     <queries>
         <intent>
@@ -23,60 +22,13 @@
     <application
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_rules"
-        android:banner="@drawable/banner"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:name="${appName}"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="MissingClass,RtlEnabled,UnusedAttribute">
-        <activity
-            android:name=".ui.MainActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTop">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
-                <category android:name="android.intent.category.PENWINDOW_LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEARCH" />
-            </intent-filter>
-            <meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
-        </activity>
-        <activity
-            android:name="com.parseus.codecinfo.ui.settings.SettingsActivity"
-            android:label="@string/action_settings"
-            android:parentActivityName=".ui.MainActivity" />
-
-        <activity
-            android:name="com.parseus.codecinfo.ui.tv.TvActivity"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat.Leanback">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="com.parseus.codecinfo.ui.tv.TvCodecDetailsActivity"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat.Leanback"
-            android:parentActivityName="com.parseus.codecinfo.ui.tv.TvActivity"/>
-        <activity android:name="com.parseus.codecinfo.ui.tv.TvSettingsActivity"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme.Preference"
-            android:parentActivityName="com.parseus.codecinfo.ui.tv.TvActivity" />
-        <activity android:name="com.parseus.codecinfo.ui.tv.TvAboutActivity"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat.Leanback"
-            android:parentActivityName="com.parseus.codecinfo.ui.tv.TvActivity" />
-        <activity android:name="com.parseus.codecinfo.ui.tv.TvSearchActivity"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.AppCompat.Leanback"
-            android:parentActivityName="com.parseus.codecinfo.ui.tv.TvActivity" />
 
         <provider
             android:authorities="${applicationId}.fileprovider"
@@ -88,34 +40,6 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
-        <uses-library
-            android:name="com.sec.android.app.multiwindow"
-            android:required="false" />
-
-        <meta-data
-            android:name="com.samsung.android.sdk.multiwindow.enable"
-            android:value="true" />
-        <meta-data
-            android:name="com.samsung.android.sdk.multiwindow.penwindow.enable"
-            android:value="true" />
-        <meta-data
-            android:name="com.sec.android.support.multiwindow"
-            android:value="true" />
-        <meta-data
-            android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W"
-            android:value="632.0dip" />
-        <meta-data
-            android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H"
-            android:value="598.0dip" />
-        <meta-data
-            android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W"
-            android:value="632.0dip" />
-        <meta-data
-            android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H"
-            android:value="598.0dip" />
-        <meta-data
-            android:name="com.lge.support.SPLIT_WINDOW"
-            android:value="true" />
     </application>
 
 </manifest>
diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html
@@ -1,6 +1,14 @@
 <html>
 <body>
 
+<h2>Version 2.1.0</h2>
+<p>Codec Info will now detect and inform users about known issues with some codecs. If you know about an issue that's not being displayed, please send a feedback email about it!
+<p>Added a notification for the user if getting a codec list is impossible due to an Android platform bug.</p>
+<p>Added more known color formats from Broadcom, MediaTek, Qualcomm and Samsung.</p>
+<p>Getting a supported profile level for VP9 codecs should be now much more accurate on Android 6.0 and older.</p>
+<p>Provide better estimates for DivX codecs, if getting the exact info is not possible.</p>
+<p>Bugfixes and general improvements.</p>
+
 <h2>Version 2.0.0</h2>
 <p>Added a new tab with DRM types (and their properties) supported by the device.</p>
 <p>Added a search functionality - search for info in a current list of codecs/DRM or codec/DRM properties!</p>