Merge upstream redesign (#714)

* merge toolbar fragment * Fix store screenshot generator * Fix alert color * Fix #609 * Fix crash * bigger hitbox for chips * support mastodon languages * merge ui utils * merge stuff * fix icon * ensure 48dp touch target * init local prefs, add helper function for enum values * update compose action layout * merge compose-adj files * update extended footer * fix poll wrong option checked closes sk22#641 * no border when disabled closes sk22#640 * Fix #610 * Minor fixes * Fix alert color * Fix #609 * Fix crash * Fix #610 * Minor fixes * add resources * more compatible mastodon language * fix html parser * mark as read on refresh * update tab bar * tweak m3 buttons * update compose-adj files * tweak and update styles * m3 expand button * flag icon should be 18dp, actually * More minor fixes closes #612 * More minor fixes closes #612 * Bump version * fix no create status event when redrafting * add material 3 assets * New translations strings.xml (Greek) * New translations strings.xml (Greek) * New translations strings.xml (Italian) * New translations strings.xml (Greek) * New translations strings.xml (Italian) * New translations strings.xml (Thai) * New translations strings.xml (Thai) * New translations strings.xml (Italian) * New translations strings.xml (Thai) * use new buttons for profile fragment * merge compose fragment * merge all the styles! oh dear * New translations full_description.txt (Indonesian) * New translations full_description.txt (Chinese Simplified) * New translations strings.xml (Chinese Simplified) * New translations full_description.txt (Chinese Simplified) * Fix #615 * Minor fixes * Fix #611 * A bunch of crash fixes * New translations strings.xml (Greek) * Make the default server configurable * Pass the system timezone to server when signing up * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Japanese) * Fix #615 * Minor fixes * Fix #611 * A bunch of crash fixes * Make the default server configurable * Pass the system timezone to server when signing up * oops. accidentally pasted the commit message in the code * Remove unused code that caused a crash for some users ¯\_(ツ)_/¯ * New translations strings.xml (Japanese) * New translations strings.xml (Japanese) * Remove unused code that caused a crash for some users ¯\_(ツ)_/¯ * New translations strings.xml (Polish) * New translations strings.xml (Polish) * New translations strings.xml (Turkish) * New translations strings.xml (Belarusian) * prepare merging profile fragment * merge profile fragment * New translations strings.xml (Belarusian) * New translations strings.xml (Greek) * fix icon padding * apply post header changes * minor margin tweaks * fix footer buttons * fix header announcement buttons * New translations strings.xml (Japanese) * New translations strings.xml (Japanese) * New translations strings.xml (Japanese) * New translations strings.xml (Japanese) * New translations strings.xml (Japanese) * New translations strings.xml (Japanese) * New translations full_description.txt (Japanese) * New translations strings.xml (Icelandic) * New translations strings.xml (Icelandic) * New translations strings.xml (Icelandic) * fix replying * New translations strings.xml (Icelandic) * fix translate button * fix more button visibility * fix counts label styling * fix disabled boost button opacity * fix tab layouts * fix notification icon color crash * New translations strings.xml (Greek) * implement elevation listener in home tab * fix elevation and listener in home tab * add elevation scroll listener to notifications * New translations strings.xml (Scottish Gaelic) * Add editorconfig So that PRs like #625 don't happen again * Crash fix * 🤔 * New translations strings.xml (Greek) * New translations strings.xml (Japanese) * New translations strings.xml (French) * New translations strings.xml (French) * New translations strings.xml (French) * fix notification elevation and integrate divider * 🤔 * Crash fix * Add editorconfig So that PRs like #625 don't happen again * New translations strings.xml (Turkish) * save interactions in cache * New translations strings.xml (Turkish) * merge new discover/search * New translations strings.xml (Bengali) * New translations strings.xml (Scottish Gaelic) * New translations strings.xml (Bengali) * merge new settings fragments * fix no auth callback always being executed * allow opening server info from profile closes sk22#593 * fix hide boosts icon color closes sk22#676 * New translations strings.xml (Turkish) * New translations strings.xml (Turkish) * New translations strings.xml (Turkish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (Turkish) * New translations strings.xml (Chinese Simplified) * New translations strings.xml (German) * New translations strings.xml (German) * New translations strings.xml (Turkish) * update fedinuke list from source; doesn't contain any modifications regarding a recent issue * New translations strings.xml (Turkish) * remove unused class * fix crash * darken m3 outline color a bit * use m3 outline again * fix misalignment closes sk22#682 * New translations strings.xml (Turkish) * New translations full_description.txt (Turkish) * New translations short_description.txt (Turkish) * fix crash * fix metadata sorting * show pronouns in header/account lists * fix broken divider line closes sk22#679 * trim pronouns * improve pronoun display * New translations strings.xml (French) * New translations strings.xml (Japanese) * fix broken federated timeline closes sk22#685 * fix broken -1 fallback behavior closes sk22#681 * don't display nothing if server about request fails closes sk22#678 * New translations strings.xml (Ukrainian) * migrate global prefs to local prefs * do confirm unfollow by default * New translations strings.xml (Ukrainian) * New translations strings.xml (Ukrainian) * New translations full_description.txt (Ukrainian) * New translations strings.xml (Ukrainian) * New translations strings.xml (Ukrainian) * New translations strings.xml (Ukrainian) * New translations strings.xml (Ukrainian) * New translations strings.xml (Ukrainian) * New translations strings.xml (Russian) * New translations strings.xml (Vietnamese) * New translations strings.xml (Ukrainian) * New translations strings.xml (Vietnamese) * New translations full_description.txt (Ukrainian) * New translations strings.xml (Ukrainian) * New translations strings.xml (Vietnamese) * New translations strings.xml (Ukrainian) * New translations strings.xml (Ukrainian) * make sure list in prefs are always mutable and nut null * New translations strings.xml (Ukrainian) * New translations strings.xml (Ukrainian) * New translations strings.xml (Russian) * fix pronouns edge case * add back fix for stretched images closes sk22#636 * fix null pointer on missing default posting language * fix default posting language not being applied * bigger username hitbox closes sk22#688 * fix rtl header username alignment closes sk22#689 * New translations strings.xml (Ukrainian) * New translations strings.xml (Ukrainian) * hopefully fix crashes closes sk22#692 * New translations strings.xml (Ukrainian) * New translations full_description.txt (Ukrainian) * fix pronoun crash * New translations strings.xml (Persian) * New translations strings.xml (Ukrainian) * re-add true black mode * asterisk can be a pronoun * New translations strings.xml (Persian) * true black mode fixes and clean-ups * material 3 button background for switcher * darker tab bar selected background * better align follow/following button widths * restore rainbow refresh colors * fix search transition * fix min width issue with switcher button * fix no elevation when true black is enabled in light theme * use statusForContent to determine spoilerRevealed closes sk22#694 * New translations strings.xml (Persian) * New translations strings.xml (Persian) * New translations strings.xml (Persian) * New translations strings.xml (Persian) * New translations strings.xml (Persian) * New translations strings.xml (Persian) * fix profile tab bar in true black theme * fix m3 default button style closes sk22#697 * prettier role badges closes sk22#663 * fix translate button spacing closes sk22#655 * use m3 switches in dialogs closes sk22#653 * implement color palette switcher * fix color palettes being overwritten * add display and notification settings * clean up code * per-account single notification setting * add missing items to notification types * add prefix replies setting * add show replies/boosts and reply visibility * add load/see new posts settings * fix spectator mode missing spoiler padding * add a bunch of display settings * update fedinuke * add content type settings * add settings for local-onlu * add missing settings items * fix visibility button icon tint * hopefully fix some crashes * normalize padding above edit text * apparently, some people don't like pills closes sk22#706 * fix play button color closes sk22#705
2023-07-16 18:01:42 +02:00
parent 3cfea0e660
commit 7677ad39ca
744 changed files with 24873 additions and 13485 deletions
--- a/mastodon/src/androidTest/java/org/joinmastodon/android/test/StoreScreenshotsGenerator.java
+++ b/mastodon/src/androidTest/java/org/joinmastodon/android/test/StoreScreenshotsGenerator.java
@@ -65,6 +65,7 @@ import static androidx.test.espresso.matcher.ViewMatchers.*;
@LargeTest
 public class StoreScreenshotsGenerator{
 	private static final String PHOTO_FILE="IMG_1010.jpg";
+	private static final long LOAD_WAIT_TIMEOUT=20_000;

 	@Rule
 	public ActivityScenarioRule<MainActivity> activityScenarioRule=new ActivityScenarioRule<>(MainActivity.class);
@@ -84,14 +85,14 @@ public class StoreScreenshotsGenerator{
 		AccountSession session=AccountSessionManager.getInstance().getAccount(AccountSessionManager.getInstance().getLastActiveAccountID());
 		MastodonApp.context.deleteDatabase(session.getID()+".db");

-		onView(isRoot()).perform(waitId(R.id.more, 5000));
+		onView(isRoot()).perform(waitId(R.id.more, LOAD_WAIT_TIMEOUT));
 		Thread.sleep(500);
 		takeScreenshot("HomeTimeline");

 		GlobalUserPreferences.theme=GlobalUserPreferences.ThemePreference.DARK;
 		activityScenarioRule.getScenario().recreate();

-		onView(isRoot()).perform(waitId(R.id.more, 5000));
+		onView(isRoot()).perform(waitId(R.id.more, LOAD_WAIT_TIMEOUT));
 		Thread.sleep(500);
 		takeScreenshot("HomeTimeline_Dark");

@@ -100,8 +101,8 @@ public class StoreScreenshotsGenerator{

 		activityScenarioRule.getScenario().onActivity(activity->UiUtils.openProfileByID(activity, session.getID(), args.getString("profileAccountID")));
 		Thread.sleep(500);
-		onView(isRoot()).perform(waitId(R.id.avatar_border, 5000)); // wait for profile to load
-		onView(isRoot()).perform(waitId(R.id.more, 5000)); // wait for timeline to load
+		onView(isRoot()).perform(waitId(R.id.avatar_border, LOAD_WAIT_TIMEOUT)); // wait for profile to load
+		onView(isRoot()).perform(waitId(R.id.more, LOAD_WAIT_TIMEOUT)); // wait for timeline to load
 		Thread.sleep(500);
 		takeScreenshot("Profile");

--- a/mastodon/src/androidTest/java/org/joinmastodon/android/ui/utils/UiUtilsTest.java
+++ b/mastodon/src/androidTest/java/org/joinmastodon/android/ui/utils/UiUtilsTest.java
@@ -2,15 +2,22 @@ package org.joinmastodon.android.ui.utils;

 import static org.junit.Assert.*;

+import android.content.Context;
+import android.content.res.Resources;
 import android.util.Pair;

+import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.AccountField;
 import org.joinmastodon.android.model.Instance;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;

+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
 import java.util.Optional;

 public class UiUtilsTest {
@@ -103,4 +110,152 @@ public class UiUtilsTest {
 				"somewhere.else"
 		));
 	}
+
+	private final String[] args = new String[] { "Megalodon", "♡" };
+
+	private String gen(String format, CharSequence... args) {
+		return UiUtils.generateFormattedString(format, args).toString();
+	}
+	@Test
+	public void generateFormattedString() {
+		assertEquals(
+				"ordered substitution",
+				"Megalodon reacted with ♡",
+				gen("%s reacted with %s", args)
+		);
+
+		assertEquals(
+				"1 2 3 4 5",
+				gen("%s %s %s %s %s", "1", "2", "3", "4", "5")
+		);
+
+		assertEquals(
+				"indexed substitution",
+				"with ♡ was reacted by Megalodon",
+				gen("with %2$s was reacted by %1$s", args)
+		);
+
+		assertEquals(
+				"indexed substitution, in order",
+				"Megalodon reacted with ♡",
+				gen("%1$s reacted with %2$s", args)
+		);
+
+		assertEquals(
+				"indexed substitution, 0-based",
+				"Megalodon reacted with ♡",
+				gen("%0$s reacted with %1$s", args)
+		);
+
+		assertEquals(
+				"indexed substitution, 5 items",
+				"5 4 3 2 1",
+				gen("%5$s %4$s %3$s %2$s %1$s", "1", "2", "3", "4", "5")
+		);
+
+		assertEquals(
+				"one argument missing",
+				"Megalodon reacted with ♡",
+				gen("reacted with %s", args)
+		);
+
+		assertEquals(
+				"multiple arguments missing",
+				"Megalodon reacted with ♡",
+				gen("reacted with", args)
+		);
+
+		assertEquals(
+				"multiple arguments missing, numbers in expeced positions",
+				"1 2 x 3 4 5",
+				gen("%s x %s", "1", "2", "3", "4", "5")
+		);
+
+		assertEquals(
+				"one leading and trailing space",
+				"Megalodon reacted with ♡",
+				gen(" reacted with ", args)
+		);
+
+		assertEquals(
+				"multiple leading and trailing spaces",
+				"Megalodon  reacted  with  ♡",
+				gen("  reacted  with  ", args)
+		);
+
+		assertEquals(
+				"invalid format produces expected invalid result",
+				"Megalodon reacted with % s ♡",
+				gen("reacted with % s", args)
+		);
+
+		assertEquals(
+				"plain string as format, all arguments get added",
+				"a x b c",
+				gen("x", new String[] { "a", "b", "c" })
+		);
+
+		assertEquals("empty input produces empty output", "", gen(""));
+
+		// not supported:
+//		assertEquals("a b a", gen("%1$s %2$s %2$s %1$s", new String[] { "a", "b", "c" }));
+//		assertEquals("x", gen("%s %1$s %2$s %1$s %s", new String[] { "a", "b", "c" }));
+	}
+
+	private AccountField makeField(String name, String value) {
+		AccountField f = new AccountField();
+		f.name = name;
+		f.value = value;
+		return f;
+	}
+
+	private Account fakeAccount(AccountField... fields) {
+		Account a = new Account();
+		a.fields = Arrays.asList(fields);
+		return a;
+	}
+
+	@Test
+	public void extractPronouns() {
+		assertEquals("they", UiUtils.extractPronouns(MastodonApp.context, fakeAccount(
+				makeField("name and pronouns", "https://pronouns.site"),
+				makeField("pronouns", "they"),
+				makeField("pronouns something", "bla bla")
+		)).orElseThrow());
+
+		assertTrue(UiUtils.extractPronouns(MastodonApp.context, fakeAccount()).isEmpty());
+
+		assertEquals("it/its", UiUtils.extractPronouns(MastodonApp.context, fakeAccount(
+				makeField("pronouns pronouns pronouns", "hi hi hi"),
+				makeField("pronouns", "it/its"),
+				makeField("the pro's nouns", "professional")
+		)).orElseThrow());
+
+		assertEquals("she/he", UiUtils.extractPronouns(MastodonApp.context, fakeAccount(
+				makeField("my name is", "jeanette shork, apparently"),
+				makeField("my pronouns are", "she/he")
+		)).orElseThrow());
+
+		assertEquals("they/them", UiUtils.extractPronouns(MastodonApp.context, fakeAccount(
+				makeField("pronouns", "https://pronouns.cc/pronouns/they/them")
+		)).orElseThrow());
+
+		Context german = UiUtils.getLocalizedContext(MastodonApp.context, Locale.GERMAN);
+
+		assertEquals("sie/ihr", UiUtils.extractPronouns(german, fakeAccount(
+				makeField("pronomen lauten", "sie/ihr"),
+				makeField("pronouns are", "she/her"),
+				makeField("die pronomen", "stehen oben")
+		)).orElseThrow());
+
+		assertEquals("er/ihm", UiUtils.extractPronouns(german, fakeAccount(
+				makeField("die pronomen", "stehen unten"),
+				makeField("pronomen sind", "er/ihm"),
+				makeField("pronouns are", "he/him")
+		)).orElseThrow());
+
+		assertEquals("* (asterisk)", UiUtils.extractPronouns(MastodonApp.context, fakeAccount(
+				makeField("pronouns", "-- * (asterisk) --")
+		)).orElseThrow());
+	}
 }
--- a/mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java
+++ b/mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java
@@ -1,10 +1,10 @@
 package org.joinmastodon.android.utils;

-import static org.joinmastodon.android.model.Filter.FilterAction.*;
-import static org.joinmastodon.android.model.Filter.FilterContext.*;
+import static org.joinmastodon.android.model.FilterAction.*;
+import static org.joinmastodon.android.model.FilterContext.*;
 import static org.junit.Assert.*;

-import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.LegacyFilter;
 import org.joinmastodon.android.model.Status;
 import org.junit.Test;

@@ -14,8 +14,8 @@ import java.util.List;

 public class StatusFilterPredicateTest {

-    private static final Filter hideMeFilter = new Filter(), warnMeFilter = new Filter();
-    private static final List<Filter> allFilters = List.of(hideMeFilter, warnMeFilter);
+    private static final LegacyFilter hideMeFilter = new LegacyFilter(), warnMeFilter = new LegacyFilter();
+    private static final List<LegacyFilter> allFilters = List.of(hideMeFilter, warnMeFilter);

    private static final Status
            hideInHomePublic = Status.ofFake(null, "hide me, please", Instant.now()),