Display changelog in "What's New" dialog

CHANGELOG.md

@@ -1,7 +1,4 @@
-Change Log
----
-=======
-### 11.0 (2020-11-10) [BETA](https://tasks.org/docs/pre_release_testing.html)
+### 11.0 (2020-11-10)
 
 * New Tasks.org synchronization service
 * Multi-select rescheduling

app/src/main/assets/CHANGELOG.md

@@ -0,0 +1 @@
+../../../../CHANGELOG.md

app/src/main/java/org/tasks/dialogs/WhatsNewDialog.kt

@@ -5,6 +5,7 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.TextView
@@ -14,6 +15,8 @@ import butterknife.ButterKnife
 import butterknife.OnClick
 import com.google.android.material.button.MaterialButton
 import dagger.hilt.android.AndroidEntryPoint
+import io.noties.markwon.Markwon
+import io.noties.markwon.ext.strikethrough.StrikethroughPlugin
 import org.tasks.BuildConfig
 import org.tasks.R
 import org.tasks.analytics.Firebase
@@ -21,6 +24,7 @@ import org.tasks.billing.Inventory
 import org.tasks.billing.PurchaseDialog.Companion.FRAG_TAG_PURCHASE_DIALOG
 import org.tasks.billing.PurchaseDialog.Companion.newPurchaseDialog
 import org.tasks.preferences.Preferences
+import java.io.BufferedReader
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -44,9 +48,13 @@ class WhatsNewDialog : DialogFragment() {
         val view: View = LayoutInflater.from(requireContext()).inflate(R.layout.dialog_whats_new, null)
         ButterKnife.bind(this, view)
 
-        val entries = resources.getStringArray(R.array.changelog).joinToString("\n\n") { "\u2022 $it" }
-        val text = "$entries\n\nVisit https://tasks.org/changelog for more info"
-        changelog.text = text
+        val textStream = requireContext().assets.open("CHANGELOG.md")
+        val text = BufferedReader(textStream.reader()).readText()
+        val markwon = Markwon.builder(requireContext())
+                .usePlugin(StrikethroughPlugin.create())
+                .build()
+        changelog.movementMethod = LinkMovementMethod.getInstance()
+        changelog.text = markwon.toMarkdown(text)
 
         val begForRating = !preferences.getBoolean(R.string.p_clicked_rate, false)
                 && (inventory.purchasedThemes() || firebase.noChurn())
@@ -81,7 +89,7 @@ class WhatsNewDialog : DialogFragment() {
             actionText.visibility = View.GONE
         }
 
-        return dialogBuilder.newDialog(R.string.whats_new_in_version, BuildConfig.VERSION_NAME)
+        return dialogBuilder.newDialog()
                 .setView(view)
                 .show()
     }

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

@@ -3,21 +3,20 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:orientation="vertical">
+  xmlns:tools="http://schemas.android.com/tools">
     <ScrollView
       android:id="@+id/scroll"
       android:layout_above="@id/bottom_panel"
-      android:layout_width="wrap_content"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content">
 
         <TextView
           android:id="@+id/text"
+          style="@style/TextAppearance"
           android:scrollbars="none"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:lineSpacingMultiplier="1.2"
-          android:textSize="16sp"
           android:padding="@dimen/keyline_second"/>
     </ScrollView>
 

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

@@ -1,35 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   xmlns:tools="http://schemas.android.com/tools"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:orientation="vertical">
+  xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <ScrollView
       android:id="@+id/scrollView2"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      app:layout_constraintTop_toTopOf="parent"
-      app:layout_constrainedHeight="true"
-      app:layout_constraintHeight_max="@dimen/whats_new_height">
+      android:layout_above="@id/action_block">
 
         <TextView
           android:id="@+id/changelog"
           style="@style/TextAppearance"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:autoLink="all"
-          android:padding="@dimen/keyline_first" />
+          android:lineSpacingMultiplier="1.2"
+          android:padding="@dimen/keyline_second" />
 
     </ScrollView>
 
     <LinearLayout
       android:id="@+id/action_block"
       android:layout_width="match_parent"
-      android:layout_height="0dp"
+      android:layout_height="wrap_content"
       android:orientation="vertical"
-      app:layout_constraintTop_toBottomOf="@+id/scrollView2">
+      android:layout_alignParentBottom="true">
 
         <View style="@style/horizontal_divider" />
 
@@ -77,4 +74,4 @@
 
     </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>

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

@@ -113,7 +113,6 @@
     <string name="support_development_subscribe">Lås ekstra funktioner op og støt open-source software</string>
     <string name="tell_me_how_im_doing">Fortæl mig, hvad jeg gør godt</string>
     <string name="enjoying_tasks">Nyder du Tasks\?</string>
-    <string name="whats_new_in_version">Ændringer i version %s</string>
     <string name="filter_eisenhower_box_4">Eisenhower-felt 4</string>
     <string name="filter_eisenhower_box_3">Eisenhower-felt 3</string>
     <string name="filter_eisenhower_box_2">Esenhower-felt 2</string>

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

@@ -596,7 +596,6 @@
     <string name="filter_no_tags">Keine Schlagwörter</string>
     <string name="filter_any_due_date">Beliebiges Fälligkeitsdatum</string>
     <string name="enjoying_tasks">Gefällt Ihnen Tasks\?</string>
-    <string name="whats_new_in_version">Änderungen in Version %s</string>
     <string name="whats_new">Was gibt\'s Neues</string>
     <string name="filter_eisenhower_box_4">Eisenhower-Quadrant IV</string>
     <string name="filter_eisenhower_box_3">Eisenhower-Quadrant III</string>

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

@@ -603,7 +603,6 @@
     <string name="support_development_subscribe">Desbloquea características adicionales y soporta software de código abierto</string>
     <string name="tell_me_how_im_doing">Por favor, dime cómo estoy</string>
     <string name="enjoying_tasks">¿Disfrutando Tasks\?</string>
-    <string name="whats_new_in_version">Qué hay de nuevo en la versión %s</string>
     <string name="whats_new">Qué hay de nuevo</string>
     <string name="action_new_task">Nueva tarea</string>
     <string name="yesterday_lowercase">ayer</string>

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

@@ -603,7 +603,6 @@
     <string name="support_development_subscribe">Desblokeatu ezaugarri gehigarriak eta babestu software librea</string>
     <string name="tell_me_how_im_doing">Esadazu nola noan</string>
     <string name="enjoying_tasks">Tasks gogoko\?</string>
-    <string name="whats_new_in_version">Zer dago berri %s bertsioan</string>
     <string name="whats_new">Zer dago berri</string>
     <string name="action_new_task">Zeregin berria</string>
     <string name="sort_modified_group">Aldaketa %s</string>

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

@@ -559,7 +559,6 @@
     <string name="support_development_subscribe">Avaa lisäominaisuuksia ja tue avoimen lähdekoodin ohjelmistoa</string>
     <string name="tell_me_how_im_doing">Kerrothan miten onnistuin</string>
     <string name="enjoying_tasks">Pidätkö Tasks ohjelmasta\?</string>
-    <string name="whats_new_in_version">Päivitykset versiossa %s</string>
     <string name="filter_low_priority">Alhainen tärkeys</string>
     <string name="filter_high_priority">Suuri tärkeys</string>
     <string name="add_filter">Lisää suodin</string>

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

@@ -598,7 +598,6 @@
     <string name="support_development_subscribe">Déverrouillez des fonctionnalités supplémentaires et supportez les logiciels open source</string>
     <string name="tell_me_how_im_doing">S’ll vous plaît, dites-moi comment je vais</string>
     <string name="enjoying_tasks">Vous aimez les Tasks \?</string>
-    <string name="whats_new_in_version">Quoi de neuf dans la version %s</string>
     <string name="whats_new">Quoi de neuf</string>
     <string name="action_new_task">Nouvelle tâche</string>
     <string name="yesterday_lowercase">hier</string>

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

@@ -601,7 +601,6 @@
     <string name="support_development_subscribe">További finkciók feloldása és a nyílt szoftver támogatása</string>
     <string name="tell_me_how_im_doing">Kérlek mondd el, hogy csinálom</string>
     <string name="enjoying_tasks">Tetszik a Tasks\?</string>
-    <string name="whats_new_in_version">Újdonságok a %s verzióban</string>
     <string name="whats_new">Újdonságok</string>
     <string name="action_new_task">Új feladat</string>
     <string name="sort_modified_group">%s módosítva</string>

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

@@ -603,7 +603,6 @@
     <string name="support_development_subscribe">Sblocca funzionalità aggiuntive e supporta il software open source</string>
     <string name="tell_me_how_im_doing">Per favore, dimmi come me la cavo</string>
     <string name="enjoying_tasks">Ti piace Tasks\?</string>
-    <string name="whats_new_in_version">Novità della versione %s</string>
     <string name="filter_no_priority">Senza priorità</string>
     <string name="filter_low_priority">Bassa priorità</string>
     <string name="filter_medium_priority">Media priorità</string>

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

@@ -540,7 +540,6 @@
     <string name="got_it">הבנתי!</string>
     <string name="no_thanks">לא תודה</string>
     <string name="support_development_subscribe">פתיחת אפשרויות נוספות ותמיכה בתוכנות קוד פתוח</string>
-    <string name="whats_new_in_version">מה חדש בגרסה %s</string>
     <string name="filter_no_priority">ללא עדיפות</string>
     <string name="filter_low_priority">עדיפות נמוכה</string>
     <string name="filter_medium_priority">עדיפות בינונית</string>

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

@@ -550,7 +550,6 @@
     <string name="sort_modified_group">%s 변경</string>
     <string name="sort_created_group">%s 생성</string>
     <string name="enjoying_tasks">Tasks 잘 쓰고 계십니까\?</string>
-    <string name="whats_new_in_version">버전 %s의 새 기능</string>
     <string name="filter_eisenhower_box_4">아이젠하워 박스 4</string>
     <string name="filter_eisenhower_box_3">아이젠하워 박스 3</string>
     <string name="filter_eisenhower_box_2">아이젠하워 박스 2</string>

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

@@ -609,7 +609,6 @@
     <string name="reset_sort_order">Tilbakestill sorteringsrekkefølge</string>
     <string name="lists">Lister</string>
     <string name="on_launch">Ved oppstart</string>
-    <string name="whats_new_in_version">Nytt i versjon %s</string>
     <string name="enjoying_tasks">Liker du Tasks\?</string>
     <string name="improve_performance">Forbedret ytelse</string>
     <string name="whats_new">Hva er nytt</string>

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

@@ -596,7 +596,6 @@
     <string name="support_development_subscribe">Ontgrendel extra mogelijkheden en ondersteun open source software</string>
     <string name="got_it">Begrepen!</string>
     <string name="whats_new">Nieuws</string>
-    <string name="whats_new_in_version">Nieuw in versie %s</string>
     <string name="no_thanks">Nee bedankt</string>
     <string name="tell_me_how_im_doing">Vertel me a.u.b. of ik het goed doe</string>
     <string name="enjoying_tasks">Gebruik je Tasks graag\?</string>

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

@@ -614,7 +614,6 @@
     <string name="support_development_subscribe">Odblokuj dodatkowe funkcje i wesprzyj oprogramowanie open source</string>
     <string name="tell_me_how_im_doing">Powiedz prosze, jak mi idzie</string>
     <string name="enjoying_tasks">Podoba Ci się Tasks\?</string>
-    <string name="whats_new_in_version">Co nowego w wersji %s</string>
     <string name="whats_new">Co nowego</string>
     <string name="sort_modified_group">Zmienione %s</string>
     <string name="sort_created_group">Stworzone %s</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -599,7 +599,6 @@
     <string name="support_development_subscribe">Desbloquear funcionalidades adicionais e apoie software de código aberto</string>
     <string name="tell_me_how_im_doing">Por favor, diga-me como está tudo</string>
     <string name="enjoying_tasks">Curtindo Tasks\?</string>
-    <string name="whats_new_in_version">Novidades na Versão %s</string>
     <string name="filter_eisenhower_box_4">Caixa Eisenhower 4</string>
     <string name="filter_eisenhower_box_3">Caixa Eisenhower 3</string>
     <string name="filter_eisenhower_box_2">Caixa Eisenhower 2</string>

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

@@ -611,7 +611,6 @@
     <string name="support_development_subscribe">Desbloqueie funcionalidades adicionais e apoie software de código aberto</string>
     <string name="tell_me_how_im_doing">Por favor, diga-me como tudo está</string>
     <string name="enjoying_tasks">Apreciando o Tasks\?</string>
-    <string name="whats_new_in_version">Novidades na Versão %s</string>
     <string name="filter_eisenhower_box_4">Caixa Eisenhower 4</string>
     <string name="filter_eisenhower_box_3">Caixa Eisenhower 3</string>
     <string name="filter_eisenhower_box_2">Caixa Eisenhower 2</string>

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

@@ -619,7 +619,6 @@
     <string name="support_development_subscribe">Разблокировать дополнительные функции и поддержать ПО с открытым исходным кодом</string>
     <string name="tell_me_how_im_doing">Пожалуйста, дайте мне знать, как я справляюсь</string>
     <string name="enjoying_tasks">Нравится Tasks\?</string>
-    <string name="whats_new_in_version">Что нового в версии %s</string>
     <string name="whats_new">Что нового</string>
     <string name="action_new_task">Новая задача</string>
     <string name="sort_modified_group">Модифицировано %s</string>

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

@@ -194,7 +194,6 @@
     <string name="no_thanks">நன்றி இல்லை</string>
     <string name="tell_me_how_im_doing">நான் எப்படி செய்கிறேன் என்று சொல்லுங்கள்</string>
     <string name="enjoying_tasks">பணிகளை அனுபவிக்கிறீர்களா\?</string>
-    <string name="whats_new_in_version">பதிப்பு %s இல் புதியது என்ன\?</string>
     <string name="filter_eisenhower_box_4">ஐசனோவர் பெட்டி 4</string>
     <string name="filter_eisenhower_box_3">ஐசனோவர் பெட்டி 3</string>
     <string name="filter_eisenhower_box_2">ஐசனோவர் பெட்டி 2</string>

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

@@ -603,7 +603,6 @@
     <string name="no_thanks">Teşekkürler</string>
     <string name="support_development_subscribe">Ek özellikleri açın ve açık kaynaklı yazılımı destekleyin</string>
     <string name="enjoying_tasks">Tasks\'ı Beğeniyor Musunuz\?</string>
-    <string name="whats_new_in_version">%s Sürümündeki Yenilikler</string>
     <string name="whats_new">Yenilikler</string>
     <string name="action_new_task">Yeni görev</string>
     <string name="sort_created_group">%s oluşturulan</string>

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

@@ -594,7 +594,6 @@
     <string name="support_development_subscribe">解锁额外功能并支持开源软件</string>
     <string name="tell_me_how_im_doing">请告诉我做得怎么样</string>
     <string name="enjoying_tasks">享受Tasks\?</string>
-    <string name="whats_new_in_version">%s 版本的新变化</string>
     <string name="whats_new">更新日志</string>
     <string name="action_new_task">新任务</string>
     <string name="sort_modified_group">修改 %s</string>

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

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="changelog">
-        <item>New Tasks.org synchronization service</item>
-        <item>Multi-select rescheduling</item>
-        <item>New custom filter criteria for hidden tasks, completed tasks, subtasks, parent tasks, and recurring tasks</item>
-        <item>New task default settings: tags, recurrence, location, hide until due time</item>
-        <item>Add ability to delete comments (Thanks to @Romedius!)</item>
-        <item>Add option to always display date (Thanks to @T0M0F!)</item>
-        <item>Copy subtasks when copying tasks (Thanks to @supermzn!)</item>
-        <item>Bug fixes and translation updates</item>
-        <item>Find Tasks on Reddit: https://reddit.com/r/tasks</item>
-    </string-array>
-</resources>

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

@@ -626,7 +626,6 @@ File %1$s contained %2$s.\n\n
   <string name="filter_eisenhower_box_2">Eisenhower box 2</string>
   <string name="filter_eisenhower_box_3">Eisenhower box 3</string>
   <string name="filter_eisenhower_box_4">Eisenhower box 4</string>
-  <string name="whats_new_in_version">What\'s New in Version %s</string>
   <string name="enjoying_tasks">Enjoying Tasks?</string>
   <string name="tell_me_how_im_doing">Please tell me how I\'m doing</string>
   <string name="support_development_subscribe">Unlock additional features and support open source software</string>