Merge branch 'master' into flavors

16 files changed, 194 insertions, 78 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 46c25af3c..7d8429adc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "it.niedermann.nextcloud.deck"
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 19
-        versionName "0.0.19"
+        versionCode 20
+        versionName "0.0.20"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         javaCompileOptions {
@@ -61,8 +61,6 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0'
 
     // Markdown
-    implementation 'io.reactivex:rxandroid:1.2.1'
-    implementation 'io.reactivex:rxjava:1.3.8'
     implementation 'com.yydcdut:markdown-processor:0.1.3'
     implementation 'com.yydcdut:rxmarkdown-wrapper:0.1.3'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
@@ -101,6 +99,13 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:$rootProject.retrofitVersion"
     implementation "com.squareup.retrofit2:converter-gson:$rootProject.retrofitVersion"
 
+    // -----------------------
+    // --- Other libraries ---
+    // -----------------------
+
+    implementation 'androidx.multidex:multidex:2.0.1'
+
+
     // -------------
     // --- Tests ---
     // -------------
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/Application.java b/app/src/main/java/it/niedermann/nextcloud/deck/Application.java
index 4543389b4..d79aec60e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/Application.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/Application.java
@@ -5,6 +5,7 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.multidex.MultiDex;
 
 public class Application extends android.app.Application {
 
@@ -14,6 +15,12 @@ public class Application extends android.app.Application {
         super.onCreate();
     }
 
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        MultiDex.install(this);
+    }
+
     public static void setAppTheme(Boolean darkTheme) {
         if (darkTheme) {
             AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/SettingsActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/SettingsActivity.java
index f74ba76e1..ee019853c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/SettingsActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/SettingsActivity.java
@@ -14,8 +14,6 @@ import it.niedermann.nextcloud.deck.ui.exception.ExceptionHandler;
 import it.niedermann.nextcloud.deck.ui.settings.SettingsFragment;
 
 public class SettingsActivity extends AppCompatActivity {
-    private static final int RESULT_CANCELED = 1;
-
     @BindView(R.id.toolbar)
     Toolbar toolbar;
 
@@ -30,7 +28,7 @@ public class SettingsActivity extends AppCompatActivity {
 
         setSupportActionBar(toolbar);
 
-        setResult(RESULT_CANCELED);
+        setResult(RESULT_OK);
         getFragmentManager().beginTransaction()
                 .add(R.id.settings_layout, new SettingsFragment())
                 .commit();
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java
index 5aa940e7c..65c4c4169 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java
@@ -31,9 +31,9 @@ import com.google.android.material.chip.ChipGroup;
 import com.google.android.material.snackbar.Snackbar;
 import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
 import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
+import com.yydcdut.markdown.MarkdownEditText;
+import com.yydcdut.markdown.MarkdownProcessor;
 import com.yydcdut.markdown.syntax.edit.EditFactory;
-import com.yydcdut.rxmarkdown.RxMDEditText;
-import com.yydcdut.rxmarkdown.RxMarkdown;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -58,7 +58,6 @@ import it.niedermann.nextcloud.deck.util.ColorUtil;
 import it.niedermann.nextcloud.deck.util.DimensionUtil;
 import it.niedermann.nextcloud.deck.util.MarkDownUtil;
 import it.niedermann.nextcloud.deck.util.ViewUtil;
-import rx.Subscriber;
 
 import static it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util.LiveDataHelper.observeOnce;
 import static it.niedermann.nextcloud.deck.ui.card.CardAdapter.BUNDLE_KEY_ACCOUNT_ID;
@@ -84,7 +83,7 @@ public class CardDetailsFragment extends Fragment implements DatePickerDialog.On
     private Activity activity;
 
     @BindView(R.id.description)
-    RxMDEditText description;
+    MarkdownEditText description;
     @BindView(R.id.people)
     DelayedAutoCompleteTextView people;
     @BindView(R.id.labels)
@@ -188,24 +187,10 @@ public class CardDetailsFragment extends Fragment implements DatePickerDialog.On
 
     private void setupDescription() {
         if (canEdit) {
-            RxMarkdown.live(description)
-                    .config(MarkDownUtil.getMarkDownConfiguration(description.getContext()).build())
-                    .factory(EditFactory.create())
-                    .intoObservable()
-                    .subscribe(new Subscriber<CharSequence>() {
-                        @Override
-                        public void onCompleted() {
-                        }
-
-                        @Override
-                        public void onError(Throwable e) {
-                        }
-
-                        @Override
-                        public void onNext(CharSequence charSequence) {
-                            description.setText(charSequence, TextView.BufferType.SPANNABLE);
-                        }
-                    });
+            MarkdownProcessor markdownProcessor = new MarkdownProcessor(requireContext());
+            markdownProcessor.config(MarkDownUtil.getMarkDownConfiguration(description.getContext()).build());
+            markdownProcessor.factory(EditFactory.create());
+            markdownProcessor.live(description);
             description.addTextChangedListener(new TextWatcher() {
                 @Override
                 public void onTextChanged(CharSequence s, int start, int before, int count) {
diff --git a/app/src/main/res/layout/fragment_card_edit_tab_details.xml b/app/src/main/res/layout/fragment_card_edit_tab_details.xml
index d6b630298..b4b2d5184 100644
--- a/app/src/main/res/layout/fragment_card_edit_tab_details.xml
+++ b/app/src/main/res/layout/fragment_card_edit_tab_details.xml
@@ -144,7 +144,7 @@
                 android:contentDescription="@null"
                 app:srcCompat="@drawable/ic_format_align_left_black_24dp" />
 
-            <com.yydcdut.rxmarkdown.RxMDEditText
+            <com.yydcdut.markdown.MarkdownEditText
                 android:id="@+id/description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ee34624dc..05195d611 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -101,7 +101,7 @@
     <string name="simple_rename">Umbenennen</string>
     <string name="simple_settings">Einstellungen</string>
     <string name="settings_theme_title">Dunkles Design</string>
-    <string name="settings_background_sync">Hintergrundsynchronisation</string>
+    <string name="settings_background_sync">Hintergrundsynchronisierung</string>
     <string name="pref_value_wifi_and_mobile">Über WLAN und mobile Daten synchronisieren</string>
     <string name="pref_value_wifi_only">Nur über WLAN synchronisieren</string>
     <string name="pref_value_theme_light">Hell</string>
@@ -119,7 +119,7 @@
     <string name="simple_comment">Kommentar</string>
     <string name="attachment_delete_message">Damit wird dieser Anhang dauerhaft gelöscht.</string>
     <string name="no_content">Bislang kein Inhalt</string>
-    <string name="last_background_sync">Letzte Hintergrundsynchronisation:</string>
+    <string name="last_background_sync">Letzte Hintergrundsynchronisierung:</string>
     <string name="simple_off">Aus</string>
     <string name="minutes_15">15 Minuten</string>
     <string name="hour_1">1 Stunde</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 2aa03e87f..d907f766f 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -16,6 +16,8 @@
     <string name="edit_board">Tábla szerkesztése</string>
     <string name="archive_board">Tábla archiválása</string>
     <string name="delete_board">Tábla törlése</string>
+    <string name="delete_something">%1$s törlése</string>
+
     <!-- About -->
     <string name="about">Névjegy</string>
     <string name="about_version_title">Verzió</string>
@@ -87,6 +89,7 @@
     <string name="do_you_want_to_save_your_changes">Biztos, hogy menti a változásokat?</string>
     <string name="simple_discard">elvetés</string>
     <string name="do_you_want_to_delete_the_current_column">Biztos, hogy törli a jelenlegi oszlopot?</string>
+    <string name="add_a_new_column_using_the_button">Új oszlop hozzáadása a + gombbal</string>
     <string name="add_a_new_card_using_the_button">Új kártya hozzáadása a + gombbal</string>
     <string name="update_deck">Kártyák frissítése</string>
     <string name="your_deck_version_is_too_old">A Kártyák verziója túl régi</string>
@@ -98,6 +101,7 @@
     <string name="simple_rename">Átnevezés</string>
     <string name="simple_settings">Beállítások</string>
     <string name="settings_theme_title">Sötét téma</string>
+    <string name="settings_background_sync">Háttér-szinkronizálás</string>
     <string name="pref_value_wifi_and_mobile">Szinkronizálás Wi-Fin és mobil adatkapcsolaton</string>
     <string name="pref_value_wifi_only">Szinkronizálás csak Wi-Fin</string>
     <string name="pref_value_theme_light">Világos</string>
@@ -113,7 +117,13 @@
     <string name="simple_select">Kiválasztás</string>
     <string name="owner">Tulajdonos</string>
     <string name="simple_comment">Megjegyzés</string>
+    <string name="attachment_delete_message">Ez véglegesen törli ezt a mellékletet.</string>
+    <string name="no_content">Még nincs tartalom</string>
+    <string name="last_background_sync">Legutóbbi háttér-szinkronizálás:</string>
+    <string name="simple_off">Ki</string>
     <string name="minutes_15">15 perc</string>
     <string name="hour_1">1 óra</string>
     <string name="hours_6">6 óra</string>
-    </resources>
+    <string name="action_card_move">Kártya áthelyezése</string>
+    <string name="action_card_move_title">%1$s áthelyezése</string>
+</resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 13ad13b16..1bf8ee936 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -16,6 +16,8 @@
     <string name="edit_board">게시판 편집</string>
     <string name="archive_board">게시판 보관</string>
     <string name="delete_board">게시판 삭제</string>
+    <string name="delete_something">%1$s 삭제</string>
+
     <!-- About -->
     <string name="about">정보</string>
     <string name="about_version_title">버전</string>
@@ -31,6 +33,7 @@
     <string name="about_issues_title">문제점</string>
     <string name="about_issues">GitHub 이슈 트래커에서 이 앱의 버그를 보고하거나 기능을 제안할 수 있습니다: &lt;a href=\"%1$s\">&lt;/a></string>
     <string name="about_translate_title">번역</string>
+    <string name="about_translate">Transifex의 Nextcloud팀에 가입해서 번역을 도와주세요: %1$s</string>
     <string name="about_app_license_title">앱 라이선스</string>
     <string name="about_app_license">이 앱은 GNU General Public License v3+로 배포됩니다.</string>
     <string name="about_app_license_button">라이선스 보기</string>
@@ -86,22 +89,41 @@
     <string name="do_you_want_to_save_your_changes">변경된 사항을 저장하시겠습니까?</string>
     <string name="simple_discard">무시</string>
     <string name="do_you_want_to_delete_the_current_column">선택된 열을 지우시겠습니까?</string>
-    <string name="add_a_new_card_using_the_button">더하기 버튼을 사용하여 새 카드를 추가하십시오.</string>
+    <string name="add_a_new_column_using_the_button">+ 버튼을 사용하여 열 추가</string>
+    <string name="add_a_new_card_using_the_button">+ 버튼을 사용하여 새 카드를 추가</string>
     <string name="update_deck">덱 업데이트하기</string>
     <string name="your_deck_version_is_too_old">덱 버전이 너무 오래되었습니다.</string>
     <string name="deck_outdated_please_update">덱 버전이 너무 오래되었습니다. 안드로이드 클라이언트를 사용하기 위해서는 업데이트가 필요합니다.</string>
     <string name="simple_update">업데이트</string>
     <string name="simple_delete">삭제</string>
+    <string name="delete_board_message">이 행동은 스택과 카드를 포함한 게시판을 영구히 삭제합니다.</string>
+    <string name="action_card_list_rename_column">열 이름 바꾸기</string>
     <string name="simple_rename">이름 바꾸기</string>
     <string name="simple_settings">설정</string>
     <string name="settings_theme_title">어두운 테마</string>
+    <string name="settings_background_sync">백그라운드 동기화</string>
+    <string name="pref_value_wifi_and_mobile">Wi-Fi나 모바일 데이터를 사용해 동기화</string>
+    <string name="pref_value_wifi_only">Wi-Fi만 사용해 동기화</string>
     <string name="pref_value_theme_light">밝게</string>
+    <string name="unassigned_user">할당되지 않은 %1$s</string>
     <string name="simple_undo">실행 취소</string>
+    <string name="no_activities">카드에 활동이 없습니다. 인터넷에 연결되어 있어야만 활동을 불러올 수 있습니다.</string>
+    <string name="rename_column">열 이름 바꾸기</string>
+    <string name="share_board">게시판 공유</string>
+    <string name="you_are_currently_offline">현재 오프라인</string>
+    <string name="simple_manage">관리</string>
     <string name="simple_share">공유</string>
+    <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">인터넷에 연결되어 있어야만 계정을 추가할 수 있습니다.</string>
     <string name="simple_select">선택</string>
     <string name="owner">Owner</string>
     <string name="simple_comment">설명</string>
+    <string name="attachment_delete_message">이 행동은 첨부파일을 영구히 삭제합니다.</string>
+    <string name="no_content">아직 내용 없음</string>
+    <string name="last_background_sync">마지막 백그라운드 동기화:</string>
+    <string name="simple_off">꺼짐</string>
     <string name="minutes_15">15분</string>
     <string name="hour_1">1시간</string>
     <string name="hours_6">6시간</string>
-    </resources>
+    <string name="action_card_move">카드 이동</string>
+    <string name="action_card_move_title">%1$s 이동</string>
+</resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 0bde64aa3..110e50531 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -10,11 +10,13 @@
 
     <!-- Simple values -->
     <string name="simple_boards">Nástenky</string>
+    <string name="simple_add">Pridať</string>
     <string name="simple_save">Uložiť</string>
 
     <string name="edit_board">Upraviť nástenku</string>
     <string name="archive_board">Archivovať nástenku</string>
     <string name="delete_board">Zmazať nástenku</string>
+    <string name="delete_something">Zmazať %1$s</string>
 
     <!-- About -->
     <string name="about">O aplikácii</string>
@@ -49,11 +51,14 @@
     <string name="hint_assign_people">Priradiť používateľov</string>
     <string name="hint_due_date_date">Termín dokončenia</string>
     <string name="activity">Aktivita</string>
+    <string name="add_card">Pridať kartu</string>
+    <string name="add_column">Pridať stĺpec</string>
+
     <string name="add_account">Pridať účet</string>
 
     <string name="label_menu">menu</string>
-    <string name="action_card_assign">Priradiť kartu vám</string>
-    <string name="action_card_unassign">Zrušiť priradenie karty vám</string>
+    <string name="action_card_assign">Priradiť kartu mne</string>
+    <string name="action_card_unassign">Zrušiť priradenie karty mne</string>
     <string name="action_card_archive">Archivovať kartu</string>
     <string name="action_card_delete">Zmazať kartu</string>
     <string name="add_board">Pridať nástenk</string>
@@ -62,6 +67,7 @@
 
     <string name="label_clear_due_date">Odstrániť termín dokončenia</string>
 
+    <string name="label_add">Pridať %1$s</string>
     <string name="error">Vyskytla sa chyba</string>
     <string name="simple_copy">kopírovať</string>
     <string name="simple_exception">Výnimka</string>
@@ -72,4 +78,52 @@
     <string name="card_edit_attachments">Prílohy</string>
     <string name="card_edit_activity">Aktivita</string>
     <string name="about_server_app_version_text">Verzia aplikácie na serveri:</string>
-    </resources>
+    <string name="no_files_attached_to_this_card">K tejto karte nie sú pripojené žiadne súbory.</string>
+    <string name="attachments">Prílohy</string>
+    <string name="no_cards">Zatiaľ žiadne karty</string>
+    <string name="no_account">Nie je nastavený žiadny účet</string>
+    <string name="account_already_added">Účet už bol pridaný</string>
+    <string name="account_is_getting_imported">Účet sa importuje</string>
+    <string name="not_synced_yet">Zatiaľ nie je synchronizovaný</string>
+    <string name="no_columns">Zatiaľ žiadne stĺpce</string>
+    <string name="do_you_want_to_save_your_changes">Chcete uložiť zmeny?</string>
+    <string name="simple_discard">odhodiť</string>
+    <string name="do_you_want_to_delete_the_current_column">Chcete odstrániť aktuálny stĺpec?</string>
+    <string name="add_a_new_column_using_the_button">Pridajte nový stĺpec pomocou tlačidla +</string>
+    <string name="add_a_new_card_using_the_button">Pridajte novú kartu pomocou tlačidla +</string>
+    <string name="update_deck">Aktualizovať balíček</string>
+    <string name="your_deck_version_is_too_old">Verzia vášho balíčka je príliš stará</string>
+    <string name="deck_outdated_please_update">Verzia vášho balíčka je príliš stará. Ak chcete túto aplikáciu pre Android používať ako klienta, aktualizujte ju.</string>
+    <string name="simple_update">Aktualizovať</string>
+    <string name="simple_delete">Zmazať</string>
+    <string name="delete_board_message">Táto nástenka sa natrvalo odstráni, vrátane všetkých stĺpcov a kariet.</string>
+    <string name="action_card_list_rename_column">Premenovať stĺpec</string>
+    <string name="simple_rename">Premenovať</string>
+    <string name="simple_settings">Nastavenia</string>
+    <string name="settings_theme_title">Tmavý motív</string>
+    <string name="settings_background_sync">Synchronizácia na pozadí</string>
+    <string name="pref_value_wifi_and_mobile">Synchronizovať na Wi-Fi a mobilných dátach</string>
+    <string name="pref_value_wifi_only">Synchronizovať len na Wi-Fi</string>
+    <string name="pref_value_theme_light">Svetlý</string>
+    <string name="unassigned_user">Nepriradené %1$s</string>
+    <string name="simple_undo">Odvolať</string>
+    <string name="no_activities">Na tejto karte nie sú žiadne aktivity. Na načítanie a zobrazenie aktivít musíte byť pripojení k internetu.</string>
+    <string name="rename_column">Premenovať stĺpec</string>
+    <string name="share_board">Zdieľať nástenku</string>
+    <string name="you_are_currently_offline">Momentálne ste offline</string>
+    <string name="simple_manage">spravovať</string>
+    <string name="simple_share">sprístupniť</string>
+    <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">Ak chcete pridať účet, musíte byť pripojení k internetu.</string>
+    <string name="simple_select">Vybrať</string>
+    <string name="owner">Majiteľ</string>
+    <string name="simple_comment">Komentár</string>
+    <string name="attachment_delete_message">Táto príloha sa natrvalo odstráni.</string>
+    <string name="no_content">Zatiaľ žiadny obsah</string>
+    <string name="last_background_sync">Posledná synchronizácia na pozadí:</string>
+    <string name="simple_off">Vypnúť</string>
+    <string name="minutes_15">15 minút</string>
+    <string name="hour_1">1 hodina</string>
+    <string name="hours_6">6 hodín</string>
+    <string name="action_card_move">Presunúť kartu</string>
+    <string name="action_card_move_title">Preusnúť %1$s</string>
+</resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 02547af3a..34a6f727e 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -2,9 +2,10 @@
     <string name="navigation_drawer_open">開啟導覽列</string>
     <string name="navigation_drawer_close">關閉導覽列</string>
 
+    <string name="drawer_header_background">側滑選單背景圖片</string>
     <string name="drawer_current_account">目前帳戶</string>
-    <string name="drawer_middle_account">中間帳號</string>
-    <string name="drawer_end_account">最後帳號</string>
+    <string name="drawer_middle_account">中間帳戶</string>
+    <string name="drawer_end_account">最後帳戶</string>
     <string name="drawer_manage_accounts">帳戶管理</string>
 
     <!-- Simple values -->
@@ -12,45 +13,55 @@
     <string name="simple_add">新增</string>
     <string name="simple_save">儲存</string>
 
-    <string name="edit_board">編輯專案</string>
-    <string name="archive_board">封存的專案</string>
-    <string name="delete_board">刪除的專案</string>
+    <string name="edit_board">編輯佈告欄</string>
+    <string name="archive_board">封存佈告欄</string>
+    <string name="delete_board">刪除佈告欄</string>
+    <string name="delete_something">刪除 %1$s</string>
 
     <!-- About -->
     <string name="about">關於</string>
     <string name="about_version_title">版本</string>
-    <string name="about_version">你目前使用%1$s</string>
+    <string name="about_version">你目前使用 %1$s</string>
     <string name="about_maintainer_title">維護者</string>
     <string name="about_developers_title">開發者</string>
     <string name="about_translators_title">譯者</string>
-    <string name="about_translators_transifex">Nextcloud社群在%1$s</string>
+    <string name="about_translators_transifex">%1$s 上的 Nextcloud 社群</string>
     <string name="about_translators_transifex_label">Transifex</string>
     <string name="about_testers_title">測試人員</string>
     <string name="about_source_title">原始碼</string>
-    <string name="about_source">本專案託管於Github%1$s</string>
+    <string name="about_source">本專案寄存於 GitHub：%1$s</string>
     <string name="about_issues_title">翻譯</string>
-    <string name="about_issues">您可以使用Github issue tracker回報bug，提出優化與功能建議%1$s</string>
+    <string name="about_issues">您可以在 GitHub 問題回報系統回報臭蟲、改善建議及功能需求：%1$s</string>
     <string name="about_translate_title">翻譯</string>
-    <string name="about_translate">加入Nextcloud在Transifex上的翻譯小組，協助我們翻譯這個程式%1$s</string>
-    <string name="about_app_license_title">程式授權</string>
+    <string name="about_translate">歡迎加入 Transifex 的 Nextcloud 團隊並協助翻譯此 App：%1$s</string>
+    <string name="about_app_license_title">程式授權條款</string>
     <string name="about_app_license">此程式依照 GNU GENERAL PUBLIC LICENSE v3+ 方式授權使用</string>
-    <string name="about_app_license_button">檢式授權</string>
+    <string name="about_app_license_button">檢視授權條款</string>
+    <string name="about_icons_disclaimer_title">圖示</string>
+    <string name="about_icons_disclaimer">原創圖示由 %1$s 製作，其他 App 使用的圖示均為 Google Inc. 製作的 %2$s，並依 Apache 2.0 條款授權。</string>
+    <string name="about_icons_disclaimer_mdi">Material Design 圖示</string>
+    <string name="about_credits_tab_title">致謝</string>
     <string name="about_contribution_tab_title">貢獻</string>
     <string name="about_license_tab_title">授權</string>
 
     <string name="seconds_ago">幾秒前</string>
     <string name="edit">編輯</string>
-    <string name="label_labels">選擇Tags</string>
+    <string name="label_labels">選擇標籤</string>
     <string name="label_description">描述</string>
-    <string name="hint_assign_people">指派負責人</string>
+    <string name="hint_assign_people">分派使用者</string>
     <string name="hint_due_date_date">截止日</string>
     <string name="activity">活動</string>
+    <string name="add_card">新增卡片</string>
+    <string name="add_column">新增欄位</string>
+
     <string name="add_account">新增帳戶</string>
 
-    <string name="label_menu">目錄</string>
-    <string name="action_card_archive">封存作業</string>
-    <string name="action_card_delete">刪除作業</string>
-    <string name="add_board">新增專案</string>
+    <string name="label_menu">選單</string>
+    <string name="action_card_assign">分派卡片給我</string>
+    <string name="action_card_unassign">取消分派給我的卡片</string>
+    <string name="action_card_archive">封存卡片</string>
+    <string name="action_card_delete">刪除卡片</string>
+    <string name="add_board">新增佈告欄</string>
     <string name="action_card_list_delete_column">刪除欄位</string>
     <string name="simple_title">標題</string>
 
@@ -60,31 +71,59 @@
     <string name="error">發生錯誤</string>
     <string name="simple_copy">複製</string>
     <string name="simple_exception">例外</string>
-    <string name="copied_to_clipboard">複製至剪貼簿中</string>
+    <string name="copied_to_clipboard">已複製至剪貼簿</string>
     <string name="simple_close"> 關閉</string>
 
     <string name="card_edit_details">詳細資料</string>
     <string name="card_edit_attachments">附件</string>
     <string name="card_edit_activity">活動</string>
-    <string name="about_server_app_version_text">伺服器版本</string>
+    <string name="about_server_app_version_text">伺服器 App 版本：</string>
+    <string name="no_files_attached_to_this_card">沒有附加至此卡片的檔案。</string>
     <string name="attachments">附件</string>
-    <string name="account_already_added">帳號已被加入</string>
+    <string name="no_cards">尚無卡片</string>
+    <string name="no_account">沒有已設定的帳戶</string>
+    <string name="account_already_added">已加入帳戶</string>
+    <string name="account_is_getting_imported">已匯入帳戶</string>
     <string name="not_synced_yet">尚未同步完成</string>
-    <string name="do_you_want_to_save_your_changes">您想要儲存您做出的調整嗎</string>
-    <string name="your_deck_version_is_too_old">您的Deck版本過舊</string>
-    <string name="deck_outdated_please_update">您的Deck版本過舊，請至Play Store下載更新</string>
+    <string name="no_columns">目前還沒有欄</string>
+    <string name="do_you_want_to_save_your_changes">您想要儲存您做出的變更嗎？</string>
+    <string name="simple_discard">放棄</string>
+    <string name="do_you_want_to_delete_the_current_column">請問您想刪除目前的欄嗎？</string>
+    <string name="add_a_new_column_using_the_button">用 + 按鈕新增欄</string>
+    <string name="add_a_new_card_using_the_button">用 + 按鈕新增卡片</string>
+    <string name="update_deck">更新 Deck</string>
+    <string name="your_deck_version_is_too_old">您的 Deck 版本過舊</string>
+    <string name="deck_outdated_please_update">您的 Deck 版本過舊。請更新以將此 Android App 當作用戶端使用。</string>
     <string name="simple_update">更新</string>
     <string name="simple_delete">刪除</string>
+    <string name="delete_board_message">這將永久刪除此佈告欄，包含所有項目及卡片。</string>
+    <string name="action_card_list_rename_column">重新命名欄</string>
     <string name="simple_rename">重新命名</string>
     <string name="simple_settings">設定</string>
     <string name="settings_theme_title">暗色主題</string>
-    <string name="pref_value_wifi_and_mobile">在使用Wi-Fi與行動網路進行同步</string>
-    <string name="pref_value_wifi_only">只在透過 WI-FI 同步</string>
+    <string name="settings_background_sync">背景同步</string>
+    <string name="pref_value_wifi_and_mobile">使用 Wi-Fi 及行動網路時同步</string>
+    <string name="pref_value_wifi_only">只在使用 Wi-Fi 時同步</string>
     <string name="pref_value_theme_light">亮色</string>
+    <string name="unassigned_user">已取消分派 %1$s</string>
     <string name="simple_undo">復原</string>
+    <string name="no_activities">此卡片沒有活動。您需要連線至網際網路，才能載入並顯示活動。</string>
+    <string name="rename_column">重新命名欄</string>
+    <string name="share_board">分享佈告欄</string>
     <string name="you_are_currently_offline">目前離線中</string>
     <string name="simple_manage">管理</string>
     <string name="simple_share">分享</string>
-    <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">您必須連線到網際網路已新增帳號</string>
+    <string name="you_have_to_be_connected_to_the_internet_in_order_to_add_an_account">您必須連線到網際網路才能新增帳戶。</string>
     <string name="simple_select">選擇</string>
-    </resources>
+    <string name="owner">擁有者</string>
+    <string name="simple_comment">備註</string>
+    <string name="attachment_delete_message">這會永久刪除此附件。</string>
+    <string name="no_content">目前還沒有內容</string>
+    <string name="last_background_sync">上次背景同步時間：</string>
+    <string name="simple_off">關閉</string>
+    <string name="minutes_15">15 分鐘</string>
+    <string name="hour_1">1 小時</string>
+    <string name="hours_6">6 小時</string>
+    <string name="action_card_move">移動卡片</string>
+    <string name="action_card_move_title">移動 %1$s</string>
+</resources>
diff --git a/build.gradle b/build.gradle
index 94b89f84d..0851a9ea4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/fastlane/metadata/android/en-US/changelogs/19.txt b/fastlane/metadata/android/en-US/changelogs/19.txt
index 57e56cc01..cae6820b9 100644
--- a/fastlane/metadata/android/en-US/changelogs/19.txt
+++ b/fastlane/metadata/android/en-US/changelogs/19.txt
@@ -1,8 +1,3 @@
 - Attachments 📎 (#211)
-- EmptyContentView is not inflateable on API level 14 (#254)
-- Keyboard doesn't auto pop up when creating new card (#249)
-- Due date needs padding right when user has no edit permission (#242)
-- Adjust empty content views depending on edit permissions (#241)
-- Max card lable length is not enforced correctly (#262)
 - Display "disabled" instead of `1970-01-01` when background sync is disabled
 - User avatars not updated on modification (#231)
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/20.txt b/fastlane/metadata/android/en-US/changelogs/20.txt
index e69de29bb..886abeb1c 100644
--- a/fastlane/metadata/android/en-US/changelogs/20.txt
+++ b/fastlane/metadata/android/en-US/changelogs/20.txt
@@ -0,0 +1,4 @@
+- Attachments 📎 (#211)
+- Display "disabled" instead of `1970-01-01` when background sync is disabled
+- User avatars not updated on modification (#231)
+- Fix multidex issue with old android devices
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/21.txt b/fastlane/metadata/android/en-US/changelogs/21.txt
index e69de29bb..9af25a289 100644
--- a/fastlane/metadata/android/en-US/changelogs/21.txt
+++ b/fastlane/metadata/android/en-US/changelogs/21.txt
@@ -0,0 +1 @@
+- NPE on drag after dark-mode toggle (#253)
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9dcc58ab5..fea07f136 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
diff --git a/settings.gradle b/settings.gradle
index 2104f465a..9d495b34f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1 @@
-include ':app'
-//include ':Android-SingleSignOn'
-
-include ':Android-SingleSignOn'
-project(':Android-SingleSignOn').projectDir = new File('../Android-SingleSignOn')
\ No newline at end of file
+include ':app'
\ No newline at end of file