Mastodon
/
Yuito-app-android
mirror of https://github.com/accelforce/Yuito
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'tuskyapp/master'

This commit is contained in:
kyori19 2019-09-08 00:11:45 +09:00
parent 588e98f3f6 98f2cd0789
commit 8c2437c6bf
9 changed files with 66 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
View File

@ -115,10 +115,6 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
// Obtain information to fill out the profile.
viewModel.setAccountInfo(intent.getStringExtra(KEY_ACCOUNT_ID))
if (viewModel.isSelf) {
updateButtons()
}
val sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this)
animateAvatar = sharedPrefs.getBoolean("animateGifAvatars", false)
hideFab = sharedPrefs.getBoolean("fabHide", false)
@ -129,6 +125,10 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
setupAccountViews()
setupRefreshLayout()
subscribeObservables()
if (viewModel.isSelf) {
updateButtons()
}
}
/**

3
app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
View File

@ -198,6 +198,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
contentWarningButton.setVisibility(View.VISIBLE);
contentWarningButton.setChecked(expanded);
contentWarningButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
contentWarningDescription.invalidate();
if (getAdapterPosition() != RecyclerView.NO_POSITION) {
listener.onExpandedChange(isChecked, getAdapterPosition());
}
@ -595,7 +596,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
private static CharSequence getAttachmentDescription(Context context, Attachment attachment) {
String duration = "";
if(attachment.getMeta().getDuration() != null && attachment.getMeta().getDuration() > 0) {
if(attachment.getMeta() != null && attachment.getMeta().getDuration() != null && attachment.getMeta().getDuration() > 0) {
duration = formatDuration(attachment.getMeta().getDuration()) + " ";
}
if (TextUtils.isEmpty(attachment.getDescription())) {

3
app/src/main/res/values-ar/strings.xml
View File

@ -481,4 +481,5 @@
<string name="poll_new_choice_hint">الخيار %d</string>
<string name="edit_poll">تعديل</string>
</resources>
<string name="filter_dialog_whole_word_description">عندما تكون الكلمة أو العبارة أبجدية رقمية فقط ، فلن يتم تطبيقها إلا إذا كانت مطابقة للكلمة بأكملها</string>
</resources>

13
app/src/main/res/values-de/strings.xml
View File

@ -435,4 +435,17 @@
<string name="edit_poll">Bearbeiten</string>
<string name="about_tusky_version">Tusky Version %s</string>
<string name="action_add_poll">Umfrage hinzufügen</string>
<string name="pref_title_alway_open_spoiler">Immer Beiträge ausklappen, die mit Inhaltswarnungen versehen wurden</string>
<string name="description_poll">Umfrage mit den Möglichkeiten: %1$s, %2$s, %3$s, %4$s; %5$s</string>
<string name="compose_preview_image_description">Aktionen für Bild %s</string>
<string name="failed_fetch_statuses">Fehler beim Holen der Beiträge</string>
<string name="title_accounts">Konten</string>
<string name="failed_search">Fehler beim Suchen</string>
<string name="add_poll_choice">Auswahlmöglichkeit hinzufügen</string>
<string name="poll_allow_multiple_choices">Mehrere Möglichkeiten</string>
<string name="poll_new_choice_hint">Möglichkeit %d</string>
</resources>

18
app/src/main/res/values-es/strings.xml
View File

@ -283,7 +283,7 @@
<string name="download_failed">Descarga fallida</string>
<string name="profile_badge_bot_text">Bot</string>
<string name="account_moved_description">%1$s se trasladó a:</string>
<string name="reblog_private">Volver a compartir</string>
<string name="reblog_private">Impulsar a la audiencia original</string>
<string name="unreblog_private">Dejar de impulsar</string>
<string name="license_description">Yuito contiene código y recursos de los siguientes proyectos:</string>
<string name="license_apache_2">Licenciado bajo Apache License (texto bajo la lista)</string>
@ -449,4 +449,18 @@
<string name="title_accounts">Cuentas</string>
<string name="failed_search">Error al buscar</string>
</resources>
<string name="action_add_poll">Añadir encuesta</string>
<string name="create_poll_title">Encuesta</string>
<string name="poll_duration_5_min">5 minutos</string>
<string name="poll_duration_30_min">30 minutos</string>
<string name="poll_duration_1_hour">1 hora</string>
<string name="poll_duration_6_hours">6 horas</string>
<string name="poll_duration_1_day">1 día</string>
<string name="poll_duration_3_days">3 días</string>
<string name="poll_duration_7_days">7 días</string>
<string name="add_poll_choice">Añadir opción</string>
<string name="poll_allow_multiple_choices">Opciones múltiples</string>
<string name="poll_new_choice_hint">Opción %d</string>
<string name="edit_poll">Editar</string>
</resources>

16
app/src/main/res/values-sl/strings.xml
View File

@ -504,4 +504,18 @@
<string name="failed_search">Iskanje je bilo neuspešno</string>
<string name="pref_title_alway_open_spoiler">Vedno razširite tute, označene z opozorilom o vsebini</string>
</resources>
<string name="action_add_poll">Dodaj anketo</string>
<string name="create_poll_title">Anketa</string>
<string name="poll_duration_5_min">5 minut</string>
<string name="poll_duration_30_min">30 minut</string>
<string name="poll_duration_1_hour">1 ura</string>
<string name="poll_duration_6_hours">6 ur</string>
<string name="poll_duration_1_day">1 dan</string>
<string name="poll_duration_3_days">3 dni</string>
<string name="poll_duration_7_days">7 dni</string>
<string name="add_poll_choice">Dodaj izbiro</string>
<string name="poll_allow_multiple_choices">Več izbir</string>
<string name="poll_new_choice_hint">Izbira %d</string>
<string name="edit_poll">Uredi</string>
</resources>

12
fastlane/metadata/android/de/full_description.txt Normal file
View File

@ -0,0 +1,12 @@
Tusky ist ein leichtgewichtiger Client für Mastodon, ein freier und quelloffener Server für soziales Netzwerken.
• Material Design
• Meiste Mastodon-APIs implementiert
• Multi-Account-Support
• Dunkles und helles Theme mit der Möglichkeit es automatisch je nach Tageszeit zu wechseln
• Entwürfe - Schreibe Beiträge und speichere sie für später
• Auswahl zwischen verschiedenen Emoji-Stilen
• Optimiert für alle Bildschirmgrößen
• Komplett quelloffenen - Keine unfreien Abhängigkeiten wie Google-Dienste
Um mehr über Mastodon zu erfahren besuche https://joinmastodon.org/

1
fastlane/metadata/android/de/short_description.txt Normal file
View File

@ -0,0 +1 @@
Ein Multi-Account-Client für das soziale Netzwerk Mastodon

1
fastlane/metadata/android/de/title.txt Normal file
View File

@ -0,0 +1 @@
Tusky