mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-12-25 00:00:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'uRDAlaqjNb-quote-policy--replace-no-one' into develop

Browse source
This commit is contained in:
0xd9a 2025-09-22 11:42:09 +05:30
commit 1708cd62cd
11 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/app/fedilab/android/mastodon/activities/EditProfileActivity.java
View file

@ -200,7 +200,7 @@ public class EditProfileActivity extends BaseBarActivity {
String quotePolicy = Helper.getCurrentAccount(EditProfileActivity.this).mastodon_account.source.quote_policy;
if (quotePolicy != null) {
switch (quotePolicy) {
case "nobody" -> binding.quoteApprovalPolicyNoOne.setChecked(true);
case "nobody" -> binding.quoteApprovalPolicyJustMe.setChecked(true);
case "followers" -> binding.quoteApprovalPolicyFollowersOnly.setChecked(true);
case "public" -> binding.quoteApprovalPolicyAnyone.setChecked(true);
}
@ -397,7 +397,7 @@ public class EditProfileActivity extends BaseBarActivity {
}
private String getQuotePolicy() {
if (binding.quoteApprovalPolicyNoOne.isChecked()) {
if (binding.quoteApprovalPolicyJustMe.isChecked()) {
return "nobody";
} else if (binding.quoteApprovalPolicyFollowersOnly.isChecked()) {
return "followers";

2
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java
View file

@ -1768,7 +1768,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
applyColor(context, holder, statusDraft.visibility);
unlisted_changed = true;
});
holder.binding.buttonQuoteApprovalPolicyNoOne.setOnClickListener(v -> {
holder.binding.buttonQuoteApprovalPolicyJustMe.setOnClickListener(v -> {
holder.binding.quoteApprovalPolicyPanel.setVisibility(View.GONE);
holder.binding.buttonQuoteApprovalPolicy.setIconResource(R.drawable.ic_quote_policy_nobody);
statusDraft.quote_approval_policy = MastodonHelper.quote_visibility.NOBODY.name();

4
app/src/main/res/layouts/mastodon/layout/activity_edit_profile.xml
View file

@ -389,11 +389,11 @@
app:singleSelection="true">
<com.google.android.material.button.MaterialButton
android:id="@+id/quote_approval_policy_no_one"
android:id="@+id/quote_approval_policy_just_me"
style="@style/Fedilab.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/no_one"
android:text="@string/just_me"
android:textAlignment="textStart"
app:icon="@drawable/ic_quote_policy_nobody" />

4
app/src/main/res/layouts/mastodon/layout/drawer_status_compose.xml
View file

@ -466,14 +466,14 @@
app:singleSelection="true">
<com.google.android.material.button.MaterialButton
android:id="@+id/button_quote_approval_policy_no_one"
android:id="@+id/button_quote_approval_policy_just_me"
style="@style/Widget.Material3.Button.OutlinedButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:insetTop="0dp"
android:insetBottom="0dp"
android:minHeight="36dp"
android:text="@string/no_one"
android:text="@string/just_me"
android:textAlignment="textStart"
app:icon="@drawable/ic_quote_policy_nobody" />

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

@ -1127,7 +1127,6 @@
<string name="set_tracking_parameters">Suprimir paràmetres de rastreig</string>
<string name="set_tracking_parameters_indication">L\'app suprimirà automàticament els paràmetres de rastreig d\'URLs abans de visitar un enllaç.</string>
<string name="who_can_quote">Qui pot citar</string>
<string name="no_one">Ningú</string>
<string name="anyone">Tothom</string>
<string name="set_translate_button">Botó de traducció</string>
<string name="action_unreblog">Desdifondre</string>

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

@ -1134,7 +1134,6 @@
<string name="set_tracking_parameters">Odstranit sledovací parametry</string>
<string name="set_tracking_parameters_indication">Aplikace automaticky odstraní sledovací parametry z URL před návštěvou odkazu.</string>
<string name="who_can_quote">Kdo může citovat</string>
<string name="no_one">Nikdo</string>
<string name="anyone">Kdokoliv</string>
<string name="add_featured_hashtag">Přidat oblíbený hashtag</string>
<string name="no_feature_hashtag_suggestion">Žádné návrhy na oblíbené hashtagy!</string>

1
app/src/main/res/values-gl/strings.xml
View file

@ -1123,7 +1123,6 @@
<string name="about_website">Sitio web:</string>
<string name="about_donate">Doar:</string>
<string name="who_can_quote">Quen pode citar</string>
<string name="no_one">Ninguén</string>
<string name="anyone">Calquera</string>
<string name="set_translate_button">Botón para traducir</string>
<string name="move_timeline_up">Mover arriba a cronoloxía</string>

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

@ -1128,7 +1128,6 @@
<string name="about_donate">寄付:</string>
<string name="default_who_can_quote">デフォルトの見積可能者を選択</string>
<string name="who_can_quote">見積可能者</string>
<string name="no_one">誰も</string>
<string name="anyone">誰か</string>
<string name="set_translate_button">翻訳ボタン</string>
<string name="action_unreblog">アンブースト</string>

1
app/src/main/res/values-uk/strings.xml
View file

@ -1135,7 +1135,6 @@
<string name="about_website">Вебсайт:</string>
<string name="about_donate">Пожертвувати:</string>
<string name="who_can_quote">Хто може цитувати</string>
<string name="no_one">Ніхто</string>
<string name="anyone">Будь-хто</string>
<string name="default_who_can_quote">Вибір за замовчуванням для тих, хто може котирувати</string>
<string name="set_translate_button">Кнопка перекладу</string>

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

@ -1125,7 +1125,6 @@
<string name="about_fediverse">联邦宇宙：</string>
<string name="about_website">网站：</string>
<string name="who_can_quote">谁可引用</string>
<string name="no_one">无人</string>
<string name="anyone">任何人</string>
<string name="default_who_can_quote">谁可以引用的默认选择</string>
<string name="set_translate_button">翻译按钮</string>

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

@ -692,7 +692,7 @@
<string name="followers_only">Followers only</string>
<string name="who_can_quote">Who can quote</string>
<string name="quoting_messages">Quoting messages</string>
<string name="no_one">No one</string>
<string name="just_me">Just me</string>
<string name="anyone">Anyone</string>
<string name="other">Other</string>
<string name="eg_sensitive_content">Eg.: Sensitive Content</string>