Merge remote-tracking branch 'remotes/origin/develop'

sergpetrov · Nov 27, 2020 · 46eedbb · 46eedbb
2 parents 8837a46 + 55492be
commit 46eedbb
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 9 deletions.
diff --git a/base/src/main/java/com/telex/base/presentation/page/format/ImageFormat.kt b/base/src/main/java/com/telex/base/presentation/page/format/ImageFormat.kt
@@ -10,10 +10,14 @@ import com.telex.base.presentation.page.adapter.ImageUploadStatus
 data class ImageFormat(
     var url: String,
     var caption: String
-) : Format(FormatType.IMAGE, "<figure><img src=\"$url\"/><figcaption>$caption</figcaption></figure>") {
+) : Format(FormatType.IMAGE) {
 
     var uploadStatus: ImageUploadStatus? = null
 
+    override fun toHtml(): String {
+        return "<figure><img src=\"$url\"/><figcaption>$caption</figcaption></figure>"
+    }
+
     fun getFullUrl() = if (!url.isUrl()) ServerManager.endPoint + url else url
 
 }
diff --git a/base/src/main/res/values-de/strings.xml b/base/src/main/res/values-de/strings.xml
@@ -30,7 +30,7 @@
     <string name="click_button_to_create_a_new_post">"Klicke + um einen neuen Post zu kreieren"</string>
     <string name="no_drafts">"Keine Entwürfe"</string>
     <string name="drafts_are_storing_on_device_only">"Deine Entwürfe werden nur auf deinem Gerät gespeichert"</string>
-    <string name="login_description">"Um deine Posts zu verwalten musst du dich mit <b>@Telegrah</b> bot einloggen. Wenn du Telegram bereits benutzt, kannst du sofort anfangen."</string>
+    <string name="login_description">"Um deine Posts zu verwalten musst du dich mit <b>@Telegraph</b> bot einloggen. Wenn du Telegram bereits benutzt, kannst du sofort anfangen."</string>
     <string name="launch_telegram">"Öffne Telegram"</string>
     <string name="log_in">"Einloggen"</string>
     <plurals name="d_posts">

diff --git a/base/src/main/res/values-he/strings.xml b/base/src/main/res/values-he/strings.xml
@@ -30,7 +30,7 @@
     <string name="click_button_to_create_a_new_post">"לחץ על + על מנת ליצור פוסט חדש"</string>
     <string name="no_drafts">"אין טיוטה"</string>
     <string name="drafts_are_storing_on_device_only">"הטיוטות יאוחסנו במכשיר שלך בלבד"</string>
-    <string name="login_description">"התחבר למכשיר זה באמצעות <b>@Telegrah</b> בוט בטלגרם ואז בחר באפליקציית Telegraph X כדי להמשיך"</string>
+    <string name="login_description">"התחבר למכשיר זה באמצעות <b>@Telegraph</b> בוט בטלגרם ואז בחר באפליקציית Telegraph X כדי להמשיך"</string>
     <string name="launch_telegram">"הפעל טלגרם"</string>
     <string name="log_in">"התחבר"</string>
     <plurals name="d_posts">

diff --git a/base/src/main/res/values-it/strings.xml b/base/src/main/res/values-it/strings.xml
@@ -30,7 +30,7 @@
     <string name="click_button_to_create_a_new_post">"Clicca il tasto + per creare un nuovo post"</string>
     <string name="no_drafts">"Nessuna bozza"</string>
     <string name="drafts_are_storing_on_device_only">"Le tue bozze rimarranno solo sul tuo dispositivo"</string>
-    <string name="login_description">"Per gestire i post devi entrare usando il bot <b>@Telegrah</b>. Se hai un account di Telegram, puoi conettere Telegraph."</string>
+    <string name="login_description">"Per gestire i post devi entrare usando il bot <b>@Telegraph</b>. Se hai un account di Telegram, puoi conettere Telegraph."</string>
     <string name="launch_telegram">"Avvia Telegram"</string>
     <string name="log_in">"Entra"</string>
     <plurals name="d_posts">

diff --git a/base/src/main/res/values-iw/strings.xml b/base/src/main/res/values-iw/strings.xml
@@ -30,7 +30,7 @@
     <string name="click_button_to_create_a_new_post">"לחץ על + על מנת ליצור פוסט חדש"</string>
     <string name="no_drafts">"אין טיוטה"</string>
     <string name="drafts_are_storing_on_device_only">"הטיוטות יאוחסנו במכשיר שלך בלבד"</string>
-    <string name="login_description">"התחבר למכשיר זה באמצעות <b>@Telegrah</b> בוט בטלגרם ואז בחר באפליקציית Telegraph X כדי להמשיך"</string>
+    <string name="login_description">"התחבר למכשיר זה באמצעות <b>@Telegraph</b> בוט בטלגרם ואז בחר באפליקציית Telegraph X כדי להמשיך"</string>
     <string name="launch_telegram">"הפעל טלגרם"</string>
     <string name="log_in">"התחבר"</string>
     <plurals name="d_posts">

diff --git a/base/src/main/res/values-tr/strings.xml b/base/src/main/res/values-tr/strings.xml
@@ -30,7 +30,7 @@
     <string name="click_button_to_create_a_new_post">"Yeni yazı oluşturmak için + butonuna tıklayın"</string>
     <string name="no_drafts">"Taslak Yok"</string>
     <string name="drafts_are_storing_on_device_only">"Taslaklar sadece cihazınızda depolanacak"</string>
-    <string name="login_description">"Yazılarınızı yönetmek için <b>@Telegrah</b> botunu kullanarak giriş yapmanız gerekir. Telegram hesabınız varsa, şu an bağlanabilirsiniz."</string>
+    <string name="login_description">"Yazılarınızı yönetmek için <b>@Telegraph</b> botunu kullanarak giriş yapmanız gerekir. Telegram hesabınız varsa, şu an bağlanabilirsiniz."</string>
     <string name="launch_telegram">"Telegram’ı Başlat"</string>
     <string name="log_in">"Giriş yap"</string>
     <plurals name="d_posts">

diff --git a/base/src/pro/AndroidManifest.xml b/base/src/pro/AndroidManifest.xml
@@ -4,7 +4,9 @@
 
     <application>
 
-        <activity android:name=".presentation.statistics.PageStatisticsActivity" />
+        <activity
+            android:name=".presentation.statistics.PageStatisticsActivity"
+            android:theme="@style/AppTheme.Transparent" />
 
     </application>
 

diff --git a/build.gradle b/build.gradle
@@ -29,8 +29,8 @@ task clean(type: Delete) {
 }
 
 ext {
-    versionCode = 49
-    versionName = "2.4.0"
+    versionCode = 50
+    versionName = "2.4.1"
 
     compileSdk = 29
     targetSdk = 29