Bump aboutlibraries-core from 7.1.0 to 8.0.0 (#731)

app/build.gradle

@@ -4,6 +4,7 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'io.fabric'
 apply plugin: 'com.github.triplet.play'
+apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 apply from: 'jacoco.gradle'
 apply from: 'sonarqube.gradle'
 apply from: 'hooks.gradle'
@@ -96,6 +97,10 @@ android {
         exclude 'META-INF/library_release.kotlin_module'
         exclude 'META-INF/library-core_release.kotlin_module'
     }
+
+    aboutLibraries {
+        configPath = "app/src/main/res/raw"
+    }
 }
 
 androidExtensions {
@@ -175,7 +180,7 @@ dependencies {
     implementation "com.jakewharton.timber:timber:4.7.1"
     implementation "at.favre.lib:slf4j-timber:1.0.1"
     implementation "fr.bipi.treessence:treessence:0.3.2"
-    implementation "com.mikepenz:aboutlibraries-core:7.1.0"
+    implementation "com.mikepenz:aboutlibraries-core:$about_libraries"
     implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
 
     implementation("io.coil-kt:coil:0.9.5")

app/proguard-rules.pro

@@ -43,3 +43,10 @@
 
 #Config for Material Components
 -keep class com.google.android.material.tabs.** { *; }
+
+
+#Config for About Libraries
+-keep class .R
+-keep class **.R$* {
+    <fields>;
+}

app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicenseItem.kt

@@ -19,7 +19,7 @@ class LicenseItem(val library: Library) : AbstractFlexibleItem<LicenseItem.ViewH
     override fun bindViewHolder(adapter: FlexibleAdapter<IFlexible<*>>, holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
         with(holder) {
             licenseItemName.text = library.libraryName
-            licenseItemSummary.text = library.license?.licenseName
+            licenseItemSummary.text = library.license?.licenseName?.takeIf { it.isNotBlank() } ?: library.libraryVersion
         }
     }
 

app/src/main/java/io/github/wulkanowy/ui/modules/about/license/LicensePresenter.kt

@@ -27,10 +27,6 @@ class LicensePresenter @Inject constructor(
 
     private fun loadData() {
         disposable.add(Single.fromCallable { view?.appLibraries }
-            .map {
-                val exclude = listOf("Android-Iconics", "CircleImageView", "FastAdapter", "Jsoup", "okio", "Retrofit")
-                it.filter { library -> !exclude.contains(library.libraryName) }
-            }
             .map { it.map { library -> LicenseItem(library) } }
             .subscribeOn(schedulers.backgroundThread)
             .observeOn(schedulers.mainThread)

app/src/main/res/layout/item_license.xml

@@ -14,9 +14,11 @@
         android:id="@+id/licenseItemName"
         android:layout_width="match_parent"
         android:layout_height="28dp"
+        android:ellipsize="end"
         android:gravity="bottom"
+        android:singleLine="true"
         android:textSize="16sp"
-        tools:text="@tools:sample/lorem" />
+        tools:text="@tools:sample/lorem/random" />
 
     <TextView
         android:id="@+id/licenseItemSummary"

app/src/main/res/raw/custom_license_mappings.prop

@@ -0,0 +1 @@
+io_github_wulkanowy__sdk:apache_2_0

app/src/main/res/raw/custom_license_year_mappings.prop

@@ -0,0 +1,3 @@
+com_github_wulkanowy__material_chips_input:2019
+io_github_wulkanowy__uonet_request_signer:2019
+io_github_wulkanowy__sdk:2020

app/src/main/res/raw/custom_name_mappings.prop

@@ -0,0 +1,3 @@
+com_github_wulkanowy__material_chips_input:Material Chips Input
+io_github_wulkanowy__uonet_request_signer:UONET+ Request Signer
+io_github_wulkanowy__sdk:VULCAN UONET+ SDK

app/src/main/res/values/library_wulkanowy_api.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="define_WulkanowyApi" translatable="false" />
-
-    <string name="library_WulkanowyApi_author" translatable="false">Wulkanowy</string>
-    <string name="library_WulkanowyApi_authorWebsite" translatable="false">https://github.com/wulkanowy</string>
-
-    <string name="library_WulkanowyApi_libraryName" translatable="false">UONET+ Scraping API</string>
-    <string name="library_WulkanowyApi_libraryDescription" translatable="false">The  UONET+ client using web scraping</string>
-    <string name="library_WulkanowyApi_libraryWebsite" translatable="false">https://github.com/wulkanowy/api</string>
-    <string name="library_WulkanowyApi_libraryVersion" translatable="false">Development</string>
-
-    <string name="library_WulkanowyApi_isOpenSource" translatable="false">true</string>
-    <string name="library_WulkanowyApi_repositoryLink" translatable="false">https://github.com/wulkanowy/api</string>
-
-    <string name="library_WulkanowyApi_licenseId" translatable="false">apache_2_0</string>
-</resources>

build.gradle

@@ -1,5 +1,6 @@
 buildscript {
     ext.kotlin_version = '1.3.71'
+    ext.about_libraries = '8.0.2'
     repositories {
         mavenCentral()
         google()
@@ -16,6 +17,7 @@ buildscript {
         classpath "com.github.triplet.gradle:play-publisher:2.7.2"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8.0.1969"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
+        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${about_libraries}"
     }
 }