fix(recycler-empty-view): make the textViews in the empty views follow the color themes

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android"
 		minSdk 23
 		targetSdk 33
-		versionCode 69
-		versionName "2.1.3"
+		versionCode 66
+		versionName "2.1.0"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "da-rDK", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fa-rIR", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "ig-rNG", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "my-rMM", "nl-rNL", "no-rNO", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "ur-rIN", "vi-rVN", "zh-rCN", "zh-rTW"
 	}
@@ -76,7 +76,7 @@ dependencies {
 	implementation 'me.grishka.litex:viewpager:1.0.0'
 	implementation 'me.grishka.litex:viewpager2:1.0.0'
 	implementation 'me.grishka.litex:palette:1.0.0'
-	implementation 'me.grishka.appkit:appkit:1.2.13'
+	implementation 'me.grishka.appkit:appkit:1.2.10'
 	implementation 'com.google.code.gson:gson:2.8.9'
 	implementation 'org.jsoup:jsoup:1.14.3'
 	implementation 'com.squareup:otto:1.3.8'

mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java

@@ -118,8 +118,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				List<NotificationChannel> channels=Arrays.stream(PushNotification.Type.values())
 						.map(type->{
 							NotificationChannel channel=new NotificationChannel(accountID+"_"+type, context.getString(type.localizedName), NotificationManager.IMPORTANCE_DEFAULT);
-							channel.setLightColor(context.getColor(R.color.primary_700));
-							channel.enableLights(true);
 							channel.setGroup(accountID);
 							return channel;
 						})
@@ -149,7 +147,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)
 				.setAutoCancel(true)
-				.setLights(context.getColor(R.color.primary_700), 500, 1000)
 				.setColor(context.getColor(R.color.primary_700));
 		if(avatar!=null){
 			builder.setLargeIcon(UiUtils.getBitmapFromDrawable(avatar));

mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java

@@ -150,7 +150,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 				});
 			}
 		}
-		tabBar.selectTab(currentTab);
 
 		return content;
 	}

mastodon/src/main/java/org/joinmastodon/android/fragments/MastodonRecyclerFragment.java

@@ -2,6 +2,10 @@ package org.joinmastodon.android.fragments;
 
 import android.os.Bundle;
 import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
 import android.widget.Toolbar;
 
 import org.joinmastodon.android.R;
@@ -43,6 +47,14 @@ public abstract class MastodonRecyclerFragment<T> extends BaseRecyclerFragment<T
 			refreshLayout.setProgressBackgroundColorSchemeColor(UiUtils.alphaBlendColors(colorBackground, colorPrimary, 0.11f));
 			refreshLayout.setColorSchemeColors(colorPrimary);
 		}
+
+		// This is to set the color of the 'This list is empty'
+		for (int i=0; i < ((LinearLayout) emptyView).getChildCount(); i++) {
+			View v = ((LinearLayout) emptyView).getChildAt(i);
+			if(v instanceof TextView) {
+				((TextView) v).setTextColor(UiUtils.getThemeColor(getContext(), android.R.attr.textColorSecondary));
+			}
+		}
 	}
 
 	@Override

mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java

@@ -1044,7 +1044,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		@NonNull
 		@Override
 		public SimpleViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType){
-			FrameLayout view=new FrameLayout(parent.getContext());
+			FrameLayout view=tabViews[viewType];
+			((ViewGroup)view.getParent()).removeView(view);
+			view.setVisibility(View.VISIBLE);
 			view.setLayoutParams(new RecyclerView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 			return new SimpleViewHolder(view);
 		}
@@ -1052,13 +1054,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		@Override
 		public void onBindViewHolder(@NonNull SimpleViewHolder holder, int position){
 			Fragment fragment=getFragmentForPage(position);
-			FrameLayout fragmentView=tabViews[position];
-			fragmentView.setVisibility(View.VISIBLE);
-			if(fragmentView.getParent() instanceof ViewGroup parent)
-				parent.removeView(fragmentView);
-			((FrameLayout)holder.itemView).addView(fragmentView);
 			if(!fragment.isAdded()){
-				getChildFragmentManager().beginTransaction().add(fragmentView.getId(), fragment).commit();
+				getChildFragmentManager().beginTransaction().add(holder.itemView.getId(), fragment).commit();
 				holder.itemView.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener(){
 					@Override
 					public boolean onPreDraw(){

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchQueryFragment.java

@@ -384,8 +384,6 @@ public class SearchQueryFragment extends MastodonRecyclerFragment<SearchResultVi
 	}
 
 	private void onSearchViewEnter(){
-		if(TextUtils.isEmpty(currentQuery) || currentQuery.trim().isEmpty())
-			return;
 		deliverResult(currentQuery, null);
 	}
 

mastodon/src/main/java/org/joinmastodon/android/model/Hashtag.java

@@ -30,19 +30,4 @@ public class Hashtag extends BaseModel implements DisplayItemsParent{
 	public String getID(){
 		return name;
 	}
-
-	@Override
-	public boolean equals(Object o){
-		if(this==o) return true;
-		if(o==null || getClass()!=o.getClass()) return false;
-
-		Hashtag hashtag=(Hashtag) o;
-
-		return name.equals(hashtag.name);
-	}
-
-	@Override
-	public int hashCode(){
-		return name.hashCode();
-	}
 }

mastodon/src/main/java/org/joinmastodon/android/model/Mention.java

@@ -20,22 +20,4 @@ public class Mention extends BaseModel{
 				", url='"+url+'\''+
 				'}';
 	}
-
-	@Override
-	public boolean equals(Object o){
-		if(this==o) return true;
-		if(o==null || getClass()!=o.getClass()) return false;
-
-		Mention mention=(Mention) o;
-
-		if(!id.equals(mention.id)) return false;
-		return url.equals(mention.url);
-	}
-
-	@Override
-	public int hashCode(){
-		int result=id.hashCode();
-		result=31*result+url.hashCode();
-		return result;
-	}
 }

mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/ZoomPanView.java

@@ -119,9 +119,6 @@ public class ZoomPanView extends FrameLayout implements ScaleGestureDetector.OnS
 
 		int width=right-left;
 		int height=bottom-top;
-		if(width==0 || height==0)
-			return;
-
 		float scale=Math.min(width/(float)child.getWidth(), height/(float)child.getHeight());
 		minScale=scale;
 		maxScale=Math.max(3f, height/(float)child.getHeight());
@@ -309,6 +306,8 @@ public class ZoomPanView extends FrameLayout implements ScaleGestureDetector.OnS
 				}, 1f).setMinimumVisibleChange(DynamicAnimation.MIN_VISIBLE_CHANGE_ALPHA));
 			}
 		}else{
+			if(animatingTransition)
+				Log.w(TAG, "updateViewTransform: ", new Throwable().fillInStackTrace());
 			child.setScaleX(matrixValues[Matrix.MSCALE_X]);
 			child.setScaleY(matrixValues[Matrix.MSCALE_Y]);
 			child.setTranslationX(matrixValues[Matrix.MTRANS_X]);

mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java

@@ -81,10 +81,10 @@ public class HtmlParser{
 			}
 		}
 
-		Map<String, String> idsByUrl=mentions.stream().distinct().collect(Collectors.toMap(m->m.url, m->m.id));
+		Map<String, String> idsByUrl=mentions.stream().collect(Collectors.toMap(m->m.url, m->m.id));
 		// Hashtags in remote posts have remote URLs, these have local URLs so they don't match.
 //		Map<String, String> tagsByUrl=tags.stream().collect(Collectors.toMap(t->t.url, t->t.name));
-		Map<String, Hashtag> tagsByTag=tags.stream().distinct().collect(Collectors.toMap(t->t.name.toLowerCase(), Function.identity()));
+		Map<String, Hashtag> tagsByTag=tags.stream().collect(Collectors.toMap(t->t.name.toLowerCase(), Function.identity()));
 
 		final SpannableStringBuilder ssb=new SpannableStringBuilder();
 		Jsoup.parseBodyFragment(source).body().traverse(new NodeVisitor(){

mastodon/src/main/java/org/joinmastodon/android/ui/views/MediaGridLayout.java

@@ -18,7 +18,7 @@ public class MediaGridLayout extends ViewGroup{
 	public static final int MAX_WIDTH=400; // dp
 	private static final int GAP=2; // dp
 	private PhotoLayoutHelper.TiledLayoutResult tiledLayout;
-	private int[] columnStarts, columnEnds, rowStarts, rowEnds;
+	private int[] columnStarts=new int[10], columnEnds=new int[10], rowStarts=new int[10], rowEnds=new int[10];
 
 	public MediaGridLayout(Context context){
 		this(context, null);
@@ -45,14 +45,6 @@ public class MediaGridLayout extends ViewGroup{
 			width=Math.round(width*(tiledLayout.width/(float)PhotoLayoutHelper.MAX_WIDTH));
 		}
 
-		if(rowStarts==null || rowStarts.length<tiledLayout.rowSizes.length){
-			rowStarts=new int[tiledLayout.rowSizes.length];
-			rowEnds=new int[tiledLayout.rowSizes.length];
-		}
-		if(columnStarts==null || columnStarts.length<tiledLayout.columnSizes.length){
-			columnStarts=new int[tiledLayout.columnSizes.length];
-			columnEnds=new int[tiledLayout.columnSizes.length];
-		}
 		int offset=0;
 		for(int i=0;i<tiledLayout.columnSizes.length;i++){
 			columnStarts[i]=offset;
@@ -85,7 +77,7 @@ public class MediaGridLayout extends ViewGroup{
 
 	@Override
 	protected void onLayout(boolean changed, int l, int t, int r, int b){
-		if(tiledLayout==null || rowStarts==null)
+		if(tiledLayout==null)
 			return;
 
 		int maxWidth=V.dp(MAX_WIDTH);

mastodon/src/main/res/values-el-rGR/strings.xml

@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Καλώς ήρθες στο Mastodon</string>
 	<string name="welcome_paragraph1">Το Mastodon είναι ένα αποκεντρωμένο κοινωνικό δίκτυο που σημαίνει ότι καμία εταιρεία δεν το ελέγχει. Αποτελείται από πολλούς ανεξάρτητους διακομιστές, όλοι συνδεδεμένοι μαζί.</string>
 	<string name="what_are_servers">Τι είναι οι διακομιστές;</string>
-	<string name="welcome_paragraph2">Κάθε λογαριασμός Mastodon φιλοξενείται σε ένα διακομιστή - ο καθένας με τις δικές του αξίες, κανόνες &amp; διαχειριστές. Ανεξάρτητα από το ποιον μπορεί να επιλέξεις, μπορείς να ακολουθήσεις και να αλληλεπιδράσεις με άτομα από οποιονδήποτε διακομιστή.</string>
 	<string name="opening_link">Άνοιγμα συνδέσμου…</string>
 	<string name="link_not_supported">Αυτός ο σύνδεσμος δεν υποστηρίζεται στην εφαρμογή</string>
 	<string name="log_out_all_accounts">Αποσύνδεση από όλους τους λογαριασμούς</string>
@@ -583,20 +582,5 @@
 	<string name="time_hours_ago_short">%dώ πριν</string>
 	<string name="time_days_ago_short">%dημ πριν</string>
 	<!-- %s is the name of the post language -->
-	<string name="translate_post">Μετάφραση από %s</string>
 	<!-- %1$s is the language, %2$s is the name of the translation service -->
-	<string name="post_translated">Μεταφράστηκε από %1$s χρησιμοποιώντας %2$s</string>
-	<string name="translation_show_original">Εμφάνιση αρχικού</string>
-	<string name="translation_failed">Η μετάφραση απέτυχε. Ίσως ο διαχειριστής δεν έχει ενεργοποιήσει μεταφράσεις σε αυτόν τον διακομιστή ή αυτός ο διακομιστής εκτελεί μια παλαιότερη έκδοση του Mastodon όπου οι μεταφράσεις δεν υποστηρίζονται ακόμα.</string>
-	<string name="settings_privacy">Ιδιωτικότητα και προσιτότητα</string>
-	<string name="settings_discoverable">Παροχή προφίλ και δημοσιεύσεων σε αλγορίθμους ανακάλυψης</string>
-	<string name="settings_indexable">Συμπερίληψη δημόσιων αναρτήσεων στα αποτελέσματα αναζήτησης</string>
-	<plurals name="x_participants">
-		<item quantity="one">%,d συμμετέχων</item>
-		<item quantity="other">%,d συμμετέχοντες</item>
-	</plurals>
-	<plurals name="x_posts_today">
-		<item quantity="one">%,d ανάρτηση σήμερα</item>
-		<item quantity="other">%,d αναρτήσεις σήμερα</item>
-	</plurals>
 </resources>

mastodon/src/main/res/values-fa-rIR/strings.xml

@@ -588,9 +588,6 @@
 	<string name="post_translated">ترجمه از %1$s با %2$s</string>
 	<string name="translation_show_original">نمایش اصلی</string>
 	<string name="translation_failed">ترجمه ناموفق بود. شاید مدیر ترجمه‌ها را در این کارساز فعال نکرده باشد یا این کارساز نسخه قدیمی ماستودون را اجرا می کند که در آن ترجمه‌ها هنوز پشتیبانی نمی شوند.</string>
-	<string name="settings_privacy">محرمانگی و دسترسی</string>
-	<string name="settings_discoverable">مشخص کردن مشخصات و فرسته‌ها در الگوریتم‌های اکتشاف</string>
-	<string name="settings_indexable">قرار دادن فرسته‌های عمومی در نتایج جستجو</string>
 	<plurals name="x_participants">
 		<item quantity="one">%,d شرکت کننده</item>
 		<item quantity="other">%,d شرکت‌کننده</item>

mastodon/src/main/res/values-fil-rPH/strings.xml

@@ -211,12 +211,12 @@
 		<item quantity="other">%,d tagasunod</item>
 	</plurals>
 	<plurals name="x_following">
-		<item quantity="one">%,d Sumusunod</item>
-		<item quantity="other">%,d Sumusunod</item>
+		<item quantity="one">%, d Sumusunod</item>
+		<item quantity="other">%, d Sumusunod</item>
 	</plurals>
 	<plurals name="x_favorites">
-		<item quantity="one">%,d Paborito</item>
-		<item quantity="other">%,d paborito</item>
+		<item quantity="one">%, d Paborito</item>
+		<item quantity="other">%, d paborito</item>
 	</plurals>
 	<string name="timestamp_via_app">%1$s sa pamamagitan ng %2$s</string>
 	<string name="time_now">ngayon</string>

mastodon/src/main/res/values-gl-rES/strings.xml

@@ -4,14 +4,12 @@
 	<string name="next">Seguinte</string>
 	<string name="loading_instance">Obtendo info do servidor…</string>
 	<string name="error">Erro</string>
-	<string name="not_a_mastodon_instance">%s non semella ser un servidor Mastodon.</string>
 	<string name="ok">OK</string>
 	<string name="preparing_auth">Preparándose para a autenticación…</string>
 	<string name="finishing_auth">Rematando coa autenticación…</string>
 	<string name="user_boosted">%s promoveu</string>
 	<string name="in_reply_to">Como resposta a %s</string>
 	<string name="notifications">Notificacións</string>
-	<string name="user_followed_you">%s comezou a seguirte</string>
 	<string name="share_toot_title">Compartir</string>
 	<string name="settings">Axustes</string>
 	<string name="publish">Publicar</string>

mastodon/src/main/res/values-is-rIS/strings.xml

@@ -583,20 +583,5 @@
 	<string name="time_hours_ago_short">fyrir %dh síðan</string>
 	<string name="time_days_ago_short">fyrir %dd síðan</string>
 	<!-- %s is the name of the post language -->
-	<string name="translate_post">Þýða úr %s</string>
 	<!-- %1$s is the language, %2$s is the name of the translation service -->
-	<string name="post_translated">Þýtt úr %1$s með %2$s</string>
-	<string name="translation_show_original">Sýna upprunalegt</string>
-	<string name="translation_failed">Þýðing mistókst. Mögulega hefur kerfisstjórinn ekki virkjað þýðingar á þessum netþjóni, eða að netþjónninn sé keyrður á eldri útgáfu Mastodon þar sem þýðingar séu ekki studdar.</string>
-	<string name="settings_privacy">Gagnaleynd og útbreiðsla</string>
-	<string name="settings_discoverable">Hafa notandasnið og færslur með í reikniritum leitar</string>
-	<string name="settings_indexable">Hafa opinberar færslur með í leitarniðurstöðum</string>
-	<plurals name="x_participants">
-		<item quantity="one">%,d þátttakandi</item>
-		<item quantity="other">%,d þátttakendur</item>
-	</plurals>
-	<plurals name="x_posts_today">
-		<item quantity="one">%,d færsla í dag</item>
-		<item quantity="other">%,d færslur í dag</item>
-	</plurals>
 </resources>

mastodon/src/main/res/values-it-rIT/strings.xml

@@ -588,7 +588,6 @@
 	<string name="post_translated">Tradotto da %1$s utilizzando %2$s</string>
 	<string name="translation_show_original">Mostra originale</string>
 	<string name="translation_failed">Traduzione fallita. Forse l\'amministratore non ha abilitato le traduzioni su questo server, o su questo server è in esecuzione una versione precedente di Mastodon in cui le traduzioni non sono ancora supportate.</string>
-	<string name="settings_indexable">Includi i post pubblici nei risultati di ricerca</string>
 	<plurals name="x_participants">
 		<item quantity="one">%,d participante</item>
 		<item quantity="other">%,d partecipanti</item>

mastodon/src/main/res/values-ja-rJP/strings.xml

@@ -554,18 +554,5 @@
 	<string name="time_hours_ago_short">%d 時間前</string>
 	<string name="time_days_ago_short">%d 日前</string>
 	<!-- %s is the name of the post language -->
-	<string name="translate_post">%s から翻訳</string>
 	<!-- %1$s is the language, %2$s is the name of the translation service -->
-	<string name="post_translated">%2$s による %1$s からの翻訳</string>
-	<string name="translation_show_original">原文を表示</string>
-	<string name="translation_failed">翻訳に失敗しました。このサーバーは翻訳機能を有効にしていないか、翻訳機能のない旧バージョンの Mastodon を実行しているのかもしれません。</string>
-	<string name="settings_privacy">プライバシーとつながりやすさ</string>
-	<string name="settings_discoverable">アカウントを見つけやすくする</string>
-	<string name="settings_indexable">公開投稿を検索できるようにする</string>
-	<plurals name="x_participants">
-		<item quantity="other">参加者 %d 人</item>
-	</plurals>
-	<plurals name="x_posts_today">
-		<item quantity="other">今日の投稿 %,d 件</item>
-	</plurals>
 </resources>

mastodon/src/main/res/values-ru-rRU/strings.xml

@@ -641,24 +641,5 @@
 	<string name="time_hours_ago_short">%d ч. назад</string>
 	<string name="time_days_ago_short">%d д. назад</string>
 	<!-- %s is the name of the post language -->
-	<string name="translate_post">Перевести %s</string>
 	<!-- %1$s is the language, %2$s is the name of the translation service -->
-	<string name="post_translated">%1$s переведён с помощью %2$s</string>
-	<string name="translation_show_original">Показать оригинал</string>
-	<string name="translation_failed">Перевод не удался. Возможно, администратор не включил переводы на этом сервере или на этом сервере установлена ​​более старая версия Mastodon, где переводы еще не поддерживаются.</string>
-	<string name="settings_privacy">Приватность и доступ</string>
-	<string name="settings_discoverable">Показывать профиль и посты в алгоритмах рекомендаций</string>
-	<string name="settings_indexable">Включить публичные посты в результаты поиска</string>
-	<plurals name="x_participants">
-		<item quantity="one">%,d участник</item>
-		<item quantity="few">%,d участника</item>
-		<item quantity="many">%,d участников</item>
-		<item quantity="other">%,d участников</item>
-	</plurals>
-	<plurals name="x_posts_today">
-		<item quantity="one">%,d пост сегодня</item>
-		<item quantity="few">%,d поста сегодня</item>
-		<item quantity="many">%,d постов сегодня</item>
-		<item quantity="other">%,d постов сегодня</item>
-	</plurals>
 </resources>

mastodon/src/main/res/values-sl-rSI/strings.xml

@@ -274,8 +274,6 @@
 	<string name="trending_posts_info_banner">To so objave, ki plenijo pozornost po Mastodonu.</string>
 	<string name="trending_links_info_banner">To so novice, o katerih se govori na Mastodonu.</string>
 	<!-- %s is the server domain -->
-	<string name="local_timeline_info_banner">To so vse objave vseh uporabnikov na vašem strežniku (%s).</string>
-	<string name="recommended_accounts_info_banner">Glede na to, komu sledite, vam bodo ti računi všeč.</string>
 	<string name="see_new_posts">Pokaži nove objave</string>
 	<string name="load_missing_posts">Naloži manjkajoče objave</string>
 	<string name="follow_back">Sledijo nazaj</string>
@@ -457,11 +455,8 @@
 	<!-- %s is the app name (Mastodon, key app_name). I made it a placeholder so everything Just Works™ with forks -->
 	<string name="about_app">O programu %s</string>
 	<string name="default_post_language">Privzeti jezik objave</string>
-	<string name="settings_confirm_delete_post">Vprašaj pred brisanjem objav</string>
 	<string name="pause_all_notifications">Premor za vse</string>
 	<string name="pause_notifications_off">Izklopljeno</string>
-	<string name="notifications_policy_anyone">Kdor koli</string>
-	<string name="notifications_policy_followed">Ljudje, ki vam sledijo</string>
 	<string name="notifications_policy_follower">Ljudje, ki jim sledite</string>
 	<string name="notifications_policy_no_one">Nihče</string>
 	<string name="notification_type_mentions_and_replies">Omembe in odgovori</string>
@@ -509,7 +504,6 @@
 	<string name="filter_context_profiles">Profili</string>
 	<string name="settings_filter_title">Naslov</string>
 	<string name="settings_delete_filter_title">Ali želite izbrisati filter »%s«?</string>
-	<string name="settings_delete_filter_confirmation">Ta filter bo izbrisan iz vašega računa na vseh vaših napravah.</string>
 	<string name="add_muted_word">Dodaj utišano besedo</string>
 	<string name="edit_muted_word">Uredi utišano besedo</string>
 	<string name="add">Dodaj</string>
@@ -539,12 +533,5 @@
 	<string name="time_hours_ago_short">pred %dh urami</string>
 	<string name="time_days_ago_short">pred %d dnemi</string>
 	<!-- %s is the name of the post language -->
-	<string name="translate_post">Prevedi iz jezika: %s</string>
 	<!-- %1$s is the language, %2$s is the name of the translation service -->
-	<string name="post_translated">Prevedeno iz %1$s s pomočjo %2$s</string>
-	<string name="translation_show_original">Pokaži izvirnik</string>
-	<string name="translation_failed">Prevod je spodletel. Morda skrbnik ni omogočil prevajanja na tem strežniku ali pa strežnik teče na starejši različici Masotodona, na kateri prevajanje še ni podprto.</string>
-	<string name="settings_privacy">Zasebnost in dosegljivost</string>
-	<string name="settings_discoverable">Izpostavljaj profile in objave v algoritmih odkrivanja</string>
-	<string name="settings_indexable">Med zadetke iskanja vključi javne objave</string>
 </resources>

mastodon/src/main/res/values-th-rTH/strings.xml

@@ -559,9 +559,6 @@
 	<string name="post_translated">แปลจาก %1$s โดยใช้ %2$s</string>
 	<string name="translation_show_original">แสดงดั้งเดิม</string>
 	<string name="translation_failed">การแปลล้มเหลว บางทีผู้ดูแลอาจไม่ได้เปิดใช้งานการแปลในเซิร์ฟเวอร์นี้หรือเซิร์ฟเวอร์นี้กำลังใช้ Mastodon รุ่นเก่ากว่าที่ยังไม่รองรับการแปล</string>
-	<string name="settings_privacy">ความเป็นส่วนตัวและการเข้าถึง</string>
-	<string name="settings_discoverable">แสดงโปรไฟล์และโพสต์ในอัลกอริทึมการค้นพบ</string>
-	<string name="settings_indexable">รวมโพสต์สาธารณะในผลลัพธ์การค้นหา</string>
 	<plurals name="x_participants">
 		<item quantity="other">%,d ผู้มีส่วนร่วม</item>
 	</plurals>

mastodon/src/main/res/values-tr-rTR/strings.xml

@@ -387,7 +387,6 @@
 	<string name="welcome_to_mastodon">Mastodon\'a hoş geldiniz</string>
 	<string name="welcome_paragraph1">Mastodon merkezi olmayan bir sosyal ağdır, yani onu tek bir şirket kontrol etmiyor. Hepsi birbirine bağlı, bağımsız olarak çalışan birçok sunucudan oluşur.</string>
 	<string name="what_are_servers">Sunucular nedir?</string>
-	<string name="welcome_paragraph2">Her Mastodon hesabı bir sunucuda barındırılır - her birinin kendi değerleri, kuralları ve yöneticileri vardır. Hangisini seçerseniz seçin, herhangi bir sunucudaki insanları takip edebilir ve onlarla etkileşime geçebilirsiniz.</string>
 	<string name="opening_link">Bağlantı açılıyor…</string>
 	<string name="link_not_supported">Bu bağlantı uygulamada desteklenmiyor</string>
 	<string name="log_out_all_accounts">Tüm hesaplardan çıkış yap</string>
@@ -583,20 +582,5 @@
 	<string name="time_hours_ago_short">%dsa önce</string>
 	<string name="time_days_ago_short">%dg önce</string>
 	<!-- %s is the name of the post language -->
-	<string name="translate_post">%s dilinden çevrildi</string>
 	<!-- %1$s is the language, %2$s is the name of the translation service -->
-	<string name="post_translated">%2$s kullanılarak %1$s dilinden çevrildi</string>
-	<string name="translation_show_original">Özgün içeriği göster</string>
-	<string name="translation_failed">Çeviri başarısız oldu. Yönetici bu sunucuda çevirileri etkinleştirmemiş olabilir veya bu sunucu çevirilerin henüz desteklenmediği eski bir Mastodon sürümünü çalıştırıyor olabilir.</string>
-	<string name="settings_privacy">Gizlilik ve erişim</string>
-	<string name="settings_discoverable">Profil ve gönderileri keşif algoritmalarında kullan</string>
-	<string name="settings_indexable">Herkese açık gönderileri arama sonuçlarına ekle</string>
-	<plurals name="x_participants">
-		<item quantity="one">%d katılımcılar</item>
-		<item quantity="other">%d katılımcılar</item>
-	</plurals>
-	<plurals name="x_posts_today">
-		<item quantity="one">%,d bunu gönder</item>
-		<item quantity="other">%,d bunları gönder</item>
-	</plurals>
 </resources>

mastodon/src/main/res/values-uk-rUA/strings.xml

@@ -641,24 +641,5 @@
 	<string name="time_hours_ago_short">%dгод. тому</string>
 	<string name="time_days_ago_short">%dд. тому</string>
 	<!-- %s is the name of the post language -->
-	<string name="translate_post">Перекласти з %s</string>
 	<!-- %1$s is the language, %2$s is the name of the translation service -->
-	<string name="post_translated">Перекладено з %1$s за допомогою %2$s</string>
-	<string name="translation_show_original">Показати оригінал</string>
-	<string name="translation_failed">Не вдалося виконати переклад. Можливо, адміністратор не активував переклади на цьому сервері або цей сервер використовує стару версію Mastodon, де переклади ще не підтримуються.</string>
-	<string name="settings_privacy">Приватність і досяжність</string>
-	<string name="settings_discoverable">Враховувати профіль та дописи в алгоритмах пошуку</string>
-	<string name="settings_indexable">Включити загальнодоступні дописи в результати пошуку</string>
-	<plurals name="x_participants">
-		<item quantity="one">%,d учасник</item>
-		<item quantity="few">%,d учасники</item>
-		<item quantity="many">%,d учасників</item>
-		<item quantity="other">%,d учасника</item>
-	</plurals>
-	<plurals name="x_posts_today">
-		<item quantity="one">%,d допис сьогодні</item>
-		<item quantity="few">%,d дописи сьогодні</item>
-		<item quantity="many">%,d дописів сьогодні</item>
-		<item quantity="other">%,d дописа сьогодні</item>
-	</plurals>
 </resources>

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

@@ -553,12 +553,5 @@
 	<string name="time_hours_ago_short">%d 小时前</string>
 	<string name="time_days_ago_short">%d 天前</string>
 	<!-- %s is the name of the post language -->
-	<string name="translate_post">从 %s 翻译</string>
 	<!-- %1$s is the language, %2$s is the name of the translation service -->
-	<string name="post_translated">从 %1$s 翻译成 %2$s</string>
-	<string name="translation_show_original">显示原文</string>
-	<string name="translation_failed">翻译失败。此服务器运行的 Mastodon 版本不支持翻译功能，或管理员未将翻译功能开启。</string>
-	<string name="settings_privacy">隐私与可达性</string>
-	<string name="settings_discoverable">在发现算法中展示您的个人资料和嘟文</string>
-	<string name="settings_indexable">将您的公开嘟文纳入搜索范围</string>
 </resources>

mastodon/src/main/res/values-zh-rTW/strings.xml

@@ -559,9 +559,6 @@
 	<string name="post_translated">透過 %2$s 翻譯 %1$s</string>
 	<string name="translation_show_original">顯示原文</string>
 	<string name="translation_failed">翻譯失敗。也許管理員未於此伺服器啟用翻譯功能，或此伺服器為未支援翻譯功能之舊版本 Mastodon。</string>
-	<string name="settings_privacy">隱私權及觸及</string>
-	<string name="settings_discoverable">於探索演算法中推薦個人檔案及嘟文</string>
-	<string name="settings_indexable">允許公開嘟文顯示於搜尋結果中</string>
 	<plurals name="x_participants">
 		<item quantity="other">%,d 位參與者</item>
 	</plurals>

mastodon/src/main/res/values/styles.xml

@@ -21,7 +21,6 @@
 		<item name="android:actionModeBackground">@color/m3_sys_light_primary</item>
 		<item name="android:actionModeStyle">@style/Widget.Mastodon.Toolbar.ActionMode</item>
 		<item name="android:actionModeCloseDrawable">@drawable/ic_actionmode_close</item>
-		<item name="appkitEmptyTextAppearance">@style/empty_text</item>
 
 		<!-- M3 colors -->
 		<item name="colorM3Primary">@color/m3_sys_light_primary</item>
@@ -86,7 +85,6 @@
 		<item name="android:windowActionModeOverlay">true</item>
 		<item name="android:actionModeBackground">@color/m3_sys_dark_primary</item>
 		<item name="android:actionModeCloseDrawable">@drawable/ic_actionmode_close</item>
-		<item name="appkitEmptyTextAppearance">@style/empty_text</item>
 
 		<!-- M3 colors -->
 		<item name="colorM3Primary">@color/m3_sys_dark_primary</item>
@@ -401,8 +399,4 @@
 	<style name="window_fade_out">
 		<item name="android:windowExitAnimation">@anim/fade_out_fast</item>
 	</style>
-
-	<style name="empty_text" parent="m3_body_large">
-		<item name="android:textColor">?colorM3OnSurfaceVariant</item>
-	</style>
 </resources>

tools/VerifyTranslatedStringFormatting.java

@@ -1,116 +0,0 @@
-// run: java tools/VerifyTranslatedStringFormatting.java
-// Reads all localized strings and makes sure they contain valid formatting placeholders matching the original English strings to avoid crashes.
-
-import org.w3c.dom.*;
-import javax.xml.parsers.*;
-import java.io.*;
-import java.util.*;
-import java.util.regex.*;
-
-public class VerifyTranslatedStringFormatting{
-	// %[argument_index$][flags][width][.precision][t]conversion
-	private static final String formatSpecifier="%(\\d+\\$)?([-#+ 0,(\\<]*)?(\\d+)?(\\.\\d+)?([tT])?([a-zA-Z%])";
-	private static final Pattern fsPattern=Pattern.compile(formatSpecifier);
-
-	private static HashMap<String, List<String>> placeholdersInStrings=new HashMap<>();
-	private static int errorCount=0;
-
-	public static void main(String[] args) throws Exception{
-		DocumentBuilderFactory factory=DocumentBuilderFactory.newInstance();
-		factory.setNamespaceAware(false);
-		DocumentBuilder builder=factory.newDocumentBuilder();
-		Document doc;
-		try(FileInputStream in=new FileInputStream("mastodon/src/main/res/values/strings.xml")){
-			doc=builder.parse(in);
-		}
-		NodeList list=doc.getDocumentElement().getChildNodes(); // why does this stupid NodeList thing exist at all?
-		for(int i=0;i<list.getLength();i++){
-			if(list.item(i) instanceof Element el){
-				String name=el.getAttribute("name");
-				String value;
-				if("string".equals(el.getTagName())){
-					value=el.getTextContent();
-				}else if("plurals".equals(el.getTagName())){
-					value=el.getElementsByTagName("item").item(0).getTextContent();
-				}else{
-					System.out.println("Warning: unexpected tag "+name);
-					continue;
-				}
-				ArrayList<String> placeholders=new ArrayList<>();
-				Matcher matcher=fsPattern.matcher(value);
-				while(matcher.find()){
-					placeholders.add(matcher.group());
-				}
-				placeholdersInStrings.put(name, placeholders);
-			}
-		}
-		for(File file:new File("mastodon/src/main/res").listFiles()){
-			if(file.getName().startsWith("values-")){
-				File stringsXml=new File(file, "strings.xml");
-				if(stringsXml.exists()){
-					processFile(stringsXml);
-				}
-			}
-		}
-		if(errorCount>0){
-			System.err.println("Found "+errorCount+" problems in localized strings");
-			System.exit(1);
-		}
-	}
-
-	private static void processFile(File file) throws Exception{
-		DocumentBuilderFactory factory=DocumentBuilderFactory.newInstance();
-		factory.setNamespaceAware(false);
-		DocumentBuilder builder=factory.newDocumentBuilder();
-		Document doc;
-		try(FileInputStream in=new FileInputStream(file)){
-			doc=builder.parse(in);
-		}
-		NodeList list=doc.getDocumentElement().getChildNodes();
-		for(int i=0;i<list.getLength();i++){
-			if(list.item(i) instanceof Element el){
-				String name=el.getAttribute("name");
-				String value;
-				if("string".equals(el.getTagName())){
-					value=el.getTextContent();
-					if(!verifyString(value, placeholdersInStrings.get(name))){
-						errorCount++;
-						System.out.println(file+": string "+name+" is missing placeholders");
-					}
-				}else if("plurals".equals(el.getTagName())){
-					NodeList items=el.getElementsByTagName("item");
-					for(int j=0;j<items.getLength();j++){
-						Element item=(Element)items.item(j);
-						value=item.getTextContent();
-						String quantity=item.getAttribute("quantity");
-						if(!verifyString(value, placeholdersInStrings.get(name))){
-							// Some languages use zero/one/two for just these numbers so they may skip the placeholder
-							// still make sure that there's no '%' characters to avoid crashes
-							if(List.of("zero", "one", "two").contains(quantity) && !value.contains("%")){
-								continue;
-							}
-							errorCount++;
-							System.out.println(file+": string "+name+"["+quantity+"] is missing placeholders");
-						}
-					}
-				}else{
-					System.out.println("Warning: unexpected tag "+name);
-					continue;
-				}
-			}
-		}
-	}
-
-	private static boolean verifyString(String str, List<String> placeholders){
-		for(String placeholder:placeholders){
-			if(placeholder.equals("%,d")){
-				// %,d and %d are interchangeable but %,d provides nicer formatting
-				if(!str.contains(placeholder) && !str.contains("%d"))
-					return false;
-			}else if(!str.contains(placeholder)){
-				return false;
-			}
-		}
-		return true;
-	}
-}