Update aboutlibraries

app/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'org.greenrobot.greendao'
+apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 
 android {
     compileSdkVersion 28
@@ -70,7 +71,8 @@ dependencies {
     implementation 'org.conscrypt:conscrypt-android:2.4.0'
     implementation 'com.facebook.stetho:stetho:1.5.1'
     implementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
-    implementation 'com.mikepenz:aboutlibraries:7.1.0'
+    implementation "com.mikepenz:aboutlibraries-core:${aboutLibrariesVersion}"
+    implementation "com.mikepenz:aboutlibraries:${aboutLibrariesVersion}"
     implementation 'com.github.di72nn.wallabag-api-wrapper:api-wrapper:v2.0.0-beta.4'
     implementation 'org.slf4j:slf4j-android:1.7.30'
 }

app/src/main/java/fr/gaulupeau/apps/Poche/ui/MainActivity.java

@@ -22,8 +22,6 @@
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
 
-import android.text.Html;
-import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.Log;
@@ -35,7 +33,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.mikepenz.aboutlibraries.Libs;
 import com.mikepenz.aboutlibraries.LibsBuilder;
 
 import org.greenrobot.eventbus.EventBus;
@@ -465,27 +462,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
                 break;
 
             case R.id.nav_about:
-                Libs.ActivityStyle style;
-                switch(Themes.getCurrentTheme()) {
-                    case DARK:
-                    case DARK_CONTRAST:
-                        style = Libs.ActivityStyle.DARK;
-                        break;
-
-                    default:
-                        style = Libs.ActivityStyle.LIGHT_DARK_TOOLBAR;
-                        break;
-                }
-                CharSequence aboutCharSequence = getText(R.string.aboutText);
-                String aboutString = aboutCharSequence instanceof Spanned
-                        ? Html.toHtml((Spanned) aboutCharSequence)
-                        : aboutCharSequence.toString();
-                new LibsBuilder()
-                        .withActivityStyle(style)
-                        .withAboutIconShown(true)
-                        .withAboutVersionShown(true)
-                        .withAboutDescription(aboutString)
-                        .start(this);
+                new LibsBuilder().start(this);
                 break;
         }
 

app/src/main/res/values-de/strings.xml

@@ -66,7 +66,7 @@
     <string name="themeName_solarized">Solarisiert</string>
     <string name="menu_readArticle_increaseFontSize">Schrift vergrößern</string>
     <string name="menu_readArticle_decreaseFontSize">Schrift verkleinern</string>
-    <string name="aboutText"><b>wallabag-App für Android</b>\n
+    <string name="aboutLibraries_description_text"><b>wallabag-App für Android</b>\n
         wallabag ist eine selbsthostbare Anwendung, die dir ermöglicht, nie wieder Inhalte zu vermissen. Klicke, speichere und lese es, wann du willst. Der ausgewählte Inhalt wird gespeichert, sodass du ihn lesen kannst, wenn du Zeit hast.</string>
     <string name="readSpeed">Lesegeschwindigkeit</string>
     <string name="voiceHeight">Stimmhöhe</string>

app/src/main/res/values-es/strings.xml

@@ -97,7 +97,7 @@
     <string name="themeName_solarized">Solarizado</string>
     <string name="menu_readArticle_increaseFontSize">Aumentar tamaño de letra</string>
     <string name="menu_readArticle_decreaseFontSize">Disminuir tamaño de letra</string>
-    <string name="aboutText">
+    <string name="aboutLibraries_description_text">
         <b>Aplicación de wallabag para Android</b>\n
         wallabag es una aplicación self hosted que te ayuda a no perderte contenidos nunca más. Haz clic, guarda y lee cuando puedas. Extrae contenido de forma automática para que puedas leerlo cuando tengas tiempo.</string>
     <string name="readSpeed">Velocidad de lectura</string>

app/src/main/res/values-eu/strings.xml

@@ -95,7 +95,7 @@
     <string name="themeName_solarized">Solarizatuta</string>
     <string name="menu_readArticle_increaseFontSize">Handiagotu letra-tamaina</string>
     <string name="menu_readArticle_decreaseFontSize">Txikiagotu letra-tamaina</string>
-    <string name="aboutText"><b>wallabag aplikazioa Androiderako</b>
+    <string name="aboutLibraries_description_text"><b>wallabag aplikazioa Androiderako</b>
 \n wallabag edukirik inoiz gehiago ez galtzea ahalbidetzen dizun aplikazio auto-ostatagarri bat da. Klikatu, gorde eta irakurri ahal duzunean. Edukia ateratzen du astia duzunean irakurri ahal izateko.</string>
     <string name="readSpeed">Irakurketa abiadura</string>
     <string name="voiceHeight">Ahots tonua</string>

app/src/main/res/values-fr/strings.xml

@@ -100,7 +100,7 @@
     <string name="themeName_solarized">Solarisé</string>
     <string name="menu_readArticle_increaseFontSize">Augmenter la taille de la police</string>
     <string name="menu_readArticle_decreaseFontSize">Diminuer la taille de la police</string>
-    <string name="aboutText"><b>Application wallabag pour Android</b>
+    <string name="aboutLibraries_description_text"><b>Application wallabag pour Android</b>
 \n wallabag est une application auto-hébergeable vous permettant de ne plus rater aucun contenu. Cliquez, enregistrez et lisez le contenu extrait au moment le plus opportun.</string>
     <string name="readSpeed">Vitesse de lecture</string>
     <string name="voiceHeight">Hauteur de voix</string>

app/src/main/res/values-hu/strings.xml

@@ -85,7 +85,7 @@
     <string name="themeName_solarized">Túlexponált</string>
     <string name="menu_readArticle_increaseFontSize">Betűméret növelése</string>
     <string name="menu_readArticle_decreaseFontSize">Betűméret csökkentése</string>
-    <string name="aboutText"><b>wallabag alkalmazás Androidra</b>\n
+    <string name="aboutLibraries_description_text"><b>wallabag alkalmazás Androidra</b>\n
         A wallabag egy saját szerveren futó alkalmazás, amely lehetővé teszi, hogy többé ne hagyjon ki semmilyen tartalmat. Kattintson, mentse és olvassa el a kibontott tartalmat szabadidejében.</string>
     <string name="readSpeed">Olvasási sebesség</string>
     <string name="voiceHeight">Hangmagasság</string>

app/src/main/res/values-it/strings.xml

@@ -95,7 +95,7 @@
     <string name="themeName_solarized">Solarizzato</string>
     <string name="menu_readArticle_increaseFontSize">Aumenta dimensione del font</string>
     <string name="menu_readArticle_decreaseFontSize">Diminuisci dimensione del font</string>
-    <string name="aboutText"><b>App wallabag per Android</b>\n
+    <string name="aboutLibraries_description_text"><b>App wallabag per Android</b>\n
         wallabag è un\'app autoospidabile che ti permette non mancare più nessun contenuta. Clicca, salva e legge i contenuti estratti come vuoi.</string>
     <string name="readSpeed">Velocità di lettura</string>
     <string name="voiceHeight">Tonalità della voce</string>

app/src/main/res/values-ja/strings.xml

@@ -82,7 +82,7 @@
     <string name="themeName_solarized">ソラリゼーション</string>
     <string name="menu_readArticle_increaseFontSize">フォントサイズを大きく</string>
     <string name="menu_readArticle_decreaseFontSize">フォントサイズを小さく</string>
-    <string name="aboutText">
+    <string name="aboutLibraries_description_text">
         <b>Android 用 wallabag アプリ</b>\n
         wallabag は、すべてのコンテンツをもう見逃さないようにすることができる、自己ホスト可能なアプリケーションです。クリックして保存すれば、時間があるときにコンテンツを抽出して読むことができます。</string>
     <string name="readSpeed">読む速度</string>

app/src/main/res/values-ko/strings.xml

@@ -161,7 +161,7 @@
     <string name="pref_categoryName_autoSync">자동 동기화</string>
     <string name="manageTags_addNew">추가</string>
     <string name="connectionWizard_provider_framabag_next">연결</string>
-    <string name="aboutText">
+    <string name="aboutLibraries_description_text">
         <b>안드로이드용 wallabag 앱 </b>
 \n왈라백은 스스로 호스팅할 수 있는 앱으로, 더 이상 어떤 콘텐츠도 놓치지 않도록 해준다. 압축을 푼 콘텐츠를 여유롭게 클릭, 저장 및 읽어보십시오.</string>
     <string name="downloadAsFileArticleDownloadedDetail">기사가 %s 다운로드되었다</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -158,7 +158,7 @@
     <string name="noPreviousArticle">Det er ingen tidligere artikkel i gjeldende liste</string>
     <string name="noNextArticle">Ingen flere artikler i gjeldende liste</string>
     <string name="themeName_solarized">Solarisert</string>
-    <string name="aboutText"><b>wallabag-programfor Android</b>
+    <string name="aboutLibraries_description_text"><b>wallabag-programfor Android</b>
 \n wallabag er et program du tjener som vertskap for selv, noe som betyr at du aldri mer vil miste innhold. Klikk, lagre, og les når du kan. Det henter ut innholdet slik at du kan lese det når du har tid.</string>
     <string name="pref_desc_connection_url">Eksempler:\n
         https://wallabag.example.com\n

app/src/main/res/values-nl/strings.xml

@@ -88,7 +88,7 @@
     <string name="themeName_solarized">Gesolariseerd</string>
     <string name="menu_readArticle_increaseFontSize">Vergroot het lettertype</string>
     <string name="menu_readArticle_decreaseFontSize">Verklein het lettertype</string>
-    <string name="aboutText"><b>wallabag app voor Android</b>\n
+    <string name="aboutLibraries_description_text"><b>wallabag app voor Android</b>\n
         wallabag is een \'self-hostable\' app, waarmee je geen content meer hoeft te missen. Klik, bewaar en lees de geëxtraheerde inhoud wanneer het je uitkomt.</string>
     <string name="readSpeed">Leessnelheid</string>
     <string name="voiceHeight">Stemhoogte</string>

app/src/main/res/values-pl/strings.xml

@@ -95,7 +95,7 @@
     <string name="themeName_solarized">Prześwietlony (Solarized)</string>
     <string name="menu_readArticle_increaseFontSize">Zwiększ rozmiar czcionki</string>
     <string name="menu_readArticle_decreaseFontSize">Zmniejsz rozmiar czcionki</string>
-    <string name="aboutText">
+    <string name="aboutLibraries_description_text">
         <b>Aplikacja wallabag dla Androida</b>\n
         wallabag to samodzielna aplikacja, dzięki której nie przegapisz już żadnych treści. Kliknij, zapisz i przeczytaj wyciągniętą treść w wolnym czasie.</string>
     <string name="readSpeed">Prędkość czytania</string>

app/src/main/res/values-ru/strings.xml

@@ -107,7 +107,7 @@
     <string name="d_testConnection_urlSuggestion_cancelButton">Отменить</string>
     <string name="d_testConnection_urlSuggestion_message">Рекомендуется изменить URL на: %s. Но вы можете оставить URL введённый вами.</string>
     <string name="d_testConnection_urlSuggestion_message_mandatory">Предлагается изменить URL на: %s</string>
-    <string name="aboutText"><b>Приложение wallabag для Android</b>
+    <string name="aboutLibraries_description_text"><b>Приложение wallabag для Android</b>
 \n wallabag — это приложение, которое вы можете установить на собственном сервере, благодаря которому вы больше не пропустите никакой контент. Сохраните и читайте когда угодно.</string>
     <string name="readSpeed">Скорость чтения</string>
     <string name="voiceHeight">Тембр голоса</string>

app/src/main/res/values-tr/strings.xml

@@ -95,7 +95,7 @@
     <string name="themeName_solarized">Solarized Tema</string>
     <string name="menu_readArticle_increaseFontSize">Yazı tipi boyutunu büyüt</string>
     <string name="menu_readArticle_decreaseFontSize">Yazı tipi boyutunu küçült</string>
-    <string name="aboutText"><b>Android için wallabag</b>
+    <string name="aboutLibraries_description_text"><b>Android için wallabag</b>
 \n wallabag hiçbir makaleyi kaçırmamak için kullanabileceğiniz, ve de kendi sunucunuza yükleyebileceğiniz bir uygulamadır. Makaleleri denk geldiğiniz anda tek tuşla tıklayıp kaydedebilir, dilediğiniz zaman okuyabilirsiniz. wallabag makalelerden içeriği ayrıştırdığı için dilediğiniz zaman kaydedilmiş makaleleri okuyabilirsiniz.</string>
     <string name="readSpeed">Okuma hızı</string>
     <string name="voiceHeight">Ses seviyesi</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -101,7 +101,7 @@
     <string name="themeName_solarized">过曝光</string>
     <string name="menu_readArticle_increaseFontSize">增大字体</string>
     <string name="menu_readArticle_decreaseFontSize">缩小字体</string>
-    <string name="aboutText"><b>适用于 Android 的 wallabag 应用</b>\n
+    <string name="aboutLibraries_description_text"><b>适用于 Android 的 wallabag 应用</b>\n
         wallabag 是一个自托管应用，使您不再错过任何内容。点击，保存并在闲暇时阅读提取的内容。</string>
     <string name="readSpeed">朗读速度</string>
     <string name="voiceHeight">语音音高</string>

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

@@ -102,7 +102,7 @@
     <string name="themeName_solarized">Solarized</string>
     <string name="menu_readArticle_increaseFontSize">Increase font size</string>
     <string name="menu_readArticle_decreaseFontSize">Decrease font size</string>
-    <string name="aboutText"><b>wallabag app for Android</b>\n
+    <string name="aboutLibraries_description_text"><b>wallabag app for Android</b>\n
         wallabag is a self-hostable app, allowing you to not miss any content anymore. Click, save and read the extracted content at your leisure.</string>
     <string name="readSpeed">Read speed</string>
     <string name="voiceHeight">Voice pitch</string>

build.gradle

@@ -5,9 +5,13 @@ buildscript {
         google()
         jcenter()
     }
+    ext {
+        aboutLibrariesVersion = '8.1.2'
+    }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.2'
         classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'
+        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${aboutLibrariesVersion}"
     }
 }