chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Create polls (#1452)

Browse source 
* add AddPollDialog

* add support for pleroma poll options

* add PollPreviewView

* add Poll support to drafts

* add license header, cleanup

* rename drawable files to correct size

* fix tests

* fix bug with Poll having wrong duration after delete&redraft

* add input validation

* grey out poll button when its disabled

* code cleanup & small improvements
This commit is contained in:
Konrad Pozniak 2019-08-22 20:30:08 +02:00 • committed by GitHub
commit 51c6852492
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 1540 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/res/drawable/ic_check_box_outline_blank_18dp.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="18dp"
android:height="18dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
</vector>

9
app/src/main/res/drawable/ic_radio_button_unchecked_18dp.xml Normal file
View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="18dp"
android:height="18dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
</vector>

9
app/src/main/res/layout/activity_compose.xml
View file

@ -190,6 +190,15 @@
android:padding="8dp"
android:text="@string/action_add_media"
android:textSize="?attr/status_text_medium" />
<TextView
android:id="@+id/action_add_poll"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="8dp"
android:padding="8dp"
android:text="@string/action_add_poll"
android:textSize="?attr/status_text_medium" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView

57
app/src/main/res/layout/dialog_add_poll.xml Normal file
View file

@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView 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="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingStart="16dp"
android:paddingTop="8dp"
android:paddingEnd="16dp">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/pollChoices"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false"
android:overScrollMode="never"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/addChoiceButton"
style="@style/TuskyButton.Outlined"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:text="@string/add_poll_choice"
app:layout_constraintEnd_toStartOf="@id/pollDurationSpinner"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/pollChoices" />
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/pollDurationSpinner"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:entries="@array/poll_duration_names"
app:layout_constraintBottom_toBottomOf="@id/addChoiceButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/addChoiceButton"
app:layout_constraintTop_toTopOf="@id/addChoiceButton" />
<CheckBox
android:id="@+id/multipleChoicesCheckBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/poll_allow_multiple_choices"
app:buttonTint="?attr/compound_button_color"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/addChoiceButton" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>

32
app/src/main/res/layout/item_add_poll_option.xml Normal file
View file

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/optionTextInputLayout"
style="@style/TuskyTextInput"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_weight="1">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/optionEditText"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.textfield.TextInputLayout>
<ImageButton
android:id="@+id/deleteButton"
style="?attr/image_button_style"
android:layout_marginStart="8dp"
android:layout_width="32dp"
android:layout_height="32dp"
android:contentDescription="@string/action_remove"
android:layout_gravity="bottom"
android:layout_marginBottom="8dp"
android:src="@drawable/ic_clear_24dp" />
</LinearLayout>

10
app/src/main/res/layout/item_poll_preview_option.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawablePadding="4dp"
android:ellipsize="end"
android:focusableInTouchMode="false"
android:gravity="center_vertical"
android:lines="1"
android:maxEms="20" />

37
app/src/main/res/layout/view_poll_preview.xml Normal file
View file

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<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"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:background="@drawable/card_frame"
tools:padding="@dimen/poll_preview_padding"
tools:parentTag="android.widget.LinearLayout">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableStart="@drawable/ic_poll_24dp"
android:drawablePadding="4dp"
android:gravity="center_vertical"
android:text="@string/create_poll_title"
android:textStyle="bold" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/pollPreviewOptions"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:nestedScrollingEnabled="false"
android:overScrollMode="never"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
<TextView
android:id="@+id/pollDurationPreview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
tools:text="5 Minutes" />
</merge>

2
app/src/main/res/values-ar/strings.xml
View file

@ -280,7 +280,7 @@
<string name="hint_describe_for_visually_impaired">وصف لضعاف البصر
\n(%d أحرف على أقصى تقدير)</string>
<string name="action_set_caption">إضافة شرح</string>
<string name="action_remove_media">حذف</string>
<string name="action_remove">حذف</string>
<string name="lock_account_label">تجميد الحساب</string>
<string name="lock_account_label_description">يتطلب منك قبول طلبات المتابَعة يدويا</string>
<string name="compose_save_draft">هل تود الإحتفاظ بالمسودة ؟</string>

2
app/src/main/res/values-bn-rIN/strings.xml
View file

@ -334,7 +334,7 @@
<string name="hint_describe_for_visually_impaired">দৃষ্টি প্রতিবন্ধী জন্য বর্ণনা করুন
\n(%d অক্ষর সীমা)</string>
<string name="action_set_caption">ক্যাপশন সেট করুন</string>
<string name="action_remove_media">সরান</string>
<string name="action_remove">সরান</string>
<string name="lock_account_label">অ্যাকাউন্ট লক করুন</string>
<string name="lock_account_label_description">অনুসারী অনুমোদন করার জন্য আপনাকে প্রয়োজন</string>
<string name="compose_save_draft">ড্রাফট সংরক্ষণ\?</string>

2
app/src/main/res/values-ca/strings.xml
View file

@ -347,7 +347,7 @@
<string name="hint_describe_for_visually_impaired">Descriure per a invidentes
\n(%d character limit)</string>
<string name="action_set_caption">Afegir una llegenda</string>
<string name="action_remove_media">Eliminar</string>
<string name="action_remove">Eliminar</string>
<string name="lock_account_label">Protegir el compte</string>
<string name="lock_account_label_description">S\'haurà d\'admetre els seguidors manualment</string>
<string name="compose_save_draft">Guardar l\'esborrany\?</string>

2
app/src/main/res/values-cs/strings.xml
View file

@ -289,7 +289,7 @@
<string name="error_failed_set_caption">Nastavení popisku selhalo</string>
<string name="hint_describe_for_visually_impaired">Popis pro zrakově postižené\n(limit %d znaků)</string>
<string name="action_set_caption">Nastavit popisek</string>
<string name="action_remove_media">Odstranit</string>
<string name="action_remove">Odstranit</string>
<string name="lock_account_label">Uzamknout účet</string>
<string name="lock_account_label_description">Vyžaduje, abyste ručně schvaloval/a sledující</string>
<string name="compose_save_draft">Uložit koncept?</string>

2
app/src/main/res/values-cy/strings.xml
View file

@ -239,7 +239,7 @@
<string name="compose_active_account_description">Yn postio â chyfrif %1$s</string>
<string name="error_failed_set_caption">Methu gosod pennawd</string>
<string name="action_set_caption">Pennu pennawd</string>
<string name="action_remove_media">Dileu</string>
<string name="action_remove">Dileu</string>
<string name="lock_account_label">Cloi cyfrif</string>
<string name="lock_account_label_description">Angen cymeradwyo dilynwyr eich hun</string>
<string name="compose_save_draft">Cadw drafft?</string>

2
app/src/main/res/values-de/strings.xml
View file

@ -268,7 +268,7 @@
<string name="error_failed_set_caption">Fehler beim Speichern der Beschreibung</string>
<string name="hint_describe_for_visually_impaired">Für Menschen mit Sehbehinderung beschreiben\n(%d Zeichen)</string>
<string name="action_set_caption">Beschreibung eingeben</string>
<string name="action_remove_media">entfernen</string>
<string name="action_remove">entfernen</string>
<string name="lock_account_label">Gesperrtes Profil</string>
<string name="lock_account_label_description">Wer dir folgen möchte, muss um deine Erlaubnis bitten</string>
<string name="compose_save_draft">Entwurf speichern?</string>

2
app/src/main/res/values-eo/strings.xml
View file

@ -285,7 +285,7 @@
<string name="error_failed_set_caption">Redakto de apudskribo malsukcesis</string>
<string name="hint_describe_for_visually_impaired">Priskribi por misvidantaj homoj\n(%d signoj maksimume)</string>
<string name="action_set_caption">Redakti apudskribon</string>
<string name="action_remove_media">Forigi</string>
<string name="action_remove">Forigi</string>
<string name="lock_account_label">Ŝlosi konton</string>
<string name="lock_account_label_description">Vi devas permane rajtigi sekvantojn</string>
<string name="compose_save_draft">Konservi malneton?</string>

2
app/src/main/res/values-es/strings.xml
View file

@ -255,7 +255,7 @@
<string name="error_failed_set_caption">Error al añadir leyenda</string>
<string name="hint_describe_for_visually_impaired">Describir para invidentes\n(límite de %d caracteres)</string>
<string name="action_set_caption">Añadir leyenda</string>
<string name="action_remove_media">Eliminar</string>
<string name="action_remove">Eliminar</string>
<string name="lock_account_label">Proteger cuenta</string>
<string name="lock_account_label_description">Tendrá que admitir los seguidores manualmente</string>
<string name="compose_save_draft">¿Guardar borrador?</string>

2
app/src/main/res/values-eu/strings.xml
View file

@ -237,7 +237,7 @@
<string name="error_failed_set_caption">Akatsa deskribapena eranstean</string>
<string name="hint_describe_for_visually_impaired">Ikusmen urritasuna dutenentzat deskribapena\n(%d karaktereko muga)</string>
<string name="action_set_caption">Deskribapena erantsi</string>
<string name="action_remove_media">Ezabatu</string>
<string name="action_remove">Ezabatu</string>
<string name="lock_account_label">Kontua babestu</string>
<string name="lock_account_label_description">Jarraitzaileak eskuz onartu beharko dituzu</string>
<string name="compose_save_draft">Zirriborroa gorde?</string>

2
app/src/main/res/values-fa/strings.xml
View file

@ -231,7 +231,7 @@
<string name="error_failed_set_caption">ناتوان در تنظیم عنوان</string>
<string name="hint_describe_for_visually_impaired">توصیف برای کم‌بینایان\n(محدودیت نویسه %d)</string>
<string name="action_set_caption">تنظیم عنوان</string>
<string name="action_remove_media">حذف</string>
<string name="action_remove">حذف</string>
<string name="lock_account_label">قفل حساب</string>
<string name="lock_account_label_description">به شما امکان می‌دهد بصورت دستی دنبال‌کنندگان را تایید کنید</string>
<string name="compose_save_draft">ذخیره به عنوان پیش‌نویس</string>

2
app/src/main/res/values-fr/strings.xml
View file

@ -290,7 +290,7 @@
<string name="hint_describe_for_visually_impaired">Décrire pour les malvoyants
\n(%d caractères maximum)</string>
<string name="action_set_caption">Mettre une légende</string>
<string name="action_remove_media">Supprimer le média</string>
<string name="action_remove">Supprimer le média</string>
<string name="lock_account_label">Verrouiller le compte</string>
<string name="lock_account_label_description">Vous devez approuvez manuellement les abonnements</string>
<string name="compose_save_draft">Enregistrer comme brouillon ?</string>

2
app/src/main/res/values-hu/strings.xml
View file

@ -237,7 +237,7 @@
<string name="add_account_description">Új Mastodon fiók hozzáadása</string>
<string name="action_lists">Listák</string>
<string name="title_lists">Listák</string>
<string name="action_remove_media">Törlés</string>
<string name="action_remove">Törlés</string>
<string name="lock_account_label">Fiók lezárása</string>
<string name="compose_save_draft">Elmented a vázlatot?</string>
<string name="send_toot_notification_title">Tülk elküldése…</string>

2
app/src/main/res/values-it/strings.xml
View file

@ -283,7 +283,7 @@
<string name="error_failed_set_caption">Impostazione del sottotitolo non riuscita</string>
<string name="hint_describe_for_visually_impaired">Descrivi per ipovedenti\n(limite di %d caratteri)</string>
<string name="action_set_caption">Inserisci descrizione</string>
<string name="action_remove_media">Rimuovi</string>
<string name="action_remove">Rimuovi</string>
<string name="lock_account_label">Blocca account</string>
<string name="lock_account_label_description">Richiede la tua approvazione manuale di chi ti segue</string>
<string name="compose_save_draft">Salvare bozza?</string>

2
app/src/main/res/values-ja/strings.xml
View file

@ -264,7 +264,7 @@
<string name="error_failed_set_caption">説明の設定に失敗しました</string>
<string name="hint_describe_for_visually_impaired">視覚障害者のための説明 (%d文字まで)</string>
<string name="action_set_caption">説明を設定</string>
<string name="action_remove_media">消去</string>
<string name="action_remove">消去</string>
<string name="lock_account_label">アカウントをロック</string>
<string name="lock_account_label_description">フォロワーを手動で承認する必要があります</string>
<string name="compose_save_draft">下書きを保存しますか？</string>

2
app/src/main/res/values-ko/strings.xml
View file

@ -347,7 +347,7 @@
<string name="hint_describe_for_visually_impaired">시각 장애인을 위한 설명
\n(%d글자 작성 가능)</string>
<string name="action_set_caption">설명 추가</string>
<string name="action_remove_media">삭제</string>
<string name="action_remove">삭제</string>
<string name="lock_account_label">계정 잠금</string>
<string name="lock_account_label_description">팔로워를 수동으로 승인합니다</string>
<string name="compose_save_draft">작성 중인 내용을 저장하시겠습니까\?</string>

2
app/src/main/res/values-nl/strings.xml
View file

@ -263,7 +263,7 @@
<string name="error_failed_set_caption">Toevoegen van beschrijving mislukt</string>
<string name="hint_describe_for_visually_impaired">Omschrijf dit voor mensen met een visuele beperking\n(tekenlimiet is %d)</string>
<string name="action_set_caption">Beschrijving toevoegen</string>
<string name="action_remove_media">Verwijderen</string>
<string name="action_remove">Verwijderen</string>
<string name="lock_account_label">Account besloten maken</string>
<string name="lock_account_label_description">Handmatige goedkeuring vereist voor volgers</string>
<string name="compose_save_draft">Concept bewaren?</string>

2
app/src/main/res/values-no-rNB/strings.xml
View file

@ -304,7 +304,7 @@
<string name="hint_describe_for_visually_impaired">Beskriv for de med nedsatt synsevne
\n(maks %d tegn)</string>
<string name="action_set_caption">Sett bildetekst</string>
<string name="action_remove_media">Slett</string>
<string name="action_remove">Slett</string>
<string name="lock_account_label">Lås konto</string>
<string name="lock_account_label_description">Krever at du manuelt godkjenner nye følgere</string>
<string name="compose_save_draft">Lagre kladd\?</string>

2
app/src/main/res/values-oc/strings.xml
View file

@ -230,7 +230,7 @@
<string name="compose_active_account_description">Publicar amb lo compte %1$s</string>
<string name="error_failed_set_caption">Fracàs en apondre una legenda</string>
<string name="action_set_caption">Apondre una legenda</string>
<string name="action_remove_media">Levar</string>
<string name="action_remove">Levar</string>
<string name="lock_account_label">Clavar lo compte</string>
<string name="lock_account_label_description">Demanda que validetz manualament los seguidors</string>
<string name="compose_save_draft">Salvar lo borrolhon ?</string>

2
app/src/main/res/values-pl/strings.xml
View file

@ -233,7 +233,7 @@
<string name="compose_active_account_description">Publikowanie z konta %1$s</string>
<string name="error_failed_set_caption">Nie udało się ustawić podpisu</string>
<string name="action_set_caption">Ustaw podpis</string>
<string name="action_remove_media">Usuń</string>
<string name="action_remove">Usuń</string>
<string name="lock_account_label">Zablokuj konto</string>
<string name="lock_account_label_description">Wymaga od Ciebie ręcznej akceptacji próśb o śledzenie</string>
<string name="compose_save_draft">Czy chcesz zapisać szkic?</string>

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

@ -251,7 +251,7 @@
<string name="compose_active_account_description">Usando a conta %1$s</string>
<string name="error_failed_set_caption">Falha ao incluir descrição</string>
<string name="action_set_caption">Descrever</string>
<string name="action_remove_media">Remover</string>
<string name="action_remove">Remover</string>
<string name="lock_account_label">Trancar conta</string>
<string name="lock_account_label_description">Requer aprovação manual de seguidores</string>
<string name="compose_save_draft">Salvar rascunho?</string>

2
app/src/main/res/values-ru/strings.xml
View file

@ -352,7 +352,7 @@
<string name="error_failed_set_caption">Не удалось добавить подпись</string>
<string name="hint_describe_for_visually_impaired">Описание для слабовидящих\n(не более %d символов)</string>
<string name="action_set_caption">Добавить подпись</string>
<string name="action_remove_media">Удалить</string>
<string name="action_remove">Удалить</string>
<string name="lock_account_label">Закрыть аккаунт</string>
<string name="lock_account_label_description">Вам придётся вручную подтверждать подписчиков</string>
<string name="compose_save_draft">Сохранить черновик?</string>

2
app/src/main/res/values-sl/strings.xml
View file

@ -304,7 +304,7 @@
<string name="hint_describe_for_visually_impaired">Opišite za slabovidne
\n(omejitev znakov - %d)</string>
<string name="action_set_caption">Nastavi opis</string>
<string name="action_remove_media">Odstrani</string>
<string name="action_remove">Odstrani</string>
<string name="lock_account_label">Zakleni račun</string>
<string name="lock_account_label_description">Zahtevana je ročna potrditev sledilcev</string>
<string name="compose_save_draft">Shrani osnutek\?</string>

2
app/src/main/res/values-sv/strings.xml
View file

@ -284,7 +284,7 @@
<string name="error_failed_set_caption">Misslyckades med att ange bildtext</string>
<string name="hint_describe_for_visually_impaired">Beskriv för synskadade\n(%d teckengräns)</string>
<string name="action_set_caption">Ange bildtext</string>
<string name="action_remove_media">Ta bort</string>
<string name="action_remove">Ta bort</string>
<string name="lock_account_label">Lås konto</string>
<string name="lock_account_label_description">Kräver att du manuellt godkänner följare</string>
<string name="compose_save_draft">Spara utkast?</string>

2
app/src/main/res/values-ta/strings.xml
View file

@ -219,7 +219,7 @@
<string name="compose_active_account_description">%1$s கணக்குடன் பதிவிட</string>
<string name="error_failed_set_caption">தலைப்பை அமைக்க முடியவில்லை</string>
<string name="action_set_caption">தலைப்பை அமை</string>
<string name="action_remove_media">நீக்கு</string>
<string name="action_remove">நீக்கு</string>
<string name="lock_account_label">கணக்கை முடக்கு</string>
<string name="lock_account_label_description">நீங்களாக பின்பற்றுபவர்களை அங்கீகரிக்க</string>
<string name="compose_save_draft">வரைவை சேமிக்கவா?</string>

2
app/src/main/res/values-tr/strings.xml
View file

@ -250,7 +250,7 @@
<string name="hint_describe_for_visually_impaired">Görme engelliler için açıklama
\n(%d karakter limiti)</string>
<string name="action_set_caption">Başlık belirle</string>
<string name="action_remove_media">Kaldır</string>
<string name="action_remove">Kaldır</string>
<string name="lock_account_label">Hesabı Gizle</string>
<string name="lock_account_label_description">Aktif edilirse takipçileri elle onaylamanız gerekir</string>
<string name="compose_save_draft">Taslaklara kaydedilsin mi\?</string>

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

@ -337,7 +337,7 @@
<string name="error_failed_set_caption">设置图片标题失败</string>
<string name="hint_describe_for_visually_impaired">为视觉障碍用户提供的描述\n(限制 %d 字)</string>
<string name="action_set_caption">设置图片标题</string>
<string name="action_remove_media">移除</string>
<string name="action_remove">移除</string>
<string name="lock_account_label">保护你的帐户（锁嘟）</string>
<string name="lock_account_label_description">你需要手动审核所有关注请求</string>
<string name="compose_save_draft">保存为草稿？</string>

2
app/src/main/res/values-zh-rHK/strings.xml
View file

@ -332,7 +332,7 @@
<string name="error_failed_set_caption">設定圖片標題失敗</string>
<string name="hint_describe_for_visually_impaired">為視覺障礙用戶提供的描述\n(限制 %d 字)</string>
<string name="action_set_caption">設定圖片標題</string>
<string name="action_remove_media">移除</string>
<string name="action_remove">移除</string>
<string name="lock_account_label">保護你的帳戶（鎖嘟）</string>
<string name="lock_account_label_description">你需要手動審核所有關注請求</string>
<string name="compose_save_draft">儲存為草稿？</string>

2
app/src/main/res/values-zh-rMO/strings.xml
View file

@ -332,7 +332,7 @@
<string name="error_failed_set_caption">設定圖片標題失敗</string>
<string name="hint_describe_for_visually_impaired">為視覺障礙用戶提供的描述\n(限制 %d 字)</string>
<string name="action_set_caption">設定圖片標題</string>
<string name="action_remove_media">移除</string>
<string name="action_remove">移除</string>
<string name="lock_account_label">保護你的帳戶（鎖嘟）</string>
<string name="lock_account_label_description">你需要手動審核所有關注請求</string>
<string name="compose_save_draft">儲存為草稿？</string>

2
app/src/main/res/values-zh-rSG/strings.xml
View file

@ -337,7 +337,7 @@
<string name="error_failed_set_caption">设置图片标题失败</string>
<string name="hint_describe_for_visually_impaired">为视觉障碍用户提供的描述\n(限制 %d 字)</string>
<string name="action_set_caption">设置图片标题</string>
<string name="action_remove_media">移除</string>
<string name="action_remove">移除</string>
<string name="lock_account_label">保护你的帐户（锁嘟）</string>
<string name="lock_account_label_description">你需要手动审核所有关注请求</string>
<string name="compose_save_draft">保存为草稿？</string>

2
app/src/main/res/values-zh-rTW/strings.xml
View file

@ -331,7 +331,7 @@
<string name="error_failed_set_caption">設定圖片標題失敗</string>
<string name="hint_describe_for_visually_impaired">為視覺障礙用戶提供的描述\n(限制 %d 字)</string>
<string name="action_set_caption">設定圖片標題</string>
<string name="action_remove_media">移除</string>
<string name="action_remove">移除</string>
<string name="lock_account_label">保護你的帳戶（鎖嘟）</string>
<string name="lock_account_label_description">你需要手動審核所有關注請求</string>
<string name="compose_save_draft">儲存為草稿？</string>

2
app/src/main/res/values/dimens.xml
View file

@ -42,4 +42,6 @@
<dimen name="min_report_button_width">160dp</dimen>
<dimen name="card_radius">5dp</dimen>
<dimen name="poll_preview_padding">12dp</dimen>
</resources>

23
app/src/main/res/values/donottranslate.xml
View file

@ -116,4 +116,27 @@
</string-array>
<string name="rick_roll_url">https://www.youtube.com/watch?v=dQw4w9WgXcQ</string>
<string-array name="poll_duration_names">
<item>@string/poll_duration_5_min</item>
<item>@string/poll_duration_30_min</item>
<item>@string/poll_duration_1_hour</item>
<item>@string/poll_duration_6_hours</item>
<item>@string/poll_duration_1_day</item>
<item>@string/poll_duration_3_days</item>
<item>@string/poll_duration_7_days</item>
</string-array>
<integer-array name="poll_duration_values"> <!-- values in seconds, corresponding to poll_duration_names -->
<item>300</item>
<item>1800</item>
<item>3600</item>
<item>21600</item>
<item>86400</item>
<item>259200</item>
<item>604800</item>
</integer-array>
</resources>

18
app/src/main/res/values/strings.xml
View file

@ -97,6 +97,7 @@
<string name="action_view_media">Media</string>
<string name="action_open_in_web">Open in browser</string>
<string name="action_add_media">Add media</string>
<string name="action_add_poll">Add poll</string>
<string name="action_photo_take">Take photo</string>
<string name="action_share">Share</string>
<string name="action_mute">Mute</string>
@ -349,7 +350,7 @@
<string name="error_failed_set_caption">Failed to set caption</string>
<string name="hint_describe_for_visually_impaired">Describe for visually impaired\n(%d character limit)</string>
<string name="action_set_caption">Set caption</string>
<string name="action_remove_media">Remove</string>
<string name="action_remove">Remove</string>
<string name="lock_account_label">Lock account</string>
<string name="lock_account_label_description">Requires you to manually approve followers</string>
<string name="compose_save_draft">Save draft?</string>
@ -517,4 +518,19 @@
<string name="failed_search">Failed to search</string>
<string name="pref_title_show_notifications_filter">Show Notifications filter</string>
<string name="create_poll_title">Poll</string>
<string name="poll_duration_5_min">5 minutes</string>
<string name="poll_duration_30_min">30 minutes</string>
<string name="poll_duration_1_hour">1 hour</string>
<string name="poll_duration_6_hours">6 hours</string>
<string name="poll_duration_1_day">1 day</string>
<string name="poll_duration_3_days">3 days</string>
<string name="poll_duration_7_days">7 days</string>
<string name="add_poll_choice">Add choice</string>
<string name="poll_allow_multiple_choices">Multiple choices</string>
<string name="poll_new_choice_hint">Choice %d</string>
<string name="edit_poll">Edit</string>
</resources>