Commit 5fec0e54 authored by Thomas's avatar Thomas
Browse files

Merge branch 'develop' of framagit.org:tom79/fedilab into develop

parents 082d86d2 2ecc498d
......@@ -1330,6 +1330,32 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
}
});
if (theme == Helper.THEME_BLACK) {
holder.fedilab_features.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
holder.custom_feature_bookmark.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
holder.custom_feature_translate.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
holder.custom_feature_timed_mute.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
holder.custom_feature_schedule.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
holder.custom_feature_mention.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
holder.custom_feature_cache.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4__));
} else if (theme == Helper.THEME_DARK) {
holder.fedilab_features.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
holder.custom_feature_bookmark.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
holder.custom_feature_translate.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
holder.custom_feature_timed_mute.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
holder.custom_feature_schedule.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
holder.custom_feature_mention.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
holder.custom_feature_cache.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4_));
} else {
holder.fedilab_features.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
holder.custom_feature_bookmark.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
holder.custom_feature_translate.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
holder.custom_feature_timed_mute.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
holder.custom_feature_schedule.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
holder.custom_feature_mention.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
holder.custom_feature_cache.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC4));
}
if (status.isCustomFeaturesDisplayed()) {
holder.fedilab_features_panel.setVisibility(View.VISIBLE);
} else {
......
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:id="@+id/fedilab_features_panel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_marginStart="5dp"
android:background="@color/custom_features_panel_background"
android:paddingStart="2dp"
android:paddingTop="4dp"
android:paddingEnd="2dp"
android:paddingBottom="4dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/fedilab_features"
app:layout_constraintStart_toEndOf="@id/fedilab_features"
app:layout_constraintTop_toTopOf="@id/fedilab_features">
<ImageButton
android:id="@+id/custom_feature_timed_mute"
android:id="@+id/custom_feature_bookmark"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_margin="5dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/timed_mute"
android:src="@drawable/ic_timelapse"
android:tooltipText="@string/timed_mute"
android:contentDescription="@string/bookmark_add"
android:src="@drawable/ic_bookmark_white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/custom_feature_schedule"
app:layout_constraintEnd_toStartOf="@id/custom_feature_translate"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/custom_feature_schedule"
android:id="@+id/custom_feature_translate"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_margin="5dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/schedule"
android:src="@drawable/ic_schedule"
android:tooltipText="@string/schedule_boost"
android:contentDescription="@string/translate"
android:src="@drawable/ic_translate_white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/custom_feature_timed_mute"
app:layout_constraintRight_toLeftOf="@id/custom_feature_translate"
app:layout_constraintEnd_toStartOf="@id/custom_feature_timed_mute"
app:layout_constraintStart_toEndOf="@id/custom_feature_bookmark"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/custom_feature_translate"
android:id="@+id/custom_feature_timed_mute"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_margin="5dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/translate"
android:src="@drawable/ic_translate_white"
android:tooltipText="@string/translate"
android:contentDescription="@string/timed_mute"
android:src="@drawable/ic_timed_mute"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/custom_feature_schedule"
app:layout_constraintRight_toLeftOf="@id/custom_feature_bookmark"
app:layout_constraintEnd_toStartOf="@id/custom_feature_schedule"
app:layout_constraintStart_toEndOf="@id/custom_feature_translate"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/custom_feature_bookmark"
android:id="@+id/custom_feature_schedule"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_margin="5dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/bookmark_add"
android:src="@drawable/ic_bookmark_white"
android:tooltipText="@string/bookmark_add"
android:contentDescription="@string/schedule"
android:src="@drawable/ic_schedule_boost"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/custom_feature_translate"
app:layout_constraintRight_toLeftOf="@id/custom_feature_mention"
app:layout_constraintEnd_toStartOf="@id/custom_feature_mention"
app:layout_constraintStart_toEndOf="@id/custom_feature_timed_mute"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
......@@ -70,14 +81,14 @@
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_margin="5dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/mention_account"
android:src="@drawable/ic_mention_white"
android:tooltipText="@string/mention_status"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/custom_feature_bookmark"
app:layout_constraintRight_toLeftOf="@id/custom_feature_cache"
app:layout_constraintEnd_toStartOf="@id/custom_feature_cache"
app:layout_constraintStart_toEndOf="@id/custom_feature_schedule"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
......@@ -85,14 +96,14 @@
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_margin="5dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/refresh_cache"
android:src="@drawable/ic_refresh"
android:tooltipText="@string/refresh_cache"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/custom_feature_mention"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/custom_feature_mention"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
......@@ -277,9 +277,9 @@
android:id="@+id/status_account_username"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="5dp"
android:layout_marginLeft="5dp"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
......@@ -960,113 +960,7 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/fedilab_features_panel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:background="@color/custom_features_panel_background"
android:paddingStart="2dp"
android:paddingTop="4dp"
android:paddingEnd="2dp"
android:paddingBottom="4dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/fedilab_features"
app:layout_constraintStart_toEndOf="@id/fedilab_features"
app:layout_constraintTop_toTopOf="@id/fedilab_features">
<ImageButton
android:id="@+id/custom_feature_bookmark"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/bookmark_add"
android:src="@drawable/ic_bookmark_white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/custom_feature_translate"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/custom_feature_translate"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/translate"
android:src="@drawable/ic_translate_white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/custom_feature_timed_mute"
app:layout_constraintStart_toEndOf="@id/custom_feature_bookmark"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/custom_feature_timed_mute"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/timed_mute"
android:src="@drawable/ic_timed_mute"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/custom_feature_schedule"
app:layout_constraintStart_toEndOf="@id/custom_feature_translate"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/custom_feature_schedule"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/schedule"
android:src="@drawable/ic_schedule_boost"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/custom_feature_mention"
app:layout_constraintStart_toEndOf="@id/custom_feature_timed_mute"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/custom_feature_mention"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/mention_account"
android:src="@drawable/ic_mention_white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/custom_feature_cache"
app:layout_constraintStart_toEndOf="@id/custom_feature_schedule"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/custom_feature_cache"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/refresh_cache"
android:src="@drawable/ic_refresh"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/custom_feature_mention"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<include layout="@layout/custom_fedilab_features" />
<include
layout="@layout/layout_quick_reply"
......
......@@ -635,113 +635,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/status_toot_date" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/fedilab_features_panel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:background="@color/custom_features_panel_background"
android:paddingStart="2dp"
android:paddingTop="4dp"
android:paddingEnd="2dp"
android:paddingBottom="4dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/fedilab_features"
app:layout_constraintStart_toEndOf="@id/fedilab_features"
app:layout_constraintTop_toTopOf="@id/fedilab_features">
<ImageButton
android:id="@+id/custom_feature_bookmark"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/bookmark_add"
android:src="@drawable/ic_bookmark_white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/custom_feature_translate"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/custom_feature_translate"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/translate"
android:src="@drawable/ic_translate_white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/custom_feature_timed_mute"
app:layout_constraintStart_toEndOf="@id/custom_feature_bookmark"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/custom_feature_timed_mute"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/timed_mute"
android:src="@drawable/ic_timed_mute"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/custom_feature_schedule"
app:layout_constraintStart_toEndOf="@id/custom_feature_translate"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/custom_feature_schedule"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/schedule"
android:src="@drawable/ic_schedule_boost"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/custom_feature_mention"
app:layout_constraintStart_toEndOf="@id/custom_feature_timed_mute"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/custom_feature_mention"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/mention_account"
android:src="@drawable/ic_mention_white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/custom_feature_cache"
app:layout_constraintStart_toEndOf="@id/custom_feature_schedule"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/custom_feature_cache"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:background="@color/mastodonC4"
android:contentDescription="@string/refresh_cache"
android:src="@drawable/ic_refresh"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/custom_feature_mention"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<include layout="@layout/custom_fedilab_features" />
</androidx.constraintlayout.widget.ConstraintLayout>
......
......@@ -86,7 +86,7 @@
<string name="profile">Profil</string>
<string name="make_a_choice">Was möchten Sie tun?</string>
<string name="delete_account_title">Konto löschen</string>
<string name="delete_account_message" formatted="false">Konto %1$s aus der Anwendung löschen?</string>
<string name="delete_account_message" formatted="false">Möchten Sie das Konto %1$s wirklich aus der App entfernen?</string>
<string name="send_email">E-Mail senden</string>
<string name="choose_file">Datei wählen</string>
<string name="choose_file_error">Kein Dateimanager gefunden!</string>
......@@ -132,7 +132,7 @@
</string-array>
<string-array name="more_action_owner_confirm">
<item>Entferne diesen Toot?</item>
<item>Diesen Toot löschen &amp; neuentwerfen?</item>
<item>Diesen Toot löschen &amp; neu entwerfen?</item>
</string-array>
<plurals name="preview_replies">
<item quantity="one">%d Antwort</item>
......@@ -510,7 +510,7 @@ Durch das Löschen der Anwendung werden diese Daten sofort entfernt.\n
<string name="hide_boost">Verstecke geteilte Beiträge von %s</string>
<string name="endorse">Auf Profil hervorheben</string>
<string name="hide_everything">Verberge alles von %s</string>
<string name="show_boost">Zeige geteilte Beiträge von %s</string>
<string name="show_boost">Geteilte Beiträge von %s anzeigen</string>
<string name="unendorse">Nicht mehr im Profil hervorheben</string>
<string name="show_everything">Alles von %s anzeigen</string>
<string name="toast_endorse">Dieser Benutzer wird nun in deinem Profil hervorgehoben</string>
......@@ -621,7 +621,7 @@ Durch das Löschen der Anwendung werden diese Daten sofort entfernt.\n
<string name="tags_renamed">Dieses Schlagwort wurde geändert!</string>
<string name="tags_deleted">Dieses Schlagwort wurde gelöscht!</string>
<string name="set_display_art">Kunst-Zeitlinie anzeigen</string>
<string name="schedule_boost">Plane teilen des Beitrags</string>
<string name="schedule_boost">Teilen des Beitrags planen</string>
<string name="boost_scheduled">Teilen geplant!</string>
<string name="no_scheduled_boosts">Nichts geplant!</string>
<string name="no_scheduled_boosts_indications"><![CDATA[Öffne das Menü eines Toots und wähle <b>Teilen planen</b>.]]></string>
......
......@@ -1014,13 +1014,13 @@ Le bouton de connexion s’activera une fois qu’un domaine valide sera renseig
<string name="crash_message">Vous pouvez m’envoyer le rapport d’erreur par mail. Cela aidera à corriger le problème :)\n\nVous pouvez y ajouter des informations supplémentaires. Merci !</string>
<string name="set_wysiwyg">Utiliser l\'éditeur visuel</string>
<string name="set_wysiwyg_indication">Lorsque cette option est activée, vous serez en mesure de mettre en forme votre texte facilement avec des outils.</string>
<string name="action_stats">Statistics</string>
<string name="action_stats">Statistiques</string>
<string name="total_statuses">Total statuses</string>
<string name="number_boosts">Number of boosts</string>
<string name="number_replies">Number of replies</string>
<string name="number_statuses">Number of statuses</string>
<string name="statuses">Statuses</string>
<string name="visibility">Visibility</string>
<string name="visibility">Visibilité</string>
<string name="number_with_media">Number with media</string>
<string name="number_with_sensitive_media">Number with sensitive media</string>
<string name="number_with_cw">Number with CW</string>
......
......@@ -145,7 +145,7 @@
<string name="status_unbookmarked">게시물이 북마크에서 삭제 되었습니다!</string>
<!-- Date -->
<string name="date_seconds">%d 초</string>
<string name="date_minutes">%d </string>
<string name="date_minutes">%d </string>
<string name="date_hours">%d 시</string>
<string name="date_day">%d 초</string>
<!-- TOOT -->
......
......@@ -1028,8 +1028,8 @@ Yandex 有適當的隱私權政策,可以在這裡找到:https://yandex.ru/l
<string name="frequency">頻率</string>
<string name="toot_per_day">每日狀態數</string>
<string name="date_range">日期範圍</string>
<string name="action_groups">Groups</string>
<string name="no_messages">No groups!</string>
<string name="action_groups">群組</string>
<string name="no_messages">沒有群組!</string>
<plurals name="number_of_vote">
<item quantity="other">%d 人投票</item>
</plurals>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment