Merge branch 'develop' into m_quotes

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()

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;
     }
 }

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<Integer, Field.FieldParams> fields,
                                                List<String> 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<Account> accountCall = mastodonAccountsService.update_credentials(token, accountParams);
             // Call<Account> accountCall = mastodonAccountsService.update_credentials(token, discoverable, bot, displayName, note, locked, privacy, sensitive, language, fields);

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" />
 
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/visibility_direct"
-                    style="@style/Fedilab.OutlinedButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/v_direct"
-                    android:textAlignment="textStart"
-                    app:icon="@drawable/ic_compose_visibility_direct" />
-
             </com.google.android.material.button.MaterialButtonToggleGroup>
 
             <com.google.android.material.textview.MaterialTextView

app/src/main/res/layouts/mastodon/layout/fragment_login_main.xml

@@ -36,21 +36,24 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="24dp"
+        style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
         app:errorEnabled="true"
+        android:hint="@string/instance"
+        app:helperText="@string/instance_example"
         app:layout_constraintBottom_toTopOf="@id/login_token_layout"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed">
 
         <com.google.android.material.textfield.MaterialAutoCompleteTextView
             android:id="@+id/login_instance"
-            style="@style/Widget.Material3.TextInputEditText.FilledBox"
+            style="@style/Widget.Material3.TextInputEditText.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:dropDownAnchor="@id/login_instance_layout"
-            android:hint="@string/instance_example"
             android:imeOptions="actionDone"
             android:inputType="textWebEmailAddress"
             android:singleLine="true" />
+
     </com.google.android.material.textfield.TextInputLayout>
 
 
@@ -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 @@
 
         <com.google.android.material.textfield.MaterialAutoCompleteTextView
             android:id="@+id/login_token"
-            style="@style/Widget.Material3.TextInputEditText.FilledBox"
+            style="@style/Widget.Material3.TextInputEditText.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/instance_token"
             android:imeOptions="actionDone"
             android:inputType="text"
             android:singleLine="true" />
+
     </com.google.android.material.textfield.TextInputLayout>
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/continue_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
         android:text="@string/keepon"
         android:textAllCaps="false"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -93,19 +100,19 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginBottom="12dp"
         android:text="@string/dont_have_an_account"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="@id/no_account_a"
+        app:layout_constraintBottom_toBottomOf="@id/no_account_a"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <com.google.android.material.textview.MaterialTextView
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/no_account_a"
+        style="@style/Widget.Material3.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:layout_marginBottom="12dp"
         android:text="@string/join_the_fediverse"
-        android:textColor="?android:textColorLink"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@id/no_account_q" />
 

app/src/main/res/values-bg/strings.xml

@@ -426,4 +426,4 @@
     <string name="toast_unpin">Съобщението вече не е закачено!</string>
     <string name="post_format">Формат на публикация</string>
     <string name="Pronouns">Местоимения</string>
-</resources>
+</resources>

app/src/main/res/values-ca/strings.xml

@@ -1110,4 +1110,23 @@
     <string name="action_follow_tag_confirm">Estàs segura de seguir l\'etiqueta %1$s??</string>
     <string name="underline_bottom_hashtags">Ressaltar etiquetes inferiors</string>
     <string name="remaining_tags">…i %d més</string>
+    <string name="tab_home_timeline">\@string/context_home</string>
+    <string name="tab_local_timeline">\@string/local_menu</string>
+    <string name="tab_public_timeline">Pissarra pública</string>
+    <string name="tab_private_mentions">Mencions privades</string>
+    <string name="tab_bubble_timeline">Pissarra de bafarada</string>
+    <string name="cd_translated_content">Contingut traduït: %s</string>
+    <string name="cd_list_timeline">%s. Pissarra de llista</string>
+    <string name="cd_hash_tag_timeline">%s. Pissarra de hashtag</string>
+    <string name="cd_hide_media">Ocultar mèdia</string>
+    <string name="cd_show_media">Mostrar mèdia</string>
+    <string name="default_who_can_quote">Selecció predeterminada de qui pot citar</string>
+    <string name="about_fediverse">Fediverse:</string>
+    <string name="about_website">Pàgina web:</string>
+    <string name="about_donate">Donacions:</string>
+    <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>
 </resources>

app/src/main/res/values-cy/strings.xml

@@ -109,7 +109,7 @@
         <item quantity="two">eiliad</item>
         <item quantity="few">%d eiliadau</item>
         <item quantity="many">%d eiliadau</item>
-        <item quantity="other"/>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="date_minutes_polls">
         <item quantity="zero">%d minutes</item>
@@ -125,7 +125,7 @@
         <item quantity="two">%d awr</item>
         <item quantity="few">%d oriau</item>
         <item quantity="many">%d oriau</item>
-        <item quantity="other"/>
+        <item quantity="other"></item>
     </plurals>
     <plurals name="date_day_polls">
         <item quantity="zero">%d days</item>
@@ -133,7 +133,7 @@
         <item quantity="two">%d dydd</item>
         <item quantity="few">%d dyddiau</item>
         <item quantity="many">%d dyddiau</item>
-        <item quantity="other"/>
+        <item quantity="other"></item>
     </plurals>
     <!-- TOOT -->
     <string name="toot_select_image_error">Roedd gwall!</string>
@@ -503,7 +503,7 @@
         <item quantity="two">%d pleidleisiwr</item>
         <item quantity="few">%d pleidleisiwyr</item>
         <item quantity="many">%d pleidleisiwyr</item>
-        <item quantity="other"/>
+        <item quantity="other"></item>
     </plurals>
     <string-array name="poll_choice_type">
         <item>Single choice</item>

app/src/main/res/values-gl/strings.xml

@@ -21,7 +21,7 @@
     <string name="tags">Etiquetas</string>
     <string name="save">Gardar</string>
     <string name="instance">Instancia</string>
-    <string name="instance_example">Instancia: mastodon.social</string>
+    <string name="instance_example">Ex.: mastodon.social</string>
     <string name="toast_account_changed" formatted="false">%1$s é a conta activa</string>
     <string name="add_account">Engadir unha conta</string>
     <string name="clipboard">Copiose ao portapapeis o contido da mensaxe</string>
@@ -1118,4 +1118,11 @@
     <string name="cd_hash_tag_timeline">%s. Cronoloxía do cancelo</string>
     <string name="cd_hide_media">Ocultar multimedia</string>
     <string name="cd_show_media">Mostrar multimedia</string>
+    <string name="default_who_can_quote">Valor por defecto para quen pode citar</string>
+    <string name="about_fediverse">Fediverso:</string>
+    <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>
 </resources>

app/src/main/res/values-ia/strings.xml

@@ -78,4 +78,4 @@
     <string name="text_size">Dimensiones de texto</string>
     <string name="icon_size">Dimensiones de icones</string>
     <string name="show_my_messages">Monstrar mi messages</string>
-</resources>
+</resources>

app/src/main/res/values-is/strings.xml

@@ -217,4 +217,4 @@
     <string name="action_add_notes">Bæta við minnispunkti</string>
     <string name="pref_theme_base">Grunnur þemu</string>
     <string name="set_customize_dark">Sérsníða dökkþemu</string>
-</resources>
+</resources>

app/src/main/res/values-ja/strings.xml

@@ -21,7 +21,7 @@
     <string name="tags">タグ</string>
     <string name="save">保存</string>
     <string name="instance">サーバー</string>
-    <string name="instance_example">サーバー: mastodon.social</string>
+    <string name="instance_example">例: mastodon.social</string>
     <string name="toast_account_changed" formatted="false">アカウント %1$s に切り替えました</string>
     <string name="add_account">アカウントを追加</string>
     <string name="clipboard">投稿の内容をクリップボードにコピーしました</string>

app/src/main/res/values-kab/strings.xml

@@ -55,7 +55,7 @@
     <string name="blocked_menu">Imseqdacen yettusḥebsen</string>
     <string name="notifications">Ilɣa</string>
     <string name="follow_request">Isuturen n teḍfeṛt</string>
-    <string name="settings">Iɣewwaṛen</string>
+    <string name="settings">Iɣewwaren</string>
     <string name="send_email">Azen imayl</string>
     <string name="scheduled_toots">Scheduled toots</string>
     <string name="disclaimer_full">Information below may reflect the user\'s profile incompletely.</string>

app/src/main/res/values-uk/strings.xml

@@ -21,7 +21,7 @@
     <string name="tags">Мітки</string>
     <string name="save">Зберегти</string>
     <string name="instance">Екземпляр</string>
-    <string name="instance_example">Екземпляр: mastodon.social</string>
+    <string name="instance_example">Наприклад: mastodon.social</string>
     <string name="toast_account_changed" formatted="false">Тепер працює з обліковим записом %1$s</string>
     <string name="add_account">Додати обліковий запис</string>
     <string name="clipboard">Вміст повідомлення скопійований в буфер обміну</string>

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

@@ -21,7 +21,7 @@
     <string name="tags">标签</string>
     <string name="save">保存</string>
     <string name="instance">实例</string>
-    <string name="instance_example">实例：mastodon.social</string>
+    <string name="instance_example">如：mastodon.social</string>
     <string name="toast_account_changed" formatted="false">现在使用账号 %1$s</string>
     <string name="add_account">添加账号</string>
     <string name="clipboard">消息内容已复制到剪贴板</string>
@@ -1127,4 +1127,5 @@
     <string name="who_can_quote">谁可引用</string>
     <string name="no_one">无人</string>
     <string name="anyone">任何人</string>
+    <string name="default_who_can_quote">谁可以引用的默认选择</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -23,7 +23,7 @@
     <string name="tags">Tags</string>
     <string name="save">Save</string>
     <string name="instance">Instance</string>
-    <string name="instance_example">Instance: mastodon.social</string>
+    <string name="instance_example">E.g.: mastodon.social</string>
     <string name="instance_token">Your token</string>
     <string name="toast_account_changed" formatted="false">Now works with the account %1$s</string>
     <string name="add_account">Add an account</string>

app/src/main/res/xml/pref_timelines.xml

@@ -72,6 +72,16 @@
         app:singleLineTitle="false"
         app:title="@string/truncate_links" />
 
+    <androidx.preference.SeekBarPreference
+        android:defaultValue="30"
+        android:max="150"
+        app:dependency="@string/SET_TRUNCATE_LINKS"
+        app:iconSpaceReserved="false"
+        app:key="@string/SET_TRUNCATE_LINKS_MAX"
+        app:min="20"
+        app:showSeekBarValue="true"
+        app:singleLineTitle="false"
+        app:title="@string/truncate_links_max" />
 
     <SwitchPreferenceCompat
         android:defaultValue="true"
@@ -94,16 +104,6 @@
         app:singleLineTitle="false"
         app:title="@string/pronouns_support" />
 
-    <androidx.preference.SeekBarPreference
-        android:defaultValue="30"
-        android:max="150"
-        app:dependency="@string/SET_TRUNCATE_LINKS"
-        app:iconSpaceReserved="false"
-        app:key="@string/SET_TRUNCATE_LINKS_MAX"
-        app:min="20"
-        app:showSeekBarValue="true"
-        app:singleLineTitle="false"
-        app:title="@string/truncate_links_max" />
     <SwitchPreferenceCompat
         android:defaultValue="false"
         app:iconSpaceReserved="false"

src/fdroid/fastlane/metadata/android/ca/changelogs/538.txt

@@ -0,0 +1,26 @@
+Afegit:
+- Descripcions en pestanyes i barres superiors
+- Acció per permutar sensibilitat dels mèdia de brams i pissarres
+- Accions d’accessibilitat per traduir, descarregar i compartir amb el visor de mèdia
+- Indicador d’idioma en focalitzar
+- Idioma persa a pref. de “Canviar d’idioma”
+- Nou logo d’App
+
+Canviat:
+- Mostra llocs-tinents en carregar imatges de perfil
+- Actual. títols de pestanyes de navegació
+- Mill. accessibilitat de contingut traduït
+- Actual. paràmetres de rastreig de llista de “Suprimir paràmetres UTM
+- Rastreig en lloc d’UTM
+- Accessibilitat de pàgina de gestió de pissarres
+- Engrandit el botó de grandària de mèdia
+- Actual. de pàg. de crèdits
+
+Corregit:
+- Hashtags inferiors desapareixien a bios en act. “Ressaltar hashtags inferiors”
+- “Ús de frontal alternatiu” tallava enllaç al media
+- Tocar botó múltiples cops generava múltiples publicacions d’un bram
+- Text emergent no redimensionat al lliscar
+- Controls de vídeo invisibles amb tema clar
+- Imatge perfil sortia a l'esquerra del títol en pàgina de conversa en mode RTL
+- Fallides diverses

src/fdroid/fastlane/metadata/android/ja/changelogs/538.txt

@@ -1,19 +1,19 @@
 追加:
 - トップ・バーのタブのコンテンツ説明
-- タイムライン中の投稿のメディアの感度切替を容易にするアクション
+- タイムライン中の投稿のメディア感度切替の容易化アクション
-- メディアビューワー中の翻訳、ダウンロード、共有を容易にするアクション
+- メディアビューワー中の翻訳、ダウンロード、共有を容易化アクション
 - フォーカスされたステータスに言語インジケーター
 - "言語の変更"選択肢のペルシャ語
-- 新たなアプリのロゴ
+- 新アプリロゴ
 
 変更:
-- プロフィール写真読込中はプレースホルダーを表示する
+- プロフィール写真読込中はプレースホルダーを表示
 - 下部ナビゲーションタブのタイトルを刷新
 - 翻訳コンテンツの利用しやすさを改善
-- "UTMパラメータの削除"で使用するトラッキングパラメータの一覧を更新
+- "UTMパラメータの削除"の利用トラッキングパラメータの一覧を更新
 - "UTM"の代わりに"トラッキング"を利用
 - タイムラインページの管理の利用しやすさを改善
-- メディアの表示／非表示ボタンをより大きくした
+- メディアの表示/非表示ボタンをより大きくした
 - ページに関する更新
 
 修正: