From 5fc3ab0c1f25e1eddb8d350199d3f4362a8f7a50 Mon Sep 17 00:00:00 2001 From: Sergey Petrov Date: Fri, 27 Nov 2020 16:14:49 +0300 Subject: [PATCH 1/4] * fix adding image from gallery --- .../com/telex/base/presentation/page/format/ImageFormat.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 index 40b17f4..149078c 100644 --- 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, "
$caption
") { +) : Format(FormatType.IMAGE) { var uploadStatus: ImageUploadStatus? = null + override fun toHtml(): String { + return "
$caption
" + } + fun getFullUrl() = if (!url.isUrl()) ServerManager.endPoint + url else url } From e9c44c597632ee324c6e92e74d2b8284bb7ed220 Mon Sep 17 00:00:00 2001 From: Sergey Petrov Date: Fri, 27 Nov 2020 16:18:21 +0300 Subject: [PATCH 2/4] * fix page statistics activity theme --- base/src/pro/AndroidManifest.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/base/src/pro/AndroidManifest.xml b/base/src/pro/AndroidManifest.xml index 90675c4..319b5b3 100644 --- a/base/src/pro/AndroidManifest.xml +++ b/base/src/pro/AndroidManifest.xml @@ -4,7 +4,9 @@ - + From e468297c5e6b2776d9b8472a483f9a7e644586d2 Mon Sep 17 00:00:00 2001 From: Sergey Petrov Date: Fri, 27 Nov 2020 16:20:34 +0300 Subject: [PATCH 3/4] * fix telegraph bot name translations --- base/src/main/res/values-de/strings.xml | 2 +- base/src/main/res/values-he/strings.xml | 2 +- base/src/main/res/values-it/strings.xml | 2 +- base/src/main/res/values-iw/strings.xml | 2 +- base/src/main/res/values-tr/strings.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/src/main/res/values-de/strings.xml b/base/src/main/res/values-de/strings.xml index 9a6304e..1856e7a 100644 --- a/base/src/main/res/values-de/strings.xml +++ b/base/src/main/res/values-de/strings.xml @@ -30,7 +30,7 @@ "Klicke + um einen neuen Post zu kreieren" "Keine Entwürfe" "Deine Entwürfe werden nur auf deinem Gerät gespeichert" - "Um deine Posts zu verwalten musst du dich mit @Telegrah bot einloggen. Wenn du Telegram bereits benutzt, kannst du sofort anfangen." + "Um deine Posts zu verwalten musst du dich mit @Telegraph bot einloggen. Wenn du Telegram bereits benutzt, kannst du sofort anfangen." "Öffne Telegram" "Einloggen" diff --git a/base/src/main/res/values-he/strings.xml b/base/src/main/res/values-he/strings.xml index 0022b8a..244bb82 100644 --- a/base/src/main/res/values-he/strings.xml +++ b/base/src/main/res/values-he/strings.xml @@ -30,7 +30,7 @@ "לחץ על + על מנת ליצור פוסט חדש" "אין טיוטה" "הטיוטות יאוחסנו במכשיר שלך בלבד" - "התחבר למכשיר זה באמצעות @Telegrah בוט בטלגרם ואז בחר באפליקציית Telegraph X כדי להמשיך" + "התחבר למכשיר זה באמצעות @Telegraph בוט בטלגרם ואז בחר באפליקציית Telegraph X כדי להמשיך" "הפעל טלגרם" "התחבר" diff --git a/base/src/main/res/values-it/strings.xml b/base/src/main/res/values-it/strings.xml index e6fdd69..b97bb60 100644 --- a/base/src/main/res/values-it/strings.xml +++ b/base/src/main/res/values-it/strings.xml @@ -30,7 +30,7 @@ "Clicca il tasto + per creare un nuovo post" "Nessuna bozza" "Le tue bozze rimarranno solo sul tuo dispositivo" - "Per gestire i post devi entrare usando il bot @Telegrah. Se hai un account di Telegram, puoi conettere Telegraph." + "Per gestire i post devi entrare usando il bot @Telegraph. Se hai un account di Telegram, puoi conettere Telegraph." "Avvia Telegram" "Entra" diff --git a/base/src/main/res/values-iw/strings.xml b/base/src/main/res/values-iw/strings.xml index 0022b8a..244bb82 100644 --- a/base/src/main/res/values-iw/strings.xml +++ b/base/src/main/res/values-iw/strings.xml @@ -30,7 +30,7 @@ "לחץ על + על מנת ליצור פוסט חדש" "אין טיוטה" "הטיוטות יאוחסנו במכשיר שלך בלבד" - "התחבר למכשיר זה באמצעות @Telegrah בוט בטלגרם ואז בחר באפליקציית Telegraph X כדי להמשיך" + "התחבר למכשיר זה באמצעות @Telegraph בוט בטלגרם ואז בחר באפליקציית Telegraph X כדי להמשיך" "הפעל טלגרם" "התחבר" diff --git a/base/src/main/res/values-tr/strings.xml b/base/src/main/res/values-tr/strings.xml index 4c89b6d..e9f11fa 100644 --- a/base/src/main/res/values-tr/strings.xml +++ b/base/src/main/res/values-tr/strings.xml @@ -30,7 +30,7 @@ "Yeni yazı oluşturmak için + butonuna tıklayın" "Taslak Yok" "Taslaklar sadece cihazınızda depolanacak" - "Yazılarınızı yönetmek için @Telegrah botunu kullanarak giriş yapmanız gerekir. Telegram hesabınız varsa, şu an bağlanabilirsiniz." + "Yazılarınızı yönetmek için @Telegraph botunu kullanarak giriş yapmanız gerekir. Telegram hesabınız varsa, şu an bağlanabilirsiniz." "Telegram’ı Başlat" "Giriş yap" From 55492be64c25cdfd81554c376d2168a3fec50454 Mon Sep 17 00:00:00 2001 From: Sergey Petrov Date: Fri, 27 Nov 2020 16:22:52 +0300 Subject: [PATCH 4/4] * versionName 2.4.1, versionCode 50 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7c79f5b..feb1a56 100644 --- 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