diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3851e9905..95fc8b71e 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/app/src/main/assets/CHANGELOG.md b/app/src/main/assets/CHANGELOG.md
new file mode 120000
index 000000000..2bf6a6cbd
--- /dev/null
+++ b/app/src/main/assets/CHANGELOG.md
@@ -0,0 +1 @@
+../../../../CHANGELOG.md
\ No newline at end of file
diff --git a/app/src/main/java/org/tasks/dialogs/WhatsNewDialog.kt b/app/src/main/java/org/tasks/dialogs/WhatsNewDialog.kt
index 3fb12c388..e38d50ce3 100644
--- a/app/src/main/java/org/tasks/dialogs/WhatsNewDialog.kt
+++ b/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()
}
diff --git a/app/src/main/res/layout/activity_purchase.xml b/app/src/main/res/layout/activity_purchase.xml
index 1c3be039f..70ed052fa 100644
--- a/app/src/main/res/layout/activity_purchase.xml
+++ b/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">
diff --git a/app/src/main/res/layout/dialog_whats_new.xml b/app/src/main/res/layout/dialog_whats_new.xml
index ee1efc48c..bd28643ca 100644
--- a/app/src/main/res/layout/dialog_whats_new.xml
+++ b/app/src/main/res/layout/dialog_whats_new.xml
@@ -1,35 +1,32 @@
-
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+ android:layout_above="@id/action_block">
+ android:lineSpacingMultiplier="1.2"
+ android:padding="@dimen/keyline_second" />
+ android:layout_alignParentBottom="true">
@@ -77,4 +74,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 6d6aec4dd..181a77aea 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -113,7 +113,6 @@
Lås ekstra funktioner op og støt open-source software
Fortæl mig, hvad jeg gør godt
Nyder du Tasks\?
- Ændringer i version %s
Eisenhower-felt 4
Eisenhower-felt 3
Esenhower-felt 2
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 043a0c6e5..88fb19428 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -596,7 +596,6 @@
Keine Schlagwörter
Beliebiges Fälligkeitsdatum
Gefällt Ihnen Tasks\?
- Änderungen in Version %s
Was gibt\'s Neues
Eisenhower-Quadrant IV
Eisenhower-Quadrant III
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 629dd6049..d24beb308 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -603,7 +603,6 @@
Desbloquea características adicionales y soporta software de código abierto
Por favor, dime cómo estoy
¿Disfrutando Tasks\?
- Qué hay de nuevo en la versión %s
Qué hay de nuevo
Nueva tarea
ayer
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 7df4f4398..3b6bb52d0 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -603,7 +603,6 @@
Desblokeatu ezaugarri gehigarriak eta babestu software librea
Esadazu nola noan
Tasks gogoko\?
- Zer dago berri %s bertsioan
Zer dago berri
Zeregin berria
Aldaketa %s
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index d21896d0d..8c72eaf57 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -559,7 +559,6 @@
Avaa lisäominaisuuksia ja tue avoimen lähdekoodin ohjelmistoa
Kerrothan miten onnistuin
Pidätkö Tasks ohjelmasta\?
- Päivitykset versiossa %s
Alhainen tärkeys
Suuri tärkeys
Lisää suodin
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e5cf32d16..1aac70b8b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -598,7 +598,6 @@
Déverrouillez des fonctionnalités supplémentaires et supportez les logiciels open source
S’ll vous plaît, dites-moi comment je vais
Vous aimez les Tasks \?
- Quoi de neuf dans la version %s
Quoi de neuf
Nouvelle tâche
hier
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 6004e34fe..c0d78855b 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -601,7 +601,6 @@
További finkciók feloldása és a nyílt szoftver támogatása
Kérlek mondd el, hogy csinálom
Tetszik a Tasks\?
- Újdonságok a %s verzióban
Újdonságok
Új feladat
%s módosítva
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 05beea3ac..ab15ca37f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -603,7 +603,6 @@
Sblocca funzionalità aggiuntive e supporta il software open source
Per favore, dimmi come me la cavo
Ti piace Tasks\?
- Novità della versione %s
Senza priorità
Bassa priorità
Media priorità
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index c86e8d3b8..c137a4b6c 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -540,7 +540,6 @@
הבנתי!
לא תודה
פתיחת אפשרויות נוספות ותמיכה בתוכנות קוד פתוח
- מה חדש בגרסה %s
ללא עדיפות
עדיפות נמוכה
עדיפות בינונית
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 96f10a7ff..5d61d8a0c 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -550,7 +550,6 @@
%s 변경
%s 생성
Tasks 잘 쓰고 계십니까\?
- 버전 %s의 새 기능
아이젠하워 박스 4
아이젠하워 박스 3
아이젠하워 박스 2
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index a243f68c2..8a4f77e48 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -609,7 +609,6 @@
Tilbakestill sorteringsrekkefølge
Lister
Ved oppstart
- Nytt i versjon %s
Liker du Tasks\?
Forbedret ytelse
Hva er nytt
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 2b3c37b59..66b24c11a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -596,7 +596,6 @@
Ontgrendel extra mogelijkheden en ondersteun open source software
Begrepen!
Nieuws
- Nieuw in versie %s
Nee bedankt
Vertel me a.u.b. of ik het goed doe
Gebruik je Tasks graag\?
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 9bcef7a67..a40cdd8ee 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -614,7 +614,6 @@
Odblokuj dodatkowe funkcje i wesprzyj oprogramowanie open source
Powiedz prosze, jak mi idzie
Podoba Ci się Tasks\?
- Co nowego w wersji %s
Co nowego
Zmienione %s
Stworzone %s
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 7c5c8cdc3..6d3a55485 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -599,7 +599,6 @@
Desbloquear funcionalidades adicionais e apoie software de código aberto
Por favor, diga-me como está tudo
Curtindo Tasks\?
- Novidades na Versão %s
Caixa Eisenhower 4
Caixa Eisenhower 3
Caixa Eisenhower 2
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index a368dcfe7..80ef06647 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -611,7 +611,6 @@
Desbloqueie funcionalidades adicionais e apoie software de código aberto
Por favor, diga-me como tudo está
Apreciando o Tasks\?
- Novidades na Versão %s
Caixa Eisenhower 4
Caixa Eisenhower 3
Caixa Eisenhower 2
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 7103554d7..9e79ed20c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -619,7 +619,6 @@
Разблокировать дополнительные функции и поддержать ПО с открытым исходным кодом
Пожалуйста, дайте мне знать, как я справляюсь
Нравится Tasks\?
- Что нового в версии %s
Что нового
Новая задача
Модифицировано %s
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index fdcbd1909..cee86eebe 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -194,7 +194,6 @@
நன்றி இல்லை
நான் எப்படி செய்கிறேன் என்று சொல்லுங்கள்
பணிகளை அனுபவிக்கிறீர்களா\?
- பதிப்பு %s இல் புதியது என்ன\?
ஐசனோவர் பெட்டி 4
ஐசனோவர் பெட்டி 3
ஐசனோவர் பெட்டி 2
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 30eaece2d..dc5e86a45 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -603,7 +603,6 @@
Teşekkürler
Ek özellikleri açın ve açık kaynaklı yazılımı destekleyin
Tasks\'ı Beğeniyor Musunuz\?
- %s Sürümündeki Yenilikler
Yenilikler
Yeni görev
%s oluşturulan
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 0fb86d060..d81a558e9 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -594,7 +594,6 @@
解锁额外功能并支持开源软件
请告诉我做得怎么样
享受Tasks\?
- %s 版本的新变化
更新日志
新任务
修改 %s
diff --git a/app/src/main/res/values/changelog.xml b/app/src/main/res/values/changelog.xml
deleted file mode 100644
index 6afb8d46f..000000000
--- a/app/src/main/res/values/changelog.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- - New Tasks.org synchronization service
- - Multi-select rescheduling
- - New custom filter criteria for hidden tasks, completed tasks, subtasks, parent tasks, and recurring tasks
- - New task default settings: tags, recurrence, location, hide until due time
- - Add ability to delete comments (Thanks to @Romedius!)
- - Add option to always display date (Thanks to @T0M0F!)
- - Copy subtasks when copying tasks (Thanks to @supermzn!)
- - Bug fixes and translation updates
- - Find Tasks on Reddit: https://reddit.com/r/tasks
-
-
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 85b32d439..85441d3b8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -626,7 +626,6 @@ File %1$s contained %2$s.\n\n
Eisenhower box 2
Eisenhower box 3
Eisenhower box 4
- What\'s New in Version %s
Enjoying Tasks?
Please tell me how I\'m doing
Unlock additional features and support open source software