Commit 79a8dee7 authored by Thomas's avatar Thomas
Browse files

Merge remote-tracking branch 'origin/develop' into develop

parents f7ac7c5b dc22571f

app/src/main/java/app/fedilab/android/mastodon/helper/SpannableHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public class SpannableHelper { 
        String[] tags = new String[]{};

        while (matcherBottomTags.find()) {

            String stringTags = Objects.requireNonNull(matcherBottomTags.group()).trim();

            tags = stringTags.split("\\s");

            tags = stringTags.split("\\s\\n?");

        }

        return tags;

    }

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

+12 −12
Original line number Diff line number Diff line
@@ -281,18 +281,6 @@ 
            tools:maxLines="10"

            tools:text="@tools:sample/lorem/random" />



        <com.google.android.material.chip.ChipGroup

            android:id="@+id/status_hashtags"

            android:visibility="gone"

            tools:visibility="visible"

            android:layout_marginStart="48dp"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="12dp"

            app:chipSpacingHorizontal="6dp"

            app:chipSpacingVertical="6dp"

            app:layout_constraintTop_toBottomOf="@id/description"/>



        <androidx.core.widget.NestedScrollView

            android:id="@+id/status_content_maths"

            android:layout_width="match_parent"
@@ -370,6 +358,18 @@ 


        </androidx.constraintlayout.widget.ConstraintLayout>



        <com.google.android.material.chip.ChipGroup

            android:id="@+id/status_hashtags"

            android:visibility="gone"

            tools:visibility="visible"

            android:layout_marginStart="48dp"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="12dp"

            app:chipSpacingHorizontal="6dp"

            app:chipSpacingVertical="6dp"

            app:layout_constraintTop_toBottomOf="@id/description"/>



        <com.google.android.material.card.MaterialCardView

            android:id="@+id/card"

            android:layout_width="match_parent"

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

+6 −0
Original line number Diff line number Diff line
@@ -1099,4 +1099,10 @@ 
    <string name="links">Ligazóns</string>

    <string name="link_image">Imaxe anexa á ligazón</string>

    <string name="underline_bottom_hashtags">Destacar cancelos da parte inferior</string>

    <string name="add_featured_hashtag">Engadir cancelo destacado</string>

    <string name="no_feature_hashtag_suggestion">Sen suxestións para os cancelos destacados!</string>

    <string name="fields_title">Engadir ou retirar campos</string>

    <string name="featured_hashtags_title">Engadir ou retirar cancelos destacados</string>

    <string name="delete_featured_hashtag">Eliminar cancelo destacado</string>

    <string name="delete_featured_hashtag_confirm">Tes certeza de querer eliminar o cancelo destacado?</string>

</resources>

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

+4 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>

    <string name="action_about">Γef</string>

    <string name="action_about_instance">Γef uqeddac</string>

    <string name="action_about">Ɣef</string>

    <string name="action_about_instance">Ɣef uqeddac</string>

    <string name="action_privacy">Tabaḍnit</string>

    <string name="action_cache">Tazarkatut</string>

    <string name="action_logout">Ffeɣ</string>
@@ -30,8 +30,8 @@ 
    <string name="delete_all">Kkes kullec</string>

    <string name="schedule">Sɣiwes</string>

    <string name="text_size">Tuɣzi n uḍris</string>

    <string name="next">Γer sdat</string>

    <string name="previous">Γer deffir</string>

    <string name="next">Uḍfir</string>

    <string name="previous">Uzwir</string>

    <string name="open_with">Ldi s</string>

    <string name="validate">Seɣbel</string>

    <string name="media">Amidya</string>

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

+6 −0
Original line number Diff line number Diff line
@@ -1109,4 +1109,10 @@ 
    <string name="underline_bottom_hashtags">Виділіть нижні хештеги</string>

    <string name="links">Посилання</string>

    <string name="link_image">Зображення додано до посилання</string>

    <string name="add_featured_hashtag">Додати популярний хештег</string>

    <string name="no_feature_hashtag_suggestion">Немає пропозицій щодо вибраних хештегів!</string>

    <string name="fields_title">Додавання або видалення полів</string>

    <string name="delete_featured_hashtag">Видалити обраний хештег</string>

    <string name="featured_hashtags_title">Додавання або видалення популярних хештегів</string>

    <string name="delete_featured_hashtag_confirm">Ви впевнені, що хочете видалити цей обраний хештег?</string>

</resources>