From 0d465d3bee6a97b425b13bdd9bea5907dbc05475 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Mon, 23 Sep 2019 17:09:13 +0200
Subject: [PATCH 01/21] remove duplicate request when timeline is empty (#1491)

---
 .../tusky/fragment/TimelineFragment.java              | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
index 3bf38f691..a4dc23b8e 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
@@ -68,7 +68,6 @@ import com.keylesspalace.tusky.view.EndlessOnScrollListener;
 import com.keylesspalace.tusky.viewdata.StatusViewData;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -286,12 +285,12 @@ public class TimelineFragment extends SFragment implements
     }
 
     private void updateCurrent() {
-        String topId;
         if (this.statuses.isEmpty()) {
-            topId = null;
-        } else {
-            topId = CollectionsKt.first(this.statuses, Either::isRight).asRight().getId();
+            return;
         }
+
+        String topId = CollectionsKt.first(this.statuses, Either::isRight).asRight().getId();
+
         this.timelineRepo.getStatuses(topId, null, null, LOAD_AT_ONCE,
                 TimelineRequestMode.NETWORK)
                 .observeOn(AndroidSchedulers.mainThread())
@@ -303,7 +302,7 @@ public class TimelineFragment extends SFragment implements
                             if (!statuses.isEmpty()) {
                                 filterStatuses(statuses);
 
-                                if (!this.statuses.isEmpty() && topId != null) {
+                                if (!this.statuses.isEmpty()) {
                                     // clear old cached statuses
                                     Iterator<Either<Placeholder, Status>> iterator = this.statuses.iterator();
                                     while (iterator.hasNext()) {

From ca3ce63c8065165ec234b1e6f7bce776372c9e83 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Tue, 24 Sep 2019 20:33:05 +0200
Subject: [PATCH 02/21] fix content warning edittext not losing focus when its
 hidden (#1498)

---
 app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index a9ed60e47..e34802e3f 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -1718,6 +1718,7 @@ public final class ComposeActivity
             color = ContextCompat.getColor(this, R.color.tusky_blue);
         } else {
             contentWarningBar.setVisibility(View.GONE);
+            textEditor.requestFocus();
             color = ThemeUtils.getColor(this, android.R.attr.textColorTertiary);
         }
         contentWarningButton.getDrawable().setColorFilter(color, PorterDuff.Mode.SRC_IN);

From a9440ea2ab27c25380c62ccc73b58f7e527ead64 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Tue, 24 Sep 2019 20:33:29 +0200
Subject: [PATCH 03/21] filter polls (#1496)

---
 .../tusky/fragment/SFragment.java             |  19 +-
 .../tusky/fragment/TimelineFragment.java      |   2 +-
 .../tusky/fragment/ViewThreadFragment.java    |   2 +-
 .../com/keylesspalace/tusky/FilterTest.kt     | 238 ++++++++++++++++++
 4 files changed, 256 insertions(+), 5 deletions(-)
 create mode 100644 app/src/test/java/com/keylesspalace/tusky/FilterTest.kt

diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
index 9dd5706d6..81fa8a8d5 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
@@ -33,6 +33,7 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.core.app.ActivityOptionsCompat;
@@ -52,6 +53,7 @@ import com.keylesspalace.tusky.db.AccountManager;
 import com.keylesspalace.tusky.di.Injectable;
 import com.keylesspalace.tusky.entity.Attachment;
 import com.keylesspalace.tusky.entity.Filter;
+import com.keylesspalace.tusky.entity.PollOption;
 import com.keylesspalace.tusky.entity.Status;
 import com.keylesspalace.tusky.network.MastodonApi;
 import com.keylesspalace.tusky.network.TimelineCases;
@@ -445,7 +447,8 @@ public abstract class SFragment extends BaseFragment implements Injectable {
         });
     }
 
-    void reloadFilters(boolean forceRefresh) {
+    @VisibleForTesting
+    public void reloadFilters(boolean forceRefresh) {
         if (filters != null && !forceRefresh) {
             applyFilters(forceRefresh);
             return;
@@ -469,7 +472,7 @@ public abstract class SFragment extends BaseFragment implements Injectable {
         });
     }
 
-    protected boolean filterIsRelevant(Filter filter) {
+    protected boolean filterIsRelevant(@NonNull Filter filter) {
         // Called when building local filter expression
         // Override to select relevant filters for your fragment
         return false;
@@ -480,7 +483,17 @@ public abstract class SFragment extends BaseFragment implements Injectable {
         // Override to refresh your fragment
     }
 
-    boolean shouldFilterStatus(Status status) {
+    @VisibleForTesting
+    public boolean shouldFilterStatus(Status status) {
+
+        if(filterRemoveRegex && status.getPoll() != null) {
+            for(PollOption option: status.getPoll().getOptions()) {
+                if(filterRemoveRegexMatcher.reset(option.getTitle()).find()) {
+                    return true;
+                }
+            }
+        }
+
         return (filterRemoveRegex && (filterRemoveRegexMatcher.reset(status.getActionableStatus().getContent()).find()
                 || (!status.getSpoilerText().isEmpty() && filterRemoveRegexMatcher.reset(status.getActionableStatus().getSpoilerText()).find())));
     }
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
index a4dc23b8e..44937d150 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
@@ -376,7 +376,7 @@ public class TimelineFragment extends SFragment implements
     }
 
     @Override
-    protected boolean filterIsRelevant(Filter filter) {
+    protected boolean filterIsRelevant(@NonNull Filter filter) {
         return filterContextMatchesKind(kind, filter.getContext());
     }
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
index 00464311d..825cd23ce 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
@@ -686,7 +686,7 @@ public final class ViewThreadFragment extends SFragment implements
     }
 
     @Override
-    protected boolean filterIsRelevant(Filter filter) {
+    protected boolean filterIsRelevant(@NonNull Filter filter) {
         return filter.getContext().contains(Filter.THREAD);
     }
 
diff --git a/app/src/test/java/com/keylesspalace/tusky/FilterTest.kt b/app/src/test/java/com/keylesspalace/tusky/FilterTest.kt
new file mode 100644
index 000000000..704586442
--- /dev/null
+++ b/app/src/test/java/com/keylesspalace/tusky/FilterTest.kt
@@ -0,0 +1,238 @@
+package com.keylesspalace.tusky
+
+import android.os.Bundle
+import android.text.SpannedString
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.keylesspalace.tusky.entity.Filter
+import com.keylesspalace.tusky.entity.Poll
+import com.keylesspalace.tusky.entity.PollOption
+import com.keylesspalace.tusky.entity.Status
+import com.keylesspalace.tusky.fragment.SFragment
+import com.keylesspalace.tusky.network.MastodonApi
+import com.nhaarman.mockitokotlin2.mock
+import okhttp3.Request
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito
+import org.robolectric.Robolectric
+import org.robolectric.annotation.Config
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import java.util.*
+
+@Config(application = FakeTuskyApplication::class)
+@RunWith(AndroidJUnit4::class)
+class FilterTest {
+
+    private val fragment = FakeFragment()
+
+    @Before
+    fun setup() {
+
+        val controller = Robolectric.buildActivity(FakeActivity::class.java)
+        val activity = controller.get()
+
+        activity.accountManager = mock()
+        activity.themeUtils = mock()
+        val apiMock = Mockito.mock(MastodonApi::class.java)
+        Mockito.`when`(apiMock.getFilters()).thenReturn(object: Call<List<Filter>> {
+            override fun isExecuted(): Boolean {
+                return false
+            }
+            override fun clone(): Call<List<Filter>> {
+                throw Error("not implemented")
+            }
+            override fun isCanceled(): Boolean {
+                throw Error("not implemented")
+            }
+            override fun cancel() {
+                throw Error("not implemented")
+            }
+            override fun execute(): Response<List<Filter>> {
+                throw Error("not implemented")
+            }
+            override fun request(): Request {
+                throw Error("not implemented")
+            }
+
+            override fun enqueue(callback: Callback<List<Filter>>) {
+                callback.onResponse(
+                        this,
+                        Response.success(
+                                listOf(
+                                        Filter(
+                                                id = "123",
+                                                phrase = "badWord",
+                                                context = listOf(Filter.HOME),
+                                                expiresAt = null,
+                                                irreversible = false,
+                                                wholeWord = false
+                                        ),
+                                        Filter(
+                                                id = "123",
+                                                phrase = "badWholeWord",
+                                                context = listOf(Filter.HOME, Filter.PUBLIC),
+                                                expiresAt = null,
+                                                irreversible = false,
+                                                wholeWord = true
+                                        ),
+                                        Filter(
+                                                id = "123",
+                                                phrase = "wrongContext",
+                                                context = listOf(Filter.PUBLIC),
+                                                expiresAt = null,
+                                                irreversible = false,
+                                                wholeWord = true
+                                        )
+                                )
+                        )
+                )
+            }
+        })
+
+        activity.mastodonApi = apiMock
+
+
+        controller.create().start()
+
+        fragment.mastodonApi = apiMock
+
+
+        activity.supportFragmentManager.beginTransaction()
+                .replace(R.id.activity_main, fragment, "fragment")
+                .commit()
+
+        fragment.reloadFilters(false)
+
+    }
+
+    @Test
+    fun shouldNotFilter() {
+        assertFalse(fragment.shouldFilterStatus(
+                mockStatus(content = "should not be filtered")
+        ))
+    }
+
+    @Test
+    fun shouldNotFilter_whenContextDoesNotMatch() {
+        assertFalse(fragment.shouldFilterStatus(
+                mockStatus(content = "one two wrongContext three")
+        ))
+    }
+
+    @Test
+    fun shouldFilter_whenContentMatchesBadWord() {
+        assertTrue(fragment.shouldFilterStatus(
+                mockStatus(content = "one two badWord three")
+        ))
+    }
+
+    @Test
+    fun shouldFilter_whenContentMatchesBadWordPart() {
+        assertTrue(fragment.shouldFilterStatus(
+                mockStatus(content = "one two badWordPart three")
+        ))
+    }
+
+    @Test
+    fun shouldFilter_whenContentMatchesBadWholeWord() {
+        assertTrue(fragment.shouldFilterStatus(
+                mockStatus(content = "one two badWholeWord three")
+        ))
+    }
+
+    @Test
+    fun shouldNotFilter_whenContentDoesNotMAtchWholeWord() {
+        assertFalse(fragment.shouldFilterStatus(
+                mockStatus(content = "one two badWholeWordTest three")
+        ))
+    }
+
+    @Test
+    fun shouldFilter_whenSpoilerTextDoesMatch() {
+        assertTrue(fragment.shouldFilterStatus(
+                mockStatus(
+                        content = "should not be filtered",
+                        spoilerText = "badWord should be filtered"
+                )
+        ))
+    }
+
+    @Test
+    fun shouldFilter_whenPollTextDoesMatch() {
+        assertTrue(fragment.shouldFilterStatus(
+                mockStatus(
+                        content = "should not be filtered",
+                        spoilerText = "should not be filtered",
+                        pollOptions = listOf("should not be filtered", "badWord")
+                )
+        ))
+    }
+
+    private fun mockStatus(
+            content: String = "",
+            spoilerText: String = "",
+            pollOptions: List<String>? = null
+    ): Status {
+        return Status(
+                id = "123",
+                url = "https://mastodon.social/@Tusky/100571663297225812",
+                account = mock(),
+                inReplyToId = null,
+                inReplyToAccountId = null,
+                reblog = null,
+                content = SpannedString(content),
+                createdAt = Date(),
+                emojis = emptyList(),
+                reblogsCount = 0,
+                favouritesCount = 0,
+                reblogged = false,
+                favourited = false,
+                sensitive = false,
+                spoilerText = spoilerText,
+                visibility = Status.Visibility.PUBLIC,
+                attachments = arrayListOf(),
+                mentions = emptyArray(),
+                application = null,
+                pinned = false,
+                poll = if (pollOptions != null) {
+                    Poll(
+                            id = "1234",
+                            expiresAt = null,
+                            expired = false,
+                            multiple = false,
+                            votesCount = 0,
+                            options = pollOptions.map {
+                                PollOption(it, 0)
+                            },
+                            voted = false
+                    )
+                } else null,
+                card = null
+        )
+    }
+
+}
+
+class FakeActivity: BottomSheetActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+    }
+}
+
+class FakeFragment: SFragment() {
+    override fun removeItem(position: Int) {
+    }
+
+    override fun onReblog(reblog: Boolean, position: Int) {
+    }
+
+    override fun filterIsRelevant(filter: Filter): Boolean {
+        return filter.context.contains(Filter.HOME)
+    }
+}
\ No newline at end of file

From 33a78a59a02beef5e1dbc98ac75fd115e4b2b890 Mon Sep 17 00:00:00 2001
From: Ivan Kupalov <charlag@tuta.io>
Date: Tue, 24 Sep 2019 20:33:41 +0200
Subject: [PATCH 04/21] Fix screen reader not announcing post content in some
 cases (#1495)

---
 .../com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
index 4f95f6cfb..6cbdc7d08 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -682,7 +682,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         String description = context.getString(R.string.description_status,
                 status.getUserFullName(),
                 getContentWarningDescription(context, status),
-                (!status.isSensitive() || status.isExpanded() ? status.getContent() : ""),
+                (TextUtils.isEmpty(status.getSpoilerText()) || !status.isSensitive() || status.isExpanded() ? status.getContent() : ""),
                 getCreatedAtDescription(status.getCreatedAt()),
                 getReblogDescription(context, status),
                 status.getNickname(),

From 5be7e31eaac7458a2097c57b2d1b93641f32b06a Mon Sep 17 00:00:00 2001
From: Weblate <42475313+nailyk-weblate@users.noreply.github.com>
Date: Thu, 26 Sep 2019 19:46:13 +0200
Subject: [PATCH 05/21] Translated using Weblate (Hungarian) (#1499)

Currently translated at 83.3% (5 of 6 strings)

Translation: Tusky/Tusky-app
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/hu/
---
 fastlane/metadata/android/hu/changelogs/67.txt | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 fastlane/metadata/android/hu/changelogs/67.txt

diff --git a/fastlane/metadata/android/hu/changelogs/67.txt b/fastlane/metadata/android/hu/changelogs/67.txt
new file mode 100644
index 000000000..e2e0aafe7
--- /dev/null
+++ b/fastlane/metadata/android/hu/changelogs/67.txt
@@ -0,0 +1,9 @@
+Tusky v9.0
+
+- Indíthatsz szavazást Tusky-ból
+- Fejlettebb keresés
+- Új opció a fiók beállításainál a tartalom-figyelmeztetések alapértelmezett mutatására
+- A navigációs fióknál az avataroknak lekerekített négyzet alakja van
+- Be lehet jelenteni olyan fiókokat is, akik még sosem posztoltak
+- A Tusky nem fog csatlakozni titkosítatlan kapcsolaton Android 6+-on
+- Egy rakás kisebb fejlesztés és bugfix

From 0c8407657ed411d98ecf8a26875e0188c37fea25 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Wed, 25 Sep 2019 15:40:26 +0000
Subject: [PATCH 06/21] Translated using Weblate (Hungarian)

Currently translated at 100.0% (395 of 395 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/hu/

Translated using Weblate (Catalan)

Currently translated at 100.0% (395 of 395 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ca/
---
 app/src/main/res/values-ca/strings.xml | 12 +++++++++++-
 app/src/main/res/values-hu/strings.xml |  5 +++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 6ad2f69e1..da6720c72 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -510,4 +510,14 @@
     <string name="poll_duration_6_hours">6 hores</string>
     <string name="edit_poll">Modificar</string>
 
-</resources>
+<string name="action_add_poll">Afegeix una enquesta</string>
+    <string name="create_poll_title">Enquesta</string>
+    <string name="poll_duration_5_min">5 minuts</string>
+    <string name="poll_duration_30_min">30 minuts</string>
+    <string name="poll_duration_1_day">1 dia</string>
+    <string name="poll_duration_3_days">3 dies</string>
+    <string name="poll_duration_7_days">7 dies</string>
+    <string name="add_poll_choice">Afegeix una tria</string>
+    <string name="poll_allow_multiple_choices">Múltiples tries</string>
+    <string name="poll_new_choice_hint">Tria %d</string>
+    </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 997d7da38..d700c1176 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -453,4 +453,9 @@
     <string name="title_accounts">Fiókok</string>
     <string name="failed_search">Sikertelen keresés</string>
 
+    <string name="action_add_poll">Szavazás hozzáadása</string>
+    <string name="create_poll_title">Szavazás</string>
+    <string name="poll_duration_5_min">5 perc</string>
+    <string name="poll_duration_30_min">30 perc</string>
+    <string name="poll_duration_1_hour">1 óra</string>
     </resources>

From 37ba892b18a42da7b690989743b2c8d2f43e3a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Gera?= <gerazo@caesar.elte.hu>
Date: Wed, 25 Sep 2019 15:40:26 +0000
Subject: [PATCH 07/21] Translated using Weblate (Hungarian)

Currently translated at 100.0% (395 of 395 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/hu/
---
 app/src/main/res/values-hu/strings.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index d700c1176..bb036b679 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -50,7 +50,7 @@
     <string name="status_content_show_less">Összecsukás</string>
     <string name="message_empty">Nincs itt semmi.</string>
     <string name="footer_empty">Üres tartalom. Húzd le a frissítéshez!</string>
-    <string name="notification_reblog_format">%s megolta a tülködet</string>
+    <string name="notification_reblog_format">%s megtolta a tülködet</string>
     <string name="notification_favourite_format">%s kedvencnek jelölte tülködet</string>
     <string name="notification_follow_format">%s követ</string>
     <string name="report_username_format">\@%s bejelentése</string>
@@ -458,4 +458,13 @@
     <string name="poll_duration_5_min">5 perc</string>
     <string name="poll_duration_30_min">30 perc</string>
     <string name="poll_duration_1_hour">1 óra</string>
-    </resources>
+    <string name="poll_duration_6_hours">6 óra</string>
+    <string name="poll_duration_1_day">1 nap</string>
+    <string name="poll_duration_3_days">3 nap</string>
+    <string name="poll_duration_7_days">7 nap</string>
+    <string name="add_poll_choice">Válasz hozzáadása</string>
+    <string name="poll_allow_multiple_choices">Több lehetőség</string>
+    <string name="poll_new_choice_hint">Válasz %d</string>
+    <string name="edit_poll">Szerkesztés</string>
+
+</resources>

From a38c2a284b30d990d4cf4f36030ff5b50cb2d568 Mon Sep 17 00:00:00 2001
From: Daniele Lira Mereb <danielelmereb@gmail.com>
Date: Thu, 26 Sep 2019 03:57:50 +0000
Subject: [PATCH 08/21] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (6 of 6 strings)

Translation: Tusky/Tusky-app
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/pt_BR/
---
 fastlane/metadata/android/pt_BR/changelogs/67.txt | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 fastlane/metadata/android/pt_BR/changelogs/67.txt

diff --git a/fastlane/metadata/android/pt_BR/changelogs/67.txt b/fastlane/metadata/android/pt_BR/changelogs/67.txt
new file mode 100644
index 000000000..acd2075b2
--- /dev/null
+++ b/fastlane/metadata/android/pt_BR/changelogs/67.txt
@@ -0,0 +1,9 @@
+Tusky v9.0
+
+- Agora você pode criar enquetes no Tusky
+- Pesquisa melhorada
+- Nova opção nas preferências da conta: "Sempre expandir toots com Aviso de Conteúdo"
+- Avatares em formato quadrado arredondado
+- Agora é possível denunciar usuários mesmo sem toots
+- Tusky se recusará a se conectar através de conexões de texto claro em Android 6+
+- Muitas outras pequenas melhorias e correções de bugs

From 1fd6a7cd72b7a2483fc90a1cfc7e54c229e00034 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Sat, 28 Sep 2019 12:52:10 +0200
Subject: [PATCH 09/21] Fix crash in AccountListFragment (#1502)

---
 .../tusky/fragment/AccountListFragment.kt     | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.kt
index eb5960b03..62ba853ef 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.kt
@@ -57,7 +57,8 @@ class AccountListFragment : BaseFragment(), AccountActionListener, Injectable {
     lateinit var api: MastodonApi
 
     private lateinit var type: Type
-    private lateinit var id: String
+    private var id: String? = null
+
     private lateinit var scrollListener: EndlessOnScrollListener
     private lateinit var adapter: AccountAdapter
     private var fetching = false
@@ -66,7 +67,7 @@ class AccountListFragment : BaseFragment(), AccountActionListener, Injectable {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         type = arguments?.getSerializable(ARG_TYPE) as Type
-        id = arguments?.getString(ARG_ID)!!
+        id = arguments?.getString(ARG_ID)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
@@ -251,36 +252,52 @@ class AccountListFragment : BaseFragment(), AccountActionListener, Injectable {
         Log.e(TAG, "Failed to $verb account id $accountId.")
     }
 
-    private fun getFetchCallByListType(type: Type, fromId: String?): Single<Response<List<Account>>> {
+    private fun getFetchCallByListType(fromId: String?): Single<Response<List<Account>>> {
         return when (type) {
-            Type.FOLLOWS -> api.accountFollowing(id, fromId)
-            Type.FOLLOWERS -> api.accountFollowers(id, fromId)
+            Type.FOLLOWS -> {
+                val accountId = requireId(type, id)
+                api.accountFollowing(accountId, fromId)
+            }
+            Type.FOLLOWERS -> {
+                val accountId = requireId(type, id)
+                api.accountFollowers(accountId, fromId)
+            }
             Type.BLOCKS -> api.blocks(fromId)
             Type.MUTES -> api.mutes(fromId)
             Type.FOLLOW_REQUESTS -> api.followRequests(fromId)
-            Type.REBLOGGED -> api.statusRebloggedBy(id, fromId)
-            Type.FAVOURITED -> api.statusFavouritedBy(id, fromId)
+            Type.REBLOGGED -> {
+                val statusId = requireId(type, id)
+                api.statusRebloggedBy(statusId, fromId)
+            }
+            Type.FAVOURITED -> {
+                val statusId = requireId(type, id)
+                api.statusFavouritedBy(statusId, fromId)
+            }
         }
     }
 
-    private fun fetchAccounts(id: String? = null) {
+    private fun requireId(type: Type, id: String?): String {
+        return requireNotNull(id) { "id must not be null for type "+type.name }
+    }
+
+    private fun fetchAccounts(fromId: String? = null) {
         if (fetching) {
             return
         }
         fetching = true
 
-        if (id != null) {
+        if (fromId != null) {
             recyclerView.post { adapter.setBottomLoading(true) }
         }
 
-        getFetchCallByListType(type, id)
+        getFetchCallByListType(fromId)
                 .observeOn(AndroidSchedulers.mainThread())
                 .autoDispose(from(this, Lifecycle.Event.ON_DESTROY))
                 .subscribe({ response ->
                     val accountList = response.body()
 
                     if (response.isSuccessful && accountList != null) {
-                        val linkHeader = response.headers().get("Link")
+                        val linkHeader = response.headers()["Link"]
                         onFetchAccountsSuccess(accountList, linkHeader)
                     } else {
                         onFetchAccountsFailure(Exception(response.message()))

From a84fd6e83437603b7e58f258496e4f81a6e388f6 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <k.pozniak@gmx.at>
Date: Sat, 28 Sep 2019 13:21:47 +0200
Subject: [PATCH 10/21] prepare changelog for Tusky 9.1

---
 fastlane/metadata/android/en-US/changelogs/68.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/68.txt

diff --git a/fastlane/metadata/android/en-US/changelogs/68.txt b/fastlane/metadata/android/en-US/changelogs/68.txt
new file mode 100644
index 000000000..61b9e7522
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/68.txt
@@ -0,0 +1,3 @@
+Tusky v9.1
+
+This release ensures compatibility with Mastodon 3 and improves performance and stability.

From 8f92274e0bc26c865c382ace16e7822f02797763 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Sat, 28 Sep 2019 16:29:40 +0200
Subject: [PATCH 11/21] remove callList from BaseActivity (#1503)

* remove callList from BaseActivity

* remove callList from BaseActivity
---
 .../java/com/keylesspalace/tusky/BaseActivity.java  | 13 -------------
 .../keylesspalace/tusky/BottomSheetActivityTest.kt  |  1 -
 2 files changed, 14 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java b/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java
index 2c96c83df..389a745e6 100644
--- a/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java
@@ -50,12 +50,8 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import retrofit2.Call;
-
 public abstract class BaseActivity extends AppCompatActivity implements Injectable {
 
-    protected List<Call> callList;
-
     @Inject
     public ThemeUtils themeUtils;
     @Inject
@@ -95,7 +91,6 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
             redirectIfNotLoggedIn();
         }
 
-        callList = new ArrayList<>();
         requesters = new HashMap<>();
     }
 
@@ -164,14 +159,6 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
         }
     }
 
-    @Override
-    protected void onDestroy() {
-        for (Call call : callList) {
-            call.cancel();
-        }
-        super.onDestroy();
-    }
-
     public void showAccountChooserDialog(CharSequence dialogTitle, boolean showActiveAccount, AccountSelectionListener listener) {
         List<AccountEntity> accounts = accountManager.getAllAccountsOrderedByActive();
         AccountEntity activeAccount = accountManager.getActiveAccount();
diff --git a/app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt b/app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt
index 79d81a23d..2db1cd0d7 100644
--- a/app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt
+++ b/app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt
@@ -268,7 +268,6 @@ class BottomSheetActivityTest {
             mastodonApi = api
             @Suppress("UNCHECKED_CAST")
             bottomSheet = mock(BottomSheetBehavior::class.java) as BottomSheetBehavior<LinearLayout>
-            callList = arrayListOf()
         }
 
         override fun openLink(url: String) {

From c35f744a179631d73804b892fa03b1fca658e800 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Tue, 1 Oct 2019 08:08:21 +0200
Subject: [PATCH 12/21] fix requestLayout() improperly called warning in
 AccountActivity (#1507)

---
 .../main/java/com/keylesspalace/tusky/AccountActivity.kt   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
index 39c75c53a..f207bb207 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
@@ -236,11 +236,18 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
 
         // Add a listener to change the toolbar icon color when it enters/exits its collapsed state.
         accountAppBarLayout.addOnOffsetChangedListener(object : AppBarLayout.OnOffsetChangedListener {
+            var priorOffset = 0
+
             @AttrRes
             var priorAttribute = R.attr.account_toolbar_icon_tint_uncollapsed
 
             override fun onOffsetChanged(appBarLayout: AppBarLayout, verticalOffset: Int) {
 
+                if(verticalOffset == priorOffset) {
+                    return
+                }
+                priorOffset = verticalOffset
+
                 @AttrRes val attribute = if (titleVisibleHeight + verticalOffset < 0) {
                     supportActionBar?.setDisplayShowTitleEnabled(true)
 

From 8a3fa79cd6b5092b4b6967c4f7b20c5adb896aa0 Mon Sep 17 00:00:00 2001
From: Vegard Skjefstad <vegard@vegard.net>
Date: Sun, 29 Sep 2019 04:08:23 +0000
Subject: [PATCH 13/21] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?=
 =?UTF-8?q?=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (7 of 7 strings)

Translation: Tusky/Tusky-app
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/nb_NO/
---
 fastlane/metadata/android/nb_NO/changelogs/68.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 fastlane/metadata/android/nb_NO/changelogs/68.txt

diff --git a/fastlane/metadata/android/nb_NO/changelogs/68.txt b/fastlane/metadata/android/nb_NO/changelogs/68.txt
new file mode 100644
index 000000000..5cfca4aca
--- /dev/null
+++ b/fastlane/metadata/android/nb_NO/changelogs/68.txt
@@ -0,0 +1,3 @@
+Tusky v9.1
+
+Denne versjonen sørger for kompatibilitet med Mastodon 3, og forbedrer ytelse og stabilitet.

From 095326f9c8c481c12d61271cedcc3cd505839cea Mon Sep 17 00:00:00 2001
From: Mostafa Ahangarha <ahangarha@riseup.net>
Date: Mon, 30 Sep 2019 18:54:41 +0000
Subject: [PATCH 14/21] Translated using Weblate (Persian)

Currently translated at 85.7% (6 of 7 strings)

Translation: Tusky/Tusky-app
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/fa/
---
 fastlane/metadata/android/fa/changelogs/58.txt     | 11 +++++++++++
 fastlane/metadata/android/fa/changelogs/61.txt     |  7 +++++++
 fastlane/metadata/android/fa/changelogs/67.txt     |  9 +++++++++
 fastlane/metadata/android/fa/changelogs/68.txt     |  3 +++
 fastlane/metadata/android/fa/full_description.txt  | 12 ++++++++++++
 fastlane/metadata/android/fa/short_description.txt |  1 +
 fastlane/metadata/android/fa/title.txt             |  1 +
 7 files changed, 44 insertions(+)
 create mode 100644 fastlane/metadata/android/fa/changelogs/58.txt
 create mode 100644 fastlane/metadata/android/fa/changelogs/61.txt
 create mode 100644 fastlane/metadata/android/fa/changelogs/67.txt
 create mode 100644 fastlane/metadata/android/fa/changelogs/68.txt
 create mode 100644 fastlane/metadata/android/fa/full_description.txt
 create mode 100644 fastlane/metadata/android/fa/short_description.txt
 create mode 100644 fastlane/metadata/android/fa/title.txt

diff --git a/fastlane/metadata/android/fa/changelogs/58.txt b/fastlane/metadata/android/fa/changelogs/58.txt
new file mode 100644
index 000000000..9eda8dd95
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/58.txt
@@ -0,0 +1,11 @@
+تاسکی نسخه ۶٫۰
+
+- صافی‌های خط‌زمانی به ترجیحات حساب منتقل شده و با کارساز همگام خواهد شد
+- اکنون می‌توانید هشتگ سفارشی را به عنوان یک زبانه در رابط اصلی داشته باشید
+- سیاهه‌ها می‌توانند ویرایش شوند
+- امنیتی: حذف پشتیبانی برای TLS 1.0 و TLS 1.1، و افزودن پیشتیبانی برای TLS 1.3 روی اندروید ۶ به بالا
+- نمای ایجاد با شروع نگارش، شکلک‌های سفارشی پیشنهاد می‌دهد
+- سبک جدید «پیروی از سبک سیستم» در تنظیمات
+- بهبود دسترس‌پذییری خط‌زمانی
+- تاسکی اکنون اعلان‌های ناشناس را نادیده می‌گید و دیگر فرونمی‌پاشد
+-
diff --git a/fastlane/metadata/android/fa/changelogs/61.txt b/fastlane/metadata/android/fa/changelogs/61.txt
new file mode 100644
index 000000000..e666ddc28
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/61.txt
@@ -0,0 +1,7 @@
+تاسکی نسخه ۷٫۰
+
+- پشتیبانی از نمایش نظرسنجی‌ها، رای‌ها و اعلان‌های مربوط به نظرسنجی
+- دکمه جدید برای از صافی گذراندن زبانه اعلان و برای پاک کردن همه اعلان‌ها
+- امکان پاک کردن و بازنویسی بوق‌تان
+- علامت جدید روی تصویر نمایه که نشان می‌دهد یک حساب، بات است یا نه (قابل غیرفعال‌سازی در ترجیحات)
+- ترجمه‌های جدید: زبان‌های نروژی و اسلونیایی.
diff --git a/fastlane/metadata/android/fa/changelogs/67.txt b/fastlane/metadata/android/fa/changelogs/67.txt
new file mode 100644
index 000000000..41d522e10
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/67.txt
@@ -0,0 +1,9 @@
+تاسکی نسخه ۹٫۰
+
+- می‌توانید داخل تاسکی، نظرسنجی ایجاد کنید
+- بهبود جستجو
+- گزینه جدید در ترجیحات حساب برای اینکه همواره بوق‌های دارای محتوای حساس کامل نمایش داده شوند
+- آواتارها در کشوی ناوبری اکنون به صورت مربع دارای لبه‌های گرد دیده می‌شوند
+- اکنون امکان گزارش کاربرانی که هیچ بوقی ندارند فراهم شده است
+- تاسکی اکنون از اتصال غیر ایمن در اندروید ۶ سربازمی‌زند
+- به همراه بسیاری بهبودها و رفع اشکالات
diff --git a/fastlane/metadata/android/fa/changelogs/68.txt b/fastlane/metadata/android/fa/changelogs/68.txt
new file mode 100644
index 000000000..56c36c0d1
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/68.txt
@@ -0,0 +1,3 @@
+تاسکی نسخه ۹٫۱
+
+این نسخه، سازگاری با ماستودون ۳ را تامین کرده و دارای بهبود عملکرد و پایداری است.
diff --git a/fastlane/metadata/android/fa/full_description.txt b/fastlane/metadata/android/fa/full_description.txt
new file mode 100644
index 000000000..ca5520bda
--- /dev/null
+++ b/fastlane/metadata/android/fa/full_description.txt
@@ -0,0 +1,12 @@
+تاسکی یک کارخواه سبک برای ماستودون (کارساز شبکه احتماعی آزاد و متن‌باز) است.
+
+• دارای طراحی متریال
+• اکثر APIهای ماستودون پیاده‌سازی شده است
+• پشتیبانی از چند حساب
+• پشتیبانی از سبک تیره و روشن با امکان تنظیم تغییر خودکار بر اساس ساعت روز
+• پشتیبانی از پیش‌نویس - امکان نوشتن بوق‌ها و ذخیره‌شان برای بعد
+• امکان انتخاب از بین انواع شکلک
+• بهینه‌سازی‌شده برای صفحه‌هایی با اندازه‌های مختلف
+• کاملا آزاد و متن‌باز - بدون وابستگی‌های غیرآزاد به خدمات گوگل
+
+برای دریافت اطلاعات بیشتر درباره ماستودون https://joinmastodon.org را ببینید
diff --git a/fastlane/metadata/android/fa/short_description.txt b/fastlane/metadata/android/fa/short_description.txt
new file mode 100644
index 000000000..37ab16ac1
--- /dev/null
+++ b/fastlane/metadata/android/fa/short_description.txt
@@ -0,0 +1 @@
+یک کارخواه چندحسابی برای شبکه اجتماعی ماستودون
diff --git a/fastlane/metadata/android/fa/title.txt b/fastlane/metadata/android/fa/title.txt
new file mode 100644
index 000000000..57a4e8902
--- /dev/null
+++ b/fastlane/metadata/android/fa/title.txt
@@ -0,0 +1 @@
+تاسکی

From 5e29c06fd4eb5ba824cfd527361ccba3abca5c4d Mon Sep 17 00:00:00 2001
From: Mostafa Ahangarha <ahangarha@riseup.net>
Date: Tue, 1 Oct 2019 06:08:27 +0000
Subject: [PATCH 15/21] Translated using Weblate (Persian)

Currently translated at 98.2% (388 of 395 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fa/
---
 app/src/main/res/values-fa/strings.xml | 314 ++++++++++++++++++++-----
 1 file changed, 251 insertions(+), 63 deletions(-)

diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 4d1756163..74ac692bc 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="error_generic">خطایی رخ داد</string>
+    <string name="error_generic">خطایی رخ داد.</string>
     <string name="error_empty">این نمی‌تواند خالی باشد.</string>
     <string name="error_invalid_domain">دامنه وارد شده نامعتبر است</string>
-    <string name="error_failed_app_registration">احراز هویت با سرور ناموفق بود</string>
-    <string name="error_no_web_browser_found">مرورگری برای استفاده یافت نشد</string>
+    <string name="error_failed_app_registration">احراز هویت با این نمونه ناموفق بود.</string>
+    <string name="error_no_web_browser_found">مرورگری برای استفاده یافت نشد.</string>
     <string name="error_authorization_unknown">خطای احراز هویت ناشناس رخ داده است.</string>
-    <string name="error_authorization_denied">هویت احراز نشد</string>
-    <string name="error_retrieving_oauth_token">دریافت توکن ورود ناموفق بود</string>
+    <string name="error_authorization_denied">هویت احراز نشد.</string>
+    <string name="error_retrieving_oauth_token">دریافت توکن ورود ناموفق بود.</string>
     <string name="error_compose_character_limit">وضعیت خیلی طولانی است!</string>
-    <string name="error_image_upload_size">پرونده باید کمتر از ۸ مگابایت باشد</string>
-    <string name="error_video_upload_size">پرونده ویدئویی باید کمتر از ۴۰ مگابایت باشد</string>
-    <string name="error_media_upload_type">این نوع از پرونده نمی‌تواند بارگذاری شود</string>
-    <string name="error_media_upload_opening">پرونده باز نشد</string>
-    <string name="error_media_upload_permission">مجوز برای خواندن رسانه نیاز است</string>
-    <string name="error_media_download_permission">اجازه ذخیره رسانه نیاز است</string>
+    <string name="error_image_upload_size">پرونده باید کمتر از ۸ مگابایت باشد.</string>
+    <string name="error_video_upload_size">پرونده‌های ویدئویی باید کمتر از ۴۰ مگابایت باشد.</string>
+    <string name="error_media_upload_type">این نوع از پرونده نمی‌تواند بارگذاری شود.</string>
+    <string name="error_media_upload_opening">پرونده باز نشد.</string>
+    <string name="error_media_upload_permission">مجوز برای خواندن رسانه نیاز است.</string>
+    <string name="error_media_download_permission">اجازه ذخیره رسانه نیاز است.</string>
     <string name="error_media_upload_image_or_video">تصاویر و فیلم‌ها هر دو نمی‌توانند به یک وضعیت ضمیمه شوند.</string>
-    <string name="error_media_upload_sending">بارگذاری ناموفق بود</string>
-    <string name="error_sender_account_gone">خطا در ارسال بوق</string>
+    <string name="error_media_upload_sending">بارگذاری ناموفق بود.</string>
+    <string name="error_sender_account_gone">خطا در ارسال بوق.</string>
     <string name="title_home">خانه</string>
     <string name="title_notifications">اعلان‌ها</string>
     <string name="title_public_local">محلی</string>
@@ -25,9 +25,9 @@
     <string name="title_view_thread">بوق</string>
     <string name="title_statuses">پست‌ها</string>
     <string name="title_statuses_with_replies">با پاسخ‌</string>
-    <string name="title_follows">دنبال شونده‌ها</string>
-    <string name="title_followers">دنبال کننده‌ها</string>
-    <string name="title_favourites">علاقه‌مندی‌ها</string>
+    <string name="title_follows">دنبال‌شونده‌ها</string>
+    <string name="title_followers">دنبال‌کننده‌ها</string>
+    <string name="title_favourites">پسندها</string>
     <string name="title_mutes">کاربرهای بی‌صدا</string>
     <string name="title_blocks">کاربرهای مسدود شده</string>
     <string name="title_follow_requests">درخواست‌های دنبال کردن</string>
@@ -40,21 +40,21 @@
     <string name="status_sensitive_media_directions">برای نمایش کلیک کن</string>
     <string name="status_content_warning_show_more">نمایش بیشتر</string>
     <string name="status_content_warning_show_less">نمایش کمتر</string>
-    <string name="status_content_show_more">بازکردن</string>
+    <string name="status_content_show_more">گسترش دادن</string>
     <string name="status_content_show_less">بستن</string>
-    <string name="footer_empty">چیزی اینجا نیست.برای تازه سازی، به پایین بکشید</string>
+    <string name="footer_empty">چیزی اینجا نیست. برای تازه‌سازی، به پایین بکشید!</string>
     <string name="notification_reblog_format">%s بوق شما را تقویت کرد</string>
     <string name="notification_favourite_format">%s بوق شما را پسندید</string>
     <string name="notification_follow_format">%s شما را دنبال می‌کند</string>
     <string name="report_username_format">گزارش @%s</string>
-    <string name="report_comment_hint">پیام‌های اضافی</string>
+    <string name="report_comment_hint">پیام‌های اضافی؟</string>
     <string name="action_quick_reply">پاسخ سریع</string>
     <string name="action_reply">پاسخ</string>
     <string name="action_reblog">تقویت</string>
-    <string name="action_favourite">مورد علاقه</string>
+    <string name="action_favourite">پسند</string>
     <string name="action_more">بیشتر</string>
     <string name="action_compose">ایجاد</string>
-    <string name="action_login">با mastodon وارد شو</string>
+    <string name="action_login">با ماستودون وارد شو</string>
     <string name="action_logout">خروج</string>
     <string name="action_logout_confirm">آیا از خارج شدن از این حساب %1s اطمینان دارید؟</string>
     <string name="action_follow">دنبال کن</string>
@@ -68,11 +68,11 @@
     <string name="action_send">بوق</string>
     <string name="action_send_public">بوق!</string>
     <string name="action_retry">تلاش مجدد</string>
-    <string name="action_close">بستن</string>
+    <string name="action_close">بببند</string>
     <string name="action_view_profile">نمایه</string>
     <string name="action_view_preferences">ترجیحات</string>
     <string name="action_view_account_preferences">ترجیحات حساب</string>
-    <string name="action_view_favourites">علاقه‌مندی‌ها</string>
+    <string name="action_view_favourites">پسندها</string>
     <string name="action_view_mutes">کاربران بی‌صدا</string>
     <string name="action_view_blocks">کاربران مسدود شده</string>
     <string name="action_view_follow_requests">درخواست‌های دنبال کردن</string>
@@ -89,18 +89,18 @@
     <string name="action_save">ذخیره</string>
     <string name="action_edit_profile">ویرایش نمایه</string>
     <string name="action_edit_own_profile">ویرایش</string>
-    <string name="action_undo">بازگشت</string>
+    <string name="action_undo">بازگرداندن</string>
     <string name="action_accept">پذیرش</string>
     <string name="action_reject">رد</string>
     <string name="action_search">جستجو</string>
     <string name="action_access_saved_toot">پیش‌نویس</string>
     <string name="action_toggle_visibility">نمایش بوق</string>
-    <string name="action_content_warning">هشدار محتوی</string>
+    <string name="action_content_warning">هشدار محتوا</string>
     <string name="action_emoji_keyboard">صفحه کلیک شکلک</string>
     <string name="download_image">درحال دریافت %1$s</string>
-    <string name="action_copy_link">کپی لینک</string>
-    <string name="send_status_link_to">هم‌رسانی نشانی بوق با</string>
-    <string name="send_status_content_to">هم‌رسانی بوق با</string>
+    <string name="action_copy_link">رونوشت پیوند</string>
+    <string name="send_status_link_to">هم‌رسانی نشانی بوق با…</string>
+    <string name="send_status_content_to">هم‌رسانی بوق با…</string>
     <string name="send_media_to">هم‌رسانی رسانه با…</string>
     <string name="confirmation_reported">فرستاده شد!</string>
     <string name="confirmation_unblocked">کاربر رفع انسداد شد</string>
@@ -109,23 +109,29 @@
     <string name="status_sent_long">پاسخ با موفق فرستاده شد‌.</string>
     <string name="hint_domain">کدام نمونه؟</string>
     <string name="hint_compose">چه خبر؟</string>
-    <string name="hint_content_warning">هشدار محتوی</string>
+    <string name="hint_content_warning">هشدار محتوا</string>
     <string name="hint_display_name">نام نمایشی</string>
     <string name="hint_note">بیوگرافی</string>
-    <string name="hint_search">جستجو</string>
+    <string name="hint_search">جستجو…</string>
     <string name="search_no_results">نتیجه‌ای نیست</string>
     <string name="label_quick_reply">پاسخ …</string>
     <string name="label_avatar">آواتار</string>
-    <string name="label_header">سرتیتر</string>
+    <string name="label_header">سرایند</string>
     <string name="link_whats_an_instance">یک نمونه چیست؟</string>
     <string name="login_connection">در حال اتصال …</string>
-    <string name="dialog_whats_an_instance">آدرس یا دامنه هر نمونه را می‌توانید وارد کنید، مثلا mastodon.social, icosahedron.website, social.tchncs.de, و         &lt;a href=\"https://instances.social\" &gt;بیشتر!\n\n اگر شما هنوز حساب کاربری ندارید، می‌توانید نام نمونه مورد نظر را وارد کنید از اینجا بپیوندید و حساب کاربری ایجاد کنید\n\n نمونه جایی است که حساب کاربری شما میزبان آن است اما شما به راحتی می‌توانید با افراد دیگر در نمونه‌های دیگر ارتباط برقرار کنید و آنها را دنبال کنید شما درست مثل اینکه در  یکجا باشید.\n\n برای اطلاعات بیشتر به اینجا مراجعه کنید <a href="https://joinmastodon.org">joinmastodon.org</a>.</string>
+    <string name="dialog_whats_an_instance">آدرس یا دامنه هر نمونه را می‌توانید وارد کنید، مثلا mastodon.social، icosahedron.website، social.tchncs.de، و <a href="https://instances.social">بیشتر!</a>
+\n
+\n اگر شما هنوز حساب کاربری ندارید، می‌توانید نام نمونه مورد نظر را وارد کنید از اینجا بپیوندید و حساب کاربری ایجاد کنید.
+\n
+\n نمونه جایی است که حساب کاربری شما میزبان آن است اما شما به راحتی می‌توانید با افراد دیگر در نمونه‌های دیگر ارتباط برقرار کنید و آنها را دنبال کنید شما درست مثل اینکه در یکجا باشید.
+\n
+\n برای اطلاعات بیشتر به اینجا مراجعه کنید <a href="https://joinmastodon.org">joinmastodon.org</a>. </string>
     <string name="dialog_title_finishing_media_upload">پایان بارگذاری رسانه</string>
-    <string name="dialog_message_uploading_media">در حال بارگذاری</string>
+    <string name="dialog_message_uploading_media">در حال بارگذاری…</string>
     <string name="dialog_download_image">بارگیری</string>
     <string name="dialog_message_cancel_follow_request">درخواست دنبال کردن را لغو می‌کنید؟</string>
-    <string name="dialog_unfollow_warning">لغو دنبال کردن این حساب</string>
-    <string name="dialog_delete_toot_warning">حذف این بوق</string>
+    <string name="dialog_unfollow_warning">لغو دنبال کردن این حساب؟</string>
+    <string name="dialog_delete_toot_warning">حذف این بوق؟</string>
     <string name="visibility_public">عمومی:پست به خط زمانی عمومی</string>
     <string name="visibility_unlisted">خارج از لیست: در خط زمانی عمومی نشان نده</string>
     <string name="visibility_private">تنها دنبال‌کنندگان:پست فقط به دنبال‌کنندگان</string>
@@ -140,13 +146,13 @@
     <string name="pref_title_notification_filter_mentions">صدازده‌ها</string>
     <string name="pref_title_notification_filter_follows">دنبال‌شده</string>
     <string name="pref_title_notification_filter_reblogs">پست‌های تقویت شده من</string>
-    <string name="pref_title_notification_filter_favourites">پست‌های مورد علاقه من</string>
+    <string name="pref_title_notification_filter_favourites">پست‌های پسندیده شدهٔ من</string>
     <string name="pref_title_appearance_settings">ظاهر</string>
     <string name="pref_title_app_theme">تم برنامه</string>
     <string name="pref_title_timelines">خط‌های زمانی</string>
-    <string name="app_them_dark">روشن</string>
-    <string name="app_theme_light">سیاه</string>
-    <string name="app_theme_black">تیره</string>
+    <string name="app_them_dark">تاریک</string>
+    <string name="app_theme_light">روشن</string>
+    <string name="app_theme_black">سیاه</string>
     <string name="app_theme_auto">خودکار برحسب غروب خورشید</string>
     <string name="pref_title_browser_settings">مرورگر</string>
     <string name="pref_title_custom_tabs">استفاده از زبانه‌های سفارشی کروم</string>
@@ -163,25 +169,25 @@
     <string name="pref_title_http_proxy_port">درگاه پراکسی HTTP</string>
     <string name="pref_default_post_privacy">حریم خصوصی پیش‌فرض پست</string>
     <string name="pref_default_media_sensitivity">همواره رسانه را به عنوان حساس نشانه‌گذاری کن</string>
-    <string name="pref_publishing">انتشار</string>
+    <string name="pref_publishing">انتشار (همگادم با کارساز)</string>
     <string name="pref_failed_to_sync">ناتوانی در هم‌گام‌سازی تنظیمات</string>
     <string name="post_privacy_public">عمومی</string>
-    <string name="post_privacy_unlisted">لیست‌نشده</string>
+    <string name="post_privacy_unlisted">فهرست نشده</string>
     <string name="post_privacy_followers_only">فقط دنبال‌کنندگان</string>
     <string name="pref_status_text_size">اندازه متن وضعیت</string>
-    <string name="status_text_size_smallest">کوچک‌ترین</string>
+    <string name="status_text_size_smallest">بسیار کوچک</string>
     <string name="status_text_size_small">کوچک</string>
     <string name="status_text_size_medium">متوسط</string>
     <string name="status_text_size_large">بزرگ</string>
-    <string name="status_text_size_largest">بزرگ‌ترین</string>
-    <string name="notification_mention_name">صدا زدن جدید</string>
-    <string name="notification_mention_descriptions">هشدار در مورد صدازدن جدید</string>
+    <string name="status_text_size_largest">بسیار بزرگ</string>
+    <string name="notification_mention_name">اشاره‌های جدید</string>
+    <string name="notification_mention_descriptions">اعلان در مورد اشاره‌های جدید</string>
     <string name="notification_follow_name">دنبال‌کننده‌های جدید</string>
-    <string name="notification_follow_description">هشدارها درمورد دنبال‌کنندگان جدید</string>
-    <string name="notification_boost_name">تقویت</string>
-    <string name="notification_boost_description">وقتی بوق‌های شما تقویت شد هشدار بده</string>
-    <string name="notification_favourite_name">مورد علاقه‌ها</string>
-    <string name="notification_favourite_description">هشدارها، زمانی که بوق‌های شما مورد علاقه قرار گرفت</string>
+    <string name="notification_follow_description">اعلان درمورد دنبال‌کنندگان جدید</string>
+    <string name="notification_boost_name">تقویت‌ها</string>
+    <string name="notification_boost_description">وقتی بوق‌های شما تقویت شد اعلان بده</string>
+    <string name="notification_favourite_name">پسندها</string>
+    <string name="notification_favourite_description">اعلان‌ها وقتی که بوق‌های شما پسندیده شوند</string>
     <string name="notification_mention_format">%s شما را صدا زد</string>
     <string name="notification_summary_large">%1$s, %2$s, %3$s و %4$d دیگر</string>
     <string name="notification_summary_medium">%1$s, %2$s, و %3$s</string>
@@ -212,20 +218,20 @@
     <string name="state_follow_requested">‌درخواست دنبال‌کردن فرستاده شد</string>
     <string name="no_content">بدون محتوی</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">در %dy</string>
-    <string name="abbreviated_in_days">در %dd</string>
-    <string name="abbreviated_in_hours">در % dh</string>
-    <string name="abbreviated_in_minutes">در %dm</string>
-    <string name="abbreviated_in_seconds">در %ds</string>
+    <string name="abbreviated_in_years">در %dسال</string>
+    <string name="abbreviated_in_days">در %dر</string>
+    <string name="abbreviated_in_hours">در % dس</string>
+    <string name="abbreviated_in_minutes">در %dد</string>
+    <string name="abbreviated_in_seconds">در %dث</string>
     <string name="follows_you">شما را دنبال می‌کند</string>
-    <string name="pref_title_alway_show_sensitive_media">همیشه مطالب حساس را نشان بده</string>
+    <string name="pref_title_alway_show_sensitive_media">همیشه مطلب حساس را نشان بده</string>
     <string name="title_media">رسانه</string>
     <string name="replying_to">پاسخ دادن به @%s</string>
     <string name="load_more_placeholder_text">بارگیری بیشتر</string>
     <string name="add_account_name">افزودن حساب</string>
     <string name="add_account_description">افزودن حساب ماستدون جدید</string>
-    <string name="action_lists">لیست‌ها</string>
-    <string name="title_lists">لیست‌ها</string>
+    <string name="action_lists">سیاهه‌ها</string>
+    <string name="title_lists">سیاهه‌ها</string>
     <string name="title_list_timeline">لیست خط زمانی</string>
     <string name="compose_active_account_description">پست با حساب %1$s</string>
     <string name="error_failed_set_caption">ناتوان در تنظیم عنوان</string>
@@ -234,8 +240,8 @@
     <string name="action_remove">حذف</string>
     <string name="lock_account_label">قفل حساب</string>
     <string name="lock_account_label_description">به شما امکان می‌دهد بصورت دستی دنبال‌کنندگان را تایید کنید</string>
-    <string name="compose_save_draft">ذخیره به عنوان پیش‌نویس</string>
-    <string name="send_toot_notification_title">فرستادن بوق</string>
+    <string name="compose_save_draft">ذخیره به عنوان پیش‌نویس؟</string>
+    <string name="send_toot_notification_title">فرستادن بوق…</string>
     <string name="send_toot_notification_error_title">خطای فرستادن بوق</string>
     <string name="send_toot_notification_channel_name">در حال فرستادن بوق‌ها</string>
     <string name="send_toot_notification_cancel_title">فرستادن لغو شد</string>
@@ -246,8 +252,8 @@
     <string name="emoji_style">قالب شکلک</string>
     <string name="system_default">پیشفرض سیستم</string>
     <string name="download_fonts">شما ابتدا باید این شکلک‌ها را دریافت کنید</string>
-    <string name="performing_lookup_title">اجرای جستجو</string>
-    <string name="expand_collapse_all_statuses">باز/بستن همه وضعیت‌ها</string>
+    <string name="performing_lookup_title">اجرای جستجو…</string>
+    <string name="expand_collapse_all_statuses">گستردن/بستن همه وضعیت‌ها</string>
     <string name="action_open_toot">بوق را باز کن</string>
     <string name="restart_required">برنامه به شروع مجدد نیاز دارد</string>
     <string name="restart_emoji">شما برای اعمال این تغییرات به شروع مجدد برنامه نیاز دارید</string>
@@ -271,4 +277,186 @@
     <string name="label_remote_account">اطلاعات زیر ممکن است به طور ناقص نمایه کاربر را نشان دهد. برای دیدن نمایه کامل در مرورگر، لمس کنید.</string>
     <string name="unpin_action">برداشتن سنجاق</string>
     <string name="pin_action">سنجاق کردن</string>
+<string name="error_network">یک خطای شبکه رخ داد! لطفا اتصال خود را بررسی و دوباره تلاش کنید!</string>
+    <string name="title_direct_messages">پیام‌های مستقیم</string>
+    <string name="title_tab_preferences">زبانه‌ها</string>
+    <string name="title_tag">#%ث</string>
+    <string name="title_statuses_pinned">سنجاق‌شده‌ها</string>
+    <string name="title_domain_mutes">دامنه‌های پنهان</string>
+    <string name="status_username_format">\@%s</string>
+    <string name="message_empty">چیزی اینجا نیست.</string>
+    <string name="action_unreblog">حذف بازبوق</string>
+    <string name="action_unfavourite">حذف پسند</string>
+    <string name="action_delete_and_redraft">پاک کردن و بازنویسی</string>
+    <string name="action_view_domain_mutes">دامنه‌های پنهان</string>
+    <string name="action_add_poll">افزودن نظرسنجی</string>
+    <string name="action_mute_domain">بی‌صدا کردن %s</string>
+    <string name="action_add_tab">افزوده زبانه</string>
+    <string name="action_links">پیوندها</string>
+    <string name="action_mentions">اشاره‌ها</string>
+    <string name="action_hashtags">هشتگ‌ها</string>
+    <string name="action_open_reblogger">بازکردن حساب بازبوق کننده</string>
+    <string name="action_open_reblogged_by">نمایش بازبوق‌ها</string>
+    <string name="action_open_faved_by">نمایش پسندیده‌ها</string>
+
+    <string name="title_hashtags_dialog">هشتگ‌ها</string>
+    <string name="title_mentions_dialog">اشاره‌ها</string>
+    <string name="title_links_dialog">پیوندها</string>
+    <string name="action_open_media_n">بازکردن رسانه #%d</string>
+
+    <string name="action_open_as">باز کردن به عنوان %s</string>
+    <string name="action_share_as">هم‌رسانی به عنوان …</string>
+    <string name="download_media">بارگیری رسانه</string>
+    <string name="downloading_media">در حال بارگیری رسانه</string>
+
+    <string name="confirmation_domain_unmuted">%s ناپنهان</string>
+
+    <string name="dialog_redraft_toot_warning">می‌خواهید این بوق را پاک و بازنویسی کنید؟</string>
+    <string name="mute_domain_warning_dialog_ok">پنهان کردن تمام دامنه</string>
+
+    <string name="pref_title_notification_filter_poll">نظرسنجی‌های پایان یافته</string>
+    <string name="pref_title_timeline_filters">صافی‌ها</string>
+
+    <string name="app_theme_system">استفاده از طرح سیستم</string>
+
+    <string name="pref_title_language">زبان</string>
+    <string name="pref_title_bot_overlay">نمایش نشان برای بات‌ها</string>
+    <string name="pref_title_animate_gif_avatars">پویانمایی آواتار gif</string>
+
+    <string name="notification_poll_name">نظرسنجی‌ها</string>
+    <string name="notification_poll_description">اعلان‌ها درباره نظرسنجی‌هایی که پایان یافته‌اند</string>
+
+
+    <string name="about_tusky_version">Tusky (تاسکی) %s</string>
+    <string name="abbreviated_years_ago">%dسال</string>
+    <string name="abbreviated_days_ago">%dر</string>
+    <string name="abbreviated_hours_ago">%dس</string>
+    <string name="abbreviated_minutes_ago">%dد</string>
+    <string name="abbreviated_seconds_ago">%dث</string>
+
+    <string name="pref_title_alway_open_spoiler">همواره بوق‌هایی که دارای محتوای حساس هستند را گسترش بده</string>
+    <string name="pref_title_public_filter_keywords">خط زمانی عمومی</string>
+    <string name="pref_title_thread_filter_keywords">گفتگوها</string>
+    <string name="filter_addition_dialog_title">افزودن صافی</string>
+    <string name="filter_edit_dialog_title">ویرایش صافی</string>
+    <string name="filter_dialog_remove_button">پاک کردن</string>
+    <string name="filter_dialog_update_button">به‌روزرسانی</string>
+    <string name="filter_dialog_whole_word">تمام کلمه</string>
+    <string name="error_create_list">ناتوانی در ایجاد سیاهه</string>
+    <string name="error_rename_list">ناتوانی در تغییر نام سیاهه</string>
+    <string name="error_delete_list">ناتوانی در حذف سیاهه</string>
+    <string name="action_create_list">ایجاد یک سیاهه</string>
+    <string name="action_rename_list">تغییر نام سیاهه</string>
+    <string name="action_delete_list">حذف سیاهه</string>
+    <string name="action_edit_list">ویرایش سیاهه</string>
+    <string name="hint_search_people_list">جستجو بین افرادی که دنبال می‌کنید</string>
+    <string name="action_add_to_list">افزودن حساب به سیاهه</string>
+    <string name="action_remove_from_list">حذف حساب از سیاهه</string>
+
+    <string name="caption_notoemoji">مجموعه شکلک‌های جاری گوگل</string>
+
+    <string name="license_cc_by_4">CC-BY 4.0</string>
+    <string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
+
+    <plurals name="favs">
+	<item quantity="one"><b>%1$s</b> پسند</item>
+	<item quantity="other"><b>%1$s</b> پسند</item>
+</plurals>
+
+    <plurals name="reblogs">
+	<item quantity="one"><b>%s</b> بازبوق</item>
+	<item quantity="other"><b>%s</b> بازبوق</item>
+</plurals>
+
+    <string name="title_reblogged_by">بازبوق شده توسط</string>
+    <string name="title_favourited_by">پسننده‌شده توسط</string>
+
+    <string name="conversation_1_recipients">%1$s</string>
+    <string name="conversation_2_recipients">%1$s و %2$s</string>
+    <string name="conversation_more_recipients">%1$s، %2$s و %3$d بیشتر</string>
+    <string name="max_tab_number_reached">به بیشینه %1$d زبانه رسید</string>
+
+
+    <string name="description_status_media">رسانه: %s</string>
+    <string name="description_status_cw">هشدار محتوا: %s</string>
+    <string name="description_status_media_no_description_placeholder">بدون توضیحات</string>
+    <string name="description_status_reblogged">بازبوقیده</string>
+    <string name="description_status_favourited">پسندیده</string>
+    <string name="description_visiblity_public">عمومی</string>
+    <string name="description_visiblity_unlisted">فهرست‌نشده</string>
+    <string name="description_visiblity_private">دنبال‌کنندگان</string>
+    <string name="description_visiblity_direct">مستقیم</string>
+    <string name="description_poll">نظرسنجی با انتخاب‌ها: %1$s، %2$s، %3$s، %4$s؛ %5$s</string>
+
+    <string name="hint_list_name">نام سیاهه</string>
+
+    <string name="edit_hashtag_title">ویرایش هشتگ</string>
+    <string name="edit_hashtag_hint">هشتگ بدون #</string>
+    <string name="hashtag">هشتگ</string>
+    <string name="notifications_clear">پاک کردن</string>
+    <string name="notifications_apply_filter">صافی</string>
+    <string name="filter_apply">اعمال</string>
+
+    <string name="compose_shortcut_long_label">ایجاد بوق</string>
+    <string name="compose_shortcut_short_label">ایجاد</string>
+
+    <string name="notification_clear_text">مطمئنید که به طور دائمی می‌خواهید اعلان‌ها را پاک کنید؟</string>
+    <string name="compose_preview_image_description">کنش‌ها برای تصاویر %s</string>
+
+    <plurals name="poll_info_votes">
+	<item quantity="one">%s رای</item>
+	<item quantity="other">%s رای</item>
+</plurals>
+    <string name="poll_info_time_relative">%s باقی مانده</string>
+    <string name="poll_info_time_absolute">پایان یافته در %s</string>
+    <string name="poll_info_closed">بسته شده</string>
+    <string name="poll_vote">رای</string>
+
+    <string name="poll_ended_voted">یک نظرسنجی که در آن رای داده‌اید پایان یافته است</string>
+    <string name="poll_ended_created">یک نظرسنجی ساخته‌اید پایان یافته است</string>
+
+    <plurals name="poll_timespan_days">
+	<item quantity="one">%d روز</item>
+	<item quantity="other">%d روز</item>
+</plurals>
+    <plurals name="poll_timespan_hours">
+	<item quantity="one">%d ساعت</item>
+	<item quantity="other">%d ساعت</item>
+</plurals>
+    <plurals name="poll_timespan_minutes">
+	<item quantity="one">%d دقیقه</item>
+	<item quantity="other">%d دقیقه</item>
+</plurals>
+    <plurals name="poll_timespan_seconds">
+	<item quantity="one">%d ثانیه</item>
+	<item quantity="other">%d ثانیه</item>
+</plurals>
+
+    <string name="button_continue">ادامه</string>
+    <string name="button_back">قبل</string>
+    <string name="button_done">اتمام</string>
+    <string name="report_sent_success">با موفقیت گزارش شد @%s</string>
+    <string name="hint_additional_info">نظرات بیشتر</string>
+    <string name="report_remote_instance">هدایت به %s</string>
+    <string name="failed_report">ناتوانی در گزارش</string>
+    <string name="failed_fetch_statuses">ناتوانی در دریافت وضعیت‌ها</string>
+    <string name="title_accounts">حساب‌ها</string>
+    <string name="failed_search">ناتوانی در جستجو</string>
+
+    <string name="pref_title_show_notifications_filter">نمایش فیلتر اعلانات</string>
+
+
+    <string name="create_poll_title">نظرسنجی</string>
+    <string name="poll_duration_5_min">۵ دقیقه</string>
+    <string name="poll_duration_30_min">۳۰ دقیقه</string>
+    <string name="poll_duration_1_hour">۱ ساعت</string>
+    <string name="poll_duration_6_hours">۶ ساعت</string>
+    <string name="poll_duration_1_day">۱ روز</string>
+    <string name="poll_duration_3_days">۳ روز</string>
+    <string name="poll_duration_7_days">۷ روز</string>
+    <string name="add_poll_choice">افزودن گزینه</string>
+    <string name="poll_allow_multiple_choices">گزینه‌های چندگانه</string>
+    <string name="poll_new_choice_hint">گزینه %d</string>
+    <string name="edit_poll">ویرایش</string>
+
 </resources>

From ba91182b3008fcde8114972dfe779ff9513c4147 Mon Sep 17 00:00:00 2001
From: Vegard Skjefstad <vegard@vegard.net>
Date: Sun, 29 Sep 2019 04:08:23 +0000
Subject: [PATCH 16/21] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?=
 =?UTF-8?q?=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (7 of 7 strings)

Translation: Tusky/Tusky-app
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/nb_NO/
---
 fastlane/metadata/android/nb_NO/changelogs/68.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 fastlane/metadata/android/nb_NO/changelogs/68.txt

diff --git a/fastlane/metadata/android/nb_NO/changelogs/68.txt b/fastlane/metadata/android/nb_NO/changelogs/68.txt
new file mode 100644
index 000000000..5cfca4aca
--- /dev/null
+++ b/fastlane/metadata/android/nb_NO/changelogs/68.txt
@@ -0,0 +1,3 @@
+Tusky v9.1
+
+Denne versjonen sørger for kompatibilitet med Mastodon 3, og forbedrer ytelse og stabilitet.

From 5d68f4e7370f78e7375e96b1ec60b2da90fe7dc5 Mon Sep 17 00:00:00 2001
From: Mostafa Ahangarha <ahangarha@riseup.net>
Date: Mon, 30 Sep 2019 18:54:41 +0000
Subject: [PATCH 17/21] Translated using Weblate (Persian)

Currently translated at 85.7% (6 of 7 strings)

Translation: Tusky/Tusky-app
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/fa/
---
 fastlane/metadata/android/fa/changelogs/58.txt     | 11 +++++++++++
 fastlane/metadata/android/fa/changelogs/61.txt     |  7 +++++++
 fastlane/metadata/android/fa/changelogs/67.txt     |  9 +++++++++
 fastlane/metadata/android/fa/changelogs/68.txt     |  3 +++
 fastlane/metadata/android/fa/full_description.txt  | 12 ++++++++++++
 fastlane/metadata/android/fa/short_description.txt |  1 +
 fastlane/metadata/android/fa/title.txt             |  1 +
 7 files changed, 44 insertions(+)
 create mode 100644 fastlane/metadata/android/fa/changelogs/58.txt
 create mode 100644 fastlane/metadata/android/fa/changelogs/61.txt
 create mode 100644 fastlane/metadata/android/fa/changelogs/67.txt
 create mode 100644 fastlane/metadata/android/fa/changelogs/68.txt
 create mode 100644 fastlane/metadata/android/fa/full_description.txt
 create mode 100644 fastlane/metadata/android/fa/short_description.txt
 create mode 100644 fastlane/metadata/android/fa/title.txt

diff --git a/fastlane/metadata/android/fa/changelogs/58.txt b/fastlane/metadata/android/fa/changelogs/58.txt
new file mode 100644
index 000000000..9eda8dd95
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/58.txt
@@ -0,0 +1,11 @@
+تاسکی نسخه ۶٫۰
+
+- صافی‌های خط‌زمانی به ترجیحات حساب منتقل شده و با کارساز همگام خواهد شد
+- اکنون می‌توانید هشتگ سفارشی را به عنوان یک زبانه در رابط اصلی داشته باشید
+- سیاهه‌ها می‌توانند ویرایش شوند
+- امنیتی: حذف پشتیبانی برای TLS 1.0 و TLS 1.1، و افزودن پیشتیبانی برای TLS 1.3 روی اندروید ۶ به بالا
+- نمای ایجاد با شروع نگارش، شکلک‌های سفارشی پیشنهاد می‌دهد
+- سبک جدید «پیروی از سبک سیستم» در تنظیمات
+- بهبود دسترس‌پذییری خط‌زمانی
+- تاسکی اکنون اعلان‌های ناشناس را نادیده می‌گید و دیگر فرونمی‌پاشد
+-
diff --git a/fastlane/metadata/android/fa/changelogs/61.txt b/fastlane/metadata/android/fa/changelogs/61.txt
new file mode 100644
index 000000000..e666ddc28
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/61.txt
@@ -0,0 +1,7 @@
+تاسکی نسخه ۷٫۰
+
+- پشتیبانی از نمایش نظرسنجی‌ها، رای‌ها و اعلان‌های مربوط به نظرسنجی
+- دکمه جدید برای از صافی گذراندن زبانه اعلان و برای پاک کردن همه اعلان‌ها
+- امکان پاک کردن و بازنویسی بوق‌تان
+- علامت جدید روی تصویر نمایه که نشان می‌دهد یک حساب، بات است یا نه (قابل غیرفعال‌سازی در ترجیحات)
+- ترجمه‌های جدید: زبان‌های نروژی و اسلونیایی.
diff --git a/fastlane/metadata/android/fa/changelogs/67.txt b/fastlane/metadata/android/fa/changelogs/67.txt
new file mode 100644
index 000000000..41d522e10
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/67.txt
@@ -0,0 +1,9 @@
+تاسکی نسخه ۹٫۰
+
+- می‌توانید داخل تاسکی، نظرسنجی ایجاد کنید
+- بهبود جستجو
+- گزینه جدید در ترجیحات حساب برای اینکه همواره بوق‌های دارای محتوای حساس کامل نمایش داده شوند
+- آواتارها در کشوی ناوبری اکنون به صورت مربع دارای لبه‌های گرد دیده می‌شوند
+- اکنون امکان گزارش کاربرانی که هیچ بوقی ندارند فراهم شده است
+- تاسکی اکنون از اتصال غیر ایمن در اندروید ۶ سربازمی‌زند
+- به همراه بسیاری بهبودها و رفع اشکالات
diff --git a/fastlane/metadata/android/fa/changelogs/68.txt b/fastlane/metadata/android/fa/changelogs/68.txt
new file mode 100644
index 000000000..56c36c0d1
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/68.txt
@@ -0,0 +1,3 @@
+تاسکی نسخه ۹٫۱
+
+این نسخه، سازگاری با ماستودون ۳ را تامین کرده و دارای بهبود عملکرد و پایداری است.
diff --git a/fastlane/metadata/android/fa/full_description.txt b/fastlane/metadata/android/fa/full_description.txt
new file mode 100644
index 000000000..ca5520bda
--- /dev/null
+++ b/fastlane/metadata/android/fa/full_description.txt
@@ -0,0 +1,12 @@
+تاسکی یک کارخواه سبک برای ماستودون (کارساز شبکه احتماعی آزاد و متن‌باز) است.
+
+• دارای طراحی متریال
+• اکثر APIهای ماستودون پیاده‌سازی شده است
+• پشتیبانی از چند حساب
+• پشتیبانی از سبک تیره و روشن با امکان تنظیم تغییر خودکار بر اساس ساعت روز
+• پشتیبانی از پیش‌نویس - امکان نوشتن بوق‌ها و ذخیره‌شان برای بعد
+• امکان انتخاب از بین انواع شکلک
+• بهینه‌سازی‌شده برای صفحه‌هایی با اندازه‌های مختلف
+• کاملا آزاد و متن‌باز - بدون وابستگی‌های غیرآزاد به خدمات گوگل
+
+برای دریافت اطلاعات بیشتر درباره ماستودون https://joinmastodon.org را ببینید
diff --git a/fastlane/metadata/android/fa/short_description.txt b/fastlane/metadata/android/fa/short_description.txt
new file mode 100644
index 000000000..37ab16ac1
--- /dev/null
+++ b/fastlane/metadata/android/fa/short_description.txt
@@ -0,0 +1 @@
+یک کارخواه چندحسابی برای شبکه اجتماعی ماستودون
diff --git a/fastlane/metadata/android/fa/title.txt b/fastlane/metadata/android/fa/title.txt
new file mode 100644
index 000000000..57a4e8902
--- /dev/null
+++ b/fastlane/metadata/android/fa/title.txt
@@ -0,0 +1 @@
+تاسکی

From fe304b4e83f7a70c78ec2e628ca8a11074d56b10 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Tue, 1 Oct 2019 18:24:09 +0200
Subject: [PATCH 18/21] fix videos not always keeping aspect ratio (#1508)

---
 app/src/main/AndroidManifest.xml              |  1 -
 .../tusky/fragment/ViewVideoFragment.kt       | 27 +++++++++++-----
 .../main/res/layout/fragment_view_video.xml   | 31 +++++++++----------
 3 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 16bbd3bae..0dd19c4c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -103,7 +103,6 @@
         <activity android:name=".ViewTagActivity" />
         <activity
             android:name=".ViewMediaActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
             android:theme="@style/TuskyBaseTheme" />
         <activity
             android:name=".AccountActivity"
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
index fd907c205..340361072 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
@@ -50,7 +50,7 @@ class ViewVideoFragment : ViewMediaFragment() {
     override fun setUserVisibleHint(isVisibleToUser: Boolean) {
         // Start/pause/resume video playback as fragment is shown/hidden
         super.setUserVisibleHint(isVisibleToUser)
-        if (videoPlayer == null) {
+        if (videoView == null) {
             return
         }
 
@@ -58,10 +58,10 @@ class ViewVideoFragment : ViewMediaFragment() {
             if (mediaActivity.isToolbarVisible) {
                 handler.postDelayed(hideToolbar, TOOLBAR_HIDE_DELAY_MS)
             }
-            videoPlayer.start()
+            videoView.start()
         } else {
             handler.removeCallbacks(hideToolbar)
-            videoPlayer.pause()
+            videoView.pause()
             mediaController.hide()
         }
     }
@@ -69,18 +69,31 @@ class ViewVideoFragment : ViewMediaFragment() {
     @SuppressLint("ClickableViewAccessibility")
     override fun setupMediaView(url: String, previewUrl: String?) {
         descriptionView = mediaDescription
-        val videoView = videoPlayer
+
         videoView.transitionName = url
         videoView.setVideoPath(url)
         mediaController = MediaController(mediaActivity)
-        mediaController.setMediaPlayer(videoPlayer)
-        videoPlayer.setMediaController(mediaController)
+        mediaController.setMediaPlayer(videoView)
+        videoView.setMediaController(mediaController)
         videoView.requestFocus()
         videoView.setOnTouchListener { _, _ ->
             mediaActivity.onPhotoTap()
             false
         }
         videoView.setOnPreparedListener { mp ->
+            val containerWidth = videoContainer.measuredWidth.toFloat()
+            val containerHeight = videoContainer.measuredHeight.toFloat()
+            val videoWidth = mp.videoWidth.toFloat()
+            val videoHeight = mp.videoHeight.toFloat()
+
+            if(containerWidth/containerHeight > videoWidth/videoHeight) {
+                videoView.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+                videoView.layoutParams.width = ViewGroup.LayoutParams.WRAP_CONTENT
+            } else {
+                videoView.layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT
+                videoView.layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT
+            }
+
             progressBar.hide()
             mp.isLooping = true
             if (arguments!!.getBoolean(ARG_START_POSTPONED_TRANSITION)) {
@@ -117,7 +130,7 @@ class ViewVideoFragment : ViewMediaFragment() {
     }
 
     override fun onToolbarVisibilityChange(visible: Boolean) {
-        if (videoPlayer == null || !userVisibleHint) {
+        if (videoView == null || !userVisibleHint) {
             return
         }
 
diff --git a/app/src/main/res/layout/fragment_view_video.xml b/app/src/main/res/layout/fragment_view_video.xml
index 3c8afbce4..0247a9cb3 100644
--- a/app/src/main/res/layout/fragment_view_video.xml
+++ b/app/src/main/res/layout/fragment_view_video.xml
@@ -1,46 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_gravity="center"
+    android:id="@+id/videoContainer"
     android:clickable="true"
     android:focusable="true">
 
-    <VideoView
-        android:id="@+id/videoPlayer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_gravity="center"
-        />
-
     <TextView
         android:id="@+id/mediaDescription"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="?attr/actionBarSize"
-        app:layout_constraintTop_toTopOf="parent"
         android:background="#60000000"
         android:lineSpacingMultiplier="1.1"
         android:padding="8dp"
         android:textAlignment="center"
         android:textColor="#eee"
         android:textSize="?attr/status_text_medium"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="Some media description" />
 
+    <VideoView
+        android:id="@+id/videoView"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <ProgressBar
         android:id="@+id/progressBar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_gravity="center" />
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 8a2d583b83fc8d31e61229804d767bb4399ce125 Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Tue, 1 Oct 2019 18:49:34 +0200
Subject: [PATCH 19/21] fix AccountActivity scroll animation again

---
 .../com/keylesspalace/tusky/AccountActivity.kt     | 14 +++++++-------
 app/src/main/res/layout/activity_account.xml       |  4 +---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
index f207bb207..e1d2f3ba6 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
@@ -227,26 +227,27 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
 
         // Setup the toolbar.
         setSupportActionBar(accountToolbar)
-        supportActionBar?.title = null
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        supportActionBar?.setDisplayShowHomeEnabled(true)
+        supportActionBar?.run {
+            setDisplayHomeAsUpEnabled(true)
+            setDisplayShowHomeEnabled(true)
+            setDisplayShowTitleEnabled(false)
+        }
 
         ThemeUtils.setDrawableTint(this, accountToolbar.navigationIcon, R.attr.account_toolbar_icon_tint_uncollapsed)
         ThemeUtils.setDrawableTint(this, accountToolbar.overflowIcon, R.attr.account_toolbar_icon_tint_uncollapsed)
 
         // Add a listener to change the toolbar icon color when it enters/exits its collapsed state.
         accountAppBarLayout.addOnOffsetChangedListener(object : AppBarLayout.OnOffsetChangedListener {
-            var priorOffset = 0
 
             @AttrRes
             var priorAttribute = R.attr.account_toolbar_icon_tint_uncollapsed
 
             override fun onOffsetChanged(appBarLayout: AppBarLayout, verticalOffset: Int) {
 
-                if(verticalOffset == priorOffset) {
+                if(verticalOffset == oldOffset) {
                     return
                 }
-                priorOffset = verticalOffset
+                oldOffset = verticalOffset
 
                 @AttrRes val attribute = if (titleVisibleHeight + verticalOffset < 0) {
                     supportActionBar?.setDisplayShowTitleEnabled(true)
@@ -272,7 +273,6 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
                         accountFloatingActionButton.hide()
                     }
                 }
-                oldOffset = verticalOffset
 
                 val scaledAvatarSize = (avatarSize + verticalOffset) / avatarSize
 
diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
index c0311c9b0..e0ba686de 100644
--- a/app/src/main/res/layout/activity_account.xml
+++ b/app/src/main/res/layout/activity_account.xml
@@ -17,6 +17,7 @@
             android:id="@+id/accountAppBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?android:colorBackground"
             android:elevation="@dimen/actionbar_elevation">
 
             <com.google.android.material.appbar.CollapsingToolbarLayout
@@ -232,7 +233,6 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="8dp"
-
                             android:fontFamily="sans-serif-medium"
                             android:textColor="@color/account_tab_font_color"
                             android:textSize="?attr/status_text_medium"
@@ -293,7 +293,6 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="8dp"
-                            android:background="@android:color/transparent"
                             android:fontFamily="sans-serif-medium"
                             android:textColor="@color/account_tab_font_color"
                             android:textSize="?attr/status_text_medium"
@@ -327,7 +326,6 @@
                 style="@style/TuskyTabAppearance"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-
                 android:background="?android:colorBackground"
                 app:tabGravity="center"
                 app:tabMode="scrollable"

From a6b9d2f67ec1734a4cad49a5bf1bbc1e5da4db92 Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Tue, 1 Oct 2019 18:58:55 +0200
Subject: [PATCH 20/21] Release 68

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 12c82f38f..27f4916e6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
         applicationId "com.keylesspalace.tusky"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 67
-        versionName "9.0"
+        versionCode 68
+        versionName "9.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
 

From 9e4c19a47e29719ff73f82ca166cb7c4101f9e9b Mon Sep 17 00:00:00 2001
From: kyori19 <kyori.dis@gmail.com>
Date: Thu, 3 Oct 2019 04:28:12 +0900
Subject: [PATCH 21/21] Scheduled toot (#1004)

* Scheduled toot

* Hide scheduled toot button if version < 2.7.0

* Fix timeline reloading after toot

* Add edit icon to ComposeScheduleView

* Add button to reset scheduled toot

* Close bottom sheet and change button color after time a was selected

* Fix edit icon's size

* List of scheduled toots

* Fix instance version check

* Use MaterialDatePicker

* Set date and time consecutively

* Add licenses
---
 app/build.gradle                              |   2 +-
 app/src/main/AndroidManifest.xml              |   1 +
 .../keylesspalace/tusky/ComposeActivity.java  | 126 +++++++++---
 .../com/keylesspalace/tusky/MainActivity.java |  30 +--
 .../tusky/ScheduledTootActivity.kt            | 166 ++++++++++++++++
 .../tusky/adapter/ScheduledTootAdapter.java   | 125 ++++++++++++
 .../keylesspalace/tusky/appstore/Events.kt    |   1 +
 .../tusky/di/ActivitiesModule.kt              |   3 +
 .../keylesspalace/tusky/entity/NewStatus.kt   |   1 +
 .../tusky/entity/ScheduledStatus.kt           |  25 +++
 .../tusky/entity/StatusParams.kt              |  26 +++
 .../tusky/fragment/TimePickerFragment.java    |  53 +++++
 .../tusky/network/MastodonApi.kt              |  22 +--
 .../receiver/SendStatusBroadcastReceiver.kt   |   3 +-
 .../tusky/service/SendTootService.kt          |  12 +-
 .../tusky/util/VersionUtils.java              |  42 ++++
 .../tusky/view/ComposeScheduleView.java       | 187 ++++++++++++++++++
 .../res/drawable-anydpi/ic_access_time.xml    |   9 +
 app/src/main/res/layout/activity_compose.xml  |  25 +++
 .../res/layout/activity_scheduled_toot.xml    |  53 +++++
 .../main/res/layout/item_scheduled_toot.xml   |  40 ++++
 .../main/res/layout/view_compose_schedule.xml |  31 +++
 app/src/main/res/values/strings.xml           |   6 +
 23 files changed, 933 insertions(+), 56 deletions(-)
 create mode 100644 app/src/main/java/com/keylesspalace/tusky/ScheduledTootActivity.kt
 create mode 100644 app/src/main/java/com/keylesspalace/tusky/adapter/ScheduledTootAdapter.java
 create mode 100644 app/src/main/java/com/keylesspalace/tusky/entity/ScheduledStatus.kt
 create mode 100644 app/src/main/java/com/keylesspalace/tusky/entity/StatusParams.kt
 create mode 100644 app/src/main/java/com/keylesspalace/tusky/fragment/TimePickerFragment.java
 create mode 100644 app/src/main/java/com/keylesspalace/tusky/util/VersionUtils.java
 create mode 100644 app/src/main/java/com/keylesspalace/tusky/view/ComposeScheduleView.java
 create mode 100644 app/src/main/res/drawable-anydpi/ic_access_time.xml
 create mode 100644 app/src/main/res/layout/activity_scheduled_toot.xml
 create mode 100644 app/src/main/res/layout/item_scheduled_toot.xml
 create mode 100644 app/src/main/res/layout/view_compose_schedule.xml

diff --git a/app/build.gradle b/app/build.gradle
index 27f4916e6..ae6dda088 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -100,7 +100,7 @@ dependencies {
     implementation 'androidx.browser:browser:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation 'com.google.android.material:material:1.1.0-alpha05'
+    implementation 'com.google.android.material:material:1.1.0-alpha10'
     implementation 'androidx.exifinterface:exifinterface:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.preference:preference:1.1.0-alpha04'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0dd19c4c4..edc4856e4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -135,6 +135,7 @@
             android:name=".components.report.ReportActivity"
             android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
         <activity android:name=".components.instancemute.InstanceListActivity" />
+        <activity android:name=".ScheduledTootActivity" />
 
         <receiver android:name=".receiver.NotificationClearBroadcastReceiver" />
         <receiver
diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index e34802e3f..c1ab87a69 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -17,7 +17,9 @@ package com.keylesspalace.tusky;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
+import android.app.DatePickerDialog;
 import android.app.ProgressDialog;
+import android.app.TimePickerDialog;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -55,14 +57,35 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.webkit.MimeTypeMap;
 import android.widget.Button;
+import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 import android.widget.TextView;
+import android.widget.TimePicker;
 import android.widget.Toast;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Px;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
+import androidx.core.view.inputmethod.InputConnectionCompat;
+import androidx.core.view.inputmethod.InputContentInfoCompat;
+import androidx.lifecycle.Lifecycle;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.transition.TransitionManager;
+
 import com.bumptech.glide.Glide;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.snackbar.Snackbar;
@@ -95,9 +118,11 @@ import com.keylesspalace.tusky.util.SaveTootHelper;
 import com.keylesspalace.tusky.util.SpanUtilsKt;
 import com.keylesspalace.tusky.util.StringUtils;
 import com.keylesspalace.tusky.util.ThemeUtils;
+import com.keylesspalace.tusky.util.VersionUtils;
 import com.keylesspalace.tusky.view.AddPollDialog;
 import com.keylesspalace.tusky.view.ComposeOptionsListener;
 import com.keylesspalace.tusky.view.ComposeOptionsView;
+import com.keylesspalace.tusky.view.ComposeScheduleView;
 import com.keylesspalace.tusky.view.EditTextTyped;
 import com.keylesspalace.tusky.view.PollPreviewView;
 import com.keylesspalace.tusky.view.ProgressImageView;
@@ -123,25 +148,6 @@ import java.util.concurrent.CountDownLatch;
 
 import javax.inject.Inject;
 
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.Px;
-import androidx.annotation.StringRes;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.core.content.FileProvider;
-import androidx.core.view.inputmethod.InputConnectionCompat;
-import androidx.core.view.inputmethod.InputContentInfoCompat;
-import androidx.lifecycle.Lifecycle;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.transition.TransitionManager;
-
 import at.connyduck.sparkbutton.helpers.Utils;
 import io.reactivex.Single;
 import io.reactivex.SingleObserver;
@@ -169,7 +175,8 @@ public final class ComposeActivity
         implements ComposeOptionsListener,
         ComposeAutoCompleteAdapter.AutocompletionProvider,
         OnEmojiSelectedListener,
-        Injectable, InputConnectionCompat.OnCommitContentListener {
+        Injectable, InputConnectionCompat.OnCommitContentListener,
+        TimePickerDialog.OnTimeSetListener {
 
     private static final String TAG = "ComposeActivity"; // logging tag
     static final int STATUS_CHARACTER_LIMIT = 500;
@@ -192,6 +199,7 @@ public final class ComposeActivity
     private static final String REPLYING_STATUS_AUTHOR_USERNAME_EXTRA = "replying_author_nickname_extra";
     private static final String REPLYING_STATUS_CONTENT_EXTRA = "replying_status_content";
     private static final String MEDIA_ATTACHMENTS_EXTRA = "media_attachments";
+    private static final String SCHEDULED_AT_EXTRA = "scheduled_at";
     private static final String SENSITIVE_EXTRA = "sensitive";
     private static final String POLL_EXTRA = "poll";
     // Mastodon only counts URLs as this long in terms of status character limits
@@ -217,6 +225,7 @@ public final class ComposeActivity
     private ImageButton contentWarningButton;
     private ImageButton emojiButton;
     private ImageButton hideMediaToggle;
+    private ImageButton scheduleButton;
     private TextView actionAddPoll;
     private Button atButton;
     private Button hashButton;
@@ -225,6 +234,8 @@ public final class ComposeActivity
     private BottomSheetBehavior composeOptionsBehavior;
     private BottomSheetBehavior addMediaBehavior;
     private BottomSheetBehavior emojiBehavior;
+    private BottomSheetBehavior scheduleBehavior;
+    private ComposeScheduleView scheduleView;
     private RecyclerView emojiView;
 
     private PollPreviewView pollPreview;
@@ -278,6 +289,8 @@ public final class ComposeActivity
         contentWarningButton = findViewById(R.id.composeContentWarningButton);
         emojiButton = findViewById(R.id.composeEmojiButton);
         hideMediaToggle = findViewById(R.id.composeHideMediaButton);
+        scheduleButton = findViewById(R.id.composeScheduleButton);
+        scheduleView = findViewById(R.id.composeScheduleView);
         emojiView = findViewById(R.id.emojiView);
         emojiList = Collections.emptyList();
         atButton = findViewById(R.id.atButton);
@@ -361,6 +374,8 @@ public final class ComposeActivity
 
         addMediaBehavior = BottomSheetBehavior.from(findViewById(R.id.addMediaBottomSheet));
 
+        scheduleBehavior = BottomSheetBehavior.from(scheduleView);
+
         emojiBehavior = BottomSheetBehavior.from(emojiView);
 
         emojiView.setLayoutManager(new GridLayoutManager(this, 3, GridLayoutManager.HORIZONTAL, false));
@@ -374,6 +389,8 @@ public final class ComposeActivity
         contentWarningButton.setOnClickListener(v -> onContentWarningChanged());
         emojiButton.setOnClickListener(v -> showEmojis());
         hideMediaToggle.setOnClickListener(v -> toggleHideMedia());
+        scheduleButton.setOnClickListener(v -> showScheduleView());
+        scheduleView.setResetOnClickListener(v -> resetSchedule());
         atButton.setOnClickListener(v -> atButtonClicked());
         hashButton.setOnClickListener(v -> hashButtonClicked());
 
@@ -521,6 +538,11 @@ public final class ComposeActivity
                 replyContentTextView.setText(intent.getStringExtra(REPLYING_STATUS_CONTENT_EXTRA));
             }
 
+            String scheduledAt = intent.getStringExtra(SCHEDULED_AT_EXTRA);
+            if (!TextUtils.isEmpty(scheduledAt)) {
+                scheduleView.setDateTime(scheduledAt);
+            }
+
             statusMarkSensitive = intent.getBooleanExtra(SENSITIVE_EXTRA, statusMarkSensitive);
 
             if(intent.hasExtra(POLL_EXTRA) && (mediaAttachments == null || mediaAttachments.size() == 0)) {
@@ -536,6 +558,7 @@ public final class ComposeActivity
         setStatusVisibility(startingVisibility);
 
         updateHideMediaToggle();
+        updateScheduleButton();
         updateVisibleCharactersLeft();
 
         // Setup the main text field.
@@ -799,11 +822,22 @@ public final class ComposeActivity
         }
     }
 
+    private void updateScheduleButton() {
+        @ColorInt int color;
+        if(scheduleView.getTime() == null) {
+            color = ThemeUtils.getColor(this, android.R.attr.textColorTertiary);
+        } else {
+            color = ContextCompat.getColor(this, R.color.tusky_blue);
+        }
+        scheduleButton.getDrawable().setColorFilter(color, PorterDuff.Mode.SRC_IN);
+    }
+
     private void disableButtons() {
         pickButton.setClickable(false);
         visibilityButton.setClickable(false);
         emojiButton.setClickable(false);
         hideMediaToggle.setClickable(false);
+        scheduleButton.setClickable(false);
         tootButton.setEnabled(false);
     }
 
@@ -812,6 +846,7 @@ public final class ComposeActivity
         visibilityButton.setClickable(true);
         emojiButton.setClickable(true);
         hideMediaToggle.setClickable(true);
+        scheduleButton.setClickable(true);
         tootButton.setEnabled(true);
     }
 
@@ -859,12 +894,23 @@ public final class ComposeActivity
             composeOptionsBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
             addMediaBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
             emojiBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
-
+            scheduleBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
         } else {
             composeOptionsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
         }
     }
 
+    private void showScheduleView() {
+        if (scheduleBehavior.getState() == BottomSheetBehavior.STATE_HIDDEN || scheduleBehavior.getState() == BottomSheetBehavior.STATE_COLLAPSED) {
+            scheduleBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+            composeOptionsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+            addMediaBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+            emojiBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+        } else {
+            scheduleBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+        }
+    }
+
     private void showEmojis() {
 
         if (emojiView.getAdapter() != null) {
@@ -876,7 +922,7 @@ public final class ComposeActivity
                     emojiBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
                     composeOptionsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
                     addMediaBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
-
+                    scheduleBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
                 } else {
                     emojiBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
                 }
@@ -891,7 +937,7 @@ public final class ComposeActivity
             addMediaBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
             composeOptionsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
             emojiBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
-
+            scheduleBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
         } else {
             addMediaBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
         }
@@ -1084,7 +1130,8 @@ public final class ComposeActivity
         }
 
         Intent sendIntent = SendTootService.sendTootIntent(this, content, spoilerText,
-                visibility, !mediaUris.isEmpty() && sensitive, mediaIds, mediaUris, mediaDescriptions, inReplyToId, poll,
+                visibility, !mediaUris.isEmpty() && sensitive, mediaIds, mediaUris, mediaDescriptions,
+                scheduleView.getTime(), inReplyToId, poll,
                 getIntent().getStringExtra(REPLYING_STATUS_CONTENT_EXTRA),
                 getIntent().getStringExtra(REPLYING_STATUS_AUTHOR_USERNAME_EXTRA),
                 getIntent().getStringExtra(SAVED_JSON_URLS_EXTRA),
@@ -1744,10 +1791,12 @@ public final class ComposeActivity
         // Acting like a teen: deliberately ignoring parent.
         if (composeOptionsBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED ||
                 addMediaBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED ||
-                emojiBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {
+                emojiBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED ||
+                scheduleBehavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {
             composeOptionsBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
             addMediaBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
             emojiBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+            scheduleBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
             return;
         }
 
@@ -1947,6 +1996,10 @@ public final class ComposeActivity
                 updateVisibleCharactersLeft();
             }
 
+            if (!new VersionUtils(instance.getVersion()).supportsScheduledToots()) {
+                scheduleButton.setVisibility(View.GONE);
+            }
+
             if (instance.getPollLimits() != null) {
                 maxPollOptions = instance.getPollLimits().getMaxOptions();
                 maxPollOptionLength = instance.getPollLimits().getMaxOptionChars();
@@ -2048,6 +2101,19 @@ public final class ComposeActivity
         }
     }
 
+    @Override
+    public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
+        scheduleView.onTimeSet(hourOfDay, minute);
+        updateScheduleButton();
+        scheduleBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+    }
+
+    public void resetSchedule() {
+        scheduleView.resetSchedule();
+        updateScheduleButton();
+        scheduleBehavior.setState(BottomSheetBehavior.STATE_HIDDEN);
+    }
+
     public static final class IntentBuilder {
         @Nullable
         private Integer savedTootUid;
@@ -2074,6 +2140,8 @@ public final class ComposeActivity
         @Nullable
         private ArrayList<Attachment> mediaAttachments;
         @Nullable
+        private String scheduledAt;
+        @Nullable
         private Boolean sensitive;
         @Nullable
         private NewPoll poll;
@@ -2138,6 +2206,11 @@ public final class ComposeActivity
             return this;
         }
 
+        public IntentBuilder scheduledAt(String scheduledAt) {
+            this.scheduledAt = scheduledAt;
+            return this;
+        }
+
         public IntentBuilder sensitive(boolean sensitive) {
             this.sensitive = sensitive;
             return this;
@@ -2188,6 +2261,9 @@ public final class ComposeActivity
             if (mediaAttachments != null) {
                 intent.putParcelableArrayListExtra(MEDIA_ATTACHMENTS_EXTRA, mediaAttachments);
             }
+            if (scheduledAt != null) {
+                intent.putExtra(SCHEDULED_AT_EXTRA, scheduledAt);
+            }
             if (sensitive != null) {
                 intent.putExtra(SENSITIVE_EXTRA, sensitive);
             }
diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
index de12e4e35..c10bbff84 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java
@@ -15,26 +15,11 @@
 
 package com.keylesspalace.tusky;
 
-import androidx.lifecycle.Lifecycle;
-
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-
-import com.bumptech.glide.Glide;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.tabs.TabLayout;
-
-import androidx.emoji.text.EmojiCompat;
-import androidx.fragment.app.Fragment;
-import androidx.core.content.ContextCompat;
-import androidx.viewpager.widget.ViewPager;
-import androidx.appcompat.app.AlertDialog;
-
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -42,6 +27,17 @@ import android.view.KeyEvent;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.content.ContextCompat;
+import androidx.emoji.text.EmojiCompat;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Lifecycle;
+import androidx.viewpager.widget.ViewPager;
+
+import com.bumptech.glide.Glide;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.tabs.TabLayout;
 import com.keylesspalace.tusky.appstore.CacheUpdater;
 import com.keylesspalace.tusky.appstore.EventHub;
 import com.keylesspalace.tusky.appstore.MainTabsChangedEvent;
@@ -101,6 +97,7 @@ public final class MainActivity extends BottomSheetActivity implements ActionBut
     private static final long DRAWER_ITEM_ABOUT = 7;
     private static final long DRAWER_ITEM_LOG_OUT = 8;
     private static final long DRAWER_ITEM_FOLLOW_REQUESTS = 9;
+    private static final long DRAWER_ITEM_SCHEDULED_TOOT = 10;
     public static final String STATUS_URL = "statusUrl";
 
     @Inject
@@ -391,6 +388,7 @@ public final class MainActivity extends BottomSheetActivity implements ActionBut
         listItems.add(new PrimaryDrawerItem().withIdentifier(DRAWER_ITEM_LISTS).withName(R.string.action_lists).withSelectable(false).withIcon(GoogleMaterial.Icon.gmd_list));
         listItems.add(new PrimaryDrawerItem().withIdentifier(DRAWER_ITEM_SEARCH).withName(R.string.action_search).withSelectable(false).withIcon(GoogleMaterial.Icon.gmd_search));
         listItems.add(new PrimaryDrawerItem().withIdentifier(DRAWER_ITEM_SAVED_TOOT).withName(R.string.action_access_saved_toot).withSelectable(false).withIcon(R.drawable.ic_notebook).withIconTintingEnabled(true));
+        listItems.add(new PrimaryDrawerItem().withIdentifier(DRAWER_ITEM_SCHEDULED_TOOT).withName(R.string.action_access_scheduled_toot).withSelectable(false).withIcon(R.drawable.ic_access_time).withIconTintingEnabled(true));
         listItems.add(new DividerDrawerItem());
         listItems.add(new SecondaryDrawerItem().withIdentifier(DRAWER_ITEM_ACCOUNT_SETTINGS).withName(R.string.action_view_account_preferences).withSelectable(false).withIcon(R.drawable.ic_account_settings).withIconTintingEnabled(true));
         listItems.add(new SecondaryDrawerItem().withIdentifier(DRAWER_ITEM_SETTINGS).withName(R.string.action_view_preferences).withSelectable(false).withIcon(GoogleMaterial.Icon.gmd_settings));
@@ -433,6 +431,8 @@ public final class MainActivity extends BottomSheetActivity implements ActionBut
                         } else if (drawerItemIdentifier == DRAWER_ITEM_SAVED_TOOT) {
                             Intent intent = new Intent(MainActivity.this, SavedTootActivity.class);
                             startActivityWithSlideInAnimation(intent);
+                        } else if (drawerItemIdentifier == DRAWER_ITEM_SCHEDULED_TOOT) {
+                            startActivityWithSlideInAnimation(ScheduledTootActivity.newIntent(this));
                         } else if (drawerItemIdentifier == DRAWER_ITEM_LISTS) {
                             startActivityWithSlideInAnimation(ListsActivity.newIntent(this));
                         }
diff --git a/app/src/main/java/com/keylesspalace/tusky/ScheduledTootActivity.kt b/app/src/main/java/com/keylesspalace/tusky/ScheduledTootActivity.kt
new file mode 100644
index 000000000..a7de7a2bf
--- /dev/null
+++ b/app/src/main/java/com/keylesspalace/tusky/ScheduledTootActivity.kt
@@ -0,0 +1,166 @@
+package com.keylesspalace.tusky
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.widget.Toolbar
+import androidx.lifecycle.Lifecycle
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.keylesspalace.tusky.adapter.ScheduledTootAdapter
+import com.keylesspalace.tusky.appstore.EventHub
+import com.keylesspalace.tusky.appstore.StatusScheduledEvent
+import com.keylesspalace.tusky.di.Injectable
+import com.keylesspalace.tusky.entity.ScheduledStatus
+import com.keylesspalace.tusky.network.MastodonApi
+import com.keylesspalace.tusky.util.hide
+import com.keylesspalace.tusky.util.show
+import com.uber.autodispose.AutoDispose.autoDisposable
+import com.uber.autodispose.android.lifecycle.AndroidLifecycleScopeProvider.from
+import io.reactivex.android.schedulers.AndroidSchedulers
+import kotlinx.android.synthetic.main.activity_scheduled_toot.*
+import okhttp3.ResponseBody
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+import javax.inject.Inject
+
+
+class ScheduledTootActivity : BaseActivity(), ScheduledTootAdapter.ScheduledTootAction, Injectable {
+
+    companion object {
+        @JvmStatic
+        fun newIntent(context: Context): Intent {
+            return Intent(context, ScheduledTootActivity::class.java)
+        }
+    }
+
+    lateinit var adapter: ScheduledTootAdapter
+
+    @Inject
+    lateinit var mastodonApi: MastodonApi
+    @Inject
+    lateinit var eventHub: EventHub
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_scheduled_toot)
+
+        val toolbar = findViewById<Toolbar>(R.id.toolbar)
+
+        setSupportActionBar(toolbar)
+        val bar = supportActionBar
+        if (bar != null) {
+            bar.title = getString(R.string.title_scheduled_toot)
+            bar.setDisplayHomeAsUpEnabled(true)
+            bar.setDisplayShowHomeEnabled(true)
+        }
+
+        swipe_refresh_layout.setOnRefreshListener(this::refreshStatuses)
+
+        scheduled_toot_list.setHasFixedSize(true)
+        val layoutManager = LinearLayoutManager(this)
+        scheduled_toot_list.layoutManager = layoutManager
+        val divider = DividerItemDecoration(this, layoutManager.orientation)
+        scheduled_toot_list.addItemDecoration(divider)
+        adapter = ScheduledTootAdapter(this)
+        scheduled_toot_list.adapter = adapter
+
+        loadStatuses()
+
+        eventHub.events
+                .observeOn(AndroidSchedulers.mainThread())
+                .`as`(autoDisposable(from(this, Lifecycle.Event.ON_DESTROY)))
+                .subscribe { event ->
+                    if (event is StatusScheduledEvent) {
+                        refreshStatuses()
+                    }
+                }
+    }
+
+    fun loadStatuses() {
+        progress_bar.visibility = View.VISIBLE
+        mastodonApi.scheduledStatuses()
+                .enqueue(object : Callback<List<ScheduledStatus>> {
+                    override fun onResponse(call: Call<List<ScheduledStatus>>, response: Response<List<ScheduledStatus>>) {
+                        progress_bar.visibility = View.GONE
+                        if (response.body().isNullOrEmpty()) {
+                            errorMessageView.show()
+                            errorMessageView.setup(R.drawable.elephant_friend_empty, R.string.message_empty,
+                                    null)
+                        } else {
+                            show(response.body()!!)
+                        }
+                    }
+
+                    override fun onFailure(call: Call<List<ScheduledStatus>>, t: Throwable) {
+                        progress_bar.visibility = View.GONE
+                        errorMessageView.show()
+                        errorMessageView.setup(R.drawable.elephant_error, R.string.error_generic) {
+                            errorMessageView.hide()
+                            loadStatuses()
+                        }
+                    }
+                })
+    }
+
+    private fun refreshStatuses() {
+        swipe_refresh_layout.isRefreshing = true
+        mastodonApi.scheduledStatuses()
+                .enqueue(object : Callback<List<ScheduledStatus>> {
+                    override fun onResponse(call: Call<List<ScheduledStatus>>, response: Response<List<ScheduledStatus>>) {
+                        swipe_refresh_layout.isRefreshing = false
+                        if (response.body().isNullOrEmpty()) {
+                            errorMessageView.show()
+                            errorMessageView.setup(R.drawable.elephant_friend_empty, R.string.message_empty,
+                                    null)
+                        } else {
+                            show(response.body()!!)
+                        }
+                    }
+
+                    override fun onFailure(call: Call<List<ScheduledStatus>>, t: Throwable) {
+                        swipe_refresh_layout.isRefreshing = false
+                    }
+                })
+    }
+
+    fun show(statuses: List<ScheduledStatus>) {
+        adapter.setItems(statuses)
+        adapter.notifyDataSetChanged()
+    }
+
+    override fun edit(position: Int, item: ScheduledStatus?) {
+        if (item == null) {
+            return
+        }
+        val intent = ComposeActivity.IntentBuilder()
+                .tootText(item.params.text)
+                .contentWarning(item.params.spoilerText)
+                .mediaAttachments(item.mediaAttachments)
+                .inReplyToId(item.params.inReplyToId)
+                .visibility(item.params.visibility)
+                .scheduledAt(item.scheduledAt)
+                .sensitive(item.params.sensitive)
+                .build(this)
+        startActivity(intent)
+        delete(position, item)
+    }
+
+    override fun delete(position: Int, item: ScheduledStatus?) {
+        if (item == null) {
+            return
+        }
+        mastodonApi.deleteScheduledStatus(item.id)
+                .enqueue(object : Callback<ResponseBody> {
+                    override fun onResponse(call: Call<ResponseBody>, response: Response<ResponseBody>) {
+                        adapter.removeItem(position)
+                    }
+
+                    override fun onFailure(call: Call<ResponseBody>, t: Throwable) {
+
+                    }
+                })
+    }
+}
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/ScheduledTootAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/ScheduledTootAdapter.java
new file mode 100644
index 000000000..6698dd371
--- /dev/null
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/ScheduledTootAdapter.java
@@ -0,0 +1,125 @@
+/* Copyright 2019 kyori19
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.keylesspalace.tusky.R;
+import com.keylesspalace.tusky.entity.ScheduledStatus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ScheduledTootAdapter extends RecyclerView.Adapter {
+    private List<ScheduledStatus> list;
+    private ScheduledTootAction handler;
+
+    public ScheduledTootAdapter(Context context) {
+        super();
+        list = new ArrayList<>();
+        handler = (ScheduledTootAction) context;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.item_scheduled_toot, parent, false);
+        return new TootViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
+        TootViewHolder holder = (TootViewHolder) viewHolder;
+        holder.bind(getItem(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return list.size();
+    }
+
+    public void setItems(List<ScheduledStatus> newToot) {
+        list = new ArrayList<>();
+        list.addAll(newToot);
+    }
+
+    @Nullable
+    public ScheduledStatus removeItem(int position) {
+        if (position < 0 || position >= list.size()) {
+            return null;
+        }
+        ScheduledStatus toot = list.remove(position);
+        notifyItemRemoved(position);
+        return toot;
+    }
+
+    private ScheduledStatus getItem(int position) {
+        if (position >= 0 && position < list.size()) {
+            return list.get(position);
+        }
+        return null;
+    }
+
+    public interface ScheduledTootAction {
+        void edit(int position, ScheduledStatus item);
+
+        void delete(int position, ScheduledStatus item);
+    }
+
+    private class TootViewHolder extends RecyclerView.ViewHolder {
+        View view;
+        TextView text;
+        ImageButton edit;
+        ImageButton delete;
+
+        TootViewHolder(View view) {
+            super(view);
+            this.view = view;
+            this.text = view.findViewById(R.id.text);
+            this.edit = view.findViewById(R.id.edit);
+            this.delete = view.findViewById(R.id.delete);
+        }
+
+        void bind(final ScheduledStatus item) {
+            edit.setEnabled(true);
+            delete.setEnabled(true);
+
+            if (item != null) {
+                text.setText(item.getParams().getText());
+
+                edit.setOnClickListener(v -> {
+                    v.setEnabled(false);
+                    handler.edit(getAdapterPosition(), item);
+                });
+
+                delete.setOnClickListener(v -> {
+                    v.setEnabled(false);
+                    handler.delete(getAdapterPosition(), item);
+                });
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/keylesspalace/tusky/appstore/Events.kt b/app/src/main/java/com/keylesspalace/tusky/appstore/Events.kt
index d7d92d49f..32deb0044 100644
--- a/app/src/main/java/com/keylesspalace/tusky/appstore/Events.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/appstore/Events.kt
@@ -12,6 +12,7 @@ data class BlockEvent(val accountId: String) : Dispatchable
 data class MuteEvent(val accountId: String) : Dispatchable
 data class StatusDeletedEvent(val statusId: String) : Dispatchable
 data class StatusComposedEvent(val status: Status) : Dispatchable
+data class StatusScheduledEvent(val status: Status) : Dispatchable
 data class ProfileEditedEvent(val newProfileData: Account) : Dispatchable
 data class PreferenceChangedEvent(val preferenceKey: String) : Dispatchable
 data class MainTabsChangedEvent(val newTabs: List<TabData>) : Dispatchable
diff --git a/app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt b/app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt
index ed4151b22..c107e0c62 100644
--- a/app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt
@@ -97,4 +97,7 @@ abstract class ActivitiesModule {
 
     @ContributesAndroidInjector(modules = [FragmentBuildersModule::class])
     abstract fun contributesInstanceListActivity(): InstanceListActivity
+
+    @ContributesAndroidInjector
+    abstract fun contributesScheduledTootActivity(): ScheduledTootActivity
 }
diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/NewStatus.kt b/app/src/main/java/com/keylesspalace/tusky/entity/NewStatus.kt
index 1a3226fad..ebc979f36 100644
--- a/app/src/main/java/com/keylesspalace/tusky/entity/NewStatus.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/NewStatus.kt
@@ -26,6 +26,7 @@ data class NewStatus(
         val visibility: String,
         val sensitive: Boolean,
         @SerializedName("media_ids") val mediaIds: List<String>?,
+        @SerializedName("scheduled_at") val scheduledAt: String?,
         val poll: NewPoll?
 )
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/ScheduledStatus.kt b/app/src/main/java/com/keylesspalace/tusky/entity/ScheduledStatus.kt
new file mode 100644
index 000000000..2621bd5ed
--- /dev/null
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/ScheduledStatus.kt
@@ -0,0 +1,25 @@
+/* Copyright 2019 kyori19
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.entity
+
+import com.google.gson.annotations.SerializedName
+
+data class ScheduledStatus(
+        val id: String,
+        @SerializedName("scheduled_at") val scheduledAt: String,
+        val params: StatusParams,
+        @SerializedName("media_attachments") val mediaAttachments: ArrayList<Attachment>
+)
diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/StatusParams.kt b/app/src/main/java/com/keylesspalace/tusky/entity/StatusParams.kt
new file mode 100644
index 000000000..0e25e6c16
--- /dev/null
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/StatusParams.kt
@@ -0,0 +1,26 @@
+/* Copyright 2019 kyori19
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.entity
+
+import com.google.gson.annotations.SerializedName
+
+data class StatusParams(
+        val text: String,
+        val sensitive: Boolean,
+        val visibility: Status.Visibility,
+        @SerializedName("spoiler_text") val spoilerText: String,
+        @SerializedName("in_reply_to_id") val inReplyToId: String?
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimePickerFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimePickerFragment.java
new file mode 100644
index 000000000..e4b20dda5
--- /dev/null
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimePickerFragment.java
@@ -0,0 +1,53 @@
+/* Copyright 2019 kyori19
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.fragment;
+
+import android.app.Dialog;
+import android.app.TimePickerDialog;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+
+import com.keylesspalace.tusky.ComposeActivity;
+
+import java.util.Calendar;
+import java.util.TimeZone;
+
+public class TimePickerFragment extends DialogFragment {
+
+    public static final String PICKER_TIME_HOUR = "picker_time_hour";
+    public static final String PICKER_TIME_MINUTE = "picker_time_minute";
+
+    @Override
+    @NonNull
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        Bundle args = getArguments();
+        Calendar calendar = Calendar.getInstance(TimeZone.getDefault());
+        if (args != null) {
+            calendar.set(Calendar.HOUR_OF_DAY, args.getInt(PICKER_TIME_HOUR));
+            calendar.set(Calendar.MINUTE, args.getInt(PICKER_TIME_MINUTE));
+        }
+
+        return new TimePickerDialog(getContext(),
+                android.R.style.Theme_DeviceDefault_Dialog,
+                (ComposeActivity) getActivity(),
+                calendar.get(Calendar.HOUR_OF_DAY),
+                calendar.get(Calendar.MINUTE),
+                true);
+    }
+
+}
diff --git a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
index 460b86e53..01813a3cd 100644
--- a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
@@ -23,20 +23,8 @@ import okhttp3.RequestBody
 import okhttp3.ResponseBody
 import retrofit2.Call
 import retrofit2.Response
-import retrofit2.http.Body
-import retrofit2.http.DELETE
+import retrofit2.http.*
 import retrofit2.http.Field
-import retrofit2.http.FormUrlEncoded
-import retrofit2.http.GET
-import retrofit2.http.HTTP
-import retrofit2.http.Header
-import retrofit2.http.Multipart
-import retrofit2.http.PATCH
-import retrofit2.http.POST
-import retrofit2.http.PUT
-import retrofit2.http.Part
-import retrofit2.http.Path
-import retrofit2.http.Query
 
 /**
  * for documentation of the Mastodon REST API see https://docs.joinmastodon.org/api/
@@ -202,6 +190,14 @@ interface MastodonApi {
             @Path("id") statusId: String
     ): Single<Status>
 
+    @GET("api/v1/scheduled_statuses")
+    fun scheduledStatuses(): Call<List<ScheduledStatus>>
+
+    @DELETE("api/v1/scheduled_statuses/{id}")
+    fun deleteScheduledStatus(
+            @Path("id") scheduledStatusId: String
+    ): Call<ResponseBody>
+
     @GET("api/v1/accounts/verify_credentials")
     fun accountVerifyCredentials(): Single<Account>
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt b/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt
index 7ae1f6dff..5bf8c76d7 100644
--- a/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt
@@ -18,11 +18,11 @@ package com.keylesspalace.tusky.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.RemoteInput
 import androidx.core.content.ContextCompat
-import android.util.Log
 import com.keylesspalace.tusky.ComposeActivity
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.db.AccountManager
@@ -92,6 +92,7 @@ class SendStatusBroadcastReceiver : BroadcastReceiver() {
                         emptyList(),
                         emptyList(),
                         emptyList(),
+                        null,
                         citedStatusId,
                         null,
                         null,
diff --git a/app/src/main/java/com/keylesspalace/tusky/service/SendTootService.kt b/app/src/main/java/com/keylesspalace/tusky/service/SendTootService.kt
index ba4d0b982..97aac1a86 100644
--- a/app/src/main/java/com/keylesspalace/tusky/service/SendTootService.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/service/SendTootService.kt
@@ -18,6 +18,7 @@ import androidx.core.content.ContextCompat
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.appstore.EventHub
 import com.keylesspalace.tusky.appstore.StatusComposedEvent
+import com.keylesspalace.tusky.appstore.StatusScheduledEvent
 import com.keylesspalace.tusky.db.AccountEntity
 import com.keylesspalace.tusky.db.AccountManager
 import com.keylesspalace.tusky.db.AppDatabase
@@ -140,6 +141,7 @@ class SendTootService : Service(), Injectable {
                 tootToSend.visibility,
                 tootToSend.sensitive,
                 tootToSend.mediaIds,
+                tootToSend.scheduledAt,
                 tootToSend.poll
         )
 
@@ -156,6 +158,7 @@ class SendTootService : Service(), Injectable {
         val callback = object : Callback<Status> {
             override fun onResponse(call: Call<Status>, response: Response<Status>) {
 
+                val scheduled = !tootToSend.scheduledAt.isNullOrEmpty()
                 tootsToSend.remove(tootId)
 
                 if (response.isSuccessful) {
@@ -164,7 +167,11 @@ class SendTootService : Service(), Injectable {
                         saveTootHelper.deleteDraft(tootToSend.savedTootUid)
                     }
 
-                    response.body()?.let(::StatusComposedEvent)?.let(eventHub::dispatch)
+                    if (scheduled) {
+                        response.body()?.let(::StatusScheduledEvent)?.let(eventHub::dispatch)
+                    } else {
+                        response.body()?.let(::StatusComposedEvent)?.let(eventHub::dispatch)
+                    }
 
                     notificationManager.cancel(tootId)
 
@@ -284,6 +291,7 @@ class SendTootService : Service(), Injectable {
                            mediaIds: List<String>,
                            mediaUris: List<Uri>,
                            mediaDescriptions: List<String>,
+                           scheduledAt: String?,
                            inReplyToId: String?,
                            poll: NewPoll?,
                            replyingStatusContent: String?,
@@ -303,6 +311,7 @@ class SendTootService : Service(), Injectable {
                     mediaIds,
                     mediaUris.map { it.toString() },
                     mediaDescriptions,
+                    scheduledAt,
                     inReplyToId,
                     poll,
                     replyingStatusContent,
@@ -346,6 +355,7 @@ data class TootToSend(val text: String,
                       val mediaIds: List<String>,
                       val mediaUris: List<String>,
                       val mediaDescriptions: List<String>,
+                      val scheduledAt: String?,
                       val inReplyToId: String?,
                       val poll: NewPoll?,
                       val replyingStatusContent: String?,
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/VersionUtils.java b/app/src/main/java/com/keylesspalace/tusky/util/VersionUtils.java
new file mode 100644
index 000000000..76dcd4510
--- /dev/null
+++ b/app/src/main/java/com/keylesspalace/tusky/util/VersionUtils.java
@@ -0,0 +1,42 @@
+/* Copyright 2019 kyori19
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.util;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class VersionUtils {
+
+    private int major;
+    private int minor;
+    private int patch;
+
+    public VersionUtils(String versionString) {
+        String regex = "([0-9]+)\\.([0-9]+)\\.([0-9]+).*";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matcher = pattern.matcher(versionString);
+        if (matcher.find()) {
+            major = Integer.parseInt(matcher.group(1));
+            minor = Integer.parseInt(matcher.group(2));
+            patch = Integer.parseInt(matcher.group(3));
+        }
+    }
+
+    public boolean supportsScheduledToots() {
+        return (major == 2) ? ( (minor == 7) ? (patch >= 0) : (minor > 7) ) : (major > 2);
+    }
+
+}
diff --git a/app/src/main/java/com/keylesspalace/tusky/view/ComposeScheduleView.java b/app/src/main/java/com/keylesspalace/tusky/view/ComposeScheduleView.java
new file mode 100644
index 000000000..8efe68639
--- /dev/null
+++ b/app/src/main/java/com/keylesspalace/tusky/view/ComposeScheduleView.java
@@ -0,0 +1,187 @@
+/* Copyright 2019 kyori19
+ *
+ * This file is a part of Tusky.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Tusky; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+package com.keylesspalace.tusky.view;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.google.android.material.datepicker.CalendarConstraints;
+import com.google.android.material.datepicker.DateValidatorPointForward;
+import com.google.android.material.datepicker.MaterialDatePicker;
+import com.keylesspalace.tusky.R;
+import com.keylesspalace.tusky.fragment.TimePickerFragment;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+public class ComposeScheduleView extends ConstraintLayout {
+
+    private DateFormat dateFormat;
+    private DateFormat timeFormat;
+    private SimpleDateFormat iso8601;
+
+    private Button resetScheduleButton;
+    private TextView scheduledDateTimeView;
+
+    private Calendar scheduleDateTime;
+
+    public ComposeScheduleView(Context context) {
+        super(context);
+        init();
+    }
+
+    public ComposeScheduleView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ComposeScheduleView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.view_compose_schedule, this);
+
+        dateFormat = SimpleDateFormat.getDateInstance();
+        timeFormat = SimpleDateFormat.getTimeInstance();
+        iso8601 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault());
+        iso8601.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+        resetScheduleButton = findViewById(R.id.resetScheduleButton);
+        scheduledDateTimeView = findViewById(R.id.scheduledDateTime);
+
+        scheduledDateTimeView.setOnClickListener(v -> openPickDateDialog());
+
+        scheduleDateTime = null;
+
+        setScheduledDateTime();
+
+        setEditIcons();
+    }
+
+    private void setScheduledDateTime() {
+        if (scheduleDateTime == null) {
+            scheduledDateTimeView.setText(R.string.hint_configure_scheduled_toot);
+        } else {
+            scheduledDateTimeView.setText(String.format("%s %s",
+                    dateFormat.format(scheduleDateTime.getTime()),
+                    timeFormat.format(scheduleDateTime.getTime())));
+        }
+    }
+
+    private void setEditIcons() {
+        final int size = scheduledDateTimeView.getLineHeight();
+
+        Drawable icon = getContext().getDrawable(R.drawable.ic_create_24dp);
+        if (icon == null) {
+            return;
+        }
+
+        icon.setBounds(0, 0, size, size);
+
+        scheduledDateTimeView.setCompoundDrawables(null, null, icon, null);
+    }
+
+    public void setResetOnClickListener(OnClickListener listener) {
+        resetScheduleButton.setOnClickListener(listener);
+    }
+
+    public void resetSchedule() {
+        scheduleDateTime = null;
+        setScheduledDateTime();
+    }
+
+    private void openPickDateDialog() {
+        long yesterday = Calendar.getInstance().getTimeInMillis() - 24 * 60 * 60 * 1000;
+        CalendarConstraints calendarConstraints = new CalendarConstraints.Builder()
+                .setValidator(new DateValidatorPointForward(yesterday))
+                .build();
+        if (scheduleDateTime == null) {
+            scheduleDateTime = Calendar.getInstance(TimeZone.getDefault());
+        }
+        MaterialDatePicker<Long> picker = MaterialDatePicker.Builder
+                .datePicker()
+                .setSelection(scheduleDateTime.getTimeInMillis())
+                .setCalendarConstraints(calendarConstraints)
+                .build();
+        picker.addOnPositiveButtonClickListener(this::onDateSet);
+        picker.show(((AppCompatActivity) getContext()).getSupportFragmentManager(), "date_picker");
+    }
+
+    private void openPickTimeDialog() {
+        TimePickerFragment picker = new TimePickerFragment();
+        if (scheduleDateTime != null) {
+            Bundle args = new Bundle();
+            args.putInt(TimePickerFragment.PICKER_TIME_HOUR, scheduleDateTime.get(Calendar.HOUR_OF_DAY));
+            args.putInt(TimePickerFragment.PICKER_TIME_MINUTE, scheduleDateTime.get(Calendar.MINUTE));
+            picker.setArguments(args);
+        }
+        picker.show(((AppCompatActivity) getContext()).getSupportFragmentManager(), "time_picker");
+    }
+
+    public void setDateTime(String scheduledAt) {
+        Date date;
+        try {
+            date = iso8601.parse(scheduledAt);
+        } catch (ParseException e) {
+            return;
+        }
+        if (scheduleDateTime == null) {
+            scheduleDateTime = Calendar.getInstance(TimeZone.getDefault());
+        }
+        scheduleDateTime.setTime(date);
+        setScheduledDateTime();
+    }
+
+    private void onDateSet(long selection) {
+        if (scheduleDateTime == null) {
+            scheduleDateTime = Calendar.getInstance(TimeZone.getDefault());
+        }
+        Calendar newDate = Calendar.getInstance(TimeZone.getDefault());
+        newDate.setTimeInMillis(selection);
+        scheduleDateTime.set(newDate.get(Calendar.YEAR), newDate.get(Calendar.MONTH), newDate.get(Calendar.DATE));
+        openPickTimeDialog();
+    }
+
+    public void onTimeSet(int hourOfDay, int minute) {
+        if (scheduleDateTime == null) {
+            scheduleDateTime = Calendar.getInstance(TimeZone.getDefault());
+        }
+        scheduleDateTime.set(Calendar.HOUR_OF_DAY, hourOfDay);
+        scheduleDateTime.set(Calendar.MINUTE, minute);
+        setScheduledDateTime();
+    }
+
+    public String getTime() {
+        if (scheduleDateTime == null) {
+            return null;
+        }
+        return iso8601.format(scheduleDateTime.getTime());
+    }
+}
diff --git a/app/src/main/res/drawable-anydpi/ic_access_time.xml b/app/src/main/res/drawable-anydpi/ic_access_time.xml
new file mode 100644
index 000000000..2239a4f45
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_access_time.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml
index b0b5efab3..410d04db4 100644
--- a/app/src/main/res/layout/activity_compose.xml
+++ b/app/src/main/res/layout/activity_compose.xml
@@ -231,6 +231,20 @@
         app:behavior_peekHeight="0dp"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" />
 
+    <com.keylesspalace.tusky.view.ComposeScheduleView
+        android:id="@+id/composeScheduleView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:colorBackground"
+        android:elevation="12dp"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="52dp"
+        app:behavior_hideable="true"
+        app:behavior_peekHeight="0dp"
+        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -299,6 +313,17 @@
             android:tooltipText="@string/action_emoji_keyboard"
             app:srcCompat="@drawable/ic_emoji_24dp" />
 
+        <ImageButton
+            android:id="@+id/composeScheduleButton"
+            style="?attr/image_button_style"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_marginEnd="4dp"
+            android:contentDescription="@string/action_schedule_toot"
+            android:padding="4dp"
+            android:tooltipText="@string/action_schedule_toot"
+            app:srcCompat="@drawable/ic_access_time" />
+
         <Space
             android:layout_width="0dp"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_scheduled_toot.xml b/app/src/main/res/layout/activity_scheduled_toot.xml
new file mode 100644
index 000000000..937c2db37
--- /dev/null
+++ b/app/src/main/res/layout/activity_scheduled_toot.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_view_thread"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.keylesspalace.tusky.AccountListActivity">
+
+    <include layout="@layout/toolbar_basic" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.keylesspalace.tusky.view.BackgroundMessageView
+            android:id="@+id/errorMessageView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@android:color/transparent"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@drawable/elephant_error"
+            tools:visibility="visible" />
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/swipe_refresh_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/scheduled_toot_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_scheduled_toot.xml b/app/src/main/res/layout/item_scheduled_toot.xml
new file mode 100644
index 000000000..ef935c2a8
--- /dev/null
+++ b/app/src/main/res/layout/item_scheduled_toot.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <androidx.emoji.widget.EmojiTextView
+        android:id="@+id/text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.91"
+        android:padding="8dp"
+        android:textSize="?attr/status_text_medium" />
+
+    <ImageButton
+        android:id="@+id/edit"
+        style="?attr/image_button_style"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center_vertical"
+        android:layout_margin="12dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/action_edit"
+        android:padding="4dp"
+        app:srcCompat="@drawable/ic_create_24dp" />
+
+    <ImageButton
+        android:id="@+id/delete"
+        style="?attr/image_button_style"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center_vertical"
+        android:layout_margin="12dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/action_delete"
+        android:padding="4dp"
+        app:srcCompat="@drawable/ic_clear_24dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_compose_schedule.xml b/app/src/main/res/layout/view_compose_schedule.xml
new file mode 100644
index 000000000..dde00743d
--- /dev/null
+++ b/app/src/main/res/layout/view_compose_schedule.xml
@@ -0,0 +1,31 @@
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <Button
+        android:id="@+id/resetScheduleButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:text="@string/action_reset_schedule"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+    <TextView
+        android:id="@+id/scheduledDateTime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="16dp"
+        android:paddingEnd="16dp"
+        android:paddingStart="4dp"
+        android:paddingTop="4dp"
+        android:textColor="?android:textColorTertiary"
+        android:textSize="?attr/status_text_medium"
+        android:drawablePadding="4dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:text="2020/01/01 00:00:00" />
+
+</merge>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f46c2f6c0..f71993680 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,6 +40,7 @@
     <string name="title_follow_requests">Follow Requests</string>
     <string name="title_edit_profile">Edit your profile</string>
     <string name="title_saved_toot">Drafts</string>
+    <string name="title_scheduled_toot">Scheduled toots</string>
     <string name="title_licenses">Licenses</string>
 
     <string name="status_username_format">\@%s</string>
@@ -80,6 +81,7 @@
     <string name="action_hide_reblogs">Hide boosts</string>
     <string name="action_show_reblogs">Show boosts</string>
     <string name="action_report">Report</string>
+    <string name="action_edit">Edit</string>
     <string name="action_delete">Delete</string>
     <string name="action_delete_and_redraft">Delete and re-draft</string>
     <string name="action_send">TOOT</string>
@@ -114,9 +116,12 @@
     <string name="action_reject">Reject</string>
     <string name="action_search">Search</string>
     <string name="action_access_saved_toot">Drafts</string>
+    <string name="action_access_scheduled_toot">Scheduled toots</string>
     <string name="action_toggle_visibility">Toot visibility</string>
     <string name="action_content_warning">Content warning</string>
     <string name="action_emoji_keyboard">Emoji keyboard</string>
+    <string name="action_schedule_toot">Schedule Toot</string>
+    <string name="action_reset_schedule">Reset</string>
     <string name="action_add_tab">Add Tab</string>
     <string name="action_links">Links</string>
     <string name="action_mentions">Mentions</string>
@@ -152,6 +157,7 @@
 
     <string name="hint_domain">Which instance?</string>
     <string name="hint_compose">What\'s happening?</string>
+    <string name="hint_configure_scheduled_toot">Tap here to configure scheduled toot.</string>
     <string name="hint_content_warning">Content warning</string>
     <string name="hint_display_name">Display name</string>
     <string name="hint_note">Bio</string>