diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java index 36a2d2b6..e00462d9 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java @@ -190,13 +190,24 @@ public class EditProfileActivity extends BaseBarActivity { case "public" -> binding.visibilityPublic.setChecked(true); case "unlisted" -> binding.visibilityUnlisted.setChecked(true); case "private" -> binding.visibilityPrivate.setChecked(true); - case "direct" -> binding.visibilityDirect.setChecked(true); } } else { binding.sensitive.setVisibility(View.GONE); binding.visibilityGroup.setVisibility(View.GONE); } + String quotePolicy = Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.source.quotePolicy; + if (quotePolicy != null) { + switch (quotePolicy) { + case "nobody" -> binding.quoteApprovalPolicyNoOne.setChecked(true); + case "followers" -> binding.quoteApprovalPolicyFollowersOnly.setChecked(true); + case "public" -> binding.quoteApprovalPolicyAnyone.setChecked(true); + } + } else { + binding.quoteApprovalPolicyLabel.setVisibility(View.GONE); + binding.quoteApprovalPolicyGroup.setVisibility(View.GONE); + } + binding.bot.setChecked(Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.bot); binding.discoverable.setChecked(Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.discoverable); @@ -380,8 +391,17 @@ public class EditProfileActivity extends BaseBarActivity { return "unlisted"; } else if (binding.visibilityPrivate.isChecked()) { return "private"; - } else if (binding.visibilityDirect.isChecked()) { - return "direct"; + } + return null; + } + + private String getQuotePolicy() { + if (binding.quoteApprovalPolicyNoOne.isChecked()) { + return "nobody"; + } else if (binding.quoteApprovalPolicyFollowersOnly.isChecked()) { + return "followers"; + } else if (binding.quoteApprovalPolicyAnyone.isChecked()) { + return "public"; } return null; } @@ -421,6 +441,7 @@ public class EditProfileActivity extends BaseBarActivity { binding.locked.isChecked(), getPrivacy(), binding.sensitive.isChecked(), + getQuotePolicy(), null, getFields(), getFeaturedHashtags() diff --git a/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Source.java b/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Source.java index ca84fa94..2b651316 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Source.java +++ b/app/src/main/java/app/fedilab/android/mastodon/client/entities/api/Source.java @@ -26,6 +26,8 @@ public class Source implements Serializable { public String quote_policy; @SerializedName("sensitive") public boolean sensitive; + @SerializedName("quote_policy") + public String quotePolicy; @SerializedName("language") public String language; @SerializedName("note") @@ -44,5 +46,7 @@ public class Source implements Serializable { public boolean sensitive; @SerializedName("language") public String language; + @SerializedName("quote_policy") + public String quotePolicy; } } diff --git a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AccountsVM.java b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AccountsVM.java index 9473c1dc..7a26e9ee 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AccountsVM.java +++ b/app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/AccountsVM.java @@ -251,6 +251,7 @@ public class AccountsVM extends AndroidViewModel { * @param locked Whether manual approval of follow requests is required. * @param privacy Default post privacy for authored statuses. * @param sensitive Whether to mark authored statuses as sensitive by default. + * @param quotePolicy Default value for who can quote statuses * @param language Default language to use for authored statuses. (ISO 6391) * @param fields Profile metadata name (By default, max 4 fields and 255 characters per property/value) * @param featuredHashtags Featured hashtags that will be displayed on the profile @@ -264,6 +265,7 @@ public class AccountsVM extends AndroidViewModel { Boolean locked, String privacy, Boolean sensitive, + String quotePolicy, String language, LinkedHashMap fields, List featuredHashtags @@ -286,6 +288,7 @@ public class AccountsVM extends AndroidViewModel { accountParams.source.privacy = privacy; accountParams.source.language = language; accountParams.source.sensitive = sensitive; + accountParams.source.quotePolicy = quotePolicy; accountParams.fields = fields; Call accountCall = mastodonAccountsService.update_credentials(token, accountParams); // Call accountCall = mastodonAccountsService.update_credentials(token, discoverable, bot, displayName, note, locked, privacy, sensitive, language, fields); diff --git a/app/src/main/res/layouts/mastodon/layout/activity_edit_profile.xml b/app/src/main/res/layouts/mastodon/layout/activity_edit_profile.xml index d65cea38..3fa841c2 100644 --- a/app/src/main/res/layouts/mastodon/layout/activity_edit_profile.xml +++ b/app/src/main/res/layouts/mastodon/layout/activity_edit_profile.xml @@ -365,15 +365,6 @@ android:textAlignment="textStart" app:icon="@drawable/ic_compose_visibility_private" /> - - + @@ -59,8 +62,10 @@ tools:visibility="visible" android:id="@+id/login_token_layout" android:layout_width="match_parent" + style="@style/Widget.Material3.TextInputLayout.OutlinedBox" android:layout_height="wrap_content" android:layout_marginHorizontal="24dp" + android:layout_marginTop="12dp" app:errorEnabled="true" app:layout_constraintBottom_toTopOf="@id/continue_button" app:layout_constraintTop_toBottomOf="@+id/login_instance_layout" @@ -68,19 +73,21 @@ + - diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 24733276..6e514e5c 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -426,4 +426,4 @@ Съобщението вече не е закачено! Формат на публикация Местоимения - \ No newline at end of file + diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index b486cf62..078de971 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -1110,4 +1110,23 @@ Estàs segura de seguir l\'etiqueta %1$s?? Ressaltar etiquetes inferiors …i %d més + \@string/context_home + \@string/local_menu + Pissarra pública + Mencions privades + Pissarra de bafarada + Contingut traduït: %s + %s. Pissarra de llista + %s. Pissarra de hashtag + Ocultar mèdia + Mostrar mèdia + Selecció predeterminada de qui pot citar + Fediverse: + Pàgina web: + Donacions: + Suprimir paràmetres de rastreig + L\'app suprimirà automàticament els paràmetres de rastreig d\'URLs abans de visitar un enllaç. + Qui pot citar + Ningú + Tothom diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index ebd2b8dd..a05b8513 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -109,7 +109,7 @@ eiliad %d eiliadau %d eiliadau - + %d minutes @@ -125,7 +125,7 @@ %d awr %d oriau %d oriau - + %d days @@ -133,7 +133,7 @@ %d dydd %d dyddiau %d dyddiau - + Roedd gwall! @@ -503,7 +503,7 @@ %d pleidleisiwr %d pleidleisiwyr %d pleidleisiwyr - + Single choice diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 5191094c..57b7ac29 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -21,7 +21,7 @@ Etiquetas Gardar Instancia - Instancia: mastodon.social + Ex.: mastodon.social %1$s é a conta activa Engadir unha conta Copiose ao portapapeis o contido da mensaxe @@ -1118,4 +1118,11 @@ %s. Cronoloxía do cancelo Ocultar multimedia Mostrar multimedia + Valor por defecto para quen pode citar + Fediverso: + Sitio web: + Doar: + Quen pode citar + Ninguén + Calquera diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml index d42cfada..d44253bf 100644 --- a/app/src/main/res/values-ia/strings.xml +++ b/app/src/main/res/values-ia/strings.xml @@ -78,4 +78,4 @@ Dimensiones de texto Dimensiones de icones Monstrar mi messages - \ No newline at end of file + diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 5fd02784..28c9df65 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -217,4 +217,4 @@ Bæta við minnispunkti Grunnur þemu Sérsníða dökkþemu - \ No newline at end of file + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ff8cd338..b502e6ab 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -21,7 +21,7 @@ タグ 保存 サーバー - サーバー: mastodon.social + 例: mastodon.social アカウント %1$s に切り替えました アカウントを追加 投稿の内容をクリップボードにコピーしました diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml index f6532cde..7a353874 100644 --- a/app/src/main/res/values-kab/strings.xml +++ b/app/src/main/res/values-kab/strings.xml @@ -55,7 +55,7 @@ Imseqdacen yettusḥebsen Ilɣa Isuturen n teḍfeṛt - Iɣewwaṛen + Iɣewwaren Azen imayl Scheduled toots Information below may reflect the user\'s profile incompletely. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 15ea875b..51d80073 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -21,7 +21,7 @@ Мітки Зберегти Екземпляр - Екземпляр: mastodon.social + Наприклад: mastodon.social Тепер працює з обліковим записом %1$s Додати обліковий запис Вміст повідомлення скопійований в буфер обміну diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index bbbc88d1..192cbc12 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -21,7 +21,7 @@ 标签 保存 实例 - 实例:mastodon.social + 如:mastodon.social 现在使用账号 %1$s 添加账号 消息内容已复制到剪贴板 @@ -1127,4 +1127,5 @@ 谁可引用 无人 任何人 + 谁可以引用的默认选择 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 548b0627..09547944 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -23,7 +23,7 @@ Tags Save Instance - Instance: mastodon.social + E.g.: mastodon.social Your token Now works with the account %1$s Add an account diff --git a/app/src/main/res/xml/pref_timelines.xml b/app/src/main/res/xml/pref_timelines.xml index 9a2a0167..cd3e4e10 100644 --- a/app/src/main/res/xml/pref_timelines.xml +++ b/app/src/main/res/xml/pref_timelines.xml @@ -72,6 +72,16 @@ app:singleLineTitle="false" app:title="@string/truncate_links" /> + -