From 9bddd6b27488b3c6c897620b4537c3c32def73e0 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 27 Dec 2022 16:53:21 -0300
Subject: [PATCH 001/200] The ui side is ready somehow. Still need to handle it
 all

---
 .../src/main/res/layout/fragment_profile.xml  | 25 ++++++++++++++++---
 mastodon/src/main/res/values/strings_sk.xml   |  1 +
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 7828f92be..775ec0ebe 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -256,11 +256,12 @@
 						android:textColor="?android:textColorSecondary"
 						tools:text="\@Gargron" />
 
+
 					<org.joinmastodon.android.ui.views.LinkedTextView
 						android:id="@+id/bio"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_below="@id/username"
+						android:layout_below="@id/note_edit"
 						android:layout_marginLeft="16dp"
 						android:layout_marginTop="4dp"
 						android:layout_marginRight="16dp"
@@ -285,6 +286,23 @@
 						android:elevation="0dp"
 						tools:text="Eugen" />
 
+					<EditText
+						android:id="@+id/note_edit"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_below="@id/username"
+						android:layout_marginLeft="16dp"
+						android:layout_marginTop="8dp"
+						android:layout_marginRight="16dp"
+						android:textAppearance="@style/m3_body_large"
+						android:textSize="16sp"
+						android:background="@drawable/edit_text_border"
+						android:inputType="textMultiLine|textCapSentences"
+						android:elevation="0dp"
+						android:hint="@string/sk_personal_note"
+						android:textColorHint="?android:textColorSecondaryInverseNoDisable"
+						tools:text="Founder, CEO and lead developer @Mastodon, Germany." />
+
 					<EditText
 						android:id="@+id/bio_edit"
 						android:layout_width="match_parent"
@@ -331,10 +349,11 @@
 			android:layout_marginEnd="16dp"
 			android:layout_marginBottom="24dp"
 			android:background="@drawable/bg_fab"
-			android:tint="@color/fab_icon"
 			android:scaleType="center"
+			android:src="@drawable/ic_edit_34"
 			android:stateListAnimator="@animator/fab_shadow"
-			android:src="@drawable/ic_edit_34"/>
+			android:tint="@color/fab_icon"
+			tools:ignore="SpeakableTextPresentCheck,SpeakableTextPresentCheck" />
 
 	</FrameLayout>
 
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 742706bdf..84c35d709 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -67,6 +67,7 @@
     <string name="sk_app_username" translatable="false">\@megalodon</string>
     <string name="sk_tabs_disable_swipe">Disable swiping between tabs</string>
     <string name="sk_settings_profile">Set up profile</string>
+    <string name="sk_personal_note">Personal note for this profile:</string>
     <string name="sk_settings_posting">Posting preferences</string>
     <string name="sk_settings_filters">Configure filters</string>
     <string name="sk_settings_auth">Security settings</string>

From 3104ddb4b668f0374f2ea513a58005a5c46f7fae Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 27 Dec 2022 18:26:35 -0300
Subject: [PATCH 002/200] More polishes the UI side a little more, now also
 hides the private note on the personal profile

---
 .../android/fragments/ProfileFragment.java    | 49 ++++++++++++++++++-
 .../src/main/res/layout/fragment_profile.xml  |  1 +
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 53dc5c636..1a6219086 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -117,7 +117,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private CoverOverlayGradientDrawable coverGradient=new CoverOverlayGradientDrawable();
 	private float titleTransY;
 	private View postsBtn, followersBtn, followingBtn;
-	private EditText nameEdit, bioEdit;
+	private EditText nameEdit, bioEdit, noteEdit;
 	private ProgressBar actionProgress, notifyProgress;
 	private FrameLayout[] tabViews;
 	private TabLayoutMediator tabLayoutMediator;
@@ -180,6 +180,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		name=content.findViewById(R.id.name);
 		username=content.findViewById(R.id.username);
 		bio=content.findViewById(R.id.bio);
+		noteEdit=content.findViewById(R.id.note_edit);
 		followersCount=content.findViewById(R.id.followers_count);
 		followersLabel=content.findViewById(R.id.followers_label);
 		followersBtn=content.findViewById(R.id.followers_btn);
@@ -444,6 +445,52 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		name.setText(ssb);
 		setTitle(ssb);
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		if(isOwnProfile){
+			noteEdit.setVisibility(View.GONE);
+		}
+
 		boolean isSelf=AccountSessionManager.getInstance().isSelf(accountID, account);
 
 		if(account.locked){
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 775ec0ebe..2000e718d 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -294,6 +294,7 @@
 						android:layout_marginLeft="16dp"
 						android:layout_marginTop="8dp"
 						android:layout_marginRight="16dp"
+						android:layout_marginBottom="4dp"
 						android:textAppearance="@style/m3_body_large"
 						android:textSize="16sp"
 						android:background="@drawable/edit_text_border"

From 68397bd4879a80acda67304a6ca406e6fafa8f3c Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 27 Dec 2022 18:27:57 -0300
Subject: [PATCH 003/200] How did I add some many lines? Removing them

---
 .../android/fragments/ProfileFragment.java    | 42 -------------------
 1 file changed, 42 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 1a6219086..1864a5882 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -445,48 +445,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		name.setText(ssb);
 		setTitle(ssb);
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 		if(isOwnProfile){
 			noteEdit.setVisibility(View.GONE);
 		}

From 68bb23e3b4c0a9fd2ee475c4fcb50f35b7e772fe Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 27 Dec 2022 18:48:08 -0300
Subject: [PATCH 004/200] It actually loads something. Perfect

---
 .../android/fragments/ProfileFragment.java          | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 1864a5882..4610a3d01 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -445,10 +445,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		name.setText(ssb);
 		setTitle(ssb);
 
-		if(isOwnProfile){
-			noteEdit.setVisibility(View.GONE);
-		}
-
 		boolean isSelf=AccountSessionManager.getInstance().isSelf(accountID, account);
 
 		if(account.locked){
@@ -475,6 +471,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			bio.setVisibility(View.VISIBLE);
 			bio.setText(parsedBio);
 		}
+
+		if(isOwnProfile){
+			noteEdit.setVisibility(View.GONE);
+		}
+
+
+
+
 		followersCount.setText(UiUtils.abbreviateNumber(account.followersCount));
 		followingCount.setText(UiUtils.abbreviateNumber(account.followingCount));
 		postsCount.setText(UiUtils.abbreviateNumber(account.statusesCount));
@@ -671,6 +675,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		notifyProgress.setIndeterminateTintList(notifyButton.getTextColors());
 		followsYouView.setVisibility(relationship.followedBy ? View.VISIBLE : View.GONE);
 		notifyButton.setSelected(relationship.notifying);
+		noteEdit.setText(relationship.note);
 		if (getActivity() != null) notifyButton.setContentDescription(getString(relationship.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username));
 	}
 

From 9d800106ccd2043f05413edf972141c6c1b42d2a Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 27 Dec 2022 20:20:44 -0300
Subject: [PATCH 005/200] Added a framelayout just for adding the confirm
 button

---
 .../src/main/res/layout/fragment_profile.xml  | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 2000e718d..0ad7a898e 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -256,12 +256,38 @@
 						android:textColor="?android:textColorSecondary"
 						tools:text="\@Gargron" />
 
+                    <FrameLayout
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/note_edit_wrapper"
+                        android:layout_below="@id/username"
+                        android:layout_marginTop="0dp"
+                        android:padding="0dp">
 
-					<org.joinmastodon.android.ui.views.LinkedTextView
+                        <EditText
+                            android:id="@+id/note_edit"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="16dp"
+                            android:layout_marginTop="8dp"
+                            android:layout_marginRight="16dp"
+                            android:layout_marginBottom="4dp"
+                            android:textAppearance="@style/m3_body_large"
+                            android:textSize="16sp"
+                            android:background="@drawable/edit_text_border"
+                            android:inputType="textMultiLine|textCapSentences"
+                            android:elevation="0dp"
+                            android:hint="@string/sk_personal_note"
+                            android:textColorHint="?android:textColorSecondaryInverseNoDisable"
+                            tools:text="Founder, CEO and lead developer @Mastodon, Germany." />
+
+                    </FrameLayout>
+
+                    <org.joinmastodon.android.ui.views.LinkedTextView
 						android:id="@+id/bio"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_below="@id/note_edit"
+						android:layout_below="@id/note_edit_wrapper"
 						android:layout_marginLeft="16dp"
 						android:layout_marginTop="4dp"
 						android:layout_marginRight="16dp"
@@ -286,24 +312,6 @@
 						android:elevation="0dp"
 						tools:text="Eugen" />
 
-					<EditText
-						android:id="@+id/note_edit"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:layout_below="@id/username"
-						android:layout_marginLeft="16dp"
-						android:layout_marginTop="8dp"
-						android:layout_marginRight="16dp"
-						android:layout_marginBottom="4dp"
-						android:textAppearance="@style/m3_body_large"
-						android:textSize="16sp"
-						android:background="@drawable/edit_text_border"
-						android:inputType="textMultiLine|textCapSentences"
-						android:elevation="0dp"
-						android:hint="@string/sk_personal_note"
-						android:textColorHint="?android:textColorSecondaryInverseNoDisable"
-						tools:text="Founder, CEO and lead developer @Mastodon, Germany." />
-
 					<EditText
 						android:id="@+id/bio_edit"
 						android:layout_width="match_parent"

From 094cd67728beab71d75a5698ded7549df5b40f57 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 27 Dec 2022 21:19:54 -0300
Subject: [PATCH 006/200] Now adding a confirm button

---
 .../android/fragments/ProfileFragment.java         |  9 ++++-----
 mastodon/src/main/res/layout/fragment_profile.xml  | 14 +++++++++++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 4610a3d01..d92df441b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -116,7 +116,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private SwipeRefreshLayout refreshLayout;
 	private CoverOverlayGradientDrawable coverGradient=new CoverOverlayGradientDrawable();
 	private float titleTransY;
-	private View postsBtn, followersBtn, followingBtn;
+	private View postsBtn, followersBtn, followingBtn, noteEditConfirm, noteEditWrapper;
 	private EditText nameEdit, bioEdit, noteEdit;
 	private ProgressBar actionProgress, notifyProgress;
 	private FrameLayout[] tabViews;
@@ -181,6 +181,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		username=content.findViewById(R.id.username);
 		bio=content.findViewById(R.id.bio);
 		noteEdit=content.findViewById(R.id.note_edit);
+		noteEditConfirm=content.findViewById(R.id.note_edit_confirm);
+		noteEditWrapper=content.findViewById(R.id.note_edit_wrapper);
 		followersCount=content.findViewById(R.id.followers_count);
 		followersLabel=content.findViewById(R.id.followers_label);
 		followersBtn=content.findViewById(R.id.followers_btn);
@@ -473,12 +475,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}
 
 		if(isOwnProfile){
-			noteEdit.setVisibility(View.GONE);
+			noteEditWrapper.setVisibility(View.GONE);
 		}
 
-
-
-
 		followersCount.setText(UiUtils.abbreviateNumber(account.followersCount));
 		followingCount.setText(UiUtils.abbreviateNumber(account.followingCount));
 		postsCount.setText(UiUtils.abbreviateNumber(account.statusesCount));
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 0ad7a898e..f4b10a222 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -262,7 +262,7 @@
                         android:id="@+id/note_edit_wrapper"
                         android:layout_below="@id/username"
                         android:layout_marginTop="0dp"
-                        android:padding="0dp">
+                        android:padding="2dp">
 
                         <EditText
                             android:id="@+id/note_edit"
@@ -278,8 +278,16 @@
                             android:inputType="textMultiLine|textCapSentences"
                             android:elevation="0dp"
                             android:hint="@string/sk_personal_note"
-                            android:textColorHint="?android:textColorSecondaryInverseNoDisable"
-                            tools:text="Founder, CEO and lead developer @Mastodon, Germany." />
+                            android:textColorHint="?android:textColorSecondaryInverseNoDisable" />
+
+						<Button
+							android:id="@+id/note_edit_confirm"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:background="@drawable/ic_fluent_checkmark_24_regular"
+							android:layout_marginTop="2dp"
+							android:layout_marginEnd="20dp"
+							android:layout_gravity="right|center_vertical" />
 
                     </FrameLayout>
 

From 48664bb5805036c217d3650001a7ede9b8f0f84b Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 27 Dec 2022 21:42:21 -0300
Subject: [PATCH 007/200] Idk what to call this commit, so Note Improver it is

---
 .../android/fragments/ProfileFragment.java    | 19 ++++++++++++++++++-
 .../src/main/res/layout/fragment_profile.xml  |  7 ++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index d92df441b..71b0723dd 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -37,6 +37,7 @@ import android.view.WindowInsets;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
@@ -116,8 +117,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private SwipeRefreshLayout refreshLayout;
 	private CoverOverlayGradientDrawable coverGradient=new CoverOverlayGradientDrawable();
 	private float titleTransY;
-	private View postsBtn, followersBtn, followingBtn, noteEditConfirm, noteEditWrapper;
+	private View postsBtn, followersBtn, followingBtn, noteEditWrapper;
 	private EditText nameEdit, bioEdit, noteEdit;
+	private ImageButton noteEditConfirm;
 	private ProgressBar actionProgress, notifyProgress;
 	private FrameLayout[] tabViews;
 	private TabLayoutMediator tabLayoutMediator;
@@ -182,6 +184,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		bio=content.findViewById(R.id.bio);
 		noteEdit=content.findViewById(R.id.note_edit);
 		noteEditConfirm=content.findViewById(R.id.note_edit_confirm);
+		noteEditConfirm.setOnClickListener(v->onClickNoteSave());
 		noteEditWrapper=content.findViewById(R.id.note_edit_wrapper);
 		followersCount=content.findViewById(R.id.followers_count);
 		followersLabel=content.findViewById(R.id.followers_label);
@@ -302,6 +305,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		return sizeWrapper;
 	}
 
+	private void onClickNoteSave() {
+		noteEdit.getText().toString();
+	}
+
 	@Override
 	protected void doLoadData(){
 		currentRequest=new GetAccountByID(profileAccountID)
@@ -478,6 +485,16 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			noteEditWrapper.setVisibility(View.GONE);
 		}
 
+		if(noteEdit.getText().toString() == null){
+			noteEditConfirm.setImageResource(R.drawable.ic_fluent_checkmark_24_regular);
+			noteEditConfirm.setClickable(false);
+			noteEditConfirm.setAlpha(.50f);
+		}else{
+			noteEditConfirm.setImageResource(R.drawable.ic_fluent_checkmark_24_filled);
+			noteEditConfirm.setClickable(true);
+			noteEditConfirm.setAlpha(1.0f);
+		}
+
 		followersCount.setText(UiUtils.abbreviateNumber(account.followersCount));
 		followingCount.setText(UiUtils.abbreviateNumber(account.followingCount));
 		postsCount.setText(UiUtils.abbreviateNumber(account.statusesCount));
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index f4b10a222..45c63abde 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -280,13 +280,14 @@
                             android:hint="@string/sk_personal_note"
                             android:textColorHint="?android:textColorSecondaryInverseNoDisable" />
 
-						<Button
+						<ImageButton
 							android:id="@+id/note_edit_confirm"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:background="@drawable/ic_fluent_checkmark_24_regular"
+							android:src="@drawable/ic_fluent_checkmark_24_regular"
+							android:backgroundTint="#00000000"
 							android:layout_marginTop="2dp"
-							android:layout_marginEnd="20dp"
+							android:layout_marginEnd="10dp"
 							android:layout_gravity="right|center_vertical" />
 
                     </FrameLayout>

From 3f773a52cc139021644d9a25bf2b77d7b395a26e Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 27 Dec 2022 21:43:42 -0300
Subject: [PATCH 008/200] Created the class. Lets leave this for tomorrow

---
 .../android/api/requests/accounts/SetPrivateNote.java         | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
new file mode 100644
index 000000000..f8499c1f7
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
@@ -0,0 +1,4 @@
+package org.joinmastodon.android.api.requests.accounts;
+
+public class SetPrivateNote {
+}

From 46b842afc46fe910b9162c067017f683a26eaf5d Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 28 Dec 2022 10:45:15 -0300
Subject: [PATCH 009/200] It still does not work, but its one step closer to
 working

---
 .../api/requests/accounts/SetPrivateNote.java  | 18 +++++++++++++++++-
 .../android/fragments/ProfileFragment.java     | 10 +++++++++-
 .../android/model/PrivateNote.java             |  6 ++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/model/PrivateNote.java

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
index f8499c1f7..6b928b5e4 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
@@ -1,4 +1,20 @@
 package org.joinmastodon.android.api.requests.accounts;
 
-public class SetPrivateNote {
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.PrivateNote;
+
+public class SetPrivateNote extends MastodonAPIRequest<PrivateNote>{
+    public SetPrivateNote(String id, String note){
+        super(MastodonAPIRequest.HttpMethod.POST, "/accounts/"+id+"/note", PrivateNote.class);
+        Request req = new Request(note);
+        setRequestBody(req);
+    }
+
+    public static class Request{
+        public String comment;
+
+        public Request(String note){
+            this.comment = note;
+        }
+    }
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 71b0723dd..1ba5bcbc0 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -53,6 +53,7 @@ import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
+import org.joinmastodon.android.api.requests.accounts.SetPrivateNote;
 import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.account_list.FollowerListFragment;
@@ -61,6 +62,7 @@ import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.AccountField;
 import org.joinmastodon.android.model.Attachment;
+import org.joinmastodon.android.model.PrivateNote;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.SingleImagePhotoViewerListener;
@@ -306,7 +308,13 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	}
 
 	private void onClickNoteSave() {
-		noteEdit.getText().toString();
+		Toast.makeText(getActivity(), "Its going here", Toast.LENGTH_LONG).show();
+		currentRequest = new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new SimpleCallback<PrivateNote>(this) {
+			@Override
+			public void onSuccess(PrivateNote result) {
+				Toast.makeText(getActivity(), "Success", Toast.LENGTH_LONG).show();
+			}
+		});
 	}
 
 	@Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/PrivateNote.java b/mastodon/src/main/java/org/joinmastodon/android/model/PrivateNote.java
new file mode 100644
index 000000000..9e4c7e186
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/PrivateNote.java
@@ -0,0 +1,6 @@
+package org.joinmastodon.android.model;
+
+public class PrivateNote extends BaseModel{
+    public String id;
+    public String note;
+}

From 1688168bc1d091c54d03bb40ed4ebc483745b273 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 28 Dec 2022 11:05:33 -0300
Subject: [PATCH 010/200] The ui is less broken

---
 .../src/main/res/layout/fragment_profile.xml  | 48 +++++++++++++------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 45c63abde..5a5521c3f 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -264,21 +264,39 @@
                         android:layout_marginTop="0dp"
                         android:padding="2dp">
 
-                        <EditText
-                            android:id="@+id/note_edit"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="16dp"
-                            android:layout_marginTop="8dp"
-                            android:layout_marginRight="16dp"
-                            android:layout_marginBottom="4dp"
-                            android:textAppearance="@style/m3_body_large"
-                            android:textSize="16sp"
-                            android:background="@drawable/edit_text_border"
-                            android:inputType="textMultiLine|textCapSentences"
-                            android:elevation="0dp"
-                            android:hint="@string/sk_personal_note"
-                            android:textColorHint="?android:textColorSecondaryInverseNoDisable" />
+						<EditText
+							android:id="@+id/note_edit"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:paddingVertical="16dp"
+							android:layout_marginTop="16dp"
+							android:layout_marginBottom="8dp"
+							android:layout_marginHorizontal="16dp"
+							android:inputType="textMultiLine|textCapSentences"
+							android:singleLine="false"
+							android:drawableStart="@drawable/ic_fluent_globe_20_regular"
+							android:drawablePadding="12dp"
+							android:drawableTint="?android:textColorSecondary"
+							android:background="@drawable/bg_search_field"
+							android:paddingHorizontal="16dp"
+							android:elevation="0dp"
+							android:hint="@string/sk_example_domain"/>
+
+						<!--                        <EditText-->
+<!--                            android:id="@+id/note_edit"-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="wrap_content"-->
+<!--                            android:layout_marginLeft="16dp"-->
+<!--                            android:layout_marginTop="8dp"-->
+<!--                            android:layout_marginRight="16dp"-->
+<!--                            android:layout_marginBottom="4dp"-->
+<!--                            android:textAppearance="@style/m3_body_large"-->
+<!--                            android:textSize="16sp"-->
+<!--							android:background="@drawable/bg_search_field"-->
+<!--                            android:inputType="textMultiLine|textCapSentences"-->
+<!--                            android:elevation="0dp"-->
+<!--                            android:hint="@string/sk_personal_note"-->
+<!--                            android:textColorHint="?android:textColorSecondaryInverseNoDisable" />-->
 
 						<ImageButton
 							android:id="@+id/note_edit_confirm"

From ac24f636dfb828ef0b7cfa12f7454b263c60aaed Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 28 Dec 2022 11:15:12 -0300
Subject: [PATCH 011/200] Its a little less broken

---
 .../org/joinmastodon/android/fragments/ProfileFragment.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 1ba5bcbc0..38f46d3df 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -309,7 +309,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 	private void onClickNoteSave() {
 		Toast.makeText(getActivity(), "Its going here", Toast.LENGTH_LONG).show();
-		currentRequest = new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new SimpleCallback<PrivateNote>(this) {
+		currentRequest = new SetPrivateNote(account.id, noteEdit.getText().toString()).setCallback(new SimpleCallback<PrivateNote>(this) {
 			@Override
 			public void onSuccess(PrivateNote result) {
 				Toast.makeText(getActivity(), "Success", Toast.LENGTH_LONG).show();

From 029650ef2d9e835041aa918c29de534441f433c3 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 28 Dec 2022 12:34:00 -0300
Subject: [PATCH 012/200] Its almost working, the UI side is done. But the
 request is being canceled when the back button is pressed.

---
 .../api/requests/accounts/SetPrivateNote.java | 10 +--
 .../android/fragments/ProfileFragment.java    | 61 ++++++++++---------
 .../drawable/ic_fluent_notepad_20_regular.xml |  9 +++
 .../src/main/res/layout/fragment_profile.xml  | 42 ++++---------
 4 files changed, 58 insertions(+), 64 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_notepad_20_regular.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
index 6b928b5e4..ab8b3c52b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
@@ -4,17 +4,17 @@ import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.model.PrivateNote;
 
 public class SetPrivateNote extends MastodonAPIRequest<PrivateNote>{
-    public SetPrivateNote(String id, String note){
+    public SetPrivateNote(String id, String comment){
         super(MastodonAPIRequest.HttpMethod.POST, "/accounts/"+id+"/note", PrivateNote.class);
-        Request req = new Request(note);
+        Request req = new Request(comment);
         setRequestBody(req);
     }
 
-    public static class Request{
+    private static class Request{
         public String comment;
 
-        public Request(String note){
-            this.comment = note;
+        public Request(String comment){
+            this.comment=comment;
         }
     }
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 38f46d3df..cbe31f242 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -1,16 +1,11 @@
 package org.joinmastodon.android.fragments;
 
-import static android.content.Context.CLIPBOARD_SERVICE;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.app.Fragment;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Outline;
@@ -19,8 +14,6 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.VibrationEffect;
-import android.os.Vibrator;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ImageSpan;
@@ -39,7 +32,6 @@ import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -185,9 +177,28 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		username=content.findViewById(R.id.username);
 		bio=content.findViewById(R.id.bio);
 		noteEdit=content.findViewById(R.id.note_edit);
-		noteEditConfirm=content.findViewById(R.id.note_edit_confirm);
-		noteEditConfirm.setOnClickListener(v->onClickNoteSave());
-		noteEditWrapper=content.findViewById(R.id.note_edit_wrapper);
+		noteEdit.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+			@Override
+			public void onFocusChange(View v, boolean hasFocus) {
+				if(!hasFocus){
+					Toast.makeText(getActivity(), "Its going here", Toast.LENGTH_LONG).show();
+					currentRequest = new SetPrivateNote(account.id, noteEdit.getText().toString()).setCallback(new Callback<>() {
+						@Override
+						public void onSuccess(PrivateNote result) {
+							Toast.makeText(getActivity(), "Success", Toast.LENGTH_LONG).show();
+						}
+
+						@Override
+						public void onError(ErrorResponse error) {
+							Toast.makeText(getActivity(), "Error, not success", Toast.LENGTH_LONG).show();
+						}
+					});
+				}
+			}
+		});
+//		noteEditConfirm=content.findViewById(R.id.note_edit_confirm);
+//		noteEditConfirm.setOnClickListener(v->onClickNoteSave());
+		noteEditWrapper=content.findViewById(R.id.note_edit_wrap);
 		followersCount=content.findViewById(R.id.followers_count);
 		followersLabel=content.findViewById(R.id.followers_label);
 		followersBtn=content.findViewById(R.id.followers_btn);
@@ -307,16 +318,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		return sizeWrapper;
 	}
 
-	private void onClickNoteSave() {
-		Toast.makeText(getActivity(), "Its going here", Toast.LENGTH_LONG).show();
-		currentRequest = new SetPrivateNote(account.id, noteEdit.getText().toString()).setCallback(new SimpleCallback<PrivateNote>(this) {
-			@Override
-			public void onSuccess(PrivateNote result) {
-				Toast.makeText(getActivity(), "Success", Toast.LENGTH_LONG).show();
-			}
-		});
-	}
-
 	@Override
 	protected void doLoadData(){
 		currentRequest=new GetAccountByID(profileAccountID)
@@ -493,15 +494,15 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			noteEditWrapper.setVisibility(View.GONE);
 		}
 
-		if(noteEdit.getText().toString() == null){
-			noteEditConfirm.setImageResource(R.drawable.ic_fluent_checkmark_24_regular);
-			noteEditConfirm.setClickable(false);
-			noteEditConfirm.setAlpha(.50f);
-		}else{
-			noteEditConfirm.setImageResource(R.drawable.ic_fluent_checkmark_24_filled);
-			noteEditConfirm.setClickable(true);
-			noteEditConfirm.setAlpha(1.0f);
-		}
+//		if(noteEdit.getText().toString() == null){
+//			noteEditConfirm.setImageResource(R.drawable.ic_fluent_checkmark_24_regular);
+//			noteEditConfirm.setClickable(false);
+//			noteEditConfirm.setAlpha(.50f);
+//		}else{
+//			noteEditConfirm.setImageResource(R.drawable.ic_fluent_checkmark_24_filled);
+//			noteEditConfirm.setClickable(true);
+//			noteEditConfirm.setAlpha(1.0f);
+//		}
 
 		followersCount.setText(UiUtils.abbreviateNumber(account.followersCount));
 		followingCount.setText(UiUtils.abbreviateNumber(account.followingCount));
diff --git a/mastodon/src/main/res/drawable/ic_fluent_notepad_20_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_notepad_20_regular.xml
new file mode 100644
index 000000000..67619d7cf
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_notepad_20_regular.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M7.5,7C7.224,7 7,7.224 7,7.5C7,7.776 7.224,8 7.5,8H12.5C12.776,8 13,7.776 13,7.5C13,7.224 12.776,7 12.5,7H7.5ZM7,10.5C7,10.224 7.224,10 7.5,10H12.5C12.776,10 13,10.224 13,10.5C13,10.776 12.776,11 12.5,11H7.5C7.224,11 7,10.776 7,10.5ZM7.5,13C7.224,13 7,13.224 7,13.5C7,13.776 7.224,14 7.5,14H9.5C9.776,14 10,13.776 10,13.5C10,13.224 9.776,13 9.5,13H7.5ZM6.5,2C6.224,2 6,2.224 6,2.5V3H5.5C4.672,3 4,3.672 4,4.5V16.5C4,17.328 4.672,18 5.5,18H11.5C11.633,18 11.76,17.947 11.854,17.854L15.854,13.854C15.947,13.76 16,13.633 16,13.5V4.5C16,3.672 15.328,3 14.5,3H14V2.5C14,2.224 13.776,2 13.5,2C13.224,2 13,2.224 13,2.5V3H10.5V2.5C10.5,2.224 10.276,2 10,2C9.724,2 9.5,2.224 9.5,2.5V3H7V2.5C7,2.224 6.776,2 6.5,2ZM14.5,4C14.776,4 15,4.224 15,4.5V13H12.5C11.672,13 11,13.672 11,14.5V17H5.5C5.224,17 5,16.776 5,16.5V4.5C5,4.224 5.224,4 5.5,4H14.5ZM14.293,14L12,16.293V14.5C12,14.224 12.224,14 12.5,14H14.293Z"
+      android:fillColor="#212121"/>
+</vector>
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 5a5521c3f..52d40060b 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -259,7 +259,7 @@
                     <FrameLayout
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
-                        android:id="@+id/note_edit_wrapper"
+                        android:id="@+id/note_edit_wrap"
                         android:layout_below="@id/username"
                         android:layout_marginTop="0dp"
                         android:padding="2dp">
@@ -274,39 +274,23 @@
 							android:layout_marginHorizontal="16dp"
 							android:inputType="textMultiLine|textCapSentences"
 							android:singleLine="false"
-							android:drawableStart="@drawable/ic_fluent_globe_20_regular"
+							android:drawableStart="@drawable/ic_fluent_notepad_20_regular"
 							android:drawablePadding="12dp"
 							android:drawableTint="?android:textColorSecondary"
 							android:background="@drawable/bg_search_field"
 							android:paddingHorizontal="16dp"
 							android:elevation="0dp"
-							android:hint="@string/sk_example_domain"/>
+							android:hint="@string/sk_personal_note"/>
 
-						<!--                        <EditText-->
-<!--                            android:id="@+id/note_edit"-->
-<!--                            android:layout_width="match_parent"-->
-<!--                            android:layout_height="wrap_content"-->
-<!--                            android:layout_marginLeft="16dp"-->
-<!--                            android:layout_marginTop="8dp"-->
-<!--                            android:layout_marginRight="16dp"-->
-<!--                            android:layout_marginBottom="4dp"-->
-<!--                            android:textAppearance="@style/m3_body_large"-->
-<!--                            android:textSize="16sp"-->
-<!--							android:background="@drawable/bg_search_field"-->
-<!--                            android:inputType="textMultiLine|textCapSentences"-->
-<!--                            android:elevation="0dp"-->
-<!--                            android:hint="@string/sk_personal_note"-->
-<!--                            android:textColorHint="?android:textColorSecondaryInverseNoDisable" />-->
-
-						<ImageButton
-							android:id="@+id/note_edit_confirm"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:src="@drawable/ic_fluent_checkmark_24_regular"
-							android:backgroundTint="#00000000"
-							android:layout_marginTop="2dp"
-							android:layout_marginEnd="10dp"
-							android:layout_gravity="right|center_vertical" />
+<!--						<ImageButton-->
+<!--							android:id="@+id/note_edit_confirm"-->
+<!--							android:layout_width="wrap_content"-->
+<!--							android:layout_height="wrap_content"-->
+<!--							android:src="@drawable/ic_fluent_checkmark_24_regular"-->
+<!--							android:backgroundTint="#00000000"-->
+<!--							android:layout_marginTop="2dp"-->
+<!--							android:layout_marginEnd="10dp"-->
+<!--							android:layout_gravity="right|center_vertical" />-->
 
                     </FrameLayout>
 
@@ -314,7 +298,7 @@
 						android:id="@+id/bio"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_below="@id/note_edit_wrapper"
+						android:layout_below="@id/note_edit_wrap"
 						android:layout_marginLeft="16dp"
 						android:layout_marginTop="4dp"
 						android:layout_marginRight="16dp"

From cd342d103490139a25b3a9fb3d296e2f5568aad9 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 28 Dec 2022 14:56:49 -0300
Subject: [PATCH 013/200] I am trying my best

---
 .../api/requests/accounts/SetPrivateNote.java |  7 ++--
 .../android/fragments/ProfileFragment.java    | 38 +++++++++----------
 .../android/model/PrivateNote.java            |  6 ---
 3 files changed, 21 insertions(+), 30 deletions(-)
 delete mode 100644 mastodon/src/main/java/org/joinmastodon/android/model/PrivateNote.java

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
index ab8b3c52b..e9c9fe764 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
@@ -1,18 +1,17 @@
 package org.joinmastodon.android.api.requests.accounts;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.PrivateNote;
+import org.joinmastodon.android.model.Relationship;
 
-public class SetPrivateNote extends MastodonAPIRequest<PrivateNote>{
+public class SetPrivateNote extends MastodonAPIRequest<Relationship>{
     public SetPrivateNote(String id, String comment){
-        super(MastodonAPIRequest.HttpMethod.POST, "/accounts/"+id+"/note", PrivateNote.class);
+        super(MastodonAPIRequest.HttpMethod.POST, "/accounts/"+id+"/note", Relationship.class);
         Request req = new Request(comment);
         setRequestBody(req);
     }
 
     private static class Request{
         public String comment;
-
         public Request(String comment){
             this.comment=comment;
         }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index cbe31f242..e2ce35e5d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -54,7 +54,6 @@ import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.AccountField;
 import org.joinmastodon.android.model.Attachment;
-import org.joinmastodon.android.model.PrivateNote;
 import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.SingleImagePhotoViewerListener;
@@ -177,25 +176,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		username=content.findViewById(R.id.username);
 		bio=content.findViewById(R.id.bio);
 		noteEdit=content.findViewById(R.id.note_edit);
-		noteEdit.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-			@Override
-			public void onFocusChange(View v, boolean hasFocus) {
-				if(!hasFocus){
-					Toast.makeText(getActivity(), "Its going here", Toast.LENGTH_LONG).show();
-					currentRequest = new SetPrivateNote(account.id, noteEdit.getText().toString()).setCallback(new Callback<>() {
-						@Override
-						public void onSuccess(PrivateNote result) {
-							Toast.makeText(getActivity(), "Success", Toast.LENGTH_LONG).show();
-						}
-
-						@Override
-						public void onError(ErrorResponse error) {
-							Toast.makeText(getActivity(), "Error, not success", Toast.LENGTH_LONG).show();
-						}
-					});
-				}
-			}
-		});
 //		noteEditConfirm=content.findViewById(R.id.note_edit_confirm);
 //		noteEditConfirm.setOnClickListener(v->onClickNoteSave());
 		noteEditWrapper=content.findViewById(R.id.note_edit_wrap);
@@ -465,6 +445,13 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		boolean isSelf=AccountSessionManager.getInstance().isSelf(accountID, account);
 
+		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
+			if(!hasFocus){
+//					Toast.makeText(getActivity(), "Its going here", Toast.LENGTH_LONG).show();
+				savePrivateNote();
+			}
+		});
+
 		if(account.locked){
 			ssb=new SpannableStringBuilder("@");
 			ssb.append(account.acct);
@@ -1006,6 +993,17 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		scrollView.smoothScrollTo(0, 0);
 	}
 
+	private void savePrivateNote(){
+		new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new SimpleCallback<>(this) {
+			@Override
+			public void onSuccess(Relationship result) {
+				relationship=result;
+				updateRelationship();
+				Toast.makeText(getActivity(), "Success", Toast.LENGTH_LONG).show();
+			}
+		});
+	}
+
 	private void onFollowersOrFollowingClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/PrivateNote.java b/mastodon/src/main/java/org/joinmastodon/android/model/PrivateNote.java
deleted file mode 100644
index 9e4c7e186..000000000
--- a/mastodon/src/main/java/org/joinmastodon/android/model/PrivateNote.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.joinmastodon.android.model;
-
-public class PrivateNote extends BaseModel{
-    public String id;
-    public String note;
-}

From 26297fbb5ba02cb34a73284a39f4abcd30560e39 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 28 Dec 2022 18:02:38 -0300
Subject: [PATCH 014/200] Lastcomm

---
 .../android/fragments/ProfileFragment.java      | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index e2ce35e5d..5abb0413f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -445,12 +445,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		boolean isSelf=AccountSessionManager.getInstance().isSelf(accountID, account);
 
-		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
-			if(!hasFocus){
-//					Toast.makeText(getActivity(), "Its going here", Toast.LENGTH_LONG).show();
-				savePrivateNote();
-			}
-		});
+//		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
+//			if(!hasFocus){
+////					Toast.makeText(getActivity(), "Its going here", Toast.LENGTH_LONG).show();
+//				savePrivateNote();
+////				noteEdit.setOnFocusChangeListener(savePrivateNote());
+//			}
+//		});
+		noteEdit.setOnClickListener(v->savePrivateNote());
 
 		if(account.locked){
 			ssb=new SpannableStringBuilder("@");
@@ -470,6 +472,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			username.setText('@'+account.acct+(isSelf ? ('@'+AccountSessionManager.getInstance().getAccount(accountID).domain) : ""));
 		}
 		CharSequence parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
+		bio.setOnClickListener(v->savePrivateNote());
 		if(TextUtils.isEmpty(parsedBio)){
 			bio.setVisibility(View.GONE);
 		}else{
@@ -994,7 +997,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	}
 
 	private void savePrivateNote(){
-		new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new SimpleCallback<>(this) {
+		currentRequest = new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new SimpleCallback<>(this) {
 			@Override
 			public void onSuccess(Relationship result) {
 				relationship=result;

From 7cdddf06bc21486a30eb7a33df5f5757998bc9cc Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Thu, 5 Jan 2023 16:24:44 +0100
Subject: [PATCH 015/200] feat(compose/add-poll): add contentLabel for more
 option

---
 mastodon/src/main/res/layout/fragment_compose.xml | 2 ++
 mastodon/src/main/res/values/strings_sk.xml       | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index 1e54cda1e..4d6c20132 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -153,6 +153,7 @@
 						android:layout_marginBottom="8dp"
 						android:background="@drawable/bg_poll_option_clickable"
 						android:outlineProvider="background"
+						android:contentDescription="@string/poll_option_add"
 						android:elevation="2dp">
 						<ImageView
 							android:id="@+id/add_poll_option_icon"
@@ -429,6 +430,7 @@
 				android:layout_marginStart="12dp"
 				android:visibility="gone"
 				android:tooltipText="@string/publish"
+				android:contentDescription="@string/publish"
 				android:drawableStart="@drawable/ic_fluent_send_24_selector"
 				/>
 
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 5a213ef14..578693434 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -135,4 +135,7 @@
     <string name="sk_no_image_desc">The included images have no description. Please consider adding one, to allow visually impaired people to participate.</string>
     <string name="sk_emoji_recent">Recently used</string>
     <string name="sk_clear_recent_emoji">Clear recently used emoji</string>
+
+<!--    accessibility labels-->
+    <string name="poll_option_add">Add new poll option</string>
 </resources>
\ No newline at end of file

From c65b9ff8737de33db2d2f23c92615067121eefc1 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Fri, 6 Jan 2023 18:40:28 +0100
Subject: [PATCH 016/200] fix: remove change

---
 mastodon/src/main/res/values/strings_sk.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 6600f2cb7..888db908e 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -65,7 +65,7 @@
     <string name="sk_welcome_title">Welcome!</string>
     <string name="sk_welcome_text">The shark salutes you! To get started, please enter your home instance’s domain name below.</string>
     <string name="sk_example_domain">example.social</string>
-    <string name="sk_app_username" translatable="false">\@megalodon</string>
+    <string name="sk_app_username" translatable="false">\@moshidon</string>
     <string name="sk_tabs_disable_swipe">Disable swiping between tabs</string>
     <string name="sk_settings_profile">Set up profile</string>
     <string name="sk_settings_posting">Posting preferences</string>

From bed3e987b784d6497443ebd45e29384358581c53 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Sat, 7 Jan 2023 11:38:00 +0100
Subject: [PATCH 017/200] feat(compose/poll): add contentDescription to addPoll

---
 mastodon/src/main/res/layout/fragment_compose.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index 4d6c20132..9f736bf2f 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -161,6 +161,7 @@
 							android:layout_height="24dp"
 							android:layout_margin="16dp"
 							android:tint="?colorDarkIcon"
+							android:contentDescription="@string/poll_option_add"
 							android:src="@drawable/ic_fluent_add_circle_24_regular"/>
 					</LinearLayout>
 					<TextView

From 35299a7b3f826c1e1b57deb97fd5063d61f615fe Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Mon, 9 Jan 2023 17:19:20 +0100
Subject: [PATCH 018/200] feat(accessibility): add contentDesc and toolTip to
 audioItem

---
 .../android/ui/displayitems/AudioStatusDisplayItem.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java
index 89ed42fb7..d7c1723a9 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java
@@ -1,6 +1,7 @@
 package org.joinmastodon.android.ui.displayitems;
 
 import android.content.Context;
+import android.os.Build;
 import android.os.SystemClock;
 import android.view.View;
 import android.view.ViewGroup;
@@ -9,6 +10,7 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 
 import org.joinmastodon.android.AudioPlayerService;
+import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
 import org.joinmastodon.android.model.Attachment;
@@ -126,6 +128,10 @@ public class AudioStatusDisplayItem extends StatusDisplayItem{
 				lastKnownPositionTime=SystemClock.uptimeMillis();
 				this.playing=playing;
 				playPauseBtn.setImageResource(playing ? R.drawable.ic_fluent_pause_circle_24_filled : R.drawable.ic_fluent_play_circle_24_filled);
+				playPauseBtn.setContentDescription(MastodonApp.context.getResources().getString(playing ? R.string.pause : R.string.play));
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+					playPauseBtn.setTooltipText(MastodonApp.context.getResources().getString(playing ? R.string.pause : R.string.play));
+				}
 				if(!playing){
 					lastRemainingSeconds=-1;
 					time.setText(formatDuration((int) item.attachment.getDuration()));

From 1c9e4fe561db8fa60c9fa2e52c689f1081649a05 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Mon, 9 Jan 2023 17:21:38 +0100
Subject: [PATCH 019/200] feat(accessibility): add contentDesc/toolTip to poll
 options

---
 mastodon/src/main/res/layout/compose_poll_option.xml | 2 ++
 mastodon/src/main/res/values/strings_sk.xml          | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/res/layout/compose_poll_option.xml b/mastodon/src/main/res/layout/compose_poll_option.xml
index d93a68014..61b0544fe 100644
--- a/mastodon/src/main/res/layout/compose_poll_option.xml
+++ b/mastodon/src/main/res/layout/compose_poll_option.xml
@@ -20,6 +20,7 @@
 			android:layout_height="24dp"
 			android:layout_margin="16dp"
 			android:tint="?colorDarkIcon"
+			android:importantForAccessibility="no"
 			android:src="@drawable/ic_fluent_circle_24_regular"/>
 		<EditText
 			android:id="@+id/edit"
@@ -41,6 +42,7 @@
 		android:layout_height="56dp"
 		android:scaleType="center"
 		android:tint="?colorDarkIcon"
+		android:contentDescription="@string/reorder"
 		android:src="@drawable/ic_fluent_re_order_dots_vertical_24_regular"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 888db908e..a07828b7b 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -135,8 +135,8 @@
     <string name="sk_no_image_desc">The included images have no description. Please consider adding one, to allow visually impaired people to participate.</string>
     <string name="sk_emoji_recent">Recently used</string>
     <string name="sk_clear_recent_emoji">Clear recently used emoji</string>
-
-<!--    accessibility labels-->
-    <string name="poll_option_add">Add new poll option</string>
     <string name="sk_disable_relocate_publish_button_to_enable_customization">Disable "Relocate publish button" to allow customization</string>
+
+    <!--    accessibility labels-->
+    <string name="sk_poll_option_add">Add new poll option</string>
 </resources>
\ No newline at end of file

From ddc45121169ba4a362c5f916c9a362ae6644bac1 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Mon, 9 Jan 2023 17:22:33 +0100
Subject: [PATCH 020/200] feat(accessibility): add contentDesc/toolTip to poll
 options

---
 mastodon/src/main/res/layout/fragment_compose.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index 9f736bf2f..ee65d7737 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -153,7 +153,7 @@
 						android:layout_marginBottom="8dp"
 						android:background="@drawable/bg_poll_option_clickable"
 						android:outlineProvider="background"
-						android:contentDescription="@string/poll_option_add"
+						android:contentDescription="@string/sk_poll_option_add"
 						android:elevation="2dp">
 						<ImageView
 							android:id="@+id/add_poll_option_icon"
@@ -161,7 +161,7 @@
 							android:layout_height="24dp"
 							android:layout_margin="16dp"
 							android:tint="?colorDarkIcon"
-							android:contentDescription="@string/poll_option_add"
+							android:importantForAccessibility="no"
 							android:src="@drawable/ic_fluent_add_circle_24_regular"/>
 					</LinearLayout>
 					<TextView

From f0846465c22d48c950981f9a067b0e1a9b612b17 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Mon, 9 Jan 2023 17:22:54 +0100
Subject: [PATCH 021/200] feat(accessibility): add contentDesc/toolTip to
 remove attachment

---
 mastodon/src/main/res/layout/compose_media_thumb.xml | 5 ++++-
 mastodon/src/main/res/values/strings_sk.xml          | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/layout/compose_media_thumb.xml b/mastodon/src/main/res/layout/compose_media_thumb.xml
index 38f5887dc..c3938b0a0 100644
--- a/mastodon/src/main/res/layout/compose_media_thumb.xml
+++ b/mastodon/src/main/res/layout/compose_media_thumb.xml
@@ -28,6 +28,8 @@
 			android:layout_marginTop="2dp"
 			android:layout_marginStart="2dp"
 			android:background="?android:selectableItemBackgroundBorderless"
+			android:contentDescription="@string/sk_remove_attachment"
+			android:tooltipText="@string/sk_remove_attachment"
 			android:tint="#D92C2C"
 			android:src="@drawable/ic_fluent_delete_20_regular"/>
 
@@ -136,7 +138,8 @@
 			android:layout_gravity="end|bottom"
 			android:background="?android:selectableItemBackgroundBorderless"
 			android:tint="#D92C2C"
-			android:contentDescription="@string/delete"
+			android:contentDescription="@string/sk_remove_attachment"
+			android:tooltipText="@string/sk_remove_attachment"
 			android:src="@drawable/ic_fluent_delete_20_regular"/>
 
 	</FrameLayout>
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index a07828b7b..4fb12877a 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -139,4 +139,5 @@
 
     <!--    accessibility labels-->
     <string name="sk_poll_option_add">Add new poll option</string>
+    <string name="sk_remove_attachment">Remove attachment</string>
 </resources>
\ No newline at end of file

From c2950ace90aa029a21cd52c1558f4b4dd4d6f826 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Mon, 9 Jan 2023 17:36:04 +0100
Subject: [PATCH 022/200] feat(tabBar): accessibilty hide profile avatar

Sets the `importantForAccessibility` to no on the profile avatar, since the parent already has a contentDescription.
---
 mastodon/src/main/res/layout/tab_bar.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/layout/tab_bar.xml b/mastodon/src/main/res/layout/tab_bar.xml
index 2ad234cb5..2dcde6dae 100644
--- a/mastodon/src/main/res/layout/tab_bar.xml
+++ b/mastodon/src/main/res/layout/tab_bar.xml
@@ -71,6 +71,7 @@
 				android:layout_width="28dp"
 				android:layout_height="28dp"
 				android:layout_gravity="center"
+				android:importantForAccessibility="no"
 				android:scaleType="centerCrop"
 				android:src="@null"/>
 			<View

From 1bfbb4bf38bdba95dd8ae6b836903e8afdf71ee6 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Mon, 9 Jan 2023 17:42:01 +0100
Subject: [PATCH 023/200] fix(composeMedia): change sk_remove_attachment to
 delete

---
 mastodon/src/main/res/layout/compose_media_thumb.xml | 8 ++++----
 mastodon/src/main/res/values/strings_sk.xml          | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/mastodon/src/main/res/layout/compose_media_thumb.xml b/mastodon/src/main/res/layout/compose_media_thumb.xml
index c3938b0a0..e53dacf41 100644
--- a/mastodon/src/main/res/layout/compose_media_thumb.xml
+++ b/mastodon/src/main/res/layout/compose_media_thumb.xml
@@ -28,8 +28,8 @@
 			android:layout_marginTop="2dp"
 			android:layout_marginStart="2dp"
 			android:background="?android:selectableItemBackgroundBorderless"
-			android:contentDescription="@string/sk_remove_attachment"
-			android:tooltipText="@string/sk_remove_attachment"
+			android:contentDescription="@string/delete"
+			android:tooltipText="@string/delete"
 			android:tint="#D92C2C"
 			android:src="@drawable/ic_fluent_delete_20_regular"/>
 
@@ -138,8 +138,8 @@
 			android:layout_gravity="end|bottom"
 			android:background="?android:selectableItemBackgroundBorderless"
 			android:tint="#D92C2C"
-			android:contentDescription="@string/sk_remove_attachment"
-			android:tooltipText="@string/sk_remove_attachment"
+			android:contentDescription="@string/delete"
+			android:tooltipText="@string/delete"
 			android:src="@drawable/ic_fluent_delete_20_regular"/>
 
 	</FrameLayout>
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 4fb12877a..a07828b7b 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -139,5 +139,4 @@
 
     <!--    accessibility labels-->
     <string name="sk_poll_option_add">Add new poll option</string>
-    <string name="sk_remove_attachment">Remove attachment</string>
 </resources>
\ No newline at end of file

From a5c1053c589550f0c47d5d4500887ca66d2ae0e6 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Mon, 9 Jan 2023 17:46:27 +0100
Subject: [PATCH 024/200] feat(recycler_fragment_with_fab): add
 toolTip/ContentDescription

---
 mastodon/src/main/res/layout/recycler_fragment_with_fab.xml | 6 +++++-
 mastodon/src/main/res/values/strings_sk.xml                 | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/layout/recycler_fragment_with_fab.xml b/mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
index 1ed27ed70..9ea45551c 100644
--- a/mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
+++ b/mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
@@ -20,6 +20,10 @@
 			android:layout_height="match_parent"
 			android:id="@+id/empty"/>
 
-		<ImageButton android:id="@+id/fab" style="@style/Widget.Mastodon.Button.Compose"/>
+		<ImageButton
+			android:contentDescription="@string/sk_fab_compose"
+			android:tooltipText="@string/sk_fab_compose"
+			android:id="@+id/fab"
+			style="@style/Widget.Mastodon.Button.Compose"/>
 	</FrameLayout>
 </me.grishka.appkit.views.RecursiveSwipeRefreshLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index a07828b7b..03092f10a 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -139,4 +139,5 @@
 
     <!--    accessibility labels-->
     <string name="sk_poll_option_add">Add new poll option</string>
+    <string name="sk_fab_compose">Compose</string>
 </resources>
\ No newline at end of file

From 975dc94d41f6bc96f9bf71fbf22ec10a13606b0e Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Mon, 9 Jan 2023 19:12:19 +0100
Subject: [PATCH 025/200] feat(settingsThemeItem): hide image for accessibility

---
 mastodon/src/main/res/layout/item_settings_theme_subitem.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/layout/item_settings_theme_subitem.xml b/mastodon/src/main/res/layout/item_settings_theme_subitem.xml
index 1bd0e4c6b..e2dfa4367 100644
--- a/mastodon/src/main/res/layout/item_settings_theme_subitem.xml
+++ b/mastodon/src/main/res/layout/item_settings_theme_subitem.xml
@@ -10,6 +10,7 @@
 		android:layout_width="100dp"
 		android:layout_height="121dp"
 		android:elevation="1dp"
+		android:importantForAccessibility="no"
 		android:foreground="?android:selectableItemBackground"
 		android:duplicateParentState="true"
 		tools:src="@drawable/theme_auto"/>

From 147fb94442221f0933d78b86bef3665f8a497771 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Mon, 9 Jan 2023 19:20:07 +0100
Subject: [PATCH 026/200] feat(settingsItem): set icon to not
 importantForAccessibility

---
 mastodon/src/main/res/layout/item_settings_text.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/layout/item_settings_text.xml b/mastodon/src/main/res/layout/item_settings_text.xml
index bdd90d9ea..d976eecf7 100644
--- a/mastodon/src/main/res/layout/item_settings_text.xml
+++ b/mastodon/src/main/res/layout/item_settings_text.xml
@@ -28,6 +28,7 @@
 	/>
 	<ImageView
 		android:id="@+id/icon"
+		android:importantForAccessibility="no"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content" />
 </LinearLayout>
\ No newline at end of file

From f97ab73c5dfdfd03de42003978f035131798b7bf Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Mon, 9 Jan 2023 19:21:20 +0100
Subject: [PATCH 027/200] feat(reportChoice): set radioIcon
 importantForAccessibility to no

---
 mastodon/src/main/res/layout/item_report_choice.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/layout/item_report_choice.xml b/mastodon/src/main/res/layout/item_report_choice.xml
index 6a748bca2..8ef43e36c 100644
--- a/mastodon/src/main/res/layout/item_report_choice.xml
+++ b/mastodon/src/main/res/layout/item_report_choice.xml
@@ -11,6 +11,7 @@
 		android:layout_height="24dp"
 		android:layout_alignParentStart="true"
 		android:layout_centerVertical="true"
+		android:importantForAccessibility="no"
 		android:tint="?android:textColorSecondary"
 		android:src="@drawable/ic_round_checkbox"/>
 

From 4d836f80329c7815f55dbaa254e4efa2c5288f1e Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Mon, 9 Jan 2023 19:21:54 +0100
Subject: [PATCH 028/200] feat(instanceCategory): set (unused) emoji
 importantForAccessibility to no

---
 mastodon/src/main/res/layout/item_instance_category.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/layout/item_instance_category.xml b/mastodon/src/main/res/layout/item_instance_category.xml
index c42cfe844..e1451494c 100644
--- a/mastodon/src/main/res/layout/item_instance_category.xml
+++ b/mastodon/src/main/res/layout/item_instance_category.xml
@@ -11,6 +11,7 @@
 		android:id="@+id/emoji"
 		android:layout_width="24dp"
 		android:layout_height="24dp"
+		android:importantForAccessibility="no"
 		android:layout_marginBottom="6dp"
 		android:layout_gravity="center_horizontal"/>
 

From 747439999d3876ec089338d4b1a3b0b70ea52e63 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Mon, 9 Jan 2023 19:23:38 +0100
Subject: [PATCH 029/200] feat(profile): add toolTip/ContentDescription to fab

---
 mastodon/src/main/res/layout/fragment_profile.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 22636c12c..b7e6a7781 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -318,7 +318,11 @@
 			</LinearLayout>
 		</org.joinmastodon.android.ui.views.NestedRecyclerScrollView>
 
-		<ImageButton android:id="@+id/fab" style="@style/Widget.Mastodon.Button.Compose"/>
+		<ImageButton
+			android:tooltipText="@string/sk_fab_compose"
+			android:contentDescription="@string/sk_fab_compose"
+			android:id="@+id/fab"
+			style="@style/Widget.Mastodon.Button.Compose"/>
 	</FrameLayout>
 
 </me.grishka.appkit.views.RecursiveSwipeRefreshLayout>
\ No newline at end of file

From 369902ffe5202afa8f6b92e9dd06321584c6ae2f Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Mon, 9 Jan 2023 20:19:29 +0100
Subject: [PATCH 030/200] feat(compose): add toolTip/ContentDescription to
 error icon

---
 mastodon/src/main/res/layout/compose_action.xml | 2 ++
 mastodon/src/main/res/values/strings_sk.xml     | 1 +
 2 files changed, 3 insertions(+)

diff --git a/mastodon/src/main/res/layout/compose_action.xml b/mastodon/src/main/res/layout/compose_action.xml
index 05949e8d5..7f3109061 100644
--- a/mastodon/src/main/res/layout/compose_action.xml
+++ b/mastodon/src/main/res/layout/compose_action.xml
@@ -18,6 +18,8 @@
 
     <ImageView
         android:id="@+id/send_error"
+        android:tooltipText="@string/sk_sending_error"
+        android:contentDescription="@string/sk_sending_error"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 03092f10a..8000d628a 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -140,4 +140,5 @@
     <!--    accessibility labels-->
     <string name="sk_poll_option_add">Add new poll option</string>
     <string name="sk_fab_compose">Compose</string>
+    <string name="sk_sending_error">Error publishing</string>
 </resources>
\ No newline at end of file

From 6c1424055fc86e2dfcb94f51c8fb26c23ade3b9a Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Mon, 9 Jan 2023 21:02:00 +0100
Subject: [PATCH 031/200] feat(StatusDisplay): add toolTip/ContentDescription
 to visibilty icon

---
 .../ui/displayitems/ExtendedFooterStatusDisplayItem.java | 6 ++++++
 .../java/org/joinmastodon/android/ui/utils/UiUtils.java  | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
index ed50eb4c1..060b43819 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
@@ -2,6 +2,7 @@ package org.joinmastodon.android.ui.displayitems;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
@@ -100,6 +101,11 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 				case PRIVATE -> R.drawable.ic_fluent_people_checkmark_20_regular;
 				case DIRECT -> R.drawable.ic_fluent_mention_24_regular;
 			});
+
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				visibility.setTooltipText(UiUtils.getVisibilityText(s));
+			}
+			visibility.setContentDescription(UiUtils.getVisibilityText(s));
 		}
 
 		@Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index de9843a35..b889ae2b0 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -1004,4 +1004,13 @@ public class UiUtils{
 			return false;
 		}
 	}
+
+	public static String getVisibilityText(Status status) {
+		return MastodonApp.context.getString(switch (status.visibility) {
+			case PUBLIC -> R.string.visibility_public;
+			case UNLISTED -> R.string.sk_visibility_unlisted;
+			case PRIVATE -> R.string.visibility_followers_only;
+			case DIRECT -> R.string.visibility_private;
+		});
+	}
 }

From 047e72ce9c24c149a16bd41765502f791bfe6da9 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Mon, 9 Jan 2023 21:05:58 +0100
Subject: [PATCH 032/200] refactor(compose): use UiUtils.getVisibiltyText

---
 .../joinmastodon/android/fragments/ComposeFragment.java   | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index 06bddf577..d870d2257 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -650,13 +650,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			else view.findViewById(R.id.display_item_text).setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, V.dp(16)));
 
 			replyText.setText(getString(R.string.in_reply_to, replyTo.account.displayName));
-			int visibilityNameRes = switch (replyTo.visibility) {
-				case PUBLIC -> R.string.visibility_public;
-				case UNLISTED -> R.string.sk_visibility_unlisted;
-				case PRIVATE -> R.string.visibility_followers_only;
-				case DIRECT -> R.string.visibility_private;
-			};
-			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + getString(visibilityNameRes));
+			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + UiUtils.getVisibilityText(replyTo));
 
 			ArrayList<String> mentions=new ArrayList<>();
 			String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;

From a782160dd303a3ebf694bf4abf12769b0bd65915 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Mon, 9 Jan 2023 21:30:52 +0100
Subject: [PATCH 033/200] refactor: use getContentDescription instead of
 duplicate code

---
 .../android/ui/displayitems/AudioStatusDisplayItem.java     | 2 +-
 .../ui/displayitems/ExtendedFooterStatusDisplayItem.java    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java
index d7c1723a9..3d3acef9c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java
@@ -130,7 +130,7 @@ public class AudioStatusDisplayItem extends StatusDisplayItem{
 				playPauseBtn.setImageResource(playing ? R.drawable.ic_fluent_pause_circle_24_filled : R.drawable.ic_fluent_play_circle_24_filled);
 				playPauseBtn.setContentDescription(MastodonApp.context.getResources().getString(playing ? R.string.pause : R.string.play));
 				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-					playPauseBtn.setTooltipText(MastodonApp.context.getResources().getString(playing ? R.string.pause : R.string.play));
+					playPauseBtn.setTooltipText(playPauseBtn.getContentDescription());
 				}
 				if(!playing){
 					lastRemainingSeconds=-1;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
index 060b43819..40641f36c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
@@ -102,10 +102,10 @@ public class ExtendedFooterStatusDisplayItem extends StatusDisplayItem{
 				case DIRECT -> R.drawable.ic_fluent_mention_24_regular;
 			});
 
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-				visibility.setTooltipText(UiUtils.getVisibilityText(s));
-			}
 			visibility.setContentDescription(UiUtils.getVisibilityText(s));
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				visibility.setTooltipText(visibility.getContentDescription());
+			}
 		}
 
 		@Override

From 59a8d1d462d2c3e4d75a71a15aff1de5590b2a68 Mon Sep 17 00:00:00 2001
From: dontobi <github@myhome.zone>
Date: Tue, 10 Jan 2023 06:24:10 +0100
Subject: [PATCH 034/200] Update german translation

---
 mastodon/src/main/res/values-de-rDE/strings_sk.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-de-rDE/strings_sk.xml b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
index fbdc82e94..55ac42951 100644
--- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
@@ -136,4 +136,7 @@
     <string name="sk_clear_recent_emoji">Kürzlich verwendete Emojis löschen</string>
     <string name="sk_disable_relocate_publish_button_to_enable_customization">Deaktiviere die Funktion "Veröffentlichen Schaltfläche verschieben", um eine Anpassung zu ermöglichen.</string>
     <string name="sk_keep_only_latest_notification">Nur neueste Benachrichtigung behalten</string>
-</resources>
+    <string name="sk_poll_option_add">Neue Umfrageoption hinzufügen</string>
+    <string name="sk_fab_compose">Fehler beim Veröffentlichen</string>
+    <string name="sk_sending_error">Fehler beim Veröffentlichen</string>
+</resources>
\ No newline at end of file

From 485ab4ee22125a5022283c297f8c684226802f68 Mon Sep 17 00:00:00 2001
From: Tobias S <github@myhome.zone>
Date: Tue, 10 Jan 2023 10:09:11 +0100
Subject: [PATCH 035/200] Update german translation

---
 mastodon/src/main/res/values-de-rDE/strings_sk.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/res/values-de-rDE/strings_sk.xml b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
index 55ac42951..f0721d15b 100644
--- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
@@ -137,6 +137,6 @@
     <string name="sk_disable_relocate_publish_button_to_enable_customization">Deaktiviere die Funktion "Veröffentlichen Schaltfläche verschieben", um eine Anpassung zu ermöglichen.</string>
     <string name="sk_keep_only_latest_notification">Nur neueste Benachrichtigung behalten</string>
     <string name="sk_poll_option_add">Neue Umfrageoption hinzufügen</string>
-    <string name="sk_fab_compose">Fehler beim Veröffentlichen</string>
+    <string name="sk_fab_compose">Verfassen</string>
     <string name="sk_sending_error">Fehler beim Veröffentlichen</string>
-</resources>
\ No newline at end of file
+</resources>

From 6e13e592d0b900d0384f6ad70cbce723c50609ab Mon Sep 17 00:00:00 2001
From: mishnz <david@howes.nz>
Date: Sun, 1 Jan 2023 18:50:09 +1300
Subject: [PATCH 036/200] The Mastodon server does not currently use URL_SAFE
 encoding on its serverKey. Using URL_SAFE in this client means the client
 will crash for any server that uses a key that generates a Mime64 string
 containing a "+" or "/".  This change removes the URL_SAFE logic. See:
 https://github.com/mastodon/mastodon-android/issues/483

---
 .../org/joinmastodon/android/api/PushSubscriptionManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
index e646605d4..01822fb8a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
@@ -162,7 +162,7 @@ public class PushSubscriptionManager{
 						@Override
 						public void onSuccess(PushSubscription result){
 							MastodonAPIController.runInBackground(()->{
-								serverKey=deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.URL_SAFE));
+								serverKey=deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.DEFAULT));
 
 								AccountSession session=AccountSessionManager.getInstance().tryGetAccount(accountID);
 								if(session==null)

From 34a4dd6d1fef9b7ae5aa689ed4eb4b381475f105 Mon Sep 17 00:00:00 2001
From: mishnz <david@howes.nz>
Date: Mon, 2 Jan 2023 23:56:52 +1300
Subject: [PATCH 037/200] Second fix for MIME64 inconsistency in serverKey. The
 previous fix https://github.com/mastodon/mastodon-android/pull/486 would
 break any connections to any instances using WEB_SAFE MIME64 encoding on the
 serverKey, which actually appears to be the usual case. This update reverts
 to the previous logic, but also converts standard MIME64 characters ('/' and
 '+') to their WEB_SAFE equivalents. This ensures the standard case of
 WEB_SAFE BASE64 serverKeys and the anomolous case of DEFAULT BASE64 keys both
 work.

---
 .../org/joinmastodon/android/api/PushSubscriptionManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
index 01822fb8a..710fda0c6 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
@@ -162,7 +162,9 @@ public class PushSubscriptionManager{
 						@Override
 						public void onSuccess(PushSubscription result){
 							MastodonAPIController.runInBackground(()->{
-								serverKey=deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.DEFAULT));
+								result.serverKey=result.serverKey.replace('/','_');
+								result.serverKey=result.serverKey.replace('+','-');
+								deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.URL_SAFE));
 
 								AccountSession session=AccountSessionManager.getInstance().tryGetAccount(accountID);
 								if(session==null)

From 8dd22e185314ed0d9aa9c8e04e4628c5ee972d97 Mon Sep 17 00:00:00 2001
From: mishnz <david@howes.nz>
Date: Tue, 3 Jan 2023 00:15:45 +1300
Subject: [PATCH 038/200] serverKey assignment was missing, corrected.

---
 .../org/joinmastodon/android/api/PushSubscriptionManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
index 710fda0c6..3294a02f8 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
@@ -164,7 +164,7 @@ public class PushSubscriptionManager{
 							MastodonAPIController.runInBackground(()->{
 								result.serverKey=result.serverKey.replace('/','_');
 								result.serverKey=result.serverKey.replace('+','-');
-								deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.URL_SAFE));
+								serverKey=deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.URL_SAFE));
 
 								AccountSession session=AccountSessionManager.getInstance().tryGetAccount(accountID);
 								if(session==null)

From 786dbaf92cd896e3b3c002c3b781717cffc38809 Mon Sep 17 00:00:00 2001
From: Thiago 'Jedi' Abreu <thiagoa7@gmail.com>
Date: Mon, 9 Jan 2023 06:23:14 -0300
Subject: [PATCH 039/200] Filter all status, even if filters are empty (#255)

---
 .../android/fragments/HomeTimelineFragment.java             | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
index 3f9634fe2..69993d5eb 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -188,10 +188,8 @@ public class HomeTimelineFragment extends StatusListFragment{
 							result.get(result.size()-1).hasGapAfter=true;
 							toAdd=result;
 						}
-						List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(Filter.FilterContext.HOME)).collect(Collectors.toList());
-						if(!filters.isEmpty()){
-							toAdd=toAdd.stream().filter(new StatusFilterPredicate(filters)).collect(Collectors.toList());
-						}
+						StatusFilterPredicate filterPredicate=new StatusFilterPredicate(accountID, Filter.FilterContext.HOME);
+						toAdd=toAdd.stream().filter(filterPredicate).collect(Collectors.toList());
 						if(!toAdd.isEmpty()){
 							prependItems(toAdd, true);
 							showNewPostsButton();

From c9cc8e23c1f4b72ac824e89167b6c857188ee58f Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 9 Jan 2023 10:30:49 +0100
Subject: [PATCH 040/200] don't add subject if blank

closes #240
---
 .../java/org/joinmastodon/android/ExternalShareActivity.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java b/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
index c289bde53..263af871c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
@@ -53,7 +53,10 @@ public class ExternalShareActivity extends FragmentStackActivity{
 		Intent intent=getIntent();
 		StringBuilder builder=new StringBuilder();
 		String subject = "";
-		if (intent.hasExtra(Intent.EXTRA_SUBJECT)) builder.append(subject = intent.getStringExtra(Intent.EXTRA_SUBJECT)).append("\n\n");
+		if (intent.hasExtra(Intent.EXTRA_SUBJECT)) {
+			subject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
+			if (!subject.isBlank()) builder.append(subject).append("\n\n");
+		}
 		if (intent.hasExtra(Intent.EXTRA_TEXT)) builder.append(intent.getStringExtra(Intent.EXTRA_TEXT)).append("\n");
 		String text=builder.toString();
 		List<Uri> mediaUris;

From 9bd44339427472ba1694122f95885a601f27c54f Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 9 Jan 2023 10:38:30 +0100
Subject: [PATCH 041/200] tweak reply animation

closes #237
---
 .../org/joinmastodon/android/fragments/ComposeFragment.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index d870d2257..535a16942 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -588,10 +588,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 						scrollView.post(() -> {
 							int bottom = scrollView.getChildAt(0).getBottom();
 							int delta = bottom - (scrollView.getScrollY() + scrollView.getHeight());
-							int space = GlobalUserPreferences.reduceMotion ? 0 : Math.min(V.dp(120), delta);
+							int space = GlobalUserPreferences.reduceMotion ? 0 : Math.min(V.dp(70), delta);
 							scrollView.scrollBy(0, delta - space);
 							if (!GlobalUserPreferences.reduceMotion) {
-								scrollView.postDelayed(() -> scrollView.smoothScrollBy(0, space), 100);
+								scrollView.postDelayed(() -> scrollView.smoothScrollBy(0, space), 130);
 							}
 						});
 					}

From f157313d9ad330e6c1693d11724df3696dd86682 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 9 Jan 2023 06:44:51 -0300
Subject: [PATCH 042/200] click "replying to" to scroll up

closes #241
---
 .../joinmastodon/android/fragments/ComposeFragment.java    | 3 +++
 mastodon/src/main/res/layout/fragment_compose.xml          | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index 535a16942..f5c88618f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -651,6 +651,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 			replyText.setText(getString(R.string.in_reply_to, replyTo.account.displayName));
 			replyText.setContentDescription(getString(R.string.in_reply_to, replyTo.account.displayName) + ". " + getString(R.string.post_visibility) + ": " + UiUtils.getVisibilityText(replyTo));
+			replyText.setOnClickListener(v->{
+				scrollView.smoothScrollTo(0, 0);
+			});
 
 			ArrayList<String> mentions=new ArrayList<>();
 			String ownID=AccountSessionManager.getInstance().getAccount(accountID).self.id;
diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index ee65d7737..7323ad927 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -56,10 +56,10 @@
 
 				<TextView
 					android:id="@+id/reply_text"
-					android:layout_width="match_parent"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_marginBottom="-12dp"
-					android:paddingHorizontal="16dp"
+					android:layout_marginStart="16dp"
 					android:paddingTop="16dp"
 					android:paddingBottom="6dp"
 					android:textAppearance="@style/m3_title_small"
@@ -68,8 +68,7 @@
 					android:drawableTint="?android:textColorSecondary"
 					android:drawablePadding="6dp"
 					android:singleLine="true"
-					android:ellipsize="end"
-					android:background="?android:selectableItemBackground"/>
+					android:ellipsize="end"/>
 
 				<RelativeLayout
 					android:layout_width="match_parent"

From e343131670ae8a17376723341386201cee94d041 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 9 Jan 2023 10:47:12 +0100
Subject: [PATCH 043/200] fix wrong pin icon

closes #230
---
 .../main/java/org/joinmastodon/android/ui/utils/UiUtils.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index b889ae2b0..dd8ce7533 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -498,7 +498,7 @@ public class UiUtils{
 				pinned ? R.string.sk_confirm_pin_post_title : R.string.sk_confirm_unpin_post_title,
 				pinned ? R.string.sk_confirm_pin_post : R.string.sk_confirm_unpin_post,
 				pinned ? R.string.sk_pin_post : R.string.sk_unpin_post,
-				pinned ? R.drawable.ic_fluent_pin_off_28_regular : R.drawable.ic_fluent_pin_28_regular,
+				pinned ? R.drawable.ic_fluent_pin_28_regular : R.drawable.ic_fluent_pin_off_28_regular,
 				()->{
 					new SetStatusPinned(status.id, pinned)
 							.setCallback(new Callback<>() {

From 1fa42fd20f1130b84d2257dc4e8eb12b82e2b88c Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 9 Jan 2023 07:11:00 -0300
Subject: [PATCH 044/200] scale text according to system

closes #244
---
 .../main/res/layout/compose_media_thumb.xml   |  2 +-
 .../main/res/layout/display_item_header.xml   | 26 ++++++++++---------
 .../src/main/res/layout/fragment_compose.xml  | 10 ++++---
 .../src/main/res/layout/fragment_discover.xml |  2 +-
 .../src/main/res/layout/fragment_profile.xml  |  2 +-
 .../main/res/layout/item_account_switcher.xml |  2 +-
 .../main/res/layout/item_emoji_section.xml    |  2 +-
 .../res/layout/item_instance_category.xml     |  2 +-
 .../src/main/res/layout/item_server_rule.xml  |  6 ++---
 .../item_settings_notification_policy.xml     |  4 +--
 mastodon/src/main/res/values/styles.xml       | 24 ++++++++---------
 11 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/mastodon/src/main/res/layout/compose_media_thumb.xml b/mastodon/src/main/res/layout/compose_media_thumb.xml
index e53dacf41..c795ef218 100644
--- a/mastodon/src/main/res/layout/compose_media_thumb.xml
+++ b/mastodon/src/main/res/layout/compose_media_thumb.xml
@@ -107,7 +107,7 @@
 				android:layout_below="@id/retry_or_cancel_upload"
 				android:layout_marginTop="16dp"
 				android:textColor="?colorGray200"
-				android:textSize="14dp"
+				android:textSize="14sp"
 				android:gravity="center_horizontal"
 				android:singleLine="true"
 				android:ellipsize="end"
diff --git a/mastodon/src/main/res/layout/display_item_header.xml b/mastodon/src/main/res/layout/display_item_header.xml
index 4adb201c0..b022139f2 100644
--- a/mastodon/src/main/res/layout/display_item_header.xml
+++ b/mastodon/src/main/res/layout/display_item_header.xml
@@ -49,8 +49,8 @@
 
 	<ImageView
 		android:id="@+id/avatar"
-		android:layout_width="46dp"
-		android:layout_height="46dp"
+		android:layout_width="46sp"
+		android:layout_height="46sp"
 		android:layout_alignParentStart="true"
 		android:layout_alignParentTop="true"
 		android:layout_marginEnd="12dp" />
@@ -58,15 +58,16 @@
 	<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
 		android:id="@+id/name_wrap"
 		android:layout_width="match_parent"
-		android:layout_height="24dp"
+		android:layout_height="wrap_content"
 		android:layout_marginEnd="12dp"
 		android:layout_toStartOf="@id/visibility"
-		android:layout_toEndOf="@id/avatar">
+		android:layout_toEndOf="@id/avatar"
+		android:minHeight="24sp">
 
 		<TextView
 			android:id="@+id/name"
 			android:layout_width="wrap_content"
-			android:layout_height="24dp"
+			android:layout_height="wrap_content"
 			android:ellipsize="end"
 			android:singleLine="true"
 			android:textAlignment="viewStart"
@@ -76,7 +77,7 @@
 		<TextView
 			android:id="@+id/extra_text"
 			android:layout_width="wrap_content"
-			android:layout_height="24dp"
+			android:layout_height="wrap_content"
 			android:layout_marginStart="8dp"
 			android:ellipsize="end"
 			android:fontFamily="sans-serif"
@@ -89,18 +90,19 @@
 
 	<org.joinmastodon.android.ui.views.HeaderSubtitleLinearLayout
 		android:layout_width="match_parent"
-		android:layout_height="20dp"
+		android:layout_height="wrap_content"
 		android:layout_below="@id/name_wrap"
 		android:layout_marginEnd="8dp"
 		android:layout_toStartOf="@id/visibility"
 		android:layout_toEndOf="@id/avatar"
 		android:layoutDirection="locale"
+		android:minHeight="20sp"
 		android:orientation="horizontal">
 
 		<TextView
 			android:id="@+id/username"
 			android:layout_width="wrap_content"
-			android:layout_height="20dp"
+			android:layout_height="wrap_content"
 			android:ellipsize="end"
 			android:singleLine="true"
 			android:textAppearance="@style/m3_title_small"
@@ -109,9 +111,9 @@
 		<TextView
 			android:id="@+id/separator"
 			android:layout_width="wrap_content"
-			android:layout_height="20dp"
-			android:layout_marginLeft="4dp"
-			android:layout_marginRight="4dp"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4sp"
+			android:layout_marginRight="4sp"
 			android:importantForAccessibility="no"
 			android:text="·"
 			android:textAppearance="@style/m3_title_small" />
@@ -119,7 +121,7 @@
 		<TextView
 			android:id="@+id/timestamp"
 			android:layout_width="wrap_content"
-			android:layout_height="20dp"
+			android:layout_height="wrap_content"
 			android:singleLine="true"
 			android:textAppearance="@style/m3_title_small"
 			tools:text="3h" />
diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index 7323ad927..85468f373 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -79,8 +79,8 @@
 
 					<ImageView
 						android:id="@+id/self_avatar"
-						android:layout_width="46dp"
-						android:layout_height="46dp"
+						android:layout_width="46sp"
+						android:layout_height="46sp"
 						android:layout_alignParentStart="true"
 						android:layout_alignParentTop="true"
 						android:layout_marginEnd="12dp" />
@@ -88,8 +88,9 @@
 					<TextView
 						android:id="@+id/self_name"
 						android:layout_width="match_parent"
-						android:layout_height="24dp"
+						android:layout_height="wrap_content"
 						android:layout_toEndOf="@id/self_avatar"
+						android:minHeight="24sp"
 						android:ellipsize="end"
 						android:singleLine="true"
 						android:textAppearance="@style/m3_title_medium"
@@ -98,9 +99,10 @@
 					<TextView
 						android:id="@+id/self_username"
 						android:layout_width="match_parent"
-						android:layout_height="20dp"
+						android:layout_height="wrap_content"
 						android:layout_below="@id/self_name"
 						android:layout_toEndOf="@id/self_avatar"
+						android:minHeight="20sp"
 						android:ellipsize="end"
 						android:singleLine="true"
 						android:textAppearance="@style/m3_title_small"
diff --git a/mastodon/src/main/res/layout/fragment_discover.xml b/mastodon/src/main/res/layout/fragment_discover.xml
index 7ea500d7d..d797ee7cb 100644
--- a/mastodon/src/main/res/layout/fragment_discover.xml
+++ b/mastodon/src/main/res/layout/fragment_discover.xml
@@ -36,7 +36,7 @@
 				android:hint="@string/search_hint"
 				android:textColorHint="?colorSearchHint"
 				android:textColor="?android:textColorPrimary"
-				android:textSize="16dp"
+				android:textSize="16sp"
 				android:singleLine="true"
 				android:inputType="textFilter"
 				android:imeOptions="actionSearch"
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index b7e6a7781..d89afab70 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -45,7 +45,7 @@
 						android:textColor="?colorGray50t"
 						android:textAllCaps="true"
 						android:fontFamily="sans-serif-medium"
-						android:textSize="14dp"
+						android:textSize="14sp"
 						android:gravity="center"
 						android:background="@drawable/bg_profile_follows_you"
 						android:visibility="gone"
diff --git a/mastodon/src/main/res/layout/item_account_switcher.xml b/mastodon/src/main/res/layout/item_account_switcher.xml
index f171661ce..1cffbf7af 100644
--- a/mastodon/src/main/res/layout/item_account_switcher.xml
+++ b/mastodon/src/main/res/layout/item_account_switcher.xml
@@ -19,7 +19,7 @@
 		android:layout_height="wrap_content"
 		android:layout_weight="1"
 		android:layout_marginStart="24dp"
-		android:textSize="16dp"
+		android:textSize="16sp"
 		android:textColor="?android:textColorPrimary"
 		android:singleLine="true"
 		android:ellipsize="end"/>
diff --git a/mastodon/src/main/res/layout/item_emoji_section.xml b/mastodon/src/main/res/layout/item_emoji_section.xml
index c99999753..c4341c48e 100644
--- a/mastodon/src/main/res/layout/item_emoji_section.xml
+++ b/mastodon/src/main/res/layout/item_emoji_section.xml
@@ -6,7 +6,7 @@
 	android:singleLine="true"
 	android:ellipsize="end"
 	android:fontFamily="sans-serif-medium"
-	android:textSize="12dp"
+	android:textSize="12sp"
 	android:textColor="?android:textColorSecondary"
 	android:textAllCaps="true"
 	android:paddingTop="24dp"
diff --git a/mastodon/src/main/res/layout/item_instance_category.xml b/mastodon/src/main/res/layout/item_instance_category.xml
index e1451494c..1c5e1f7ba 100644
--- a/mastodon/src/main/res/layout/item_instance_category.xml
+++ b/mastodon/src/main/res/layout/item_instance_category.xml
@@ -23,7 +23,7 @@
 		android:textAllCaps="true"
 		android:textColor="?android:textColorPrimary"
 		android:fontFamily="sans-serif-medium"
-		android:textSize="14dp"
+		android:textSize="14sp"
 		android:gravity="center_vertical"
 		android:singleLine="true"
 		android:ellipsize="end"
diff --git a/mastodon/src/main/res/layout/item_server_rule.xml b/mastodon/src/main/res/layout/item_server_rule.xml
index 9930af222..65bd75b4b 100644
--- a/mastodon/src/main/res/layout/item_server_rule.xml
+++ b/mastodon/src/main/res/layout/item_server_rule.xml
@@ -12,13 +12,13 @@
 	
 	<TextView
 		android:id="@+id/number"
-		android:layout_width="24dp"
-		android:layout_height="24dp"
+		android:layout_width="24sp"
+		android:layout_height="wrap_content"
 		android:layout_marginEnd="16dp"
 		android:textColor="?android:colorAccent"
 		android:fontFamily="sans-serif-condensed"
 		android:textStyle="bold"
-		android:textSize="22dp"
+		android:textSize="22sp"
 		android:gravity="center"
 		android:includeFontPadding="false"
 		tools:text="1"/>
diff --git a/mastodon/src/main/res/layout/item_settings_notification_policy.xml b/mastodon/src/main/res/layout/item_settings_notification_policy.xml
index a9f4d8645..eece7d1a7 100644
--- a/mastodon/src/main/res/layout/item_settings_notification_policy.xml
+++ b/mastodon/src/main/res/layout/item_settings_notification_policy.xml
@@ -14,7 +14,7 @@
 		android:layout_marginEnd="8dp"
 		android:gravity="center_vertical"
 		android:textColor="?android:textColorPrimary"
-		android:textSize="20dp"
+		android:textSize="20sp"
 		android:fontFamily="sans-serif-medium"
 		android:singleLine="true"
 		android:ellipsize="end"
@@ -26,7 +26,7 @@
 		android:layout_height="32dp"
 		android:background="@drawable/bg_inline_button"
 		android:textColor="?android:textColorPrimary"
-		android:textSize="20dp"
+		android:textSize="20sp"
 		android:fontFamily="sans-serif-medium"
 		android:paddingLeft="4dp"
 		android:paddingRight="4dp"
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index f72728e2a..1c9304bd0 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -381,7 +381,7 @@
 
 	<style name="Widget.Mastodon.M3.Button" parent="android:Widget.Material.Button">
 		<item name="android:textAllCaps">false</item>
-		<item name="android:textSize">14dp</item>
+		<item name="android:textSize">14sp</item>
 		<item name="android:minHeight">40dp</item>
 		<item name="android:fontFamily">sans-serif-medium</item>
 		<item name="android:stateListAnimator">@null</item>
@@ -403,45 +403,45 @@
 
 	<style name="alert_title">
 		<item name="android:textColor">?android:textColorPrimary</item>
-		<item name="android:textSize">24dp</item>
+		<item name="android:textSize">24sp</item>
 		<item name="android:minHeight">38dp</item>
 		<item name="android:gravity">center_vertical</item>
 	</style>
 
 	<style name="m3_body_large">
-		<item name="android:textSize">16dp</item>
+		<item name="android:textSize">16sp</item>
 		<item name="android:textColor">?android:textColorPrimary</item>
 		<item name="android:lineSpacingExtra">5dp</item>
 	</style>
 
 	<style name="m3_body_medium">
-		<item name="android:textSize">14dp</item>
+		<item name="android:textSize">14sp</item>
 		<item name="android:textColor">?android:textColorPrimary</item>
 		<item name="android:lineSpacingExtra">4dp</item>
 	</style>
 
 	<style name="m3_body_small">
-		<item name="android:textSize">12dp</item>
+		<item name="android:textSize">12sp</item>
 		<item name="android:textColor">?android:textColorSecondary</item>
 		<item name="android:lineSpacingExtra">2dp</item>
 	</style>
 
 	<style name="m3_title_medium">
 		<item name="android:fontFamily">sans-serif-medium</item>
-		<item name="android:textSize">16dp</item>
+		<item name="android:textSize">16sp</item>
 		<item name="android:textColor">?android:textColorPrimary</item>
 		<item name="android:lineSpacingExtra">5dp</item>
 	</style>
 
 	<style name="m3_title_small">
 		<item name="android:fontFamily">sans-serif-medium</item>
-		<item name="android:textSize">14dp</item>
+		<item name="android:textSize">14sp</item>
 		<item name="android:textColor">?android:textColorSecondary</item>
 	</style>
 
 	<style name="m3_label_medium">
 		<item name="android:fontFamily">sans-serif-medium</item>
-		<item name="android:textSize">12dp</item>
+		<item name="android:textSize">12sp</item>
 		<item name="android:textColor">?android:textColorPrimary</item>
 		<item name="android:lineSpacingMultiplier">1.14</item>
 	</style>
@@ -449,12 +449,12 @@
 	<style name="m3_label_large">
 		<item name="android:fontFamily">sans-serif-medium</item>
 		<item name="android:textColor">?android:textColorSecondary</item>
-		<item name="android:textSize">14dp</item>
+		<item name="android:textSize">14sp</item>
 	</style>
 
 	<style name="m3_title_large">
 		<item name="android:fontFamily">sans-serif-medium</item>
-		<item name="android:textSize">22dp</item>
+		<item name="android:textSize">22sp</item>
 		<item name="android:textColor">?android:textColorPrimary</item>
 	</style>
 
@@ -465,12 +465,12 @@
 	</style>
 
 	<style name="m3_headline_small">
-		<item name="android:textSize">24dp</item>
+		<item name="android:textSize">24sp</item>
 		<item name="android:textColor">?android:textColorPrimary</item>
 	</style>
 
 	<style name="m3_headline_medium">
-		<item name="android:textSize">28dp</item>
+		<item name="android:textSize">28sp</item>
 		<item name="android:textColor">?android:textColorPrimary</item>
 		<item name="android:lineSpacingExtra">3dp</item>
 	</style>

From ab2cee08fe0882b83ccd2780d71a473b364ac7ed Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 9 Jan 2023 11:15:14 +0100
Subject: [PATCH 045/200] hide keyboard when navigating

closes #227
---
 .../java/org/joinmastodon/android/fragments/ComposeFragment.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index f5c88618f..985bc001c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -621,6 +621,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				Bundle args=new Bundle();
 				args.putString("account", accountID);
 				args.putParcelable("profileAccount", Parcels.wrap(replyTo.account));
+				imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
 				Nav.go(getActivity(), ProfileFragment.class, args);
 			});
 

From d27fe4ebd1e8e8c4596ad0ca84aa20c7bbf1364c Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 9 Jan 2023 11:24:02 +0100
Subject: [PATCH 046/200] tweak header text margin

---
 mastodon/src/main/res/layout/display_item_header.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/layout/display_item_header.xml b/mastodon/src/main/res/layout/display_item_header.xml
index b022139f2..f7cf78c45 100644
--- a/mastodon/src/main/res/layout/display_item_header.xml
+++ b/mastodon/src/main/res/layout/display_item_header.xml
@@ -60,6 +60,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginEnd="12dp"
+		android:layout_marginTop="2sp"
 		android:layout_toStartOf="@id/visibility"
 		android:layout_toEndOf="@id/avatar"
 		android:minHeight="24sp">

From b09aab4a1d1fbb89c3304d15494bd2a3ae5c1b4d Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 9 Jan 2023 12:25:48 +0100
Subject: [PATCH 047/200] don't connect to fascists

---
 mastodon/src/main/assets/blocks.tsv           | 39 +++++++++++++++++++
 .../android/api/MastodonAPIController.java    | 19 +++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 mastodon/src/main/assets/blocks.tsv

diff --git a/mastodon/src/main/assets/blocks.tsv b/mastodon/src/main/assets/blocks.tsv
new file mode 100644
index 000000000..8075bbb4b
--- /dev/null
+++ b/mastodon/src/main/assets/blocks.tsv
@@ -0,0 +1,39 @@
+#	lists.d Mastodon Blocklist	(c) 2022 Greyhat Academy	LICENSED  UNDER: CC-BY-NC-SA 4.0
+#	https://raw.githubusercontent.com/greyhat-academy/lists.d/main/mastodon.domains.block.list.tsv
+#	This list contains domains of toxic mastodon instances
+#	Last-Modified:	1672044500
+
+#	gab - a neonazi social network
+gab.ai
+gab.com
+gab.protohype.net
+
+#	consequence-free speech
+social.unzensiert.to
+freeatlantis.com
+
+#	reactionary bigotry and hatespeech against magrinalized groups
+poa.st
+freespeechextremist.com
+rdrama.cc
+outpoa.st
+anime.website
+gameliberty.club
+social.byoblu.com
+yggdrasil.social
+smuglo.li
+dogeposting.social
+unsafe.space
+freezepeach.xyz
+
+#	+ CSAM
+rojogato.com
+
+#	antivaxxer shitposting & fearmongering
+shadowsocial.org
+
+#	Kiwifarms
+kiwifarms.net
+kiwifarms.cc
+kiwifarms.is
+kiwifarms.pleroma.net
\ No newline at end of file
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
index 5610155be..6a2dfe8a3 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
@@ -12,11 +12,14 @@ import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
 
 import org.joinmastodon.android.BuildConfig;
+import org.joinmastodon.android.MastodonApp;
 import org.joinmastodon.android.api.gson.IsoInstantTypeAdapter;
 import org.joinmastodon.android.api.gson.IsoLocalDateTypeAdapter;
 import org.joinmastodon.android.api.session.AccountSession;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.Reader;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -47,9 +50,22 @@ public class MastodonAPIController{
 	private static OkHttpClient httpClient=new OkHttpClient.Builder().build();
 
 	private AccountSession session;
+	private static List<String> badDomains = new ArrayList<>();
 
 	static{
 		thread.start();
+		try {
+			final BufferedReader reader = new BufferedReader(new InputStreamReader(
+					MastodonApp.context.getAssets().open("blocks.tsv")
+			));
+			String line;
+			while ((line = reader.readLine()) != null) {
+				if (line.isBlank() || line.startsWith("#")) continue;
+				badDomains.add(line.toLowerCase().trim());
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
 	}
 
 	public MastodonAPIController(@Nullable AccountSession session){
@@ -57,8 +73,11 @@ public class MastodonAPIController{
 	}
 
 	public <T> void submitRequest(final MastodonAPIRequest<T> req){
+		final String host = req.getURL().getHost().toLowerCase();
+		final boolean isBad = badDomains.stream().anyMatch(host::endsWith);
 		thread.postRunnable(()->{
 			try{
+				if (isBad) throw new IllegalArgumentException();
 				if(req.canceled)
 					return;
 				Request.Builder builder=new Request.Builder()

From 3cdcffe03d97ee33c1a23e03dda3bd3003e0b122 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 9 Jan 2023 13:16:03 -0300
Subject: [PATCH 048/200] implement announcements

closes #127
---
 .../announcements/DismissAnnouncement.java    |  10 ++
 .../announcements/GetAnnouncements.java       |  15 +++
 .../fragments/AnnouncementsFragment.java      | 107 ++++++++++++++++++
 .../fragments/HomeTimelineFragment.java       |  31 ++++-
 .../onboarding/CustomLoginFragment.java       |  21 ++--
 .../android/model/Announcement.java           |  63 +++++++++++
 .../displayitems/HeaderStatusDisplayItem.java |  69 ++++++++++-
 .../drawable/ic_announcements_24_badged.xml   |  10 ++
 .../ic_fluent_checkmark_20_filled.xml         |   3 +
 .../ic_fluent_circle_small_20_filled.xml      |   3 +
 .../ic_fluent_megaphone_24_regular.xml        |   3 +
 .../ic_fluent_more_vertical_20_filled.xml     |   3 +
 .../main/res/layout/display_item_header.xml   |  17 ++-
 .../main/res/layout/header_welcome_custom.xml |   3 +-
 mastodon/src/main/res/menu/home.xml           |   5 +
 mastodon/src/main/res/values/strings_sk.xml   |   3 +
 16 files changed, 344 insertions(+), 22 deletions(-)
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/DismissAnnouncement.java
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/GetAnnouncements.java
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/model/Announcement.java
 create mode 100644 mastodon/src/main/res/drawable/ic_announcements_24_badged.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_checkmark_20_filled.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_circle_small_20_filled.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_megaphone_24_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_more_vertical_20_filled.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/DismissAnnouncement.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/DismissAnnouncement.java
new file mode 100644
index 000000000..3227a2cd5
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/DismissAnnouncement.java
@@ -0,0 +1,10 @@
+package org.joinmastodon.android.api.requests.announcements;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+
+public class DismissAnnouncement extends MastodonAPIRequest<Object>{
+	public DismissAnnouncement(String id){
+		super(HttpMethod.POST, "/announcements/" + id + "/dismiss", Object.class);
+		setRequestBody(new Object());
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/GetAnnouncements.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/GetAnnouncements.java
new file mode 100644
index 000000000..4bedba6d6
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/announcements/GetAnnouncements.java
@@ -0,0 +1,15 @@
+package org.joinmastodon.android.api.requests.announcements;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.Announcement;
+
+import java.util.List;
+
+public class GetAnnouncements extends MastodonAPIRequest<List<Announcement>> {
+    public GetAnnouncements(boolean withDismissed) {
+        super(MastodonAPIRequest.HttpMethod.GET, "/announcements", new TypeToken<>(){});
+        addQueryParameter("with_dismissed", withDismissed ? "true" : "false");
+    }
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
new file mode 100644
index 000000000..eb03ddd78
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
@@ -0,0 +1,107 @@
+package org.joinmastodon.android.fragments;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageButton;
+
+import com.squareup.otto.Subscribe;
+
+import org.joinmastodon.android.E;
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.announcements.GetAnnouncements;
+import org.joinmastodon.android.api.requests.statuses.CreateStatus;
+import org.joinmastodon.android.api.requests.statuses.GetScheduledStatuses;
+import org.joinmastodon.android.api.session.AccountSession;
+import org.joinmastodon.android.api.session.AccountSessionManager;
+import org.joinmastodon.android.events.ScheduledStatusCreatedEvent;
+import org.joinmastodon.android.events.ScheduledStatusDeletedEvent;
+import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Announcement;
+import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.model.Instance;
+import org.joinmastodon.android.model.ScheduledStatus;
+import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.StatusDisplayItem;
+import org.joinmastodon.android.ui.displayitems.TextStatusDisplayItem;
+import org.joinmastodon.android.ui.text.HtmlParser;
+import org.joinmastodon.android.ui.utils.UiUtils;
+import org.parceler.Parcels;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.PaginatedList;
+import me.grishka.appkit.api.SimpleCallback;
+
+public class AnnouncementsFragment extends BaseStatusListFragment<Announcement> {
+	private Instance instance;
+	private AccountSession session;
+	private List<String> unreadIDs = null;
+
+	@Override
+	public void onAttach(Activity activity){
+		super.onAttach(activity);
+		setTitle(R.string.sk_announcements);
+		session = AccountSessionManager.getInstance().getAccount(accountID);
+		instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
+		loadData();
+	}
+
+	@Override
+	protected List<StatusDisplayItem> buildDisplayItems(Announcement a) {
+		if(TextUtils.isEmpty(a.content)) return List.of();
+		Account instanceUser = new Account();
+		instanceUser.id = instanceUser.acct = instanceUser.username = session.domain;
+		instanceUser.displayName = instance.title;
+		instanceUser.url = "https://"+session.domain+"/about";
+		instanceUser.avatar = instanceUser.avatarStatic = instance.thumbnail;
+		instanceUser.emojis = List.of();
+		Status fakeStatus = a.toStatus();
+		return List.of(
+				HeaderStatusDisplayItem.fromAnnouncement(a, fakeStatus, instanceUser, this, accountID, this::onMarkAsRead),
+				new TextStatusDisplayItem(a.id, HtmlParser.parse(a.content, a.emojis, a.mentions, a.tags, accountID), this, fakeStatus)
+		);
+	}
+
+	public void onMarkAsRead(String id) {
+		if (unreadIDs == null) return;
+		unreadIDs.remove(id);
+		if (unreadIDs.size() == 0) setResult(true, null);
+	}
+
+	@Override
+	public void onDestroy() {
+		super.onDestroy();
+	}
+
+	@Override
+	protected void addAccountToKnown(Announcement s) {}
+
+	@Override
+	public void onItemClick(String id) {
+	}
+
+	@Override
+	protected void onDataLoaded(List<Announcement> d, boolean more) {
+		unreadIDs = d.stream().filter(a -> !a.read).map(a -> a.id).collect(Collectors.toList());
+		super.onDataLoaded(d, more);
+	}
+
+	@Override
+	protected void doLoadData(int offset, int count){
+		currentRequest=new GetAnnouncements(true)
+				.setCallback(new SimpleCallback<>(this){
+					@Override
+					public void onSuccess(List<Announcement> result){
+						onDataLoaded(result, false);
+					}
+				})
+				.exec(accountID);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
index 69993d5eb..0d18115ed 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
@@ -29,10 +29,12 @@ import com.squareup.otto.Subscribe;
 import org.joinmastodon.android.E;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.announcements.GetAnnouncements;
 import org.joinmastodon.android.api.requests.timelines.GetHomeTimeline;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.SelfUpdateStateChangedEvent;
 import org.joinmastodon.android.events.StatusCreatedEvent;
+import org.joinmastodon.android.model.Announcement;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
 import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.Status;
@@ -56,11 +58,14 @@ import me.grishka.appkit.utils.CubicBezierInterpolator;
 import me.grishka.appkit.utils.V;
 
 public class HomeTimelineFragment extends StatusListFragment{
+	private static final int ANNOUNCEMENTS_RESULT = 654;
+
 	private ImageButton fab;
 	private ImageView toolbarLogo;
 	private Button toolbarShowNewPostsBtn;
 	private boolean newPostsBtnShown;
 	private AnimatorSet currentNewPostsAnim;
+	private MenuItem announcements;
 
 	private String maxID;
 
@@ -126,16 +131,40 @@ public class HomeTimelineFragment extends StatusListFragment{
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater){
 		inflater.inflate(R.menu.home, menu);
+		announcements = menu.findItem(R.id.announcements);
+
+		new GetAnnouncements(false).setCallback(new Callback<>() {
+			@Override
+			public void onSuccess(List<Announcement> result) {
+				boolean hasUnread = result.stream().anyMatch(a -> !a.read);
+				announcements.setIcon(hasUnread ? R.drawable.ic_announcements_24_badged : R.drawable.ic_fluent_megaphone_24_regular);
+			}
+
+			@Override
+			public void onError(ErrorResponse error) {
+				error.showToast(getActivity());
+			}
+		}).exec(accountID);
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		Nav.go(getActivity(), SettingsFragment.class, args);
+		if (item.getItemId() == R.id.settings) Nav.go(getActivity(), SettingsFragment.class, args);
+		if (item.getItemId() == R.id.announcements) {
+			Nav.goForResult(getActivity(), AnnouncementsFragment.class, args, ANNOUNCEMENTS_RESULT, this);
+		}
 		return true;
 	}
 
+	@Override
+	public void onFragmentResult(int reqCode, boolean noMoreUnread, Bundle result){
+		if (reqCode == ANNOUNCEMENTS_RESULT && noMoreUnread) {
+			announcements.setIcon(R.drawable.ic_fluent_megaphone_24_regular);
+		}
+	}
+
 	@Override
 	public void onConfigurationChanged(Configuration newConfig){
 		super.onConfigurationChanged(newConfig);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomLoginFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomLoginFragment.java
index 1b249f0ef..32f721c3a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomLoginFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomLoginFragment.java
@@ -36,10 +36,10 @@ import me.grishka.appkit.utils.SingleViewRecyclerAdapter;
 import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
-public class CustomLoginFragment extends InstanceCatalogFragment {
+public class CustomWelcomeFragment extends InstanceCatalogFragment {
 	private View headerView;
 
-	public CustomLoginFragment() {
+	public CustomWelcomeFragment() {
 		super(R.layout.fragment_welcome_custom, 1);
 	}
 
@@ -55,9 +55,9 @@ public class CustomLoginFragment extends InstanceCatalogFragment {
 		dataLoaded();
 	}
 
-//	@Override
+	@Override
 	protected void onUpdateToolbar(){
-//		super.onUpdateToolbar();
+		super.onUpdateToolbar();
 
 		if (!canGoBack()) {
 			ImageView toolbarLogo=new ImageView(getActivity());
@@ -137,9 +137,11 @@ public class CustomLoginFragment extends InstanceCatalogFragment {
 
 		headerView.findViewById(R.id.more).setVisibility(View.GONE);
 		headerView.findViewById(R.id.visibility).setVisibility(View.GONE);
-		((TextView) headerView.findViewById(R.id.username)).setText("@moshidon");
+		headerView.findViewById(R.id.separator).setVisibility(View.GONE);
+		headerView.findViewById(R.id.timestamp).setVisibility(View.GONE);
+		headerView.findViewById(R.id.unread_indicator).setVisibility(View.GONE);
+		((TextView) headerView.findViewById(R.id.username)).setText(R.string.sk_app_username);
 		((TextView) headerView.findViewById(R.id.name)).setText(R.string.sk_app_name);
-		((TextView) headerView.findViewById(R.id.timestamp)).setText(R.string.time_now);
 		((ImageView) headerView.findViewById(R.id.avatar)).setImageDrawable(getActivity().getDrawable(R.mipmap.ic_launcher));
 		((FragmentStackActivity) getActivity()).invalidateSystemBarColors(this);
 
@@ -168,7 +170,7 @@ public class CustomLoginFragment extends InstanceCatalogFragment {
 		return mergeAdapter;
 	}
 
-	private class InstancesAdapter extends UsableRecyclerView.Adapter<InstanceViewHolder>{
+	private class InstancesAdapter extends UsableRecyclerView.Adapter<InstanceViewHolder> {
 		public InstancesAdapter(){
 			super(imgLoader);
 		}
@@ -204,11 +206,6 @@ public class CustomLoginFragment extends InstanceCatalogFragment {
 
 		public InstanceViewHolder(){
 			super(getActivity(), R.layout.item_instance_custom, list);
-
-//			itemView.setPadding(V.dp(16), V.dp(16), V.dp(16), V.dp(16));
-//			TypedValue value = new TypedValue();
-//			getActivity().getTheme().resolveAttribute(android.R.attr.selectableItemBackground, value, true);
-//			itemView.setBackground(getActivity().getTheme().getDrawable(R.drawable.bg_search_field));
 			title=findViewById(R.id.title);
 			description=findViewById(R.id.description);
 			userCount=findViewById(R.id.user_count);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Announcement.java b/mastodon/src/main/java/org/joinmastodon/android/model/Announcement.java
new file mode 100644
index 000000000..4282da920
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Announcement.java
@@ -0,0 +1,63 @@
+package org.joinmastodon.android.model;
+
+import org.joinmastodon.android.api.RequiredField;
+import org.parceler.Parcel;
+
+import java.time.Instant;
+import java.util.List;
+
+@Parcel
+public class Announcement extends BaseModel implements DisplayItemsParent {
+    @RequiredField
+    public String id;
+    @RequiredField
+    public String content;
+    public Instant startsAt;
+    public Instant endsAt;
+    public boolean published;
+    public boolean allDay;
+    public Instant publishedAt;
+    public Instant updatedAt;
+    public boolean read;
+    public List<Emoji> emojis;
+    public List<Mention> mentions;
+    public List<Hashtag> tags;
+
+    @Override
+    public String toString() {
+        return "Announcement{" +
+                "id='" + id + '\'' +
+                ", content='" + content + '\'' +
+                ", startsAt=" + startsAt +
+                ", endsAt=" + endsAt +
+                ", published=" + published +
+                ", allDay=" + allDay +
+                ", publishedAt=" + publishedAt +
+                ", updatedAt=" + updatedAt +
+                ", read=" + read +
+                ", emojis=" + emojis +
+                ", mentions=" + mentions +
+                ", tags=" + tags +
+                '}';
+    }
+
+    public Status toStatus() {
+        Status s = new Status();
+        s.id = id;
+        s.mediaAttachments = List.of();
+        s.createdAt = startsAt != null ? startsAt : publishedAt;
+        if (updatedAt != null) s.editedAt = updatedAt;
+        s.content = s.text = content;
+        s.spoilerText = "";
+        s.visibility = StatusPrivacy.PUBLIC;
+        s.mentions = List.of();
+        s.tags = List.of();
+        s.emojis = List.of();
+        return s;
+    }
+
+    @Override
+    public String getID() {
+        return id;
+    }
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
index a0b080d97..ecf7af152 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
@@ -24,6 +24,7 @@ import android.widget.Toast;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
+import org.joinmastodon.android.api.requests.announcements.DismissAnnouncement;
 import org.joinmastodon.android.api.requests.statuses.CreateStatus;
 import org.joinmastodon.android.api.requests.statuses.GetStatusSourceText;
 import org.joinmastodon.android.api.session.AccountSession;
@@ -35,6 +36,7 @@ import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.report.ReportReasonChoiceFragment;
 import org.joinmastodon.android.model.Account;
+import org.joinmastodon.android.model.Announcement;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.model.Relationship;
@@ -52,6 +54,7 @@ import java.time.format.FormatStyle;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.function.Consumer;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.APIRequest;
@@ -75,6 +78,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 	private String extraText;
 	private Notification notification;
 	private ScheduledStatus scheduledStatus;
+	private Announcement announcement;
+	private Consumer<String> consumeReadAnnouncement;
 
 	public HeaderStatusDisplayItem(String parentID, Account user, Instant createdAt, BaseStatusListFragment parentFragment, String accountID, Status status, String extraText, Notification notification, ScheduledStatus scheduledStatus){
 		super(parentID, parentFragment);
@@ -103,6 +108,13 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		this.extraText=extraText;
 	}
 
+	public static HeaderStatusDisplayItem fromAnnouncement(Announcement a, Status fakeStatus, Account instanceUser, BaseStatusListFragment parentFragment, String accountID, Consumer<String> consumeReadID) {
+		HeaderStatusDisplayItem item = new HeaderStatusDisplayItem(a.id, instanceUser, a.startsAt, parentFragment, accountID, fakeStatus, null, null, null);
+		item.announcement = a;
+		item.consumeReadAnnouncement = consumeReadID;
+		return item;
+	}
+
 	@Override
 	public Type getType(){
 		return Type.HEADER;
@@ -122,8 +134,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 	}
 
 	public static class Holder extends StatusDisplayItem.Holder<HeaderStatusDisplayItem> implements ImageLoaderViewHolder{
-		private final TextView name, username, timestamp, extraText;
-		private final ImageView avatar, more, visibility, deleteNotification;
+		private final TextView name, username, timestamp, extraText, separator;
+		private final ImageView avatar, more, visibility, deleteNotification, unreadIndicator;
 		private final PopupMenu optionsMenu;
 		private Relationship relationship;
 		private APIRequest<?> currentRelationshipRequest;
@@ -139,11 +151,13 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			super(activity, R.layout.display_item_header, parent);
 			name=findViewById(R.id.name);
 			username=findViewById(R.id.username);
+			separator=findViewById(R.id.separator);
 			timestamp=findViewById(R.id.timestamp);
 			avatar=findViewById(R.id.avatar);
 			more=findViewById(R.id.more);
 			visibility=findViewById(R.id.visibility);
 			deleteNotification=findViewById(R.id.delete_notification);
+			unreadIndicator=findViewById(R.id.unread_indicator);
 			extraText=findViewById(R.id.extra_text);
 			avatar.setOnClickListener(this::onAvaClick);
 			avatar.setOutlineProvider(roundCornersOutline);
@@ -268,6 +282,8 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		public void onBind(HeaderStatusDisplayItem item){
 			name.setText(item.parsedName);
 			username.setText('@'+item.user.acct);
+			separator.setVisibility(View.VISIBLE);
+
 
 			username.setCompoundDrawablesWithIntrinsicBounds(item.user.bot ? R.drawable.ic_fluent_bot_24_filled : 0, 0, 0, 0);
 
@@ -278,10 +294,14 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 					DateTimeFormatter formatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM).withLocale(Locale.getDefault());
 					timestamp.setText(item.scheduledStatus.scheduledAt.atZone(ZoneId.systemDefault()).format(formatter));
 				}
-			else if(item.status==null || item.status.editedAt==null)
+			else if ((item.status==null || item.status.editedAt==null) && item.createdAt != null)
 				timestamp.setText(UiUtils.formatRelativeTimestamp(itemView.getContext(), item.createdAt));
-			else
+			else if (item.status != null && item.status.editedAt != null)
 				timestamp.setText(item.parentFragment.getString(R.string.edited_timestamp, UiUtils.formatRelativeTimestamp(itemView.getContext(), item.status.editedAt)));
+			else {
+				separator.setVisibility(View.GONE);
+				timestamp.setText("");
+			}
 			visibility.setVisibility(item.hasVisibilityToggle && !item.inset ? View.VISIBLE : View.GONE);
 			deleteNotification.setVisibility(GlobalUserPreferences.enableDeleteNotifications && item.notification!=null && !item.inset ? View.VISIBLE : View.GONE);
 			if(item.hasVisibilityToggle){
@@ -305,6 +325,42 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				currentRelationshipRequest.cancel();
 			}
 			relationship=null;
+
+			String desc;
+			if (item.announcement != null) {
+				if (unreadIndicator.getVisibility() == View.GONE) {
+					more.setAlpha(0f);
+					unreadIndicator.setAlpha(0f);
+					unreadIndicator.setVisibility(View.VISIBLE);
+				}
+				float alpha = item.announcement.read ? 0 : 1;
+				more.setImageResource(R.drawable.ic_fluent_checkmark_20_filled);
+				desc = item.parentFragment.getString(R.string.sk_mark_as_read);
+				more.animate().alpha(alpha);
+				unreadIndicator.animate().alpha(alpha);
+				more.setOnClickListener(v -> {
+					new DismissAnnouncement(item.announcement.id).setCallback(new Callback<>() {
+						@Override
+						public void onSuccess(Object o) {
+							item.consumeReadAnnouncement.accept(item.announcement.id);
+							item.announcement.read = true;
+							rebind();
+						}
+
+						@Override
+						public void onError(ErrorResponse error) {
+							error.showToast(item.parentFragment.getActivity());
+						}
+					}).exec(item.accountID);
+				});
+			} else {
+				more.setImageResource(R.drawable.ic_fluent_more_vertical_20_filled);
+				desc = item.parentFragment.getString(R.string.more_options);
+				more.setOnClickListener(this::onMoreClick);
+			}
+
+			more.setContentDescription(desc);
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) more.setTooltipText(desc);
 		}
 
 		@Override
@@ -325,6 +381,10 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void onAvaClick(View v){
+			if (item.announcement != null) {
+				UiUtils.openURL(item.parentFragment.getActivity(), item.parentFragment.getAccountID(), item.user.url);
+				return;
+			}
 			Bundle args=new Bundle();
 			args.putString("account", item.accountID);
 			args.putParcelable("profileAccount", Parcels.wrap(item.user));
@@ -356,6 +416,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		}
 
 		private void updateOptionsMenu(){
+			if (item.announcement != null) return;
 			boolean hasMultipleAccounts = AccountSessionManager.getInstance().getLoggedInAccounts().size() > 1;
 			Menu menu=optionsMenu.getMenu();
 
diff --git a/mastodon/src/main/res/drawable/ic_announcements_24_badged.xml b/mastodon/src/main/res/drawable/ic_announcements_24_badged.xml
new file mode 100644
index 000000000..e5b51e160
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_announcements_24_badged.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:drawable="@drawable/ic_fluent_megaphone_24_regular" android:left="2dp" android:right="2dp" android:top="2dp" android:bottom="2dp"/>
+	<item android:width="14dp" android:height="14dp" android:gravity="top|right">
+		<shape android:shape="oval">
+			<stroke android:color="?android:colorPrimary" android:width="2dp"/>
+			<solid android:color="?android:colorAccent"/>
+		</shape>
+	</item>
+</layer-list>
\ No newline at end of file
diff --git a/mastodon/src/main/res/drawable/ic_fluent_checkmark_20_filled.xml b/mastodon/src/main/res/drawable/ic_fluent_checkmark_20_filled.xml
new file mode 100644
index 000000000..101bc9a61
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_checkmark_20_filled.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:pathData="M7.032 13.907l-3.471-3.905C3.285 9.692 2.81 9.664 2.5 9.939 2.193 10.215 2.165 10.69 2.44 11l4 4.5c0.287 0.322 0.786 0.336 1.091 0.031l10.5-10.5c0.293-0.293 0.293-0.767 0-1.06-0.293-0.293-0.767-0.293-1.06 0l-9.938 9.937z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_circle_small_20_filled.xml b/mastodon/src/main/res/drawable/ic_fluent_circle_small_20_filled.xml
new file mode 100644
index 000000000..19ceb0169
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_circle_small_20_filled.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:pathData="M13 10c0 1.657-1.343 3-3 3s-3-1.343-3-3 1.343-3 3-3 3 1.343 3 3z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_megaphone_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_megaphone_24_regular.xml
new file mode 100644
index 000000000..e6e4f6664
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_megaphone_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M21.907 5.622C21.969 5.83 22 6.046 22 6.263V17.74c0 1.242-1.007 2.25-2.25 2.25-0.217 0-0.433-0.032-0.641-0.094l-5.514-1.64C12.938 19.602 11.558 20.5 10 20.5c-2.142 0-3.891-1.683-3.995-3.8L6 16.5 5.999 16l-2.39-0.711C2.655 15.004 2 14.127 2 13.131V10.87c0-0.995 0.655-1.873 1.61-2.156l15.5-4.606c1.19-0.355 2.443 0.324 2.797 1.515zM7.499 16.445L7.5 16.499C7.5 17.88 8.62 19 10 19c0.885 0 1.678-0.464 2.124-1.179l-4.625-1.375zm12.037-10.9l-15.5 4.605C3.718 10.245 3.5 10.537 3.5 10.87v2.261c0 0.332 0.218 0.625 0.536 0.72l15.5 4.607c0.07 0.02 0.142 0.03 0.214 0.03 0.414 0 0.75-0.335 0.75-0.75V6.264c0-0.072-0.01-0.144-0.031-0.213-0.118-0.397-0.536-0.624-0.933-0.506z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_more_vertical_20_filled.xml b/mastodon/src/main/res/drawable/ic_fluent_more_vertical_20_filled.xml
new file mode 100644
index 000000000..8f7f1d2c1
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_more_vertical_20_filled.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="20dp" android:height="20dp" android:viewportWidth="20" android:viewportHeight="20">
+    <path android:pathData="M10 6.5c-0.966 0-1.75-0.784-1.75-1.75S9.034 3 10 3s1.75 0.784 1.75 1.75S10.966 6.5 10 6.5zM10 17c-0.966 0-1.75-0.784-1.75-1.75S9.034 13.5 10 13.5s1.75 0.784 1.75 1.75S10.966 17 10 17zm-1.75-7c0 0.966 0.784 1.75 1.75 1.75s1.75-0.784 1.75-1.75S10.966 8.25 10 8.25 8.25 9.034 8.25 10z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/layout/display_item_header.xml b/mastodon/src/main/res/layout/display_item_header.xml
index f7cf78c45..5c307d82e 100644
--- a/mastodon/src/main/res/layout/display_item_header.xml
+++ b/mastodon/src/main/res/layout/display_item_header.xml
@@ -18,7 +18,7 @@
 		android:background="?android:selectableItemBackgroundBorderless"
 		android:contentDescription="@string/more_options"
 		android:scaleType="center"
-		android:src="@drawable/ic_post_more"
+		android:src="@drawable/ic_fluent_more_vertical_20_filled"
 		android:tint="?android:textColorSecondary" />
 
 	<ImageView
@@ -47,6 +47,17 @@
 		android:src="@drawable/ic_visibility"
 		android:tint="?android:textColorSecondary" />
 
+	<ImageView
+		android:id="@+id/unread_indicator"
+		android:layout_width="36dp"
+		android:layout_height="36dp"
+		android:layout_marginTop="-6dp"
+		android:layout_toStartOf="@id/visibility"
+		android:visibility="gone"
+		android:tint="?android:colorAccent"
+		android:scaleType="center"
+		android:src="@drawable/ic_fluent_circle_small_20_filled" />
+
 	<ImageView
 		android:id="@+id/avatar"
 		android:layout_width="46sp"
@@ -61,7 +72,7 @@
 		android:layout_height="wrap_content"
 		android:layout_marginEnd="12dp"
 		android:layout_marginTop="2sp"
-		android:layout_toStartOf="@id/visibility"
+		android:layout_toStartOf="@id/unread_indicator"
 		android:layout_toEndOf="@id/avatar"
 		android:minHeight="24sp">
 
@@ -94,7 +105,7 @@
 		android:layout_height="wrap_content"
 		android:layout_below="@id/name_wrap"
 		android:layout_marginEnd="8dp"
-		android:layout_toStartOf="@id/visibility"
+		android:layout_toStartOf="@id/unread_indicator"
 		android:layout_toEndOf="@id/avatar"
 		android:layoutDirection="locale"
 		android:minHeight="20sp"
diff --git a/mastodon/src/main/res/layout/header_welcome_custom.xml b/mastodon/src/main/res/layout/header_welcome_custom.xml
index a1ae29f82..ed6bda666 100644
--- a/mastodon/src/main/res/layout/header_welcome_custom.xml
+++ b/mastodon/src/main/res/layout/header_welcome_custom.xml
@@ -14,8 +14,7 @@
 		android:layout_height="wrap_content"
 		android:layout_marginHorizontal="16dp"
 		android:layout_marginVertical="12dp"
-		android:text="@string/sk_welcome_title"
-		/>
+		android:text="@string/sk_welcome_title" />
 
 	<TextView
 		style="@style/m3_body_large"
diff --git a/mastodon/src/main/res/menu/home.xml b/mastodon/src/main/res/menu/home.xml
index 5d42d671c..095a73c35 100644
--- a/mastodon/src/main/res/menu/home.xml
+++ b/mastodon/src/main/res/menu/home.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item
+		android:id="@+id/announcements"
+		android:icon="@drawable/ic_fluent_megaphone_24_regular"
+		android:showAsAction="always"
+		android:title="@string/sk_announcements" />
 	<item
 		android:id="@+id/settings"
 		android:icon="@drawable/ic_fluent_settings_24_regular"
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 6ff34be41..1d7b7c32f 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -137,9 +137,12 @@
     <string name="sk_clear_recent_emoji">Clear recently used emoji</string>
     <string name="sk_disable_relocate_publish_button_to_enable_customization">Disable "Relocate publish button" to allow customization</string>
     <string name="sk_keep_only_latest_notification">Keep only latest notification</string>
+    <string name="sk_announcements">Announcements</string>
+    <string name="sk_mark_as_read">Mark as read</string>
 
     <!--    accessibility labels-->
     <string name="sk_poll_option_add">Add new poll option</string>
     <string name="sk_fab_compose">Compose</string>
     <string name="sk_sending_error">Error publishing</string>
+
 </resources>
\ No newline at end of file

From 1206ce6efc15140a0be87680e0f7e5c495d6aac5 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Tue, 10 Jan 2023 15:43:26 +0100
Subject: [PATCH 049/200] feat(compose): move charCounter to action bar if
 relocatePublishButton is enabled

---
 .../android/fragments/ComposeFragment.java             | 10 ++++++++--
 mastodon/src/main/res/layout/compose_action.xml        | 10 ++++++++++
 mastodon/src/main/res/layout/fragment_compose.xml      |  1 +
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index d870d2257..54bd6961a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -307,12 +307,14 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 			draftsBtn=view.findViewById(R.id.drafts_btn);
 			draftsBtn.setVisibility(View.VISIBLE);
+		} else {
+			charCounter=view.findViewById(R.id.char_counter);
+			charCounter.setVisibility(View.VISIBLE);
+			charCounter.setText(String.valueOf(charLimit));
 		}
 
 		mainEditText=view.findViewById(R.id.toot_text);
 		mainEditTextWrap=view.findViewById(R.id.toot_text_wrap);
-		charCounter=view.findViewById(R.id.char_counter);
-		charCounter.setText(String.valueOf(charLimit));
 		scrollView=view.findViewById(R.id.scroll_view);
 
 		selfName=view.findViewById(R.id.self_name);
@@ -748,6 +750,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 			draftsBtn = wrap.findViewById(R.id.drafts_btn);
 			draftsBtn.setVisibility(View.VISIBLE);
+		}else{
+			charCounter = wrap.findViewById(R.id.char_counter);
+			charCounter.setVisibility(View.VISIBLE);
+			charCounter.setText(String.valueOf(charLimit));
 		}
 
 //		draftsBtn = wrap.findViewById(R.id.drafts_btn);
diff --git a/mastodon/src/main/res/layout/compose_action.xml b/mastodon/src/main/res/layout/compose_action.xml
index 7f3109061..e57394af9 100644
--- a/mastodon/src/main/res/layout/compose_action.xml
+++ b/mastodon/src/main/res/layout/compose_action.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
@@ -54,6 +55,15 @@
         android:contentDescription="@string/sk_schedule_or_draft"
         android:tooltipText="@string/sk_schedule_or_draft" />
 
+    <TextView
+        android:id="@+id/char_counter"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/m3_body_large"
+        android:textColor="?android:textColorSecondary"
+        android:visibility="gone"
+        tools:text="500"/>
+
     <Button
         android:id="@+id/publish_btn"
         android:layout_width="wrap_content"
diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index ee65d7737..41c30e0f1 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -422,6 +422,7 @@
 				android:layout_height="wrap_content"
 				android:textAppearance="@style/m3_body_large"
 				android:textColor="?android:textColorSecondary"
+				android:visibility="gone"
 				tools:text="500"/>
 
 			<Button

From b50b1c33dafae0089df828aa8b167aeb7d85664a Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 10 Jan 2023 12:11:11 -0300
Subject: [PATCH 050/200] Renaming custom login fragment to custom welcome
 fragment

---
 .../src/main/java/org/joinmastodon/android/MainActivity.java | 5 +++--
 .../{CustomLoginFragment.java => CustomWelcomeFragment.java} | 0
 .../org/joinmastodon/android/ui/AccountSwitcherSheet.java    | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/{CustomLoginFragment.java => CustomWelcomeFragment.java} (100%)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
index ba3aecb1f..22a2f9a5c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
@@ -16,7 +16,8 @@ import org.joinmastodon.android.fragments.HomeFragment;
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.fragments.onboarding.AccountActivationFragment;
-import org.joinmastodon.android.fragments.onboarding.CustomLoginFragment;
+import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
+import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
 import org.joinmastodon.android.model.Notification;
 import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
@@ -33,7 +34,7 @@ public class MainActivity extends FragmentStackActivity{
 
 		if(savedInstanceState==null){
 			if(AccountSessionManager.getInstance().getLoggedInAccounts().isEmpty()){
-				showFragmentClearingBackStack(new CustomLoginFragment());
+				showFragmentClearingBackStack(new CustomWelcomeFragment());
 			}else{
 				AccountSessionManager.getInstance().maybeUpdateLocalInfo();
 				AccountSession session;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomLoginFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
similarity index 100%
rename from mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomLoginFragment.java
rename to mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
index 91032a4e2..437d75e80 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
@@ -23,7 +23,8 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.oauth.RevokeOauthToken;
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
-import org.joinmastodon.android.fragments.onboarding.CustomLoginFragment;
+import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
+import org.joinmastodon.android.fragments.onboarding.CustomWelcomeFragment;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import java.util.List;
@@ -77,7 +78,7 @@ public class AccountSwitcherSheet extends BottomSheet{
 		holder.avatar.setImageResource(R.drawable.ic_fluent_add_circle_24_filled);
 		holder.avatar.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(activity, android.R.attr.textColorPrimary)));
 		adapter.addAdapter(new ClickableSingleViewRecyclerAdapter(holder.itemView, ()->{
-			Nav.go(activity, CustomLoginFragment.class, null);
+			Nav.go(activity, CustomWelcomeFragment.class, null);
 			dismiss();
 		}));
 

From 4fcc07fcd6baa4da3f837e4995f1ad11983af20a Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 10 Jan 2023 12:24:01 -0300
Subject: [PATCH 051/200] Adding a margin to the char counter when its on the
 top

---
 mastodon/src/main/res/layout/compose_action.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/layout/compose_action.xml b/mastodon/src/main/res/layout/compose_action.xml
index e57394af9..371604cc3 100644
--- a/mastodon/src/main/res/layout/compose_action.xml
+++ b/mastodon/src/main/res/layout/compose_action.xml
@@ -61,6 +61,7 @@
         android:layout_height="wrap_content"
         android:textAppearance="@style/m3_body_large"
         android:textColor="?android:textColorSecondary"
+        android:layout_marginHorizontal="8dp"
         android:visibility="gone"
         tools:text="500"/>
 

From c55639e9660bb6ccdf49cb06aab73c58ee18cfef Mon Sep 17 00:00:00 2001
From: dontobi <github@myhome.zone>
Date: Tue, 10 Jan 2023 17:28:26 +0100
Subject: [PATCH 052/200] Update german translation

---
 mastodon/src/main/res/values-de-rDE/strings_sk.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mastodon/src/main/res/values-de-rDE/strings_sk.xml b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
index f0721d15b..f95b1ffad 100644
--- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
@@ -136,6 +136,8 @@
     <string name="sk_clear_recent_emoji">Kürzlich verwendete Emojis löschen</string>
     <string name="sk_disable_relocate_publish_button_to_enable_customization">Deaktiviere die Funktion "Veröffentlichen Schaltfläche verschieben", um eine Anpassung zu ermöglichen.</string>
     <string name="sk_keep_only_latest_notification">Nur neueste Benachrichtigung behalten</string>
+    <string name="sk_announcements">Ankündigungen</string>
+    <string name="sk_mark_as_read">Als gelesen markieren</string>
     <string name="sk_poll_option_add">Neue Umfrageoption hinzufügen</string>
     <string name="sk_fab_compose">Verfassen</string>
     <string name="sk_sending_error">Fehler beim Veröffentlichen</string>

From a48dc18df5e417c5182b5f7cff4639fec807a2b6 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 10 Jan 2023 21:45:35 -0300
Subject: [PATCH 053/200] Possibly fixing #29 for good, but the mastodon
 servers of the accounts I own are slow, so there is basically no way to test
 it

---
 .../java/org/joinmastodon/android/MainActivity.java    |  2 +-
 .../joinmastodon/android/PushNotificationReceiver.java | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
index 22a2f9a5c..9e1072833 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
@@ -57,7 +57,7 @@ public class MainActivity extends FragmentStackActivity{
 				fragment.setArguments(args);
 				showFragmentClearingBackStack(fragment);
 				if(intent.getBooleanExtra("fromNotification", false) && intent.hasExtra("notification")){
-					Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
+					Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"+intent.getParcelableExtra("notificationID")));
 					showFragmentForNotification(notification, session.getID());
 				}else if(intent.getBooleanExtra("compose", false)){
 					showCompose();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
index 560127c64..0d1f1bb85 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
@@ -38,6 +38,8 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 
 	public static final int NOTIFICATION_ID=178;
 
+	private static int notificationID;
+
 	@Override
 	public void onReceive(Context context, Intent intent){
 		if(BuildConfig.DEBUG){
@@ -125,12 +127,16 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 					.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
 		}
 		Drawable avatar=ImageCache.getInstance(context).get(new UrlImageLoaderRequest(pn.icon, V.dp(50), V.dp(50)));
+
+		notificationID = GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : (int)System.currentTimeMillis();
+
 		Intent contentIntent=new Intent(context, MainActivity.class);
 		contentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 		contentIntent.putExtra("fromNotification", true);
 		contentIntent.putExtra("accountID", accountID);
+		contentIntent.putExtra("notificationID", notificationID);
 		if(notification!=null){
-			contentIntent.putExtra("notification", Parcels.wrap(notification));
+			contentIntent.putExtra("notification" + notificationID, Parcels.wrap(notification));
 		}
 		builder.setContentTitle(pn.title)
 				.setContentText(pn.body)
@@ -160,6 +166,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		if(AccountSessionManager.getInstance().getLoggedInAccounts().size()>1){
 			builder.setSubText(accountName);
 		}
-		nm.notify(accountID, GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : (int)System.currentTimeMillis(), builder.build());
+		nm.notify(accountID, notificationID, builder.build());
 	}
 }

From 20768182209001d9a7bd6a3d1f3be5548395f5a3 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 11 Jan 2023 11:19:30 -0300
Subject: [PATCH 054/200] Now its fixed for good. That was easier than I
 thought

---
 .../src/main/java/org/joinmastodon/android/MainActivity.java  | 2 +-
 .../org/joinmastodon/android/PushNotificationReceiver.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
index 9e1072833..22a2f9a5c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
@@ -57,7 +57,7 @@ public class MainActivity extends FragmentStackActivity{
 				fragment.setArguments(args);
 				showFragmentClearingBackStack(fragment);
 				if(intent.getBooleanExtra("fromNotification", false) && intent.hasExtra("notification")){
-					Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"+intent.getParcelableExtra("notificationID")));
+					Notification notification=Parcels.unwrap(intent.getParcelableExtra("notification"));
 					showFragmentForNotification(notification, session.getID());
 				}else if(intent.getBooleanExtra("compose", false)){
 					showCompose();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
index 0d1f1bb85..a667f8ea1 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
@@ -136,12 +136,12 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		contentIntent.putExtra("accountID", accountID);
 		contentIntent.putExtra("notificationID", notificationID);
 		if(notification!=null){
-			contentIntent.putExtra("notification" + notificationID, Parcels.wrap(notification));
+			contentIntent.putExtra("notification", Parcels.wrap(notification));
 		}
 		builder.setContentTitle(pn.title)
 				.setContentText(pn.body)
 				.setStyle(new Notification.BigTextStyle().bigText(pn.body))
-				.setContentIntent(PendingIntent.getActivity(context, accountID.hashCode() & 0xFFFF, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
+				.setContentIntent(PendingIntent.getActivity(context, notificationID, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
 				.setWhen(notification==null ? System.currentTimeMillis() : notification.createdAt.toEpochMilli())
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)

From 42a0b881af808ad694b62ccdba1cc61c82881633 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 11 Jan 2023 11:23:00 -0300
Subject: [PATCH 055/200] Bumping version number

---
 mastodon/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mastodon/build.gradle b/mastodon/build.gradle
index 5bd4f81ad..fc8dc7c5e 100644
--- a/mastodon/build.gradle
+++ b/mastodon/build.gradle
@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
 		targetSdk 33
-		versionCode 85
-		versionName "1.1.4+fork.85.moshinda"
+		versionCode 86
+		versionName "1.1.4+fork.86.moshinda"
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 		resConfigs "ar-rSA", "be-rBY", "bn-rBD", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES", "eu-rES", "fi-rFI", "fil-rPH", "fr-rFR", "ga-rIE", "gd-rGB", "gl-rES", "hi-rIN", "hr-rHR", "hu-rHU", "hy-rAM", "in-rID", "is-rIS", "it-rIT", "iw-rIL", "ja-rJP", "kab", "ko-rKR", "nl-rNL", "oc-rFR", "pl-rPL", "pt-rBR", "pt-rPT", "ro-rRO", "ru-rRU", "si-rLK", "sl-rSI", "sv-rSE", "th-rTH", "tr-rTR", "uk-rUA", "vi-rVN", "zh-rCN", "zh-rTW"
 	}

From 73869b6ea2bc5f7d5fdf7edc58b6b47688118a7a Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 11 Jan 2023 11:28:29 -0300
Subject: [PATCH 056/200] 86 changelog

---
 metadata/en-US/changelogs/86.txt | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 metadata/en-US/changelogs/86.txt

diff --git a/metadata/en-US/changelogs/86.txt b/metadata/en-US/changelogs/86.txt
new file mode 100644
index 000000000..992c16aa1
--- /dev/null
+++ b/metadata/en-US/changelogs/86.txt
@@ -0,0 +1,4 @@
+New things for release 86:
+- Ability to stack notifications, ie: having multiple notifications;
+- Introducing Announcements;
+- Many minor UI fixes.
\ No newline at end of file

From 1a075e32de3b9af47d03913f419c9668ba805170 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 11 Jan 2023 20:10:14 -0300
Subject: [PATCH 057/200] Fixing it

---
 mastodon/src/main/res/layout/item_discover_account.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mastodon/src/main/res/layout/item_discover_account.xml b/mastodon/src/main/res/layout/item_discover_account.xml
index 14d68f5ed..a93d1a06f 100644
--- a/mastodon/src/main/res/layout/item_discover_account.xml
+++ b/mastodon/src/main/res/layout/item_discover_account.xml
@@ -91,6 +91,7 @@
 			android:layout_marginStart="16dp"
 			android:layout_marginTop="16dp"
 			android:gravity="center_horizontal"
+			android:layout_weight="1"
 			android:orientation="vertical">
 
 			<TextView
@@ -115,6 +116,7 @@
 			android:layout_marginTop="16dp"
 			android:layout_marginStart="12dp"
 			android:orientation="vertical"
+			android:layout_weight="1"
 			android:gravity="center_horizontal">
 			<TextView
 				android:id="@+id/followers_count"
@@ -138,6 +140,7 @@
 			android:layout_marginTop="16dp"
 			android:layout_marginStart="12dp"
 			android:orientation="vertical"
+			android:layout_weight="1"
 			android:gravity="center_horizontal">
 			<TextView
 				android:id="@+id/following_count"
@@ -225,7 +228,9 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="8dp"
+			android:layout_marginEnd="8dp"
 			android:padding="8dp"
+			android:layout_weight="1"
 			android:clipToPadding="false">
 
 			<org.joinmastodon.android.ui.views.ProgressBarButton

From 707c51e4d6f6ae996d7c78ed0f78e58e2455c23b Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Thu, 12 Jan 2023 19:32:30 +0100
Subject: [PATCH 058/200] feat(status/footer): add tooltips to icons

---
 mastodon/src/main/res/layout/display_item_footer.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mastodon/src/main/res/layout/display_item_footer.xml b/mastodon/src/main/res/layout/display_item_footer.xml
index d3aa1c3db..6f512e3a9 100644
--- a/mastodon/src/main/res/layout/display_item_footer.xml
+++ b/mastodon/src/main/res/layout/display_item_footer.xml
@@ -20,6 +20,7 @@
 			android:drawableStart="@drawable/ic_fluent_chat_multiple_24_selector_text"
 			android:drawablePadding="8dp"
 			android:drawableTint="?android:textColorSecondary"
+			android:tooltipText="@string/button_reply"
 			android:gravity="center_vertical"
 			android:textAppearance="@style/m3_label_large"
 			tools:text="123"/>
@@ -67,6 +68,7 @@
 			android:drawableStart="@drawable/ic_fluent_star_24_selector"
 			android:drawablePadding="8dp"
 			android:drawableTint="@color/favorite_icon"
+			android:tooltipText="@string/button_favorite"
 			android:textColor="@color/favorite_icon"
 			android:gravity="center_vertical"
 			android:textAppearance="@style/m3_label_large"
@@ -92,6 +94,7 @@
 			android:drawablePadding="8dp"
 			android:drawableTint="@color/bookmark_icon"
 			android:gravity="center_vertical"
+			android:tooltipText="@string/add_bookmark"
 			android:textAppearance="@style/m3_label_large" />
 	</FrameLayout>
 

From 2c1b8da47598131f688091e670db39c26de12fa2 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Fri, 13 Jan 2023 23:38:40 +0100
Subject: [PATCH 059/200] feat(profile): add private notes textfield

---
 .../android/fragments/ProfileFragment.java    | 39 ++++++++++++-------
 .../src/main/res/layout/fragment_profile.xml  | 26 ++++++++-----
 mastodon/src/main/res/values/strings_sk.xml   |  3 +-
 3 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 5abb0413f..80aecc796 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -4,8 +4,10 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Fragment;
+import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Outline;
@@ -14,19 +16,24 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.Editable;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.text.style.ImageSpan;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
@@ -176,8 +183,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		username=content.findViewById(R.id.username);
 		bio=content.findViewById(R.id.bio);
 		noteEdit=content.findViewById(R.id.note_edit);
-//		noteEditConfirm=content.findViewById(R.id.note_edit_confirm);
-//		noteEditConfirm.setOnClickListener(v->onClickNoteSave());
+		noteEditConfirm=content.findViewById(R.id.note_edit_confirm);
 		noteEditWrapper=content.findViewById(R.id.note_edit_wrap);
 		followersCount=content.findViewById(R.id.followers_count);
 		followersLabel=content.findViewById(R.id.followers_label);
@@ -445,14 +451,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		boolean isSelf=AccountSessionManager.getInstance().isSelf(accountID, account);
 
-//		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
-//			if(!hasFocus){
-////					Toast.makeText(getActivity(), "Its going here", Toast.LENGTH_LONG).show();
-//				savePrivateNote();
-////				noteEdit.setOnFocusChangeListener(savePrivateNote());
-//			}
-//		});
-		noteEdit.setOnClickListener(v->savePrivateNote());
 
 		if(account.locked){
 			ssb=new SpannableStringBuilder("@");
@@ -472,7 +470,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			username.setText('@'+account.acct+(isSelf ? ('@'+AccountSessionManager.getInstance().getAccount(accountID).domain) : ""));
 		}
 		CharSequence parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
-		bio.setOnClickListener(v->savePrivateNote());
+//		bio.setOnClickListener(v->savePrivateNote());
 		if(TextUtils.isEmpty(parsedBio)){
 			bio.setVisibility(View.GONE);
 		}else{
@@ -484,6 +482,19 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			noteEditWrapper.setVisibility(View.GONE);
 		}
 
+		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
+			noteEditConfirm.setVisibility(hasFocus ? View.VISIBLE : View.INVISIBLE);
+		});
+
+		noteEditConfirm.setOnClickListener((v -> {
+			if (!noteEdit.getText().toString().trim().equals(account.note)) {
+				savePrivateNote();
+			}
+			InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
+			imm.hideSoftInputFromWindow(this.getView().getRootView().getWindowToken(), 0);
+			noteEdit.clearFocus();
+		}));
+
 //		if(noteEdit.getText().toString() == null){
 //			noteEditConfirm.setImageResource(R.drawable.ic_fluent_checkmark_24_regular);
 //			noteEditConfirm.setClickable(false);
@@ -1000,11 +1011,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		currentRequest = new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new SimpleCallback<>(this) {
 			@Override
 			public void onSuccess(Relationship result) {
-				relationship=result;
-				updateRelationship();
-				Toast.makeText(getActivity(), "Success", Toast.LENGTH_LONG).show();
+				Toast.makeText(getActivity(), "Successfully updated note", Toast.LENGTH_LONG).show();
 			}
-		});
+		}).exec(accountID);
 	}
 
 	private void onFollowersOrFollowingClick(View v){
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 52d40060b..11bd27315 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -4,7 +4,9 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:id="@+id/refresh_layout"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:focusableInTouchMode="true"
+	android:focusable="true">
 
 	<FrameLayout
 		android:layout_width="match_parent"
@@ -282,15 +284,19 @@
 							android:elevation="0dp"
 							android:hint="@string/sk_personal_note"/>
 
-<!--						<ImageButton-->
-<!--							android:id="@+id/note_edit_confirm"-->
-<!--							android:layout_width="wrap_content"-->
-<!--							android:layout_height="wrap_content"-->
-<!--							android:src="@drawable/ic_fluent_checkmark_24_regular"-->
-<!--							android:backgroundTint="#00000000"-->
-<!--							android:layout_marginTop="2dp"-->
-<!--							android:layout_marginEnd="10dp"-->
-<!--							android:layout_gravity="right|center_vertical" />-->
+						<ImageButton
+							android:id="@+id/note_edit_confirm"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:src="@drawable/ic_fluent_checkmark_24_filled"
+							android:backgroundTint="#00000000"
+							android:layout_marginTop="2dp"
+							android:visibility="invisible"
+							android:layout_marginEnd="20dp"
+							android:layout_gravity="right|center_vertical"
+							android:tooltipText="@string/sk_personal_note_confirm"
+							android:contentDescription="@string/sk_personal_note_confirm" />
+
 
                     </FrameLayout>
 
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 84c35d709..96c816a84 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -67,7 +67,8 @@
     <string name="sk_app_username" translatable="false">\@megalodon</string>
     <string name="sk_tabs_disable_swipe">Disable swiping between tabs</string>
     <string name="sk_settings_profile">Set up profile</string>
-    <string name="sk_personal_note">Personal note for this profile:</string>
+    <string name="sk_personal_note">Add a note for this profile</string>
+    <string name="sk_personal_note_confirm">Confirm edited note</string>
     <string name="sk_settings_posting">Posting preferences</string>
     <string name="sk_settings_filters">Configure filters</string>
     <string name="sk_settings_auth">Security settings</string>

From 5a8fed3c064e99c0f03323d755986e44559e930b Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Fri, 13 Jan 2023 23:41:57 +0100
Subject: [PATCH 060/200] feat(profile/note): add toast on save failure

---
 .../android/fragments/ProfileFragment.java    | 19 ++++++-------------
 mastodon/src/main/res/values/strings_sk.xml   |  1 +
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 80aecc796..75485a655 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -470,7 +470,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			username.setText('@'+account.acct+(isSelf ? ('@'+AccountSessionManager.getInstance().getAccount(accountID).domain) : ""));
 		}
 		CharSequence parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
-//		bio.setOnClickListener(v->savePrivateNote());
 		if(TextUtils.isEmpty(parsedBio)){
 			bio.setVisibility(View.GONE);
 		}else{
@@ -495,16 +494,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			noteEdit.clearFocus();
 		}));
 
-//		if(noteEdit.getText().toString() == null){
-//			noteEditConfirm.setImageResource(R.drawable.ic_fluent_checkmark_24_regular);
-//			noteEditConfirm.setClickable(false);
-//			noteEditConfirm.setAlpha(.50f);
-//		}else{
-//			noteEditConfirm.setImageResource(R.drawable.ic_fluent_checkmark_24_filled);
-//			noteEditConfirm.setClickable(true);
-//			noteEditConfirm.setAlpha(1.0f);
-//		}
-
 		followersCount.setText(UiUtils.abbreviateNumber(account.followersCount));
 		followingCount.setText(UiUtils.abbreviateNumber(account.followingCount));
 		postsCount.setText(UiUtils.abbreviateNumber(account.statusesCount));
@@ -1008,10 +997,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	}
 
 	private void savePrivateNote(){
-		currentRequest = new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new SimpleCallback<>(this) {
+		currentRequest = new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new Callback<>() {
 			@Override
 			public void onSuccess(Relationship result) {
-				Toast.makeText(getActivity(), "Successfully updated note", Toast.LENGTH_LONG).show();
+			}
+
+			@Override
+			public void onError(ErrorResponse result) {
+				Toast.makeText(getActivity(), getString(R.string.sk_personal_note_update_failed), Toast.LENGTH_LONG).show();
 			}
 		}).exec(accountID);
 	}
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 96c816a84..d118f320f 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -69,6 +69,7 @@
     <string name="sk_settings_profile">Set up profile</string>
     <string name="sk_personal_note">Add a note for this profile</string>
     <string name="sk_personal_note_confirm">Confirm edited note</string>
+    <string name="sk_personal_note_update_failed">Failed to save note</string>
     <string name="sk_settings_posting">Posting preferences</string>
     <string name="sk_settings_filters">Configure filters</string>
     <string name="sk_settings_auth">Security settings</string>

From adefb0e567380c6df700c0de2fc83d546d034a0d Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Fri, 13 Jan 2023 23:46:58 +0100
Subject: [PATCH 061/200] feat(profile/note): add fade animation to confirm
 icon

---
 .../android/fragments/ProfileFragment.java         | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 75485a655..6ca5d2fc4 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -482,7 +482,19 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}
 
 		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
-			noteEditConfirm.setVisibility(hasFocus ? View.VISIBLE : View.INVISIBLE);
+			if (hasFocus) {
+				noteEditConfirm.setVisibility(View.VISIBLE);
+				noteEditConfirm.animate()
+						.alpha(1.0f)
+						.setDuration(400);
+
+			} else {
+				noteEditConfirm.setVisibility(View.INVISIBLE);
+				noteEditConfirm.animate()
+						.alpha(0.0f)
+						.setDuration(400);
+
+			}
 		});
 
 		noteEditConfirm.setOnClickListener((v -> {

From b9c3143c6f9170686b87723226a90df81ca9db94 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Sat, 14 Jan 2023 11:01:29 +0100
Subject: [PATCH 062/200] feat(profile/note): increase animation duration

---
 .../android/fragments/ProfileFragment.java    | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 6ca5d2fc4..fb23bf2b9 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -4,10 +4,8 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Fragment;
-import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Outline;
@@ -16,18 +14,14 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.text.Editable;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
-import android.text.TextWatcher;
 import android.text.style.ImageSpan;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
@@ -45,6 +39,11 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.viewpager2.widget.ViewPager2;
+
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountByID;
@@ -84,10 +83,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import androidx.viewpager2.widget.ViewPager2;
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
@@ -486,13 +481,13 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				noteEditConfirm.setVisibility(View.VISIBLE);
 				noteEditConfirm.animate()
 						.alpha(1.0f)
-						.setDuration(400);
+						.setDuration(700);
 
 			} else {
 				noteEditConfirm.setVisibility(View.INVISIBLE);
 				noteEditConfirm.animate()
 						.alpha(0.0f)
-						.setDuration(400);
+						.setDuration(700);
 
 			}
 		});

From 4591f06d63c26eb1ec8ea0b4d4f76596e94331cf Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Sat, 14 Jan 2023 12:44:57 +0100
Subject: [PATCH 063/200] refactor(profile/note): rework edit text hint

---
 mastodon/src/main/res/layout/fragment_profile_about.xml | 7 +++++++
 mastodon/src/main/res/values/strings_sk.xml             | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 mastodon/src/main/res/layout/fragment_profile_about.xml

diff --git a/mastodon/src/main/res/layout/fragment_profile_about.xml b/mastodon/src/main/res/layout/fragment_profile_about.xml
new file mode 100644
index 000000000..d829e291c
--- /dev/null
+++ b/mastodon/src/main/res/layout/fragment_profile_about.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index d118f320f..50e83ab43 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -67,7 +67,7 @@
     <string name="sk_app_username" translatable="false">\@megalodon</string>
     <string name="sk_tabs_disable_swipe">Disable swiping between tabs</string>
     <string name="sk_settings_profile">Set up profile</string>
-    <string name="sk_personal_note">Add a note for this profile</string>
+    <string name="sk_personal_note">Add a note about this profile</string>
     <string name="sk_personal_note_confirm">Confirm edited note</string>
     <string name="sk_personal_note_update_failed">Failed to save note</string>
     <string name="sk_settings_posting">Posting preferences</string>

From 8594e34bb581c0d5e7a4b580cb68fc077385d9b6 Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Sat, 14 Jan 2023 12:46:40 +0100
Subject: [PATCH 064/200] refactor(profile/note): move note in about tab

---
 .../fragments/ProfileAboutFragment.java       | 83 +++++++++++++++++--
 .../android/fragments/ProfileFragment.java    | 57 ++-----------
 .../src/main/res/layout/fragment_profile.xml  | 44 +---------
 .../res/layout/fragment_profile_about.xml     | 49 +++++++++++
 4 files changed, 130 insertions(+), 103 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
index 15b11215c..82d858009 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
@@ -1,5 +1,6 @@
 package org.joinmastodon.android.fragments;
 
+import android.app.Activity;
 import android.app.Fragment;
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -12,11 +13,23 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowInsets;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.ImageButton;
 import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.accounts.SetPrivateNote;
 import org.joinmastodon.android.model.AccountField;
+import org.joinmastodon.android.model.Relationship;
 import org.joinmastodon.android.ui.BetterItemAnimator;
 import org.joinmastodon.android.ui.text.CustomEmojiSpan;
 import org.joinmastodon.android.ui.utils.SimpleTextWatcher;
@@ -26,11 +39,8 @@ import org.joinmastodon.android.ui.views.LinkedTextView;
 import java.util.Collections;
 import java.util.List;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.fragments.WindowInsetsAwareFragment;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
@@ -46,6 +56,11 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF
 	private static final int MAX_FIELDS=4;
 
 	public UsableRecyclerView list;
+	public FrameLayout noteWrap;
+	public EditText noteEdit;
+	private String accountID;
+	private String profileAccountID;
+	private String note;
 	private List<AccountField> fields=Collections.emptyList();
 	private AboutAdapter adapter;
 	private Paint dividerPaint=new Paint();
@@ -64,11 +79,51 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF
 			adapter.notifyDataSetChanged();
 	}
 
+	public void setNote(String note, String accountID, String profileAccountID){
+		this.note=note;
+		this.accountID=accountID;
+		this.profileAccountID=profileAccountID;
+		noteWrap.setVisibility(View.VISIBLE);
+		noteEdit.setVisibility(View.VISIBLE);
+		noteEdit.setText(note);
+	}
+
 	@Nullable
 	@Override
 	public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState){
-		list=new UsableRecyclerView(getActivity());
-		list.setId(R.id.list);
+		View view = inflater.inflate(R.layout.fragment_profile_about, null);
+
+		noteEdit = view.findViewById(R.id.note_edit);
+		noteWrap = view.findViewById(R.id.note_edit_wrap);
+		ImageButton noteEditConfirm = view.findViewById(R.id.note_edit_confirm);
+
+
+		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
+			if (hasFocus) {
+				noteEditConfirm.setVisibility(View.VISIBLE);
+				noteEditConfirm.animate()
+						.alpha(1.0f)
+						.setDuration(700);
+
+			} else {
+				noteEditConfirm.setVisibility(View.INVISIBLE);
+				noteEditConfirm.animate()
+						.alpha(0.0f)
+						.setDuration(700);
+
+			}
+		});
+
+		noteEditConfirm.setOnClickListener((v -> {
+			if (!noteEdit.getText().toString().trim().equals(note)) {
+				savePrivateNote();
+			}
+			InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
+			imm.hideSoftInputFromWindow(this.getView().getRootView().getWindowToken(), 0);
+			noteEdit.clearFocus();
+		}));
+
+		list = view.findViewById(R.id.list);
 		list.setItemAnimator(new BetterItemAnimator());
 		list.setDrawSelectorOnTop(true);
 		list.setLayoutManager(new LinearLayoutManager(getActivity()));
@@ -95,8 +150,20 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF
 				}
 			}
 		});
-		return list;
+		return view;
 	}
+	private void savePrivateNote(){
+		new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new Callback<>() {
+			@Override
+			public void onSuccess(Relationship result) {}
+
+			@Override
+			public void onError(ErrorResponse result) {
+				Toast.makeText(getActivity(), getString(R.string.sk_personal_note_update_failed), Toast.LENGTH_LONG).show();
+			}
+		}).exec(accountID);
+	}
+
 
 	public void enterEditMode(List<AccountField> editableFields){
 		isInEditMode=true;
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index fb23bf2b9..23c1c8574 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -27,16 +27,13 @@ import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
-import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 import android.widget.Toolbar;
 
 import androidx.annotation.NonNull;
@@ -51,7 +48,6 @@ import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
-import org.joinmastodon.android.api.requests.accounts.SetPrivateNote;
 import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.account_list.FollowerListFragment;
@@ -112,9 +108,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private SwipeRefreshLayout refreshLayout;
 	private CoverOverlayGradientDrawable coverGradient=new CoverOverlayGradientDrawable();
 	private float titleTransY;
-	private View postsBtn, followersBtn, followingBtn, noteEditWrapper;
-	private EditText nameEdit, bioEdit, noteEdit;
-	private ImageButton noteEditConfirm;
+	private View postsBtn, followersBtn, followingBtn;
+	private EditText nameEdit, bioEdit;
 	private ProgressBar actionProgress, notifyProgress;
 	private FrameLayout[] tabViews;
 	private TabLayoutMediator tabLayoutMediator;
@@ -177,9 +172,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		name=content.findViewById(R.id.name);
 		username=content.findViewById(R.id.username);
 		bio=content.findViewById(R.id.bio);
-		noteEdit=content.findViewById(R.id.note_edit);
-		noteEditConfirm=content.findViewById(R.id.note_edit_confirm);
-		noteEditWrapper=content.findViewById(R.id.note_edit_wrap);
 		followersCount=content.findViewById(R.id.followers_count);
 		followersLabel=content.findViewById(R.id.followers_label);
 		followersBtn=content.findViewById(R.id.followers_btn);
@@ -472,34 +464,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			bio.setText(parsedBio);
 		}
 
-		if(isOwnProfile){
-			noteEditWrapper.setVisibility(View.GONE);
-		}
-
-		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
-			if (hasFocus) {
-				noteEditConfirm.setVisibility(View.VISIBLE);
-				noteEditConfirm.animate()
-						.alpha(1.0f)
-						.setDuration(700);
-
-			} else {
-				noteEditConfirm.setVisibility(View.INVISIBLE);
-				noteEditConfirm.animate()
-						.alpha(0.0f)
-						.setDuration(700);
-
-			}
-		});
-
-		noteEditConfirm.setOnClickListener((v -> {
-			if (!noteEdit.getText().toString().trim().equals(account.note)) {
-				savePrivateNote();
-			}
-			InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
-			imm.hideSoftInputFromWindow(this.getView().getRootView().getWindowToken(), 0);
-			noteEdit.clearFocus();
-		}));
 
 		followersCount.setText(UiUtils.abbreviateNumber(account.followersCount));
 		followingCount.setText(UiUtils.abbreviateNumber(account.followingCount));
@@ -697,7 +661,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		notifyProgress.setIndeterminateTintList(notifyButton.getTextColors());
 		followsYouView.setVisibility(relationship.followedBy ? View.VISIBLE : View.GONE);
 		notifyButton.setSelected(relationship.notifying);
-		noteEdit.setText(relationship.note);
+		if (!isOwnProfile) {
+			aboutFragment.setNote(relationship.note, accountID, profileAccountID);
+		}
 		if (getActivity() != null) notifyButton.setContentDescription(getString(relationship.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username));
 	}
 
@@ -1003,19 +969,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		scrollView.smoothScrollTo(0, 0);
 	}
 
-	private void savePrivateNote(){
-		currentRequest = new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new Callback<>() {
-			@Override
-			public void onSuccess(Relationship result) {
-			}
-
-			@Override
-			public void onError(ErrorResponse result) {
-				Toast.makeText(getActivity(), getString(R.string.sk_personal_note_update_failed), Toast.LENGTH_LONG).show();
-			}
-		}).exec(accountID);
-	}
-
 	private void onFollowersOrFollowingClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 11bd27315..3d50ad9b7 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -258,53 +258,11 @@
 						android:textColor="?android:textColorSecondary"
 						tools:text="\@Gargron" />
 
-                    <FrameLayout
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/note_edit_wrap"
-                        android:layout_below="@id/username"
-                        android:layout_marginTop="0dp"
-                        android:padding="2dp">
-
-						<EditText
-							android:id="@+id/note_edit"
-							android:layout_width="match_parent"
-							android:layout_height="wrap_content"
-							android:paddingVertical="16dp"
-							android:layout_marginTop="16dp"
-							android:layout_marginBottom="8dp"
-							android:layout_marginHorizontal="16dp"
-							android:inputType="textMultiLine|textCapSentences"
-							android:singleLine="false"
-							android:drawableStart="@drawable/ic_fluent_notepad_20_regular"
-							android:drawablePadding="12dp"
-							android:drawableTint="?android:textColorSecondary"
-							android:background="@drawable/bg_search_field"
-							android:paddingHorizontal="16dp"
-							android:elevation="0dp"
-							android:hint="@string/sk_personal_note"/>
-
-						<ImageButton
-							android:id="@+id/note_edit_confirm"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:src="@drawable/ic_fluent_checkmark_24_filled"
-							android:backgroundTint="#00000000"
-							android:layout_marginTop="2dp"
-							android:visibility="invisible"
-							android:layout_marginEnd="20dp"
-							android:layout_gravity="right|center_vertical"
-							android:tooltipText="@string/sk_personal_note_confirm"
-							android:contentDescription="@string/sk_personal_note_confirm" />
-
-
-                    </FrameLayout>
-
                     <org.joinmastodon.android.ui.views.LinkedTextView
 						android:id="@+id/bio"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_below="@id/note_edit_wrap"
+						android:layout_below="@id/username"
 						android:layout_marginLeft="16dp"
 						android:layout_marginTop="4dp"
 						android:layout_marginRight="16dp"
diff --git a/mastodon/src/main/res/layout/fragment_profile_about.xml b/mastodon/src/main/res/layout/fragment_profile_about.xml
index d829e291c..2bfed9121 100644
--- a/mastodon/src/main/res/layout/fragment_profile_about.xml
+++ b/mastodon/src/main/res/layout/fragment_profile_about.xml
@@ -4,4 +4,53 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <FrameLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/note_edit_wrap"
+        android:layout_marginTop="0dp"
+        android:visibility="gone"
+        android:padding="2dp">
+
+        <EditText
+            android:id="@+id/note_edit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingVertical="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="4dp"
+            android:layout_marginHorizontal="16dp"
+            android:inputType="textMultiLine|textCapSentences"
+            android:singleLine="false"
+            android:drawableStart="@drawable/ic_fluent_notepad_20_regular"
+            android:drawablePadding="12dp"
+            android:drawableTint="?android:textColorSecondary"
+            android:background="@drawable/bg_search_field"
+            android:paddingHorizontal="16dp"
+            android:elevation="0dp"
+            android:visibility="gone"
+            android:hint="@string/sk_personal_note"/>
+
+        <ImageButton
+            android:id="@+id/note_edit_confirm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_fluent_checkmark_24_filled"
+            android:backgroundTint="#00000000"
+            android:layout_marginTop="2dp"
+            android:visibility="invisible"
+            android:layout_marginEnd="20dp"
+            android:layout_gravity="right|center_vertical"
+            android:tooltipText="@string/sk_personal_note_confirm"
+            android:contentDescription="@string/sk_personal_note_confirm" />
+
+    </FrameLayout>
+
+    <me.grishka.appkit.views.UsableRecyclerView
+        android:id="@+id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical"
+        android:clipToPadding="false"/>
+
 </LinearLayout>
\ No newline at end of file

From e8089777178fcc78482d534b51843f00cf4e9baf Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Sat, 14 Jan 2023 12:50:06 +0100
Subject: [PATCH 065/200] refactor(profile/note): rephrase confirm tooltip

---
 mastodon/src/main/res/values/strings_sk.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 50e83ab43..e44881272 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -68,7 +68,7 @@
     <string name="sk_tabs_disable_swipe">Disable swiping between tabs</string>
     <string name="sk_settings_profile">Set up profile</string>
     <string name="sk_personal_note">Add a note about this profile</string>
-    <string name="sk_personal_note_confirm">Confirm edited note</string>
+    <string name="sk_personal_note_confirm">Confirm changes to note</string>
     <string name="sk_personal_note_update_failed">Failed to save note</string>
     <string name="sk_settings_posting">Posting preferences</string>
     <string name="sk_settings_filters">Configure filters</string>

From 3bd69b54478b875bf05cc8892d8d83359a6cc06d Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Sat, 14 Jan 2023 14:58:31 +0100
Subject: [PATCH 066/200] fix(note/confirm): animation not displaying

---
 .../joinmastodon/android/fragments/ProfileAboutFragment.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
index 82d858009..ba2cb9d95 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
@@ -104,13 +104,11 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF
 				noteEditConfirm.animate()
 						.alpha(1.0f)
 						.setDuration(700);
-
 			} else {
-				noteEditConfirm.setVisibility(View.INVISIBLE);
 				noteEditConfirm.animate()
 						.alpha(0.0f)
 						.setDuration(700);
-
+				noteEditConfirm.setVisibility(View.INVISIBLE);
 			}
 		});
 

From 2387d84bc04dc2762f1ea1efb8bd4f02e8b3f6fc Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+FineFindus@users.noreply.github.com>
Date: Sat, 14 Jan 2023 22:48:03 +0100
Subject: [PATCH 067/200] fix(settings): reorder settings

---
 .../android/fragments/SettingsFragment.java   | 65 ++++++++++---------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
index ce7c8ecc4..91cbb0d9e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
@@ -112,6 +112,14 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.disableMarquee=i.checked;
 			GlobalUserPreferences.save();
 		}));
+		items.add(new SwitchItem(R.string.sk_settings_uniform_icon_for_notifications, R.drawable.ic_ntf_logo, GlobalUserPreferences.uniformNotificationIcon, i->{
+			GlobalUserPreferences.uniformNotificationIcon=i.checked;
+			GlobalUserPreferences.save();
+		}));
+		items.add(new SwitchItem(R.string.sk_settings_reduce_motion, R.drawable.ic_fluent_star_emphasis_24_regular, GlobalUserPreferences.reduceMotion, i->{
+			GlobalUserPreferences.reduceMotion=i.checked;
+			GlobalUserPreferences.save();
+		}));
 		items.add(new ButtonItem(R.string.sk_settings_color_palette, R.drawable.ic_fluent_color_24_regular, b->{
 			PopupMenu popupMenu=new PopupMenu(getActivity(), b, Gravity.CENTER_HORIZONTAL);
 			popupMenu.inflate(R.menu.color_palettes);
@@ -139,40 +147,33 @@ public class SettingsFragment extends MastodonToolbarFragment{
 							Toast.LENGTH_LONG).show();
 				});
 			} else {
-			b.setOnClickListener(l -> {
-				FrameLayout inputWrap = new FrameLayout(getContext());
-				EditText input = new EditText(getContext());
-				input.setHint(R.string.publish);
-				input.setText(GlobalUserPreferences.publishButtonText.trim());
-				FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-				params.setMargins(V.dp(16), V.dp(4), V.dp(16), V.dp(16));
-				input.setLayoutParams(params);
-				inputWrap.addView(input);
-				new M3AlertDialogBuilder(getContext()).setTitle(R.string.sk_settings_publish_button_text_title).setView(inputWrap)
-						.setPositiveButton(R.string.save, (d, which) -> {
-							GlobalUserPreferences.publishButtonText = input.getText().toString().trim();
-							GlobalUserPreferences.save();
-							updatePublishText(b);
-						})
-						.setNeutralButton(R.string.clear, (d, which) -> {
-							GlobalUserPreferences.publishButtonText = "";
-							GlobalUserPreferences.save();
-							updatePublishText(b);
-						})
-						.setNegativeButton(R.string.cancel, (d, which) -> {
-						})
-						.show();
-			});}
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_uniform_icon_for_notifications, R.drawable.ic_ntf_logo, GlobalUserPreferences.uniformNotificationIcon, i->{
-			GlobalUserPreferences.uniformNotificationIcon=i.checked;
-			GlobalUserPreferences.save();
-		}));
-		items.add(new SwitchItem(R.string.sk_settings_reduce_motion, R.drawable.ic_fluent_star_emphasis_24_regular, GlobalUserPreferences.reduceMotion, i->{
-			GlobalUserPreferences.reduceMotion=i.checked;
-			GlobalUserPreferences.save();
+				b.setOnClickListener(l -> {
+					FrameLayout inputWrap = new FrameLayout(getContext());
+					EditText input = new EditText(getContext());
+					input.setHint(R.string.publish);
+					input.setText(GlobalUserPreferences.publishButtonText.trim());
+					FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+					params.setMargins(V.dp(16), V.dp(4), V.dp(16), V.dp(16));
+					input.setLayoutParams(params);
+					inputWrap.addView(input);
+					new M3AlertDialogBuilder(getContext()).setTitle(R.string.sk_settings_publish_button_text_title).setView(inputWrap)
+							.setPositiveButton(R.string.save, (d, which) -> {
+								GlobalUserPreferences.publishButtonText = input.getText().toString().trim();
+								GlobalUserPreferences.save();
+								updatePublishText(b);
+							})
+							.setNeutralButton(R.string.clear, (d, which) -> {
+								GlobalUserPreferences.publishButtonText = "";
+								GlobalUserPreferences.save();
+								updatePublishText(b);
+							})
+							.setNegativeButton(R.string.cancel, (d, which) -> {
+							})
+							.show();
+				});}
 		}));
 
+
 		items.add(new HeaderItem(R.string.settings_behavior));
 		items.add(new SwitchItem(R.string.sk_settings_show_federated_timeline, R.drawable.ic_fluent_earth_24_regular, GlobalUserPreferences.showFederatedTimeline, i->{
 			GlobalUserPreferences.showFederatedTimeline=i.checked;

From 9a5747efc818d59157c99941ba5d8c0879e5760e Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Mon, 16 Jan 2023 15:26:27 -0300
Subject: [PATCH 068/200] Revert "Fixing it"

This reverts commit 1a075e32de3b9af47d03913f419c9668ba805170.
---
 mastodon/src/main/res/layout/item_discover_account.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mastodon/src/main/res/layout/item_discover_account.xml b/mastodon/src/main/res/layout/item_discover_account.xml
index a93d1a06f..14d68f5ed 100644
--- a/mastodon/src/main/res/layout/item_discover_account.xml
+++ b/mastodon/src/main/res/layout/item_discover_account.xml
@@ -91,7 +91,6 @@
 			android:layout_marginStart="16dp"
 			android:layout_marginTop="16dp"
 			android:gravity="center_horizontal"
-			android:layout_weight="1"
 			android:orientation="vertical">
 
 			<TextView
@@ -116,7 +115,6 @@
 			android:layout_marginTop="16dp"
 			android:layout_marginStart="12dp"
 			android:orientation="vertical"
-			android:layout_weight="1"
 			android:gravity="center_horizontal">
 			<TextView
 				android:id="@+id/followers_count"
@@ -140,7 +138,6 @@
 			android:layout_marginTop="16dp"
 			android:layout_marginStart="12dp"
 			android:orientation="vertical"
-			android:layout_weight="1"
 			android:gravity="center_horizontal">
 			<TextView
 				android:id="@+id/following_count"
@@ -228,9 +225,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginTop="8dp"
-			android:layout_marginEnd="8dp"
 			android:padding="8dp"
-			android:layout_weight="1"
 			android:clipToPadding="false">
 
 			<org.joinmastodon.android.ui.views.ProgressBarButton

From 19abbe199b854f4ca922d33ada7b0fd044e062a0 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Mon, 16 Jan 2023 20:57:05 -0300
Subject: [PATCH 069/200] Fixing the Bot icon. Look at how gorgeous this is
 @FineFindus!

---
 .../android/fragments/ProfileFragment.java      | 17 +++++++++++++----
 mastodon/src/main/res/drawable/ic_bot.xml       |  6 ++++++
 .../main/res/layout/fragment_profile_about.xml  |  2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/ic_bot.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 2991f1803..7b150292e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -286,10 +286,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followersBtn.setOnClickListener(this::onFollowersOrFollowingClick);
 		followingBtn.setOnClickListener(this::onFollowersOrFollowingClick);
 
-		if (account != null && account.bot) {
-			username.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_fluent_bot_24_filled, 0, 0, 0);
-		}
-
 		username.setOnLongClickListener(v->{
 			String usernameString=account.acct;
 			if(!usernameString.contains("@")){
@@ -463,6 +459,19 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			lock.setTint(username.getCurrentTextColor());
 			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(lock, ImageSpan.ALIGN_BASELINE), 0);
 			username.setText(ssb);
+		}else if(account.bot){
+			ssb=new SpannableStringBuilder("@");
+			ssb.append(account.acct);
+			if(isSelf){
+				ssb.append('@');
+				ssb.append(AccountSessionManager.getInstance().getAccount(accountID).domain);
+			}
+			ssb.append(" ");
+			Drawable botIcon=username.getResources().getDrawable(R.drawable.ic_bot, getActivity().getTheme()).mutate();
+			botIcon.setBounds(0, 0, botIcon.getIntrinsicWidth(), botIcon.getIntrinsicHeight());
+			botIcon.setTint(username.getCurrentTextColor());
+			ssb.append(getString(R.string.manually_approves_followers), new ImageSpan(botIcon, ImageSpan.ALIGN_BASELINE), 0);
+			username.setText(ssb);
 		}else{
 			// noinspection SetTextI18n
 			username.setText('@'+account.acct+(isSelf ? ('@'+AccountSessionManager.getInstance().getAccount(accountID).domain) : ""));
diff --git a/mastodon/src/main/res/drawable/ic_bot.xml b/mastodon/src/main/res/drawable/ic_bot.xml
new file mode 100644
index 000000000..9095124ed
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_bot.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="16dp" android:height="16dp" android:viewportWidth="16" android:viewportHeight="16">
+    <group android:translateX="-2" android:translateY="-1">
+        <path android:pathData="M14.69 11.503c1 0 1.81 0.81 1.81 1.81v0.689h-0.005c-0.034 0.78-0.248 1.757-1.123 2.555C14.416 17.43 12.765 18 10 18c-2.766 0-4.416-0.57-5.372-1.443-0.875-0.798-1.089-1.776-1.123-2.555H3.5v-0.69c0-0.999 0.81-1.809 1.81-1.809h9.38zM6.5 3C5.672 3 5 3.672 5 4.5v4C5 9.328 5.672 10 6.5 10h7c0.828 0 1.5-0.672 1.5-1.5v-4C15 3.672 14.328 3 13.5 3h-3V2.5C10.5 2.191 10.276 2 10 2S9.5 2.23 9.5 2.5V3h-3zM7 6.5c0-0.552 0.448-1 1-1s1 0.448 1 1-0.448 1-1 1-1-0.448-1-1zm4 0c0-0.552 0.448-1 1-1s1 0.448 1 1-0.448 1-1 1-1-0.448-1-1z" android:fillColor="@color/fluent_default_icon_tint"/>
+    </group>
+</vector>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/fragment_profile_about.xml b/mastodon/src/main/res/layout/fragment_profile_about.xml
index 2bfed9121..6644fe387 100644
--- a/mastodon/src/main/res/layout/fragment_profile_about.xml
+++ b/mastodon/src/main/res/layout/fragment_profile_about.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent">
 
     <FrameLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/note_edit_wrap"
         android:layout_marginTop="0dp"

From 9c3db24d2f23f39616e04b418a166702b18ba0d2 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Mon, 16 Jan 2023 21:10:06 -0300
Subject: [PATCH 070/200] Little improvement on the note field

---
 mastodon/src/main/res/drawable/bg_note_edit.xml         | 5 +++++
 mastodon/src/main/res/layout/fragment_profile_about.xml | 6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/bg_note_edit.xml

diff --git a/mastodon/src/main/res/drawable/bg_note_edit.xml b/mastodon/src/main/res/drawable/bg_note_edit.xml
new file mode 100644
index 000000000..de5184ab8
--- /dev/null
+++ b/mastodon/src/main/res/drawable/bg_note_edit.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="?colorSearchField"/>
+    <corners android:radius="10dp"/>
+</shape>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/fragment_profile_about.xml b/mastodon/src/main/res/layout/fragment_profile_about.xml
index 6644fe387..e97f751ac 100644
--- a/mastodon/src/main/res/layout/fragment_profile_about.xml
+++ b/mastodon/src/main/res/layout/fragment_profile_about.xml
@@ -8,9 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/note_edit_wrap"
-        android:layout_marginTop="0dp"
-        android:visibility="gone"
-        android:padding="2dp">
+        android:visibility="gone">
 
         <EditText
             android:id="@+id/note_edit"
@@ -25,7 +23,7 @@
             android:drawableStart="@drawable/ic_fluent_notepad_20_regular"
             android:drawablePadding="12dp"
             android:drawableTint="?android:textColorSecondary"
-            android:background="@drawable/bg_search_field"
+            android:background="@drawable/bg_note_edit"
             android:paddingHorizontal="16dp"
             android:elevation="0dp"
             android:visibility="gone"

From e65e6163bab7b0d73af11299bf518ed019d7a233 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Mon, 16 Jan 2023 21:32:54 -0300
Subject: [PATCH 071/200] Successfully putting it back where it was. Still need
 to add a toggle for it

---
 .../android/fragments/ProfileFragment.java    | 54 +++++++++++++++++++
 .../src/main/res/layout/fragment_profile.xml  | 43 ++++++++++++++-
 2 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 7b150292e..950dcc958 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -27,13 +27,16 @@ import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 import android.widget.Toolbar;
 
 import androidx.annotation.NonNull;
@@ -48,6 +51,7 @@ import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.api.requests.accounts.GetOwnAccount;
 import org.joinmastodon.android.api.requests.accounts.SetAccountFollowed;
+import org.joinmastodon.android.api.requests.accounts.SetPrivateNote;
 import org.joinmastodon.android.api.requests.accounts.UpdateAccountCredentials;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.account_list.FollowerListFragment;
@@ -115,6 +119,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private TabLayoutMediator tabLayoutMediator;
 	private TextView followsYouView;
 
+	public FrameLayout noteWrap;
+	public EditText noteEdit;
+	private String note;
 	private Account account;
 	private String accountID;
 	private Relationship relationship;
@@ -200,6 +207,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		fab=content.findViewById(R.id.fab);
 		followsYouView=content.findViewById(R.id.follows_you);
 
+		noteEdit = content.findViewById(R.id.note_edit);
+		noteWrap = content.findViewById(R.id.note_edit_wrap);
+		ImageButton noteEditConfirm = content.findViewById(R.id.note_edit_confirm);
+
 		avatar.setOutlineProvider(new ViewOutlineProvider(){
 			@Override
 			public void getOutline(View view, Outline outline){
@@ -208,6 +219,29 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		});
 		avatar.setClipToOutline(true);
 
+		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
+			if (hasFocus) {
+				noteEditConfirm.setVisibility(View.VISIBLE);
+				noteEditConfirm.animate()
+						.alpha(1.0f)
+						.setDuration(700);
+			} else {
+				noteEditConfirm.animate()
+						.alpha(0.0f)
+						.setDuration(700);
+				noteEditConfirm.setVisibility(View.INVISIBLE);
+			}
+		});
+
+		noteEditConfirm.setOnClickListener((v -> {
+			if (!noteEdit.getText().toString().trim().equals(note)) {
+				savePrivateNote();
+			}
+			InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Activity.INPUT_METHOD_SERVICE);
+			imm.hideSoftInputFromWindow(this.getView().getRootView().getWindowToken(), 0);
+			noteEdit.clearFocus();
+		}));
+
 		FrameLayout sizeWrapper=new FrameLayout(getActivity()){
 			@Override
 			protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec){
@@ -298,6 +332,25 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		return sizeWrapper;
 	}
 
+	public void setNote(String note){
+		this.note=note;
+		noteWrap.setVisibility(View.VISIBLE);
+		noteEdit.setVisibility(View.VISIBLE);
+		noteEdit.setText(note);
+	}
+
+	private void savePrivateNote(){
+		new SetPrivateNote(profileAccountID, noteEdit.getText().toString()).setCallback(new Callback<>() {
+			@Override
+			public void onSuccess(Relationship result) {}
+
+			@Override
+			public void onError(ErrorResponse result) {
+				Toast.makeText(getActivity(), getString(R.string.sk_personal_note_update_failed), Toast.LENGTH_LONG).show();
+			}
+		}).exec(accountID);
+	}
+
 	@Override
 	protected void doLoadData(){
 		currentRequest=new GetAccountByID(profileAccountID)
@@ -698,6 +751,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followsYouView.setVisibility(relationship.followedBy ? View.VISIBLE : View.GONE);
 		notifyButton.setSelected(relationship.notifying);
 		if (!isOwnProfile) {
+			setNote(relationship.note);
 			aboutFragment.setNote(relationship.note, accountID, profileAccountID);
 		}
 		if (getActivity() != null) notifyButton.setContentDescription(getString(relationship.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username));
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index d89afab70..90c8a0216 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -253,11 +253,52 @@
 						android:textColor="?android:textColorSecondary"
 						tools:text="\@Gargron" />
 
+					<FrameLayout
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_below="@id/username"
+						android:id="@+id/note_edit_wrap"
+						android:visibility="gone">
+
+						<EditText
+							android:id="@+id/note_edit"
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content"
+							android:paddingVertical="16dp"
+							android:layout_marginTop="4dp"
+							android:layout_marginBottom="8dp"
+							android:layout_marginHorizontal="16dp"
+							android:inputType="textMultiLine|textCapSentences"
+							android:singleLine="false"
+							android:drawableStart="@drawable/ic_fluent_notepad_20_regular"
+							android:drawablePadding="12dp"
+							android:drawableTint="?android:textColorSecondary"
+							android:background="@drawable/bg_note_edit"
+							android:paddingHorizontal="16dp"
+							android:elevation="0dp"
+							android:visibility="gone"
+							android:hint="@string/sk_personal_note"/>
+
+						<ImageButton
+							android:id="@+id/note_edit_confirm"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:src="@drawable/ic_fluent_checkmark_24_filled"
+							android:backgroundTint="#00000000"
+							android:layout_marginTop="2dp"
+							android:visibility="invisible"
+							android:layout_marginEnd="20dp"
+							android:layout_gravity="right|center_vertical"
+							android:tooltipText="@string/sk_personal_note_confirm"
+							android:contentDescription="@string/sk_personal_note_confirm" />
+
+					</FrameLayout>
+
 					<org.joinmastodon.android.ui.views.LinkedTextView
 						android:id="@+id/bio"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:layout_below="@id/username"
+						android:layout_below="@id/note_edit_wrap"
 						android:layout_marginLeft="16dp"
 						android:layout_marginRight="16dp"
 						android:textAppearance="@style/m3_body_large"

From 18811ec32afe2d44f1890fe5eb859d7377f9ffef Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 17 Jan 2023 20:42:02 -0300
Subject: [PATCH 072/200] Adding a bigger margin for consistency

---
 mastodon/src/main/res/layout/fragment_profile.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 90c8a0216..c18fb7cb6 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -266,7 +266,7 @@
 							android:layout_height="wrap_content"
 							android:paddingVertical="16dp"
 							android:layout_marginTop="4dp"
-							android:layout_marginBottom="8dp"
+							android:layout_marginBottom="16dp"
 							android:layout_marginHorizontal="16dp"
 							android:inputType="textMultiLine|textCapSentences"
 							android:singleLine="false"

From ce89733f2d5b90626d0ffcb0d259e754967d19cc Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 17 Jan 2023 21:12:04 -0300
Subject: [PATCH 073/200] Making the notes thing more beautiful, and also saves
 when back button is pressed. i love this. Try it later @FineFindus!

---
 .../android/fragments/ProfileFragment.java    |  7 +++-
 .../src/main/res/layout/fragment_profile.xml  | 32 +++++++++++++------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 950dcc958..519431d27 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -209,7 +209,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		noteEdit = content.findViewById(R.id.note_edit);
 		noteWrap = content.findViewById(R.id.note_edit_wrap);
-		ImageButton noteEditConfirm = content.findViewById(R.id.note_edit_confirm);
+		Button noteEditConfirm = content.findViewById(R.id.note_edit_confirm);
 
 		avatar.setOutlineProvider(new ViewOutlineProvider(){
 			@Override
@@ -221,11 +221,13 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		noteEdit.setOnFocusChangeListener((v, hasFocus) -> {
 			if (hasFocus) {
+				fab.setVisibility(View.GONE);
 				noteEditConfirm.setVisibility(View.VISIBLE);
 				noteEditConfirm.animate()
 						.alpha(1.0f)
 						.setDuration(700);
 			} else {
+				fab.setVisibility(View.VISIBLE);
 				noteEditConfirm.animate()
 						.alpha(0.0f)
 						.setDuration(700);
@@ -978,6 +980,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 	@Override
 	public boolean onBackPressed(){
+		if(noteEdit.hasFocus()) {
+			savePrivateNote();
+		}
 		if(isInEditMode){
 			exitEditMode();
 			return true;
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index c18fb7cb6..a84b2b949 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -258,6 +258,9 @@
 						android:layout_height="wrap_content"
 						android:layout_below="@id/username"
 						android:id="@+id/note_edit_wrap"
+						android:layout_marginTop="4dp"
+						android:layout_marginBottom="16dp"
+						android:layout_marginHorizontal="16dp"
 						android:visibility="gone">
 
 						<EditText
@@ -265,9 +268,6 @@
 							android:layout_width="match_parent"
 							android:layout_height="wrap_content"
 							android:paddingVertical="16dp"
-							android:layout_marginTop="4dp"
-							android:layout_marginBottom="16dp"
-							android:layout_marginHorizontal="16dp"
 							android:inputType="textMultiLine|textCapSentences"
 							android:singleLine="false"
 							android:drawableStart="@drawable/ic_fluent_notepad_20_regular"
@@ -279,18 +279,32 @@
 							android:visibility="gone"
 							android:hint="@string/sk_personal_note"/>
 
-						<ImageButton
+						<Button
 							android:id="@+id/note_edit_confirm"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:src="@drawable/ic_fluent_checkmark_24_filled"
-							android:backgroundTint="#00000000"
-							android:layout_marginTop="2dp"
+							android:layout_marginEnd="8dp"
+							android:paddingHorizontal="8dp"
 							android:visibility="invisible"
-							android:layout_marginEnd="20dp"
 							android:layout_gravity="right|center_vertical"
 							android:tooltipText="@string/sk_personal_note_confirm"
-							android:contentDescription="@string/sk_personal_note_confirm" />
+							android:contentDescription="@string/sk_personal_note_confirm"
+							android:drawableStart="@drawable/ic_fluent_checkmark_24_filled"
+							android:drawableTint="?colorButtonText"
+							/>
+
+<!--						<ImageButton-->
+<!--							android:id="@+id/note_edit_confirm"-->
+<!--							android:layout_width="wrap_content"-->
+<!--							android:layout_height="wrap_content"-->
+<!--							android:src="@drawable/ic_fluent_checkmark_24_filled"-->
+<!--							android:backgroundTint="#00000000"-->
+<!--							android:layout_marginTop="2dp"-->
+<!--							android:visibility="invisible"-->
+<!--							android:layout_marginEnd="20dp"-->
+<!--							android:layout_gravity="right|center_vertical"-->
+<!--							android:tooltipText="@string/sk_personal_note_confirm"-->
+<!--							android:contentDescription="@string/sk_personal_note_confirm" />-->
 
 					</FrameLayout>
 

From a55002da0cd1ef1b3e77aafa4fc60fed1705d719 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 17 Jan 2023 21:26:44 -0300
Subject: [PATCH 074/200] Messing a bit with the colors, I think I like this
 one

---
 mastodon/src/main/res/drawable/bg_note_edit.xml   | 2 +-
 mastodon/src/main/res/layout/fragment_profile.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/res/drawable/bg_note_edit.xml b/mastodon/src/main/res/drawable/bg_note_edit.xml
index de5184ab8..574282fd0 100644
--- a/mastodon/src/main/res/drawable/bg_note_edit.xml
+++ b/mastodon/src/main/res/drawable/bg_note_edit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?colorSearchField"/>
+    <solid android:color="?colorBackgroundLightest"/>
     <corners android:radius="10dp"/>
 </shape>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index a84b2b949..06427810d 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -286,11 +286,11 @@
 							android:layout_marginEnd="8dp"
 							android:paddingHorizontal="8dp"
 							android:visibility="invisible"
+							android:backgroundTint="?colorBackgroundLightest"
 							android:layout_gravity="right|center_vertical"
 							android:tooltipText="@string/sk_personal_note_confirm"
 							android:contentDescription="@string/sk_personal_note_confirm"
-							android:drawableStart="@drawable/ic_fluent_checkmark_24_filled"
-							android:drawableTint="?colorButtonText"
+							android:drawableStart="@drawable/ic_fluent_checkmark_24_regular"
 							/>
 
 <!--						<ImageButton-->

From 7223a13d08787af317f15329ec9fcf5a3572a178 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 17 Jan 2023 21:29:51 -0300
Subject: [PATCH 075/200] Editing the padding so that text doesnt go below the
 button to save

---
 mastodon/src/main/res/layout/fragment_profile.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index 06427810d..a8a16867b 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -274,6 +274,7 @@
 							android:drawablePadding="12dp"
 							android:drawableTint="?android:textColorSecondary"
 							android:background="@drawable/bg_note_edit"
+							android:paddingEnd="48dp"
 							android:paddingHorizontal="16dp"
 							android:elevation="0dp"
 							android:visibility="gone"

From 417faa66f96052e21aadd790d7a2f7c82a06abd7 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 17 Jan 2023 21:35:58 -0300
Subject: [PATCH 076/200] Deleting some old stuff

---
 mastodon/src/main/res/layout/fragment_profile.xml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml
index a8a16867b..cfb8f84fb 100644
--- a/mastodon/src/main/res/layout/fragment_profile.xml
+++ b/mastodon/src/main/res/layout/fragment_profile.xml
@@ -293,20 +293,6 @@
 							android:contentDescription="@string/sk_personal_note_confirm"
 							android:drawableStart="@drawable/ic_fluent_checkmark_24_regular"
 							/>
-
-<!--						<ImageButton-->
-<!--							android:id="@+id/note_edit_confirm"-->
-<!--							android:layout_width="wrap_content"-->
-<!--							android:layout_height="wrap_content"-->
-<!--							android:src="@drawable/ic_fluent_checkmark_24_filled"-->
-<!--							android:backgroundTint="#00000000"-->
-<!--							android:layout_marginTop="2dp"-->
-<!--							android:visibility="invisible"-->
-<!--							android:layout_marginEnd="20dp"-->
-<!--							android:layout_gravity="right|center_vertical"-->
-<!--							android:tooltipText="@string/sk_personal_note_confirm"-->
-<!--							android:contentDescription="@string/sk_personal_note_confirm" />-->
-
 					</FrameLayout>
 
 					<org.joinmastodon.android.ui.views.LinkedTextView

From 734a8049a5c98122e30d908192b220d7f3efabc8 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 17 Jan 2023 21:38:01 -0300
Subject: [PATCH 077/200] Taking the notes out of the about section until
 further notice

---
 .../android/fragments/ProfileAboutFragment.java             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
index ba2cb9d95..0e4e353ea 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java
@@ -83,9 +83,9 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF
 		this.note=note;
 		this.accountID=accountID;
 		this.profileAccountID=profileAccountID;
-		noteWrap.setVisibility(View.VISIBLE);
-		noteEdit.setVisibility(View.VISIBLE);
-		noteEdit.setText(note);
+//		noteWrap.setVisibility(View.VISIBLE);
+//		noteEdit.setVisibility(View.VISIBLE);
+//		noteEdit.setText(note);
 	}
 
 	@Nullable

From 7c7f3cc42a2824ef4c64cd83b0e63d79be5f8285 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 17 Jan 2023 22:26:54 -0300
Subject: [PATCH 078/200] Properly Fixing the bot icon at the end of the
 username on the header of posts.

---
 .../displayitems/HeaderStatusDisplayItem.java | 19 +++++++++++++++++--
 .../res/drawable/ic_fluent_bot_16_filled.xml  |  9 +++++++++
 .../main/res/layout/display_item_header.xml   |  8 ++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_bot_16_filled.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
index ecf7af152..a543cddd6 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
@@ -9,6 +9,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
+import android.text.style.ImageSpan;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -135,7 +136,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 
 	public static class Holder extends StatusDisplayItem.Holder<HeaderStatusDisplayItem> implements ImageLoaderViewHolder{
 		private final TextView name, username, timestamp, extraText, separator;
-		private final ImageView avatar, more, visibility, deleteNotification, unreadIndicator;
+		private final ImageView avatar, more, visibility, deleteNotification, unreadIndicator, botIcon;
 		private final PopupMenu optionsMenu;
 		private Relationship relationship;
 		private APIRequest<?> currentRelationshipRequest;
@@ -158,6 +159,7 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 			visibility=findViewById(R.id.visibility);
 			deleteNotification=findViewById(R.id.delete_notification);
 			unreadIndicator=findViewById(R.id.unread_indicator);
+			botIcon=findViewById(R.id.bot_icon);
 			extraText=findViewById(R.id.extra_text);
 			avatar.setOnClickListener(this::onAvaClick);
 			avatar.setOutlineProvider(roundCornersOutline);
@@ -282,10 +284,23 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 		public void onBind(HeaderStatusDisplayItem item){
 			name.setText(item.parsedName);
 			username.setText('@'+item.user.acct);
+			botIcon.setVisibility(item.user.bot ? View.VISIBLE : View.GONE);
+			botIcon.setColorFilter(username.getCurrentTextColor());
 			separator.setVisibility(View.VISIBLE);
 
+//			if(item.user.bot){
+//				SpannableStringBuilder ssb = new SpannableStringBuilder();
+//				ssb.append('@'+item.user.acct);
+//				ssb.append(" ");
+//				Drawable botIcon=username.getResources().getDrawable(R.drawable.ic_bot, itemView.getContext().getTheme()).mutate();
+//				botIcon.setBounds(0, 0, botIcon.getIntrinsicWidth(), botIcon.getIntrinsicHeight());
+//				botIcon.setTint(username.getCurrentTextColor());
+//				ssb.append(itemView.getContext().getString(R.string.manually_approves_followers), new ImageSpan(botIcon, ImageSpan.ALIGN_BASELINE), 0);
+//				username.setPaddingRelative(0,0,16,0);
+//				username.setText(ssb);
+//			}
 
-			username.setCompoundDrawablesWithIntrinsicBounds(item.user.bot ? R.drawable.ic_fluent_bot_24_filled : 0, 0, 0, 0);
+//			username.setCompoundDrawablesWithIntrinsicBounds(item.user.bot ? R.drawable.ic_fluent_bot_24_filled : 0, 0, 0, 0);
 
 			if (item.scheduledStatus!=null)
 				if (item.scheduledStatus.scheduledAt.isAfter(CreateStatus.DRAFTS_AFTER_INSTANT)) {
diff --git a/mastodon/src/main/res/drawable/ic_fluent_bot_16_filled.xml b/mastodon/src/main/res/drawable/ic_fluent_bot_16_filled.xml
new file mode 100644
index 000000000..e8e056b79
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_bot_16_filled.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M11.754,9.203C12.551,9.203 13.199,9.852 13.199,10.648L13.199,11.203L13.195,11.203C13.168,11.824 12.996,12.605 12.297,13.246C11.531,13.945 10.211,14.398 8,14.398C5.789,14.398 4.469,13.945 3.703,13.246C3.004,12.605 2.832,11.824 2.805,11.203L2.801,11.203L2.801,10.648C2.801,9.852 3.449,9.203 4.246,9.203ZM5.199,2.398C4.539,2.398 4,2.938 4,3.602L4,6.801C4,7.461 4.539,8 5.199,8L10.801,8C11.461,8 12,7.461 12,6.801L12,3.602C12,2.938 11.461,2.398 10.801,2.398L8.398,2.398C8.398,2.398 8.398,2.246 8.398,2C8.398,1.754 8.223,1.602 8,1.602C7.777,1.602 7.602,1.785 7.602,2C7.602,2.215 7.602,2.398 7.602,2.398ZM5.602,5.199C5.602,4.758 5.957,4.398 6.398,4.398C6.844,4.398 7.199,4.758 7.199,5.199C7.199,5.641 6.844,6 6.398,6C5.957,6 5.602,5.641 5.602,5.199ZM8.801,5.199C8.801,4.758 9.156,4.398 9.602,4.398C10.043,4.398 10.398,4.758 10.398,5.199C10.398,5.641 10.043,6 9.602,6C9.156,6 8.801,5.641 8.801,5.199ZM8.801,5.199"
+      android:fillColor="?android:textColorPrimary" />
+</vector>
diff --git a/mastodon/src/main/res/layout/display_item_header.xml b/mastodon/src/main/res/layout/display_item_header.xml
index 5c307d82e..94b5b0fc9 100644
--- a/mastodon/src/main/res/layout/display_item_header.xml
+++ b/mastodon/src/main/res/layout/display_item_header.xml
@@ -120,6 +120,14 @@
 			android:textAppearance="@style/m3_title_small"
 			tools:text="\@Gargron" />
 
+		<ImageView
+			android:id="@+id/bot_icon"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:importantForAccessibility="no"
+			android:layout_marginTop="2dp"
+			android:src="@drawable/ic_fluent_bot_16_filled" />
+
 		<TextView
 			android:id="@+id/separator"
 			android:layout_width="wrap_content"

From dd92f1b66f75ae6a9c422582ab579c1f9531aae8 Mon Sep 17 00:00:00 2001
From: mishnz <david@howes.nz>
Date: Sun, 1 Jan 2023 02:50:09 -0300
Subject: [PATCH 079/200] The Mastodon server does not currently use URL_SAFE
 encoding on its serverKey. Using URL_SAFE in this client means the client
 will crash for any server that uses a key that generates a Mime64 string
 containing a "+" or "/".  This change removes the URL_SAFE logic. See:
 https://github.com/mastodon/mastodon-android/issues/483

---
 .../org/joinmastodon/android/api/PushSubscriptionManager.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
index 3294a02f8..01822fb8a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
@@ -162,9 +162,7 @@ public class PushSubscriptionManager{
 						@Override
 						public void onSuccess(PushSubscription result){
 							MastodonAPIController.runInBackground(()->{
-								result.serverKey=result.serverKey.replace('/','_');
-								result.serverKey=result.serverKey.replace('+','-');
-								serverKey=deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.URL_SAFE));
+								serverKey=deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.DEFAULT));
 
 								AccountSession session=AccountSessionManager.getInstance().tryGetAccount(accountID);
 								if(session==null)

From 88474ba826e1517a1be4ef94509e8e7ca912e840 Mon Sep 17 00:00:00 2001
From: mishnz <david@howes.nz>
Date: Mon, 2 Jan 2023 23:56:52 +1300
Subject: [PATCH 080/200] Second fix for MIME64 inconsistency in serverKey. The
 previous fix https://github.com/mastodon/mastodon-android/pull/486 would
 break any connections to any instances using WEB_SAFE MIME64 encoding on the
 serverKey, which actually appears to be the usual case. This update reverts
 to the previous logic, but also converts standard MIME64 characters ('/' and
 '+') to their WEB_SAFE equivalents. This ensures the standard case of
 WEB_SAFE BASE64 serverKeys and the anomolous case of DEFAULT BASE64 keys both
 work.

---
 .../org/joinmastodon/android/api/PushSubscriptionManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
index 01822fb8a..710fda0c6 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
@@ -162,7 +162,9 @@ public class PushSubscriptionManager{
 						@Override
 						public void onSuccess(PushSubscription result){
 							MastodonAPIController.runInBackground(()->{
-								serverKey=deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.DEFAULT));
+								result.serverKey=result.serverKey.replace('/','_');
+								result.serverKey=result.serverKey.replace('+','-');
+								deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.URL_SAFE));
 
 								AccountSession session=AccountSessionManager.getInstance().tryGetAccount(accountID);
 								if(session==null)

From ff65d150e3b8bdfd35438b17404f3a7ac7fb1172 Mon Sep 17 00:00:00 2001
From: mishnz <david@howes.nz>
Date: Tue, 3 Jan 2023 00:15:45 +1300
Subject: [PATCH 081/200] serverKey assignment was missing, corrected.

---
 .../org/joinmastodon/android/api/PushSubscriptionManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
index 710fda0c6..3294a02f8 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java
@@ -164,7 +164,7 @@ public class PushSubscriptionManager{
 							MastodonAPIController.runInBackground(()->{
 								result.serverKey=result.serverKey.replace('/','_');
 								result.serverKey=result.serverKey.replace('+','-');
-								deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.URL_SAFE));
+								serverKey=deserializeRawPublicKey(Base64.decode(result.serverKey, Base64.URL_SAFE));
 
 								AccountSession session=AccountSessionManager.getInstance().tryGetAccount(accountID);
 								if(session==null)

From 57e0b96f362c100706df6f529d9336037bb78f7d Mon Sep 17 00:00:00 2001
From: Tyler Saunders <tyler@thesummit.dev>
Date: Tue, 3 Jan 2023 14:21:22 -0300
Subject: [PATCH 082/200] Update ComposeFragment to use the photopicker.

The android platform has a great photopicker, and this change checks
for the current device's sdk version, and uses the photopicker if it's
available on the device.

For pre Android R sdkrev2 devices, the experience remains unchanged.
---
 .../android/fragments/ComposeFragment.java    | 53 ++++++++++++++++---
 1 file changed, 46 insertions(+), 7 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index 7be18bf7f..97484f220 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -1,5 +1,7 @@
 package org.joinmastodon.android.fragments;
 
+import static android.os.ext.SdkExtensions.getExtensionVersion;
+
 import static org.joinmastodon.android.GlobalUserPreferences.recentLanguages;
 import static org.joinmastodon.android.api.requests.statuses.CreateStatus.DRAFTS_AFTER_INSTANT;
 import static org.joinmastodon.android.api.requests.statuses.CreateStatus.getDraftInstant;
@@ -29,6 +31,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
+import android.provider.MediaStore;
 import android.provider.OpenableColumns;
 import android.text.Editable;
 import android.text.InputFilter;
@@ -1162,14 +1165,50 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 				.show();
 	}
 
+	/**
+	 * Check to see if Android platform photopicker is available on the device\
+	 * @return whether the device supports photopicker intents.
+	 */
+	private boolean isPhotoPickerAvailable() {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+			return true;
+		} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+			return getExtensionVersion(Build.VERSION_CODES.R) >= 2;
+		} else
+			return false;
+	}
+
+	/**
+	 * Builds the correct intent for the device version to select media.
+	 *
+	 * <p>For Device version > T or R_SDK_v2, use the android platform photopicker via
+	 * {@link MediaStore#ACTION_PICK_IMAGES}
+	 *
+	 * <p>For earlier versions use the built in docs ui via {@link Intent#ACTION_GET_CONTENT}
+	 */
 	private void openFilePicker(){
-		Intent intent=new Intent(Intent.ACTION_GET_CONTENT);
-		intent.addCategory(Intent.CATEGORY_OPENABLE);
-		intent.setType("*/*");
-		if(instance.configuration!=null && instance.configuration.mediaAttachments!=null && instance.configuration.mediaAttachments.supportedMimeTypes!=null && !instance.configuration.mediaAttachments.supportedMimeTypes.isEmpty()){
-			intent.putExtra(Intent.EXTRA_MIME_TYPES, instance.configuration.mediaAttachments.supportedMimeTypes.toArray(new String[0]));
-		}else{
-			intent.putExtra(Intent.EXTRA_MIME_TYPES, new String[]{"image/*", "video/*"});
+		Intent intent;
+		boolean usePhotoPicker = isPhotoPickerAvailable();
+		if (usePhotoPicker) {
+			intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+			intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit());
+		} else {
+			intent = new Intent(Intent.ACTION_GET_CONTENT);
+			intent.addCategory(Intent.CATEGORY_OPENABLE);
+			intent.setType("*/*");
+		}
+		if (!usePhotoPicker && instance.configuration != null &&
+				instance.configuration.mediaAttachments != null &&
+				instance.configuration.mediaAttachments.supportedMimeTypes != null &&
+				!instance.configuration.mediaAttachments.supportedMimeTypes.isEmpty()) {
+			intent.putExtra(Intent.EXTRA_MIME_TYPES,
+					instance.configuration.mediaAttachments.supportedMimeTypes.toArray(
+							new String[0]));
+		} else {
+			if (!usePhotoPicker) {
+				// If photo picker is being used these are the default mimetypes.
+				intent.putExtra(Intent.EXTRA_MIME_TYPES, new String[]{"image/*", "video/*"});
+			}
 		}
 		intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
 		startActivityForResult(intent, MEDIA_RESULT);

From 153542e1b41d8c7434cf8fc554177907adc3b18b Mon Sep 17 00:00:00 2001
From: FineFindus <63370021+finefindus@users.noreply.github.com>
Date: Tue, 10 Jan 2023 05:09:47 -0300
Subject: [PATCH 083/200] feat(settings): add about instance link (#263)

---
 .../org/joinmastodon/android/fragments/SettingsFragment.java   | 1 +
 mastodon/src/main/res/drawable/ic_fluent_info_24_regular.xml   | 3 +++
 mastodon/src/main/res/values/strings_sk.xml                    | 2 ++
 3 files changed, 6 insertions(+)
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_info_24_regular.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
index 91cbb0d9e..1022a6194 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
@@ -261,6 +261,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			args.putParcelable("instance", Parcels.wrap(instance));
 			Nav.go(getActivity(), InstanceRulesFragment.class, args);
 		}, R.drawable.ic_fluent_task_list_ltr_24_regular));
+		items.add(new TextItem(R.string.sk_settings_about_instance	, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/about"), R.drawable.ic_fluent_info_24_regular));
 		items.add(new TextItem(R.string.settings_tos, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
 		items.add(new TextItem(R.string.settings_privacy_policy, ()->UiUtils.launchWebBrowser(getActivity(), "https://"+session.domain+"/terms"), R.drawable.ic_fluent_open_24_regular));
 		items.add(new TextItem(R.string.log_out, this::confirmLogOut, R.drawable.ic_fluent_sign_out_24_regular));
diff --git a/mastodon/src/main/res/drawable/ic_fluent_info_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_info_24_regular.xml
new file mode 100644
index 000000000..697a02e4a
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_info_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M12 1.999c5.524 0 10.002 4.478 10.002 10.002 0 5.523-4.478 10.001-10.002 10.001-5.524 0-10.002-4.478-10.002-10.001C1.998 6.477 6.476 1.999 12 1.999zm0 1.5c-4.695 0-8.502 3.806-8.502 8.502 0 4.695 3.807 8.501 8.502 8.501s8.502-3.806 8.502-8.501c0-4.696-3.807-8.502-8.502-8.502zm-0.004 7c0.38 0 0.694 0.282 0.744 0.648l0.007 0.102 0.004 5.502c0 0.414-0.336 0.75-0.75 0.75-0.38 0-0.694-0.282-0.744-0.648l-0.006-0.101-0.004-5.502c0-0.414 0.335-0.75 0.75-0.75zm0.005-3.497c0.551 0 0.998 0.447 0.998 0.999 0 0.551-0.447 0.998-0.998 0.998-0.552 0-1-0.447-1-0.998 0-0.552 0.448-1 1-1z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 80e31703a..9e4a42b31 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -142,10 +142,12 @@
     <string name="sk_keep_only_latest_notification">Keep only latest notification</string>
     <string name="sk_announcements">Announcements</string>
     <string name="sk_mark_as_read">Mark as read</string>
+    <string name="sk_settings_about_instance">About instance</string>
 
     <!--    accessibility labels-->
     <string name="sk_poll_option_add">Add new poll option</string>
     <string name="sk_fab_compose">Compose</string>
     <string name="sk_sending_error">Error publishing</string>
 
+
 </resources>
\ No newline at end of file

From b6660486031ab0b26d01b4e51e01674a4d981e75 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Tue, 10 Jan 2023 09:13:15 +0100
Subject: [PATCH 084/200] add missing margin

---
 mastodon/src/main/res/layout/fragment_compose.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/layout/fragment_compose.xml b/mastodon/src/main/res/layout/fragment_compose.xml
index afce1e6b4..7ea28317d 100644
--- a/mastodon/src/main/res/layout/fragment_compose.xml
+++ b/mastodon/src/main/res/layout/fragment_compose.xml
@@ -90,6 +90,7 @@
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:layout_toEndOf="@id/self_avatar"
+						android:layout_marginTop="2sp"
 						android:minHeight="24sp"
 						android:ellipsize="end"
 						android:singleLine="true"

From df44d4cc4f112ba59e16a1213a816478cbe1d68c Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Tue, 10 Jan 2023 05:38:28 -0300
Subject: [PATCH 085/200] don't overwrite notifications

re: sk22#219
---
 .../joinmastodon/android/PushNotificationReceiver.java    | 8 ++------
 .../joinmastodon/android/fragments/SettingsFragment.java  | 2 +-
 .../res/drawable/ic_fluent_convert_range_24_regular.xml   | 3 +++
 mastodon/src/main/res/values/strings_sk.xml               | 1 +
 4 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_convert_range_24_regular.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
index a667f8ea1..3b8dfbb28 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
@@ -37,8 +37,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 	private static final String TAG="PushNotificationReceive";
 
 	public static final int NOTIFICATION_ID=178;
-
-	private static int notificationID;
+	private static int notificationId = 0;
 
 	@Override
 	public void onReceive(Context context, Intent intent){
@@ -127,9 +126,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 					.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
 		}
 		Drawable avatar=ImageCache.getInstance(context).get(new UrlImageLoaderRequest(pn.icon, V.dp(50), V.dp(50)));
-
-		notificationID = GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : (int)System.currentTimeMillis();
-
 		Intent contentIntent=new Intent(context, MainActivity.class);
 		contentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 		contentIntent.putExtra("fromNotification", true);
@@ -166,6 +162,6 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		if(AccountSessionManager.getInstance().getLoggedInAccounts().size()>1){
 			builder.setSubText(accountName);
 		}
-		nm.notify(accountID, notificationID, builder.build());
+		nm.notify(accountID, GlobalUserPreferences.keepOnlyLatestNotification ? NOTIFICATION_ID : notificationId++, builder.build());
 	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
index 1022a6194..1bd1b1df3 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
@@ -244,7 +244,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		items.add(new SwitchItem(R.string.notify_reblog, R.drawable.ic_fluent_arrow_repeat_all_24_regular, pushSubscription.alerts.reblog, i->onNotificationsChanged(PushNotification.Type.REBLOG, i.checked)));
 		items.add(new SwitchItem(R.string.notify_mention, R.drawable.ic_fluent_mention_24_regular, pushSubscription.alerts.mention, i->onNotificationsChanged(PushNotification.Type.MENTION, i.checked)));
 		items.add(new SwitchItem(R.string.sk_notify_posts, R.drawable.ic_fluent_alert_24_regular, pushSubscription.alerts.status, i->onNotificationsChanged(PushNotification.Type.STATUS, i.checked)));
-		items.add(new SwitchItem(R.string.sk_keep_only_latest_notification, R.drawable.ic_fluent_custom_alert_latest_24_regular, GlobalUserPreferences.keepOnlyLatestNotification, i->{
+		items.add(new SwitchItem(R.string.sk_settings_single_notification, R.drawable.ic_fluent_convert_range_24_regular, GlobalUserPreferences.keepOnlyLatestNotification, i->{
 			GlobalUserPreferences.keepOnlyLatestNotification=i.checked;
 			GlobalUserPreferences.save();
 		}));
diff --git a/mastodon/src/main/res/drawable/ic_fluent_convert_range_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_convert_range_24_regular.xml
new file mode 100644
index 000000000..9e9786edf
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_convert_range_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M6.25 3C5.007 3 4 4.007 4 5.25v2.5C4 8.993 5.007 10 6.25 10h9.5C16.993 10 18 8.993 18 7.75v-2.5C18 4.007 16.993 3 15.75 3h-9.5zM5.5 5.25c0-0.414 0.336-0.75 0.75-0.75h9.5c0.414 0 0.75 0.336 0.75 0.75v2.5c0 0.414-0.336 0.75-0.75 0.75h-9.5C5.836 8.5 5.5 8.164 5.5 7.75v-2.5zM8.7 16C8.313 16 8 16.336 8 16.75s0.313 0.75 0.7 0.75h4.6c0.387 0 0.7-0.336 0.7-0.75S13.687 16 13.3 16H8.7zm8.653 0.445L17.28 16.53c-0.266 0.267-0.683 0.29-0.976 0.073L16.22 16.53l-2-2c-0.267-0.266-0.29-0.682-0.073-0.976l0.073-0.084 2-2c0.293-0.293 0.767-0.293 1.06 0 0.267 0.266 0.29 0.683 0.073 0.976L17.28 12.53l-0.719 0.721h1.5c0.647 0 1.18-0.492 1.243-1.122L19.311 12V9.75c0-0.415 0.335-0.75 0.75-0.75 0.38 0 0.693 0.282 0.743 0.648L20.81 9.75V12c0 1.462-1.142 2.658-2.583 2.745L18.06 14.75h-1.499l0.718 0.719c0.267 0.266 0.29 0.683 0.073 0.976zM18 19.25v-2.026l-0.013 0.012c-0.405 0.406-0.96 0.57-1.487 0.495v1.519c0 0.414-0.336 0.75-0.75 0.75h-9.5c-0.414 0-0.75-0.336-0.75-0.75v-5c0-0.414 0.336-0.75 0.75-0.75h6.822c0.058-0.192 0.148-0.376 0.272-0.543l0.022-0.03 0.12-0.14L14.275 12H6.25C5.007 12 4 13.007 4 14.25v5c0 1.243 1.007 2.25 2.25 2.25h9.5c1.243 0 2.25-1.007 2.25-2.25z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 9e4a42b31..be8b6e499 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -143,6 +143,7 @@
     <string name="sk_announcements">Announcements</string>
     <string name="sk_mark_as_read">Mark as read</string>
     <string name="sk_settings_about_instance">About instance</string>
+    <string name="sk_settings_single_notification">Only show one notification</string>
 
     <!--    accessibility labels-->
     <string name="sk_poll_option_add">Add new poll option</string>

From e45f3f30f3066ca3fbdeac71cd8ae254875f7ca1 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Tue, 10 Jan 2023 09:39:25 +0100
Subject: [PATCH 086/200] change lists string

---
 mastodon/src/main/res/values/strings_sk.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index be8b6e499..1e0b30513 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -34,7 +34,7 @@
     <string name="sk_follow_requests">Follow requests</string>
     <string name="sk_accept_follow_request">Accept follow request</string>
     <string name="sk_reject_follow_request">Reject follow request</string>
-    <string name="sk_lists_with_user">Lists with %s</string>
+    <string name="sk_lists_with_user">Edit lists with %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Always reveal content warnings</string>
     <string name="sk_disable_marquee">Disable scrolling text in title bars</string>
     <string name="sk_disable_dividers">Disable post dividers</string>

From ed9813f093cf8426ba0d105eaf23c746798e98a0 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Tue, 10 Jan 2023 07:33:04 -0300
Subject: [PATCH 087/200] implement creating lists

re: sk22#30
---
 .../api/requests/lists/CreateList.java        | 19 +++++
 .../api/requests/lists/UpdateList.java        | 14 +++
 .../fragments/ListTimelinesFragment.java      | 59 +++++++++----
 .../android/fragments/SettingsFragment.java   |  1 +
 .../android/ui/views/ListTimelineEditor.java  | 85 +++++++++++++++++++
 .../ui/views/TextInputFrameLayout.java        | 51 +++++++++++
 .../ic_fluent_channel_add_24_regular.xml      |  3 +
 .../main/res/layout/list_timeline_editor.xml  | 44 ++++++++++
 .../src/main/res/menu/list_reply_policies.xml |  6 ++
 mastodon/src/main/res/menu/menu_list.xml      |  8 ++
 mastodon/src/main/res/values/strings_sk.xml   |  7 ++
 11 files changed, 281 insertions(+), 16 deletions(-)
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/CreateList.java
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/UpdateList.java
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/ui/views/ListTimelineEditor.java
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/ui/views/TextInputFrameLayout.java
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_channel_add_24_regular.xml
 create mode 100644 mastodon/src/main/res/layout/list_timeline_editor.xml
 create mode 100644 mastodon/src/main/res/menu/list_reply_policies.xml
 create mode 100644 mastodon/src/main/res/menu/menu_list.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/CreateList.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/CreateList.java
new file mode 100644
index 000000000..f30dde544
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/CreateList.java
@@ -0,0 +1,19 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.ListTimeline;
+
+public class CreateList extends MastodonAPIRequest<ListTimeline> {
+	public CreateList(String title, ListTimeline.RepliesPolicy repliesPolicy) {
+		super(HttpMethod.POST, "/lists", ListTimeline.class);
+		Request req = new Request();
+		req.title = title;
+		req.repliesPolicy = repliesPolicy;
+		setRequestBody(req);
+	}
+
+	public static class Request {
+		public String title;
+		public ListTimeline.RepliesPolicy repliesPolicy;
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/UpdateList.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/UpdateList.java
new file mode 100644
index 000000000..0a6814277
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/UpdateList.java
@@ -0,0 +1,14 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.ListTimeline;
+
+public class UpdateList extends MastodonAPIRequest<ListTimeline> {
+	public UpdateList(String id, String title, ListTimeline.RepliesPolicy repliesPolicy) {
+		super(HttpMethod.PUT, "/lists/" + id, ListTimeline.class);
+		CreateList.Request req = new CreateList.Request();
+		req.title = title;
+		req.repliesPolicy = repliesPolicy;
+		setRequestBody(req);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
index 8f33eee01..2cfd826bf 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
@@ -1,6 +1,9 @@
 package org.joinmastodon.android.fragments;
 
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
@@ -12,16 +15,21 @@ import androidx.recyclerview.widget.RecyclerView;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.MastodonAPIRequest;
 import org.joinmastodon.android.api.requests.lists.AddAccountsToList;
+import org.joinmastodon.android.api.requests.lists.CreateList;
 import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
 import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.views.ListTimelineEditor;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.fragments.BaseRecyclerFragment;
 import me.grishka.appkit.utils.BindableViewHolder;
@@ -34,6 +42,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
     private HashMap<String, Boolean> userInListBefore = new HashMap<>();
     private HashMap<String, Boolean> userInList = new HashMap<>();
     private int inProgress = 0;
+    private ListsAdapter adapter;
 
     public ListTimelinesFragment() {
         super(10);
@@ -49,7 +58,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
             profileAccountId=args.getString("profileAccount");
             profileDisplayUsername=args.getString("profileDisplayUsername");
             setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
-//            setHasOptionsMenu(true);
+            setHasOptionsMenu(true);
         }
     }
 
@@ -60,20 +69,38 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
             loadData();
     }
 
-//    @Override
-//    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-//        Button saveButton=new Button(getActivity());
-//        saveButton.setText(R.string.save);
-//        saveButton.setOnClickListener(this::onSaveClick);
-//        LinearLayout wrap=new LinearLayout(getActivity());
-//        wrap.setOrientation(LinearLayout.HORIZONTAL);
-//        wrap.addView(saveButton, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-//        wrap.setPadding(V.dp(16), V.dp(4), V.dp(16), V.dp(8));
-//        wrap.setClipToPadding(false);
-//        MenuItem item=menu.add(R.string.save);
-//        item.setActionView(wrap);
-//        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-//    }
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_list, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.create) {
+            ListTimelineEditor editor = new ListTimelineEditor(getContext());
+            new M3AlertDialogBuilder(getActivity())
+                    .setTitle(R.string.sk_create_list_title)
+                    .setView(editor)
+                    .setPositiveButton(R.string.sk_create, (d, which) -> {
+                        new CreateList(editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
+                            @Override
+                            public void onSuccess(ListTimeline list) {
+                                saveListMembership(list.id, true);
+                                data.add(0, list);
+                                adapter.notifyItemRangeInserted(0, 1);
+                            }
+
+                            @Override
+                            public void onError(ErrorResponse error) {
+                                error.showToast(getContext());
+                            }
+                        }).exec(accountId);
+                    })
+                    .setNegativeButton(R.string.cancel, (d, which) -> {})
+                    .show();
+        }
+        return true;
+    }
 
     private void saveListMembership(String listId, boolean isMember) {
         userInList.put(listId, isMember);
@@ -119,7 +146,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
 
     @Override
     protected RecyclerView.Adapter getAdapter() {
-        return new ListsAdapter();
+        return adapter = new ListsAdapter();
     }
 
     @Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
index 1bd1b1df3..dfad92489 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
@@ -53,6 +53,7 @@ import org.joinmastodon.android.model.PushSubscription;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.OutlineProviders;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.views.TextInputFrameLayout;
 import org.joinmastodon.android.updater.GithubSelfUpdater;
 import org.parceler.Parcels;
 
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/ListTimelineEditor.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/ListTimelineEditor.java
new file mode 100644
index 000000000..3d4f289b7
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/ListTimelineEditor.java
@@ -0,0 +1,85 @@
+package org.joinmastodon.android.ui.views;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.PopupMenu;
+
+import org.joinmastodon.android.R;
+import org.joinmastodon.android.model.ListTimeline;
+
+public class ListTimelineEditor extends LinearLayout {
+    private ListTimeline.RepliesPolicy policy = null;
+    private TextInputFrameLayout input;
+    private Button button;
+
+    @SuppressLint("ClickableViewAccessibility")
+    public ListTimelineEditor(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        LayoutInflater.from(context).inflate(R.layout.list_timeline_editor, this);
+
+        button = findViewById(R.id.button);
+        input = findViewById(R.id.input);
+
+        PopupMenu popupMenu = new PopupMenu(context, button, Gravity.CENTER_HORIZONTAL);
+        popupMenu.inflate(R.menu.list_reply_policies);
+        popupMenu.setOnMenuItemClickListener(this::onMenuItemClick);
+
+        button.setOnTouchListener(popupMenu.getDragToOpenListener());
+        button.setOnClickListener(v->popupMenu.show());
+        input.getEditText().setHint(context.getString(R.string.sk_list_name_hint));
+
+        setRepliesPolicy(ListTimeline.RepliesPolicy.LIST);
+    }
+
+    public void applyList(ListTimeline list) {
+        policy = list.repliesPolicy;
+        input.getEditText().setText(list.title);
+        setRepliesPolicy(list.repliesPolicy);
+    }
+
+    public String getTitle() {
+        return input.getEditText().getText().toString();
+    }
+
+    public ListTimeline.RepliesPolicy getRepliesPolicy() {
+        return policy;
+    }
+
+    public void setRepliesPolicy(ListTimeline.RepliesPolicy policy) {
+        this.policy = policy;
+        switch (policy) {
+            case FOLLOWED -> button.setText(R.string.sk_list_replies_policy_followed);
+            case LIST -> button.setText(R.string.sk_list_replies_policy_list);
+            case NONE -> button.setText(R.string.sk_list_replies_policy_none);
+        }
+    }
+
+    private boolean onMenuItemClick(MenuItem i) {
+        if (i.getItemId() == R.id.reply_policy_none) {
+            setRepliesPolicy(ListTimeline.RepliesPolicy.NONE);
+        } else if (i.getItemId() == R.id.reply_policy_followed) {
+            setRepliesPolicy(ListTimeline.RepliesPolicy.FOLLOWED);
+        } else if (i.getItemId() == R.id.reply_policy_list) {
+            setRepliesPolicy(ListTimeline.RepliesPolicy.LIST);
+        }
+        return true;
+    }
+
+    public ListTimelineEditor(Context context, AttributeSet attrs, int defStyleAttr) {
+        this(context, attrs, defStyleAttr, 0);
+    }
+
+    public ListTimelineEditor(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public ListTimelineEditor(Context context) {
+        this(context, null);
+    }
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/TextInputFrameLayout.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/TextInputFrameLayout.java
new file mode 100644
index 000000000..4a719e0ba
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/TextInputFrameLayout.java
@@ -0,0 +1,51 @@
+package org.joinmastodon.android.ui.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import me.grishka.appkit.utils.V;
+
+public class TextInputFrameLayout extends FrameLayout {
+    private final EditText editText;
+
+    public TextInputFrameLayout(@NonNull Context context, CharSequence hint, CharSequence text) {
+        this(context, null, 0, 0, hint, text);
+    }
+
+    public TextInputFrameLayout(@NonNull Context context) {
+        this(context, null);
+    }
+
+    public TextInputFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public TextInputFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        this(context, attrs, defStyleAttr, 0);
+    }
+
+    public TextInputFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        this(context, attrs, defStyleAttr, defStyleRes, null, null);
+    }
+
+    public TextInputFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes, CharSequence hint, CharSequence text) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        editText = new EditText(context);
+        editText.setHint(hint);
+        editText.setText(text);
+        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        params.setMargins(V.dp(24), V.dp(4), V.dp(24), V.dp(16));
+        editText.setLayoutParams(params);
+        addView(editText);
+    }
+
+    public EditText getEditText() {
+        return editText;
+    }
+}
diff --git a/mastodon/src/main/res/drawable/ic_fluent_channel_add_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_channel_add_24_regular.xml
new file mode 100644
index 000000000..3825138fb
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_channel_add_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M17.75 3c1.733 0 3.15 1.356 3.245 3.066L21 6.25v5.772c-0.463-0.297-0.966-0.536-1.5-0.709V6.25c0-0.918-0.707-1.671-1.606-1.744L17.75 4.5H6.25c-0.6 0-1.13 0.302-1.445 0.763C4.491 5.095 4.132 5 3.75 5 3.57 5 3.393 5.021 3.224 5.062 3.677 3.909 4.77 3.078 6.066 3.005L6.25 3h11.5zm-6.437 16.5c0.173 0.534 0.412 1.037 0.709 1.5H6.25c-1.733 0-3.15-1.357-3.245-3.066L3 17.75V9.372C3.235 9.455 3.487 9.5 3.75 9.5S4.266 9.455 4.5 9.372v8.378c0 0.918 0.707 1.671 1.607 1.744L6.25 19.5h5.063zm0.418-4.997c0.286-0.55 0.65-1.056 1.076-1.5h-4.06l-0.1 0.007c-0.367 0.05-0.65 0.363-0.65 0.743 0 0.414 0.337 0.75 0.75 0.75h2.984zm3.521-5.007c0.415 0 0.75 0.336 0.75 0.75 0 0.38-0.282 0.694-0.648 0.743l-0.102 0.007H8.748c-0.414 0-0.75-0.336-0.75-0.75 0-0.38 0.282-0.693 0.648-0.743l0.102-0.007h6.504zM3.75 6C4.44 6 5 6.56 5 7.25S4.44 8.5 3.75 8.5 2.5 7.94 2.5 7.25 3.06 6 3.75 6zM23 17.5c0-3.038-2.462-5.5-5.5-5.5S12 14.462 12 17.5s2.462 5.5 5.5 5.5 5.5-2.462 5.5-5.5zM18 18l0.001 2.503c0 0.277-0.224 0.5-0.5 0.5s-0.5-0.223-0.5-0.5V18h-2.505c-0.276 0-0.5-0.224-0.5-0.5s0.224-0.5 0.5-0.5H17v-2.5c0-0.277 0.224-0.5 0.5-0.5s0.5 0.223 0.5 0.5V17h2.497c0.276 0 0.5 0.224 0.5 0.5s-0.224 0.5-0.5 0.5H18z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/layout/list_timeline_editor.xml b/mastodon/src/main/res/layout/list_timeline_editor.xml
new file mode 100644
index 000000000..9f1415d9f
--- /dev/null
+++ b/mastodon/src/main/res/layout/list_timeline_editor.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <org.joinmastodon.android.ui.views.AutoOrientationLinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginHorizontal="24dp">
+        <TextView
+            android:id="@+id/text"
+            android:text="@string/sk_list_replies_policy"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginEnd="8dp"
+            android:paddingVertical="8dp"
+            android:gravity="center_vertical"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="16sp" />
+
+        <Button
+            android:id="@+id/button"
+            android:layout_width="wrap_content"
+            android:layout_height="32dp"
+            android:layout_weight="0"
+            android:maxWidth="140dp"
+            android:background="@drawable/bg_inline_button"
+            android:elevation="0dp"
+            android:ellipsize="middle"
+            android:fontFamily="sans-serif-medium"
+            android:singleLine="true"
+            android:stateListAnimator="@null"
+            android:textColor="?android:textColorPrimary"
+            android:textSize="16sp" />
+    </org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
+
+    <org.joinmastodon.android.ui.views.TextInputFrameLayout
+        android:id="@+id/input"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</LinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/menu/list_reply_policies.xml b/mastodon/src/main/res/menu/list_reply_policies.xml
new file mode 100644
index 000000000..65086da38
--- /dev/null
+++ b/mastodon/src/main/res/menu/list_reply_policies.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/reply_policy_list" android:title="@string/sk_list_replies_policy_list" />
+    <item android:id="@+id/reply_policy_followed" android:title="@string/sk_list_replies_policy_followed" />
+    <item android:id="@+id/reply_policy_none" android:title="@string/sk_list_replies_policy_none" />
+</menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/menu/menu_list.xml b/mastodon/src/main/res/menu/menu_list.xml
new file mode 100644
index 000000000..dbd92e417
--- /dev/null
+++ b/mastodon/src/main/res/menu/menu_list.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/create"
+        android:title="@string/sk_create"
+        android:icon="@drawable/ic_fluent_channel_add_24_regular"
+        android:showAsAction="always" />
+</menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 1e0b30513..effccd1f4 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -144,6 +144,13 @@
     <string name="sk_mark_as_read">Mark as read</string>
     <string name="sk_settings_about_instance">About instance</string>
     <string name="sk_settings_single_notification">Only show one notification</string>
+    <string name="sk_create">Create</string>
+    <string name="sk_create_list_title">Create list</string>
+    <string name="sk_list_name_hint">List name</string>
+    <string name="sk_list_replies_policy">Show replies to</string>
+    <string name="sk_list_replies_policy_list">List members</string>
+    <string name="sk_list_replies_policy_followed">Any followed user</string>
+    <string name="sk_list_replies_policy_none">No one</string>
 
     <!--    accessibility labels-->
     <string name="sk_poll_option_add">Add new poll option</string>

From 83b089457ec8bde6e6b9da21d61f414347fc6c24 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Tue, 10 Jan 2023 09:20:56 -0300
Subject: [PATCH 088/200] implement deleting lists

re: sk22#30
---
 .../api/requests/lists/DeleteList.java        | 10 +++++++
 .../fragments/ListTimelineFragment.java       | 19 +++++++++++--
 .../fragments/ListTimelinesFragment.java      | 27 ++++++++++++++++---
 .../android/ui/utils/UiUtils.java             | 24 +++++++++++------
 mastodon/src/main/res/values/strings_sk.xml   |  2 ++
 5 files changed, 69 insertions(+), 13 deletions(-)
 create mode 100644 mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java
new file mode 100644
index 000000000..64620adac
--- /dev/null
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java
@@ -0,0 +1,10 @@
+package org.joinmastodon.android.api.requests.lists;
+
+import org.joinmastodon.android.api.MastodonAPIRequest;
+import org.joinmastodon.android.model.ListTimeline;
+
+public class DeleteList extends MastodonAPIRequest<Object> {
+	public DeleteList(String id) {
+		super(HttpMethod.DELETE, "/lists/" + id, Object.class);
+	}
+}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
index 0c1c4a0cc..83a16f300 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
@@ -41,8 +42,22 @@ public class ListTimelineFragment extends StatusListFragment {
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
-        // TODO: implement edit, delete
-        // inflater.inflate(R.menu.list, menu);
+        inflater.inflate(R.menu.list, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.edit) {
+
+        } else if (item.getItemId() == R.id.delete) {
+            UiUtils.confirmDeleteList(getActivity(), accountID, listID, () -> {
+                Bundle args = new Bundle();
+                args.putString("listID", listID);
+                setResult(true, args);
+                Nav.finish(this);
+            });
+        }
+        return true;
     }
 
     @Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
index 2cfd826bf..8c9a18470 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
@@ -20,7 +20,6 @@ import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
 import org.joinmastodon.android.model.ListTimeline;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
-import org.joinmastodon.android.ui.utils.UiUtils;
 import org.joinmastodon.android.ui.views.ListTimelineEditor;
 
 import java.util.ArrayList;
@@ -28,6 +27,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
+import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.Callback;
 import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
@@ -36,6 +36,8 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
 public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> implements ScrollableToTop {
+    private static final int LIST_DELETED_RESULT = 987;
+
     private String accountId;
     private String profileAccountId;
     private String profileDisplayUsername;
@@ -145,7 +147,22 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
     }
 
     @Override
-    protected RecyclerView.Adapter getAdapter() {
+    public void onFragmentResult(int reqCode, boolean listDeleted, Bundle result){
+        if (reqCode == LIST_DELETED_RESULT && listDeleted) {
+            String listID = result.getString("listID");
+
+            for (int i = 0; i < data.size(); i++) {
+                if (data.get(i).id.equals(listID)) {
+                    data.remove(i);
+                    adapter.notifyItemRemoved(i);
+                    break;
+                }
+            }
+        }
+    }
+
+    @Override
+    protected RecyclerView.Adapter<ListViewHolder> getAdapter() {
         return adapter = new ListsAdapter();
     }
 
@@ -202,7 +219,11 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
 
         @Override
         public void onClick() {
-            UiUtils.openListTimeline(getActivity(), accountId, item);
+            Bundle args=new Bundle();
+            args.putString("account", accountId);
+            args.putString("listID", item.id);
+            args.putString("listTitle", item.title);
+            Nav.goForResult(getActivity(), ListTimelineFragment.class, args, LIST_DELETED_RESULT, ListTimelinesFragment.this);
         }
     }
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index dd8ce7533..52ee0ca7e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -52,6 +52,7 @@ import org.joinmastodon.android.api.requests.accounts.SetAccountMuted;
 import org.joinmastodon.android.api.requests.accounts.SetDomainBlocked;
 import org.joinmastodon.android.api.requests.accounts.AuthorizeFollowRequest;
 import org.joinmastodon.android.api.requests.accounts.RejectFollowRequest;
+import org.joinmastodon.android.api.requests.lists.DeleteList;
 import org.joinmastodon.android.api.requests.notifications.DismissNotification;
 import org.joinmastodon.android.api.requests.search.GetSearchResults;
 import org.joinmastodon.android.api.requests.statuses.CreateStatus;
@@ -339,14 +340,6 @@ public class UiUtils{
 		Nav.go((Activity)context, HashtagTimelineFragment.class, args);
 	}
 
-	public static void openListTimeline(Context context, String accountID, ListTimeline list){
-		Bundle args=new Bundle();
-		args.putString("account", accountID);
-		args.putString("listID", list.id);
-		args.putString("listTitle", list.title);
-		Nav.go((Activity)context, ListTimelineFragment.class, args);
-	}
-
 	public static void showConfirmationAlert(Context context, @StringRes int title, @StringRes int message, @StringRes int confirmButton, Runnable onConfirmed){
 		showConfirmationAlert(context, title, message, confirmButton, 0, onConfirmed);
 	}
@@ -541,6 +534,21 @@ public class UiUtils{
 		);
 	}
 
+	public static void confirmDeleteList(Activity activity, String accountID, String listID, Runnable callback) {
+		showConfirmationAlert(activity, R.string.sk_delete_list, R.string.sk_delete_list_confirm, R.string.delete, R.drawable.ic_fluent_delete_28_regular,
+				() -> new DeleteList(listID).setCallback(new Callback<>() {
+					@Override
+					public void onSuccess(Object o) {
+						callback.run();
+					}
+
+					@Override
+					public void onError(ErrorResponse error) {
+						error.showToast(activity);
+					}
+				}).exec(accountID));
+	}
+
 	public static void setRelationshipToActionButton(Relationship relationship, Button button){
 		setRelationshipToActionButton(relationship, button, false);
 	}
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index effccd1f4..e74d39354 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -151,6 +151,8 @@
     <string name="sk_list_replies_policy_list">List members</string>
     <string name="sk_list_replies_policy_followed">Any followed user</string>
     <string name="sk_list_replies_policy_none">No one</string>
+    <string name="sk_delete_list">Delete list</string>
+    <string name="sk_delete_list_confirm">Are you sure you want to delete this list?</string>
 
     <!--    accessibility labels-->
     <string name="sk_poll_option_add">Add new poll option</string>

From 3713063ce3e445cc1ae6e3be98d959c4f4a83298 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Tue, 10 Jan 2023 09:56:37 -0300
Subject: [PATCH 089/200] implement editing lists

re: sk22#30
---
 .../fragments/ListTimelineFragment.java       | 44 +++++++++++++++++--
 .../fragments/ListTimelinesFragment.java      | 23 ++++++----
 .../android/ui/views/ListTimelineEditor.java  | 11 +++--
 .../main/res/layout/list_timeline_editor.xml  | 10 ++---
 mastodon/src/main/res/values/strings_sk.xml   |  7 +--
 5 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
index 83a16f300..5423d65ea 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
@@ -10,13 +10,20 @@ import android.view.ViewGroup;
 import android.widget.ImageButton;
 
 import org.joinmastodon.android.R;
+import org.joinmastodon.android.api.requests.lists.CreateList;
+import org.joinmastodon.android.api.requests.lists.UpdateList;
 import org.joinmastodon.android.api.requests.timelines.GetListTimeline;
+import org.joinmastodon.android.model.ListTimeline;
 import org.joinmastodon.android.model.Status;
+import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.utils.UiUtils;
+import org.joinmastodon.android.ui.views.ListTimelineEditor;
 
 import java.util.List;
 
 import me.grishka.appkit.Nav;
+import me.grishka.appkit.api.Callback;
+import me.grishka.appkit.api.ErrorResponse;
 import me.grishka.appkit.api.SimpleCallback;
 import me.grishka.appkit.utils.V;
 
@@ -24,6 +31,7 @@ import me.grishka.appkit.utils.V;
 public class ListTimelineFragment extends StatusListFragment {
     private String listID;
     private String listTitle;
+    private ListTimeline.RepliesPolicy repliesPolicy;
     private ImageButton fab;
 
     public ListTimelineFragment() {
@@ -33,8 +41,11 @@ public class ListTimelineFragment extends StatusListFragment {
     @Override
     public void onAttach(Activity activity){
         super.onAttach(activity);
-        listID=getArguments().getString("listID");
-        listTitle=getArguments().getString("listTitle");
+        Bundle args = getArguments();
+        listID = args.getString("listID");
+        listTitle = args.getString("listTitle");
+        repliesPolicy = ListTimeline.RepliesPolicy.values()[args.getInt("repliesPolicy", 0)];
+
         setTitle(listTitle);
         setHasOptionsMenu(true);
     }
@@ -47,12 +58,37 @@ public class ListTimelineFragment extends StatusListFragment {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        Bundle args = new Bundle();
+        args.putString("listID", listID);
         if (item.getItemId() == R.id.edit) {
+            ListTimelineEditor editor = new ListTimelineEditor(getContext());
+            editor.applyList(listTitle, repliesPolicy);
+            new M3AlertDialogBuilder(getActivity())
+                    .setTitle(R.string.sk_edit_list_title)
+                    .setView(editor)
+                    .setPositiveButton(R.string.save, (d, which) -> {
+                        new UpdateList(listID, editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
+                            @Override
+                            public void onSuccess(ListTimeline list) {
+                                setTitle(list.title);
+                                listTitle = list.title;
+                                repliesPolicy = list.repliesPolicy;
+                                args.putString("listTitle", listTitle);
+                                args.putInt("repliesPolicy", repliesPolicy.ordinal());
+                                setResult(true, args);
+                            }
 
+                            @Override
+                            public void onError(ErrorResponse error) {
+                                error.showToast(getContext());
+                            }
+                        }).exec(accountID);
+                    })
+                    .setNegativeButton(R.string.cancel, (d, which) -> {})
+                    .show();
         } else if (item.getItemId() == R.id.delete) {
             UiUtils.confirmDeleteList(getActivity(), accountID, listID, () -> {
-                Bundle args = new Bundle();
-                args.putString("listID", listID);
+                args.putBoolean("deleted", true);
                 setResult(true, args);
                 Nav.finish(this);
             });
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
index 8c9a18470..794216148 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
@@ -36,7 +36,7 @@ import me.grishka.appkit.utils.BindableViewHolder;
 import me.grishka.appkit.views.UsableRecyclerView;
 
 public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> implements ScrollableToTop {
-    private static final int LIST_DELETED_RESULT = 987;
+    private static final int LIST_CHANGED_RESULT = 987;
 
     private String accountId;
     private String profileAccountId;
@@ -147,14 +147,20 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
     }
 
     @Override
-    public void onFragmentResult(int reqCode, boolean listDeleted, Bundle result){
-        if (reqCode == LIST_DELETED_RESULT && listDeleted) {
+    public void onFragmentResult(int reqCode, boolean listChanged, Bundle result){
+        if (reqCode == LIST_CHANGED_RESULT && listChanged) {
             String listID = result.getString("listID");
-
             for (int i = 0; i < data.size(); i++) {
-                if (data.get(i).id.equals(listID)) {
-                    data.remove(i);
-                    adapter.notifyItemRemoved(i);
+                ListTimeline item = data.get(i);
+                if (item.id.equals(listID)) {
+                    if (result.getBoolean("deleted")) {
+                        data.remove(i);
+                        adapter.notifyItemRemoved(i);
+                    } else {
+                        item.title = result.getString("listTitle", item.title);
+                        item.repliesPolicy = ListTimeline.RepliesPolicy.values()[result.getInt("repliesPolicy")];
+                        adapter.notifyItemChanged(i);
+                    }
                     break;
                 }
             }
@@ -223,7 +229,8 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
             args.putString("account", accountId);
             args.putString("listID", item.id);
             args.putString("listTitle", item.title);
-            Nav.goForResult(getActivity(), ListTimelineFragment.class, args, LIST_DELETED_RESULT, ListTimelinesFragment.this);
+            args.putInt("repliesPolicy", item.repliesPolicy.ordinal());
+            Nav.goForResult(getActivity(), ListTimelineFragment.class, args, LIST_CHANGED_RESULT, ListTimelinesFragment.this);
         }
     }
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/views/ListTimelineEditor.java b/mastodon/src/main/java/org/joinmastodon/android/ui/views/ListTimelineEditor.java
index 3d4f289b7..d1f2fbf06 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/views/ListTimelineEditor.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/views/ListTimelineEditor.java
@@ -15,8 +15,8 @@ import org.joinmastodon.android.model.ListTimeline;
 
 public class ListTimelineEditor extends LinearLayout {
     private ListTimeline.RepliesPolicy policy = null;
-    private TextInputFrameLayout input;
-    private Button button;
+    private final TextInputFrameLayout input;
+    private final Button button;
 
     @SuppressLint("ClickableViewAccessibility")
     public ListTimelineEditor(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
@@ -37,10 +37,9 @@ public class ListTimelineEditor extends LinearLayout {
         setRepliesPolicy(ListTimeline.RepliesPolicy.LIST);
     }
 
-    public void applyList(ListTimeline list) {
-        policy = list.repliesPolicy;
-        input.getEditText().setText(list.title);
-        setRepliesPolicy(list.repliesPolicy);
+    public void applyList(String title, ListTimeline.RepliesPolicy policy) {
+        input.getEditText().setText(title);
+        setRepliesPolicy(policy);
     }
 
     public String getTitle() {
diff --git a/mastodon/src/main/res/layout/list_timeline_editor.xml b/mastodon/src/main/res/layout/list_timeline_editor.xml
index 9f1415d9f..2a1c6a385 100644
--- a/mastodon/src/main/res/layout/list_timeline_editor.xml
+++ b/mastodon/src/main/res/layout/list_timeline_editor.xml
@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <org.joinmastodon.android.ui.views.AutoOrientationLinearLayout
-        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
@@ -12,11 +11,12 @@
         <TextView
             android:id="@+id/text"
             android:text="@string/sk_list_replies_policy"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:layout_marginEnd="8dp"
             android:paddingVertical="8dp"
+            android:singleLine="true"
+            android:ellipsize="none"
             android:gravity="center_vertical"
             android:textColor="?android:textColorPrimary"
             android:textSize="16sp" />
@@ -25,11 +25,9 @@
             android:id="@+id/button"
             android:layout_width="wrap_content"
             android:layout_height="32dp"
-            android:layout_weight="0"
-            android:maxWidth="140dp"
             android:background="@drawable/bg_inline_button"
             android:elevation="0dp"
-            android:ellipsize="middle"
+            android:ellipsize="none"
             android:fontFamily="sans-serif-medium"
             android:singleLine="true"
             android:stateListAnimator="@null"
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index e74d39354..5f8c9c6f9 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -148,11 +148,12 @@
     <string name="sk_create_list_title">Create list</string>
     <string name="sk_list_name_hint">List name</string>
     <string name="sk_list_replies_policy">Show replies to</string>
-    <string name="sk_list_replies_policy_list">List members</string>
-    <string name="sk_list_replies_policy_followed">Any followed user</string>
-    <string name="sk_list_replies_policy_none">No one</string>
+    <string name="sk_list_replies_policy_list">list members</string>
+    <string name="sk_list_replies_policy_followed">followed users</string>
+    <string name="sk_list_replies_policy_none">no one</string>
     <string name="sk_delete_list">Delete list</string>
     <string name="sk_delete_list_confirm">Are you sure you want to delete this list?</string>
+    <string name="sk_edit_list_title">Edit list</string>
 
     <!--    accessibility labels-->
     <string name="sk_poll_option_add">Add new poll option</string>

From 3842ecb0d1a66f77dcb92962a192d2222dfb76e5 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Tue, 10 Jan 2023 10:26:18 -0300
Subject: [PATCH 090/200] move lists and change icons

---
 .../android/PushNotificationReceiver.java     |  4 +-
 .../fragments/ListTimelineFragment.java       |  1 +
 .../fragments/ListTimelinesFragment.java      |  7 +++-
 .../android/fragments/ProfileFragment.java    | 11 +++---
 .../fragments/discover/DiscoverFragment.java  | 37 +++++--------------
 .../android/ui/utils/UiUtils.java             | 20 +++++-----
 .../drawable/ic_fluent_people_24_regular.xml  |  3 ++
 .../ic_fluent_people_add_24_regular.xml       |  3 ++
 .../ic_fluent_people_add_28_regular.xml       |  3 ++
 .../ic_fluent_people_list_24_regular.xml      |  3 ++
 .../ic_fluent_people_list_28_regular.xml      |  3 ++
 mastodon/src/main/res/menu/menu_list.xml      |  2 +-
 mastodon/src/main/res/menu/profile.xml        |  2 +-
 mastodon/src/main/res/menu/profile_own.xml    |  1 +
 mastodon/src/main/res/values/strings_sk.xml   |  1 +
 15 files changed, 53 insertions(+), 48 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
index 3b8dfbb28..3cd93eb38 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
@@ -130,14 +130,14 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		contentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 		contentIntent.putExtra("fromNotification", true);
 		contentIntent.putExtra("accountID", accountID);
-		contentIntent.putExtra("notificationID", notificationID);
+		contentIntent.putExtra("notificationID", notificationId);
 		if(notification!=null){
 			contentIntent.putExtra("notification", Parcels.wrap(notification));
 		}
 		builder.setContentTitle(pn.title)
 				.setContentText(pn.body)
 				.setStyle(new Notification.BigTextStyle().bigText(pn.body))
-				.setContentIntent(PendingIntent.getActivity(context, notificationID, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
+				.setContentIntent(PendingIntent.getActivity(context, notificationId, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
 				.setWhen(notification==null ? System.currentTimeMillis() : notification.createdAt.toEpochMilli())
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
index 5423d65ea..96bc5165b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
@@ -65,6 +65,7 @@ public class ListTimelineFragment extends StatusListFragment {
             editor.applyList(listTitle, repliesPolicy);
             new M3AlertDialogBuilder(getActivity())
                     .setTitle(R.string.sk_edit_list_title)
+                    .setIcon(R.drawable.ic_fluent_people_list_28_regular)
                     .setView(editor)
                     .setPositiveButton(R.string.save, (d, which) -> {
                         new UpdateList(listID, editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
index 794216148..4c8e70d5a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
@@ -55,12 +55,14 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
         super.onCreate(savedInstanceState);
         Bundle args=getArguments();
         accountId=args.getString("account");
+        setHasOptionsMenu(true);
 
         if(args.containsKey("profileAccount")){
             profileAccountId=args.getString("profileAccount");
             profileDisplayUsername=args.getString("profileDisplayUsername");
             setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
-            setHasOptionsMenu(true);
+        } else {
+            setTitle(R.string.sk_your_lists);
         }
     }
 
@@ -82,6 +84,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
             ListTimelineEditor editor = new ListTimelineEditor(getContext());
             new M3AlertDialogBuilder(getActivity())
                     .setTitle(R.string.sk_create_list_title)
+                    .setIcon(R.drawable.ic_fluent_people_add_28_regular)
                     .setView(editor)
                     .setPositiveButton(R.string.sk_create, (d, which) -> {
                         new CreateList(editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
@@ -208,7 +211,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
         @Override
         public void onBind(ListTimeline item) {
             title.setText(item.title);
-            title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_community_24_regular), null, null, null);
+            title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_list_24_regular), null, null, null);
             if (profileAccountId != null) {
                 Boolean checked = userInList.get(item.id);
                 listToggle.setVisibility(View.VISIBLE);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 519431d27..d6ac22e20 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -635,17 +635,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
 		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
-		MenuItem manageUserLists=menu.findItem(R.id.manage_user_lists);
 		if(relationship.following) {
 			MenuItem hideBoosts = menu.findItem(R.id.hide_boosts);
 			hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getShortUsername()));
 			hideBoosts.setIcon(relationship.showingReblogs ? R.drawable.ic_fluent_arrow_repeat_all_off_24_regular : R.drawable.ic_fluent_arrow_repeat_all_24_regular);
 			UiUtils.insetPopupMenuIcon(getContext(), hideBoosts);
-			manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
-			manageUserLists.setVisible(true);
+			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
 		}else {
 			menu.findItem(R.id.hide_boosts).setVisible(false);
-			manageUserLists.setVisible(false);
 		}
 		if(!account.isLocal())
 			menu.findItem(R.id.block_domain).setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
@@ -703,8 +700,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}else if(id==R.id.manage_user_lists){
 			final Bundle args=new Bundle();
 			args.putString("account", accountID);
-			args.putString("profileAccount", profileAccountID);
-			args.putString("profileDisplayUsername", account.getDisplayUsername());
+			if (!isOwnProfile) {
+				args.putString("profileAccount", profileAccountID);
+				args.putString("profileDisplayUsername", account.getDisplayUsername());
+			}
 			Nav.go(getActivity(), ListTimelinesFragment.class, args);
 		}else if(id==R.id.followed_hashtags){
 			Bundle args=new Bundle();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
index dd40d2367..6dfea2f68 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
@@ -18,11 +18,9 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.ScrollableToTop;
-import org.joinmastodon.android.fragments.ListTimelinesFragment;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
@@ -57,7 +55,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	private SearchFragment searchFragment;
 	private LocalTimelineFragment localTimelineFragment;
 	private FederatedTimelineFragment federatedTimelineFragment;
-	private ListTimelinesFragment listTimelinesFragment;
 
 	private String accountID;
 	private Runnable searchDebouncer=this::onSearchChangedDebounced;
@@ -81,18 +78,17 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
 
-		tabViews=new FrameLayout[noFederated ? 6 : 7];
+		tabViews=new FrameLayout[noFederated ? 5 : 6];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
 			int switchIndex = noFederated && i > 0 ? i + 1 : i;
 			tabView.setId(switch(switchIndex){
 				case 0 -> R.id.discover_local_timeline;
 				case 1 -> R.id.discover_federated_timeline;
-				case 2 -> R.id.discover_lists;
-				case 3 -> R.id.discover_hashtags;
-				case 4 -> R.id.discover_posts;
-				case 5 -> R.id.discover_news;
-				case 6 -> R.id.discover_users;
+				case 2 -> R.id.discover_hashtags;
+				case 3 -> R.id.discover_posts;
+				case 4 -> R.id.discover_news;
+				case 5 -> R.id.discover_users;
 				default -> throw new IllegalStateException("Unexpected value: "+switchIndex);
 			});
 			tabView.setVisibility(View.GONE);
@@ -139,16 +135,12 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			localTimelineFragment=new LocalTimelineFragment();
 			localTimelineFragment.setArguments(args);
 
-			listTimelinesFragment=new ListTimelinesFragment();
-			listTimelinesFragment.setArguments(args);
-
 			FragmentTransaction transaction = getChildFragmentManager().beginTransaction()
 					.add(R.id.discover_posts, postsFragment)
 					.add(R.id.discover_local_timeline, localTimelineFragment)
 					.add(R.id.discover_hashtags, hashtagsFragment)
 					.add(R.id.discover_news, newsFragment)
-					.add(R.id.discover_users, accountsFragment)
-					.add(R.id.discover_lists, listTimelinesFragment);
+					.add(R.id.discover_users, accountsFragment);
 
 			if (!noFederated) {
 				federatedTimelineFragment=new FederatedTimelineFragment();
@@ -166,12 +158,10 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 				tab.setText(switch(position){
 					case 0 -> R.string.local_timeline;
 					case 1 -> R.string.sk_federated_timeline;
-					case 2 -> R.string.sk_list_timelines;
-					case 3 -> R.string.hashtags;
-					case 4 -> R.string.posts;
-					case 5 -> R.string.news;
-					case 6 -> R.string.for_you;
-
+					case 2 -> R.string.hashtags;
+					case 3 -> R.string.posts;
+					case 4 -> R.string.news;
+					case 5 -> R.string.for_you;
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);
@@ -301,7 +291,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			case 3 -> postsFragment;
 			case 4 -> newsFragment;
 			case 5 -> accountsFragment;
-			case 6 -> listTimelinesFragment;
 			default -> throw new IllegalStateException("Unexpected value: "+page);
 		};
 	}
@@ -358,10 +347,4 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			return position;
 		}
 	}
-
-	public void selectSearch(){
-		searchEdit.requestFocus();
-		onSearchEditFocusChanged(searchEdit, true);
-		getActivity().getSystemService(InputMethodManager.class).showSoftInput(searchEdit, 0);
-	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index 52ee0ca7e..1eef7802b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -537,16 +537,18 @@ public class UiUtils{
 	public static void confirmDeleteList(Activity activity, String accountID, String listID, Runnable callback) {
 		showConfirmationAlert(activity, R.string.sk_delete_list, R.string.sk_delete_list_confirm, R.string.delete, R.drawable.ic_fluent_delete_28_regular,
 				() -> new DeleteList(listID).setCallback(new Callback<>() {
-					@Override
-					public void onSuccess(Object o) {
-						callback.run();
-					}
+							@Override
+							public void onSuccess(Object o) {
+								callback.run();
+							}
 
-					@Override
-					public void onError(ErrorResponse error) {
-						error.showToast(activity);
-					}
-				}).exec(accountID));
+							@Override
+							public void onError(ErrorResponse error) {
+								error.showToast(activity);
+							}
+						})
+						.wrapProgress(activity, R.string.deleting, false)
+						.exec(accountID));
 	}
 
 	public static void setRelationshipToActionButton(Relationship relationship, Button button){
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml
new file mode 100644
index 000000000..7e747822e
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M5.5 8c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5S5.5 9.38 5.5 8zM8 4C5.79 4 4 5.79 4 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 6c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zm-2.752 13.038c0.703 0.285 1.604 0.462 2.753 0.462 2.282 0 3.586-0.697 4.297-1.558 0.345-0.418 0.52-0.84 0.61-1.163 0.044-0.16 0.067-0.299 0.08-0.402 0.006-0.052 0.009-0.095 0.01-0.128l0.003-0.043v-0.027c0-1.204-0.975-2.179-2.179-2.179H14.18c-0.028 0-0.055 0-0.082 0.002 0.394 0.41 0.68 0.925 0.816 1.498h4.908c0.372 0 0.674 0.299 0.679 0.669L20.498 16.2c-0.005 0.038-0.015 0.1-0.037 0.18-0.043 0.16-0.133 0.38-0.32 0.605C19.792 17.412 18.97 18 17.002 18c-0.98 0-1.676-0.146-2.17-0.345-0.108 0.4-0.286 0.883-0.583 1.383zM4.25 14C3.007 14 2 15.007 2 16.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 19.974 5.172 21 8 21c2.828 0 4.39-1.025 5.208-2.195 0.396-0.565 0.592-1.127 0.69-1.549 0.05-0.211 0.075-0.39 0.088-0.52 0.007-0.066 0.01-0.12 0.012-0.159L14 16.527V16.25c0-1.243-1.007-2.25-2.25-2.25h-7.5zM3.5 16.507V16.25c0-0.414 0.336-0.75 0.75-0.75h7.5c0.414 0 0.75 0.336 0.75 0.75v0.257l-0.007 0.08c-0.007 0.074-0.023 0.188-0.055 0.329-0.066 0.281-0.198 0.656-0.459 1.029C11.486 18.65 10.422 19.5 8 19.5s-3.486-0.85-3.98-1.555c-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.328-0.004-0.038-0.006-0.065-0.006-0.08z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml
new file mode 100644
index 000000000..84cd0634b
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M5.5 7c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5S9.38 9.5 8 9.5 5.5 8.38 5.5 7zM8 3C5.79 3 4 4.79 4 7s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 5c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zM4.25 13C3.007 13 2 14.007 2 15.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 18.974 5.172 20 8 20c1.369 0 2.441-0.24 3.276-0.62-0.15-0.495-0.241-1.014-0.268-1.55C10.363 18.21 9.413 18.5 8 18.5c-2.422 0-3.486-0.85-3.98-1.555-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.329C3.502 15.55 3.5 15.522 3.5 15.507V15.25c0-0.414 0.336-0.75 0.75-0.75h7.482c0.249-0.477 0.555-0.919 0.909-1.317C12.366 13.065 12.066 13 11.75 13h-7.5zM23 17.5c0-3.038-2.462-5.5-5.5-5.5S12 14.462 12 17.5s2.462 5.5 5.5 5.5 5.5-2.462 5.5-5.5zM18 18l0.001 2.503c0 0.277-0.224 0.5-0.5 0.5s-0.5-0.223-0.5-0.5V18h-2.505c-0.276 0-0.5-0.224-0.5-0.5s0.224-0.5 0.5-0.5H17v-2.5c0-0.277 0.224-0.5 0.5-0.5s0.5 0.223 0.5 0.5V17h2.497c0.276 0 0.5 0.224 0.5 0.5s-0.224 0.5-0.5 0.5H18z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml
new file mode 100644
index 000000000..370ecb02a
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
+    <path android:pathData="M9.5 4C7.015 4 5 6.015 5 8.5S7.015 13 9.5 13 14 10.985 14 8.5 11.985 4 9.5 4zm-3 4.5c0-1.657 1.343-3 3-3s3 1.343 3 3-1.343 3-3 3-3-1.343-3-3zM20 6c-1.933 0-3.5 1.567-3.5 3.5S18.067 13 20 13s3.5-1.567 3.5-3.5S21.933 6 20 6zm-2 3.5c0-1.105 0.895-2 2-2s2 0.895 2 2-0.895 2-2 2-2-0.895-2-2zM4.25 15C3.007 15 2 16.007 2 17.25v0.531l0.003 0.057c0.002 0.046 0.006 0.109 0.014 0.185 0.017 0.153 0.049 0.363 0.11 0.612 0.125 0.497 0.373 1.156 0.867 1.815C4.008 21.803 5.942 23 9.5 23c1.531 0 2.762-0.222 3.747-0.582-0.128-0.489-0.21-0.996-0.236-1.518-0.836 0.355-1.97 0.6-3.511 0.6-3.192 0-4.633-1.053-5.306-1.95-0.35-0.466-0.524-0.932-0.61-1.279-0.044-0.173-0.065-0.314-0.075-0.408-0.005-0.046-0.007-0.08-0.008-0.1L3.5 17.745V17.25c0-0.414 0.336-0.75 0.75-0.75h9.905c0.33-0.523 0.723-1.002 1.168-1.426C15.14 15.026 14.948 15 14.75 15H4.25zM27 20.5c0 3.59-2.91 6.5-6.5 6.5S14 24.09 14 20.5s2.91-6.5 6.5-6.5 6.5 2.91 6.5 6.5zm-6-4c0-0.276-0.224-0.5-0.5-0.5S20 16.224 20 16.5V20h-3.5c-0.276 0-0.5 0.224-0.5 0.5s0.224 0.5 0.5 0.5H20v3.5c0 0.276 0.224 0.5 0.5 0.5s0.5-0.224 0.5-0.5V21h3.5c0.276 0 0.5-0.224 0.5-0.5S24.776 20 24.5 20H21v-3.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml
new file mode 100644
index 000000000..f4b216279
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M5.5 8c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5S5.5 9.38 5.5 8zM8 4C5.79 4 4 5.79 4 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 6c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zM4.25 14C3.007 14 2 15.007 2 16.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 19.974 5.172 21 8 21c1.819 0 3.113-0.424 4.024-1.037 0.061-0.375 0.242-0.709 0.501-0.963-0.29-0.284-0.48-0.667-0.518-1.095l-0.028 0.04C11.486 18.65 10.422 19.5 8 19.5s-3.486-0.85-3.98-1.555c-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.328-0.004-0.038-0.006-0.065-0.006-0.08L3.5 16.495V16.25c0-0.414 0.336-0.75 0.75-0.75h7.5c0.098 0 0.19 0.019 0.276 0.052C12.009 15.454 12 15.353 12 15.25c0-0.438 0.161-0.84 0.428-1.146C12.214 14.036 11.986 14 11.75 14h-7.5zm8.275 2.5l-0.027 0.027 0.002-0.02v-0.032l0.025 0.025zm1.225-2c-0.414 0-0.75 0.336-0.75 0.75S13.336 16 13.75 16h7.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-7.5zm0 2.5C13.336 17 13 17.336 13 17.75s0.336 0.75 0.75 0.75h7.5c0.414 0 0.75-0.336 0.75-0.75S21.664 17 21.25 17h-7.5zm0 2.5c-0.414 0-0.75 0.336-0.75 0.75S13.336 21 13.75 21h7.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-7.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml
new file mode 100644
index 000000000..39394a989
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
+    <path android:pathData="M5 9.5C5 7.015 7.015 5 9.5 5S14 7.015 14 9.5 11.985 14 9.5 14 5 11.985 5 9.5zm4.5-3c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zm7 4C16.5 8.567 18.067 7 20 7s3.5 1.567 3.5 3.5S21.933 14 20 14s-3.5-1.567-3.5-3.5zm3.5-2c-1.105 0-2 0.895-2 2s0.895 2 2 2 2-0.895 2-2-0.895-2-2-2zM2 18.25C2 17.007 3.007 16 4.25 16h10.5c0.236 0 0.464 0.036 0.678 0.104C15.16 16.41 15 16.812 15 17.25c0 0.103 0.009 0.204 0.026 0.302-0.085-0.033-0.178-0.052-0.276-0.052H4.25c-0.414 0-0.75 0.336-0.75 0.75v0.513l0.009 0.1c0.01 0.094 0.03 0.235 0.074 0.408 0.087 0.347 0.261 0.813 0.61 1.279 0.674 0.897 2.115 1.95 5.307 1.95s4.633-1.053 5.306-1.95c0.072-0.096 0.136-0.191 0.194-0.286 0.005 0.608 0.32 1.141 0.793 1.451-0.066 0.078-0.135 0.154-0.208 0.229-0.049 0.044-0.095 0.09-0.139 0.139C14.332 23.155 12.489 24 9.5 24c-3.558 0-5.492-1.197-6.506-2.55-0.495-0.659-0.742-1.318-0.866-1.815-0.062-0.249-0.094-0.459-0.11-0.612-0.009-0.076-0.013-0.139-0.015-0.185L2 18.781V18.25zm14.75-1.75c-0.414 0-0.75 0.336-0.75 0.75S16.336 18 16.75 18h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5zm0 3c-0.414 0-0.75 0.336-0.75 0.75S16.336 21 16.75 21h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5zm0 3c-0.414 0-0.75 0.336-0.75 0.75S16.336 24 16.75 24h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/menu/menu_list.xml b/mastodon/src/main/res/menu/menu_list.xml
index dbd92e417..93123a9f2 100644
--- a/mastodon/src/main/res/menu/menu_list.xml
+++ b/mastodon/src/main/res/menu/menu_list.xml
@@ -3,6 +3,6 @@
     <item
         android:id="@+id/create"
         android:title="@string/sk_create"
-        android:icon="@drawable/ic_fluent_channel_add_24_regular"
+        android:icon="@drawable/ic_fluent_people_add_24_regular"
         android:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/menu/profile.xml b/mastodon/src/main/res/menu/profile.xml
index 1f2a99a2d..abf7b0e03 100644
--- a/mastodon/src/main/res/menu/profile.xml
+++ b/mastodon/src/main/res/menu/profile.xml
@@ -6,6 +6,6 @@
 	<item android:id="@+id/report" android:title="@string/report_user" android:icon="@drawable/ic_fluent_warning_24_regular"/>
 	<item android:id="@+id/block_domain" android:title="@string/block_domain" android:icon="@drawable/ic_fluent_shield_prohibited_24_regular"/>
 	<item android:id="@+id/hide_boosts" android:title="@string/hide_boosts_from_user" android:icon="@drawable/ic_fluent_arrow_repeat_all_off_24_regular"/>
-	<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_community_24_regular"/>
+	<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_list_24_regular"/>
 	<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser" android:icon="@drawable/ic_fluent_globe_24_regular"/>
 </menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/menu/profile_own.xml b/mastodon/src/main/res/menu/profile_own.xml
index 07acdf591..14c7b2c30 100644
--- a/mastodon/src/main/res/menu/profile_own.xml
+++ b/mastodon/src/main/res/menu/profile_own.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:id="@+id/followed_hashtags" android:title="@string/sk_hashtags_you_follow" android:icon="@drawable/ic_fluent_number_symbol_24_regular" android:showAsAction="always"/>
+	<item android:id="@+id/manage_user_lists" android:title="@string/sk_your_lists" android:icon="@drawable/ic_fluent_people_list_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/bookmarks" android:title="@string/bookmarks" android:icon="@drawable/ic_fluent_bookmark_multiple_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/favorites" android:title="@string/your_favorites" android:icon="@drawable/ic_fluent_star_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/scheduled" android:title="@string/sk_unsent_posts" android:icon="@drawable/ic_fluent_drafts_24_regular" android:showAsAction="always"/>
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 5f8c9c6f9..88f0772fc 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -154,6 +154,7 @@
     <string name="sk_delete_list">Delete list</string>
     <string name="sk_delete_list_confirm">Are you sure you want to delete this list?</string>
     <string name="sk_edit_list_title">Edit list</string>
+    <string name="sk_your_lists">Your lists</string>
 
     <!--    accessibility labels-->
     <string name="sk_poll_option_add">Add new poll option</string>

From 4b88ce5115578bf031d46d084f5db75f1c855f5f Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 18 Jan 2023 13:45:41 -0300
Subject: [PATCH 091/200] Revert "move lists and change icons"

This reverts commit d0ad5561
---
 .../fragments/ListTimelineFragment.java       |  1 -
 .../fragments/ListTimelinesFragment.java      |  7 ++-----
 .../android/fragments/ProfileFragment.java    | 11 +++++-----
 .../fragments/discover/DiscoverFragment.java  | 14 +++++++++++--
 .../android/ui/utils/UiUtils.java             | 20 +++++++++----------
 .../drawable/ic_fluent_people_24_regular.xml  |  3 ---
 .../ic_fluent_people_add_24_regular.xml       |  3 ---
 .../ic_fluent_people_add_28_regular.xml       |  3 ---
 .../ic_fluent_people_list_24_regular.xml      |  3 ---
 .../ic_fluent_people_list_28_regular.xml      |  3 ---
 mastodon/src/main/res/menu/menu_list.xml      |  2 +-
 mastodon/src/main/res/menu/profile.xml        |  2 +-
 mastodon/src/main/res/menu/profile_own.xml    |  1 -
 13 files changed, 31 insertions(+), 42 deletions(-)
 delete mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml
 delete mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml
 delete mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml
 delete mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml
 delete mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
index 96bc5165b..5423d65ea 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
@@ -65,7 +65,6 @@ public class ListTimelineFragment extends StatusListFragment {
             editor.applyList(listTitle, repliesPolicy);
             new M3AlertDialogBuilder(getActivity())
                     .setTitle(R.string.sk_edit_list_title)
-                    .setIcon(R.drawable.ic_fluent_people_list_28_regular)
                     .setView(editor)
                     .setPositiveButton(R.string.save, (d, which) -> {
                         new UpdateList(listID, editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
index 4c8e70d5a..794216148 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
@@ -55,14 +55,12 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
         super.onCreate(savedInstanceState);
         Bundle args=getArguments();
         accountId=args.getString("account");
-        setHasOptionsMenu(true);
 
         if(args.containsKey("profileAccount")){
             profileAccountId=args.getString("profileAccount");
             profileDisplayUsername=args.getString("profileDisplayUsername");
             setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
-        } else {
-            setTitle(R.string.sk_your_lists);
+            setHasOptionsMenu(true);
         }
     }
 
@@ -84,7 +82,6 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
             ListTimelineEditor editor = new ListTimelineEditor(getContext());
             new M3AlertDialogBuilder(getActivity())
                     .setTitle(R.string.sk_create_list_title)
-                    .setIcon(R.drawable.ic_fluent_people_add_28_regular)
                     .setView(editor)
                     .setPositiveButton(R.string.sk_create, (d, which) -> {
                         new CreateList(editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
@@ -211,7 +208,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
         @Override
         public void onBind(ListTimeline item) {
             title.setText(item.title);
-            title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_list_24_regular), null, null, null);
+            title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_community_24_regular), null, null, null);
             if (profileAccountId != null) {
                 Boolean checked = userInList.get(item.id);
                 listToggle.setVisibility(View.VISIBLE);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index d6ac22e20..519431d27 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -635,14 +635,17 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
 		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
+		MenuItem manageUserLists=menu.findItem(R.id.manage_user_lists);
 		if(relationship.following) {
 			MenuItem hideBoosts = menu.findItem(R.id.hide_boosts);
 			hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getShortUsername()));
 			hideBoosts.setIcon(relationship.showingReblogs ? R.drawable.ic_fluent_arrow_repeat_all_off_24_regular : R.drawable.ic_fluent_arrow_repeat_all_24_regular);
 			UiUtils.insetPopupMenuIcon(getContext(), hideBoosts);
-			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
+			manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
+			manageUserLists.setVisible(true);
 		}else {
 			menu.findItem(R.id.hide_boosts).setVisible(false);
+			manageUserLists.setVisible(false);
 		}
 		if(!account.isLocal())
 			menu.findItem(R.id.block_domain).setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
@@ -700,10 +703,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}else if(id==R.id.manage_user_lists){
 			final Bundle args=new Bundle();
 			args.putString("account", accountID);
-			if (!isOwnProfile) {
-				args.putString("profileAccount", profileAccountID);
-				args.putString("profileDisplayUsername", account.getDisplayUsername());
-			}
+			args.putString("profileAccount", profileAccountID);
+			args.putString("profileDisplayUsername", account.getDisplayUsername());
 			Nav.go(getActivity(), ListTimelinesFragment.class, args);
 		}else if(id==R.id.followed_hashtags){
 			Bundle args=new Bundle();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
index 6dfea2f68..8e69e7b19 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
@@ -18,9 +18,11 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.ScrollableToTop;
+import org.joinmastodon.android.fragments.ListTimelinesFragment;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
@@ -55,6 +57,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	private SearchFragment searchFragment;
 	private LocalTimelineFragment localTimelineFragment;
 	private FederatedTimelineFragment federatedTimelineFragment;
+	private ListTimelinesFragment listTimelinesFragment;
 
 	private String accountID;
 	private Runnable searchDebouncer=this::onSearchChangedDebounced;
@@ -78,7 +81,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
 
-		tabViews=new FrameLayout[noFederated ? 5 : 6];
+		tabViews=new FrameLayout[noFederated ? 6 : 7];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
 			int switchIndex = noFederated && i > 0 ? i + 1 : i;
@@ -89,6 +92,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 				case 3 -> R.id.discover_posts;
 				case 4 -> R.id.discover_news;
 				case 5 -> R.id.discover_users;
+				case 6 -> R.id.discover_lists;
 				default -> throw new IllegalStateException("Unexpected value: "+switchIndex);
 			});
 			tabView.setVisibility(View.GONE);
@@ -135,12 +139,16 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			localTimelineFragment=new LocalTimelineFragment();
 			localTimelineFragment.setArguments(args);
 
+			listTimelinesFragment=new ListTimelinesFragment();
+			listTimelinesFragment.setArguments(args);
+
 			FragmentTransaction transaction = getChildFragmentManager().beginTransaction()
 					.add(R.id.discover_posts, postsFragment)
 					.add(R.id.discover_local_timeline, localTimelineFragment)
 					.add(R.id.discover_hashtags, hashtagsFragment)
 					.add(R.id.discover_news, newsFragment)
-					.add(R.id.discover_users, accountsFragment);
+					.add(R.id.discover_users, accountsFragment)
+					.add(R.id.discover_lists, listTimelinesFragment);
 
 			if (!noFederated) {
 				federatedTimelineFragment=new FederatedTimelineFragment();
@@ -162,6 +170,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 					case 3 -> R.string.posts;
 					case 4 -> R.string.news;
 					case 5 -> R.string.for_you;
+					case 6 -> R.string.sk_list_timelines;
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);
@@ -291,6 +300,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			case 3 -> postsFragment;
 			case 4 -> newsFragment;
 			case 5 -> accountsFragment;
+			case 6 -> listTimelinesFragment;
 			default -> throw new IllegalStateException("Unexpected value: "+page);
 		};
 	}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index 1eef7802b..52ee0ca7e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -537,18 +537,16 @@ public class UiUtils{
 	public static void confirmDeleteList(Activity activity, String accountID, String listID, Runnable callback) {
 		showConfirmationAlert(activity, R.string.sk_delete_list, R.string.sk_delete_list_confirm, R.string.delete, R.drawable.ic_fluent_delete_28_regular,
 				() -> new DeleteList(listID).setCallback(new Callback<>() {
-							@Override
-							public void onSuccess(Object o) {
-								callback.run();
-							}
+					@Override
+					public void onSuccess(Object o) {
+						callback.run();
+					}
 
-							@Override
-							public void onError(ErrorResponse error) {
-								error.showToast(activity);
-							}
-						})
-						.wrapProgress(activity, R.string.deleting, false)
-						.exec(accountID));
+					@Override
+					public void onError(ErrorResponse error) {
+						error.showToast(activity);
+					}
+				}).exec(accountID));
 	}
 
 	public static void setRelationshipToActionButton(Relationship relationship, Button button){
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml
deleted file mode 100644
index 7e747822e..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M5.5 8c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5S5.5 9.38 5.5 8zM8 4C5.79 4 4 5.79 4 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 6c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zm-2.752 13.038c0.703 0.285 1.604 0.462 2.753 0.462 2.282 0 3.586-0.697 4.297-1.558 0.345-0.418 0.52-0.84 0.61-1.163 0.044-0.16 0.067-0.299 0.08-0.402 0.006-0.052 0.009-0.095 0.01-0.128l0.003-0.043v-0.027c0-1.204-0.975-2.179-2.179-2.179H14.18c-0.028 0-0.055 0-0.082 0.002 0.394 0.41 0.68 0.925 0.816 1.498h4.908c0.372 0 0.674 0.299 0.679 0.669L20.498 16.2c-0.005 0.038-0.015 0.1-0.037 0.18-0.043 0.16-0.133 0.38-0.32 0.605C19.792 17.412 18.97 18 17.002 18c-0.98 0-1.676-0.146-2.17-0.345-0.108 0.4-0.286 0.883-0.583 1.383zM4.25 14C3.007 14 2 15.007 2 16.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 19.974 5.172 21 8 21c2.828 0 4.39-1.025 5.208-2.195 0.396-0.565 0.592-1.127 0.69-1.549 0.05-0.211 0.075-0.39 0.088-0.52 0.007-0.066 0.01-0.12 0.012-0.159L14 16.527V16.25c0-1.243-1.007-2.25-2.25-2.25h-7.5zM3.5 16.507V16.25c0-0.414 0.336-0.75 0.75-0.75h7.5c0.414 0 0.75 0.336 0.75 0.75v0.257l-0.007 0.08c-0.007 0.074-0.023 0.188-0.055 0.329-0.066 0.281-0.198 0.656-0.459 1.029C11.486 18.65 10.422 19.5 8 19.5s-3.486-0.85-3.98-1.555c-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.328-0.004-0.038-0.006-0.065-0.006-0.08z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml
deleted file mode 100644
index 84cd0634b..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M5.5 7c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5S9.38 9.5 8 9.5 5.5 8.38 5.5 7zM8 3C5.79 3 4 4.79 4 7s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 5c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zM4.25 13C3.007 13 2 14.007 2 15.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 18.974 5.172 20 8 20c1.369 0 2.441-0.24 3.276-0.62-0.15-0.495-0.241-1.014-0.268-1.55C10.363 18.21 9.413 18.5 8 18.5c-2.422 0-3.486-0.85-3.98-1.555-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.329C3.502 15.55 3.5 15.522 3.5 15.507V15.25c0-0.414 0.336-0.75 0.75-0.75h7.482c0.249-0.477 0.555-0.919 0.909-1.317C12.366 13.065 12.066 13 11.75 13h-7.5zM23 17.5c0-3.038-2.462-5.5-5.5-5.5S12 14.462 12 17.5s2.462 5.5 5.5 5.5 5.5-2.462 5.5-5.5zM18 18l0.001 2.503c0 0.277-0.224 0.5-0.5 0.5s-0.5-0.223-0.5-0.5V18h-2.505c-0.276 0-0.5-0.224-0.5-0.5s0.224-0.5 0.5-0.5H17v-2.5c0-0.277 0.224-0.5 0.5-0.5s0.5 0.223 0.5 0.5V17h2.497c0.276 0 0.5 0.224 0.5 0.5s-0.224 0.5-0.5 0.5H18z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml
deleted file mode 100644
index 370ecb02a..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
-    <path android:pathData="M9.5 4C7.015 4 5 6.015 5 8.5S7.015 13 9.5 13 14 10.985 14 8.5 11.985 4 9.5 4zm-3 4.5c0-1.657 1.343-3 3-3s3 1.343 3 3-1.343 3-3 3-3-1.343-3-3zM20 6c-1.933 0-3.5 1.567-3.5 3.5S18.067 13 20 13s3.5-1.567 3.5-3.5S21.933 6 20 6zm-2 3.5c0-1.105 0.895-2 2-2s2 0.895 2 2-0.895 2-2 2-2-0.895-2-2zM4.25 15C3.007 15 2 16.007 2 17.25v0.531l0.003 0.057c0.002 0.046 0.006 0.109 0.014 0.185 0.017 0.153 0.049 0.363 0.11 0.612 0.125 0.497 0.373 1.156 0.867 1.815C4.008 21.803 5.942 23 9.5 23c1.531 0 2.762-0.222 3.747-0.582-0.128-0.489-0.21-0.996-0.236-1.518-0.836 0.355-1.97 0.6-3.511 0.6-3.192 0-4.633-1.053-5.306-1.95-0.35-0.466-0.524-0.932-0.61-1.279-0.044-0.173-0.065-0.314-0.075-0.408-0.005-0.046-0.007-0.08-0.008-0.1L3.5 17.745V17.25c0-0.414 0.336-0.75 0.75-0.75h9.905c0.33-0.523 0.723-1.002 1.168-1.426C15.14 15.026 14.948 15 14.75 15H4.25zM27 20.5c0 3.59-2.91 6.5-6.5 6.5S14 24.09 14 20.5s2.91-6.5 6.5-6.5 6.5 2.91 6.5 6.5zm-6-4c0-0.276-0.224-0.5-0.5-0.5S20 16.224 20 16.5V20h-3.5c-0.276 0-0.5 0.224-0.5 0.5s0.224 0.5 0.5 0.5H20v3.5c0 0.276 0.224 0.5 0.5 0.5s0.5-0.224 0.5-0.5V21h3.5c0.276 0 0.5-0.224 0.5-0.5S24.776 20 24.5 20H21v-3.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml
deleted file mode 100644
index f4b216279..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M5.5 8c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5S5.5 9.38 5.5 8zM8 4C5.79 4 4 5.79 4 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 6c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zM4.25 14C3.007 14 2 15.007 2 16.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 19.974 5.172 21 8 21c1.819 0 3.113-0.424 4.024-1.037 0.061-0.375 0.242-0.709 0.501-0.963-0.29-0.284-0.48-0.667-0.518-1.095l-0.028 0.04C11.486 18.65 10.422 19.5 8 19.5s-3.486-0.85-3.98-1.555c-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.328-0.004-0.038-0.006-0.065-0.006-0.08L3.5 16.495V16.25c0-0.414 0.336-0.75 0.75-0.75h7.5c0.098 0 0.19 0.019 0.276 0.052C12.009 15.454 12 15.353 12 15.25c0-0.438 0.161-0.84 0.428-1.146C12.214 14.036 11.986 14 11.75 14h-7.5zm8.275 2.5l-0.027 0.027 0.002-0.02v-0.032l0.025 0.025zm1.225-2c-0.414 0-0.75 0.336-0.75 0.75S13.336 16 13.75 16h7.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-7.5zm0 2.5C13.336 17 13 17.336 13 17.75s0.336 0.75 0.75 0.75h7.5c0.414 0 0.75-0.336 0.75-0.75S21.664 17 21.25 17h-7.5zm0 2.5c-0.414 0-0.75 0.336-0.75 0.75S13.336 21 13.75 21h7.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-7.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml
deleted file mode 100644
index 39394a989..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
-    <path android:pathData="M5 9.5C5 7.015 7.015 5 9.5 5S14 7.015 14 9.5 11.985 14 9.5 14 5 11.985 5 9.5zm4.5-3c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zm7 4C16.5 8.567 18.067 7 20 7s3.5 1.567 3.5 3.5S21.933 14 20 14s-3.5-1.567-3.5-3.5zm3.5-2c-1.105 0-2 0.895-2 2s0.895 2 2 2 2-0.895 2-2-0.895-2-2-2zM2 18.25C2 17.007 3.007 16 4.25 16h10.5c0.236 0 0.464 0.036 0.678 0.104C15.16 16.41 15 16.812 15 17.25c0 0.103 0.009 0.204 0.026 0.302-0.085-0.033-0.178-0.052-0.276-0.052H4.25c-0.414 0-0.75 0.336-0.75 0.75v0.513l0.009 0.1c0.01 0.094 0.03 0.235 0.074 0.408 0.087 0.347 0.261 0.813 0.61 1.279 0.674 0.897 2.115 1.95 5.307 1.95s4.633-1.053 5.306-1.95c0.072-0.096 0.136-0.191 0.194-0.286 0.005 0.608 0.32 1.141 0.793 1.451-0.066 0.078-0.135 0.154-0.208 0.229-0.049 0.044-0.095 0.09-0.139 0.139C14.332 23.155 12.489 24 9.5 24c-3.558 0-5.492-1.197-6.506-2.55-0.495-0.659-0.742-1.318-0.866-1.815-0.062-0.249-0.094-0.459-0.11-0.612-0.009-0.076-0.013-0.139-0.015-0.185L2 18.781V18.25zm14.75-1.75c-0.414 0-0.75 0.336-0.75 0.75S16.336 18 16.75 18h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5zm0 3c-0.414 0-0.75 0.336-0.75 0.75S16.336 21 16.75 21h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5zm0 3c-0.414 0-0.75 0.336-0.75 0.75S16.336 24 16.75 24h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
diff --git a/mastodon/src/main/res/menu/menu_list.xml b/mastodon/src/main/res/menu/menu_list.xml
index 93123a9f2..dbd92e417 100644
--- a/mastodon/src/main/res/menu/menu_list.xml
+++ b/mastodon/src/main/res/menu/menu_list.xml
@@ -3,6 +3,6 @@
     <item
         android:id="@+id/create"
         android:title="@string/sk_create"
-        android:icon="@drawable/ic_fluent_people_add_24_regular"
+        android:icon="@drawable/ic_fluent_channel_add_24_regular"
         android:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/menu/profile.xml b/mastodon/src/main/res/menu/profile.xml
index abf7b0e03..1f2a99a2d 100644
--- a/mastodon/src/main/res/menu/profile.xml
+++ b/mastodon/src/main/res/menu/profile.xml
@@ -6,6 +6,6 @@
 	<item android:id="@+id/report" android:title="@string/report_user" android:icon="@drawable/ic_fluent_warning_24_regular"/>
 	<item android:id="@+id/block_domain" android:title="@string/block_domain" android:icon="@drawable/ic_fluent_shield_prohibited_24_regular"/>
 	<item android:id="@+id/hide_boosts" android:title="@string/hide_boosts_from_user" android:icon="@drawable/ic_fluent_arrow_repeat_all_off_24_regular"/>
-	<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_list_24_regular"/>
+	<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_community_24_regular"/>
 	<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser" android:icon="@drawable/ic_fluent_globe_24_regular"/>
 </menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/menu/profile_own.xml b/mastodon/src/main/res/menu/profile_own.xml
index 14c7b2c30..07acdf591 100644
--- a/mastodon/src/main/res/menu/profile_own.xml
+++ b/mastodon/src/main/res/menu/profile_own.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:id="@+id/followed_hashtags" android:title="@string/sk_hashtags_you_follow" android:icon="@drawable/ic_fluent_number_symbol_24_regular" android:showAsAction="always"/>
-	<item android:id="@+id/manage_user_lists" android:title="@string/sk_your_lists" android:icon="@drawable/ic_fluent_people_list_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/bookmarks" android:title="@string/bookmarks" android:icon="@drawable/ic_fluent_bookmark_multiple_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/favorites" android:title="@string/your_favorites" android:icon="@drawable/ic_fluent_star_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/scheduled" android:title="@string/sk_unsent_posts" android:icon="@drawable/ic_fluent_drafts_24_regular" android:showAsAction="always"/>

From 60ee781004c142c727fc35afc3c607a0e52e9291 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 18 Jan 2023 13:47:29 -0300
Subject: [PATCH 092/200] Revert "Revert "move lists and change icons""

This reverts commit 4b88ce5115578bf031d46d084f5db75f1c855f5f.
---
 .../fragments/ListTimelineFragment.java       |  1 +
 .../fragments/ListTimelinesFragment.java      |  7 +++++--
 .../android/fragments/ProfileFragment.java    | 11 +++++-----
 .../fragments/discover/DiscoverFragment.java  | 14 ++-----------
 .../android/ui/utils/UiUtils.java             | 20 ++++++++++---------
 .../drawable/ic_fluent_people_24_regular.xml  |  3 +++
 .../ic_fluent_people_add_24_regular.xml       |  3 +++
 .../ic_fluent_people_add_28_regular.xml       |  3 +++
 .../ic_fluent_people_list_24_regular.xml      |  3 +++
 .../ic_fluent_people_list_28_regular.xml      |  3 +++
 mastodon/src/main/res/menu/menu_list.xml      |  2 +-
 mastodon/src/main/res/menu/profile.xml        |  2 +-
 mastodon/src/main/res/menu/profile_own.xml    |  1 +
 13 files changed, 42 insertions(+), 31 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
index 5423d65ea..96bc5165b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
@@ -65,6 +65,7 @@ public class ListTimelineFragment extends StatusListFragment {
             editor.applyList(listTitle, repliesPolicy);
             new M3AlertDialogBuilder(getActivity())
                     .setTitle(R.string.sk_edit_list_title)
+                    .setIcon(R.drawable.ic_fluent_people_list_28_regular)
                     .setView(editor)
                     .setPositiveButton(R.string.save, (d, which) -> {
                         new UpdateList(listID, editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
index 794216148..4c8e70d5a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
@@ -55,12 +55,14 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
         super.onCreate(savedInstanceState);
         Bundle args=getArguments();
         accountId=args.getString("account");
+        setHasOptionsMenu(true);
 
         if(args.containsKey("profileAccount")){
             profileAccountId=args.getString("profileAccount");
             profileDisplayUsername=args.getString("profileDisplayUsername");
             setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
-            setHasOptionsMenu(true);
+        } else {
+            setTitle(R.string.sk_your_lists);
         }
     }
 
@@ -82,6 +84,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
             ListTimelineEditor editor = new ListTimelineEditor(getContext());
             new M3AlertDialogBuilder(getActivity())
                     .setTitle(R.string.sk_create_list_title)
+                    .setIcon(R.drawable.ic_fluent_people_add_28_regular)
                     .setView(editor)
                     .setPositiveButton(R.string.sk_create, (d, which) -> {
                         new CreateList(editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
@@ -208,7 +211,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
         @Override
         public void onBind(ListTimeline item) {
             title.setText(item.title);
-            title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_community_24_regular), null, null, null);
+            title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_list_24_regular), null, null, null);
             if (profileAccountId != null) {
                 Boolean checked = userInList.get(item.id);
                 listToggle.setVisibility(View.VISIBLE);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 519431d27..d6ac22e20 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -635,17 +635,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
 		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
-		MenuItem manageUserLists=menu.findItem(R.id.manage_user_lists);
 		if(relationship.following) {
 			MenuItem hideBoosts = menu.findItem(R.id.hide_boosts);
 			hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getShortUsername()));
 			hideBoosts.setIcon(relationship.showingReblogs ? R.drawable.ic_fluent_arrow_repeat_all_off_24_regular : R.drawable.ic_fluent_arrow_repeat_all_24_regular);
 			UiUtils.insetPopupMenuIcon(getContext(), hideBoosts);
-			manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
-			manageUserLists.setVisible(true);
+			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
 		}else {
 			menu.findItem(R.id.hide_boosts).setVisible(false);
-			manageUserLists.setVisible(false);
 		}
 		if(!account.isLocal())
 			menu.findItem(R.id.block_domain).setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
@@ -703,8 +700,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}else if(id==R.id.manage_user_lists){
 			final Bundle args=new Bundle();
 			args.putString("account", accountID);
-			args.putString("profileAccount", profileAccountID);
-			args.putString("profileDisplayUsername", account.getDisplayUsername());
+			if (!isOwnProfile) {
+				args.putString("profileAccount", profileAccountID);
+				args.putString("profileDisplayUsername", account.getDisplayUsername());
+			}
 			Nav.go(getActivity(), ListTimelinesFragment.class, args);
 		}else if(id==R.id.followed_hashtags){
 			Bundle args=new Bundle();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
index 8e69e7b19..6dfea2f68 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
@@ -18,11 +18,9 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.ScrollableToTop;
-import org.joinmastodon.android.fragments.ListTimelinesFragment;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
@@ -57,7 +55,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	private SearchFragment searchFragment;
 	private LocalTimelineFragment localTimelineFragment;
 	private FederatedTimelineFragment federatedTimelineFragment;
-	private ListTimelinesFragment listTimelinesFragment;
 
 	private String accountID;
 	private Runnable searchDebouncer=this::onSearchChangedDebounced;
@@ -81,7 +78,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
 
-		tabViews=new FrameLayout[noFederated ? 6 : 7];
+		tabViews=new FrameLayout[noFederated ? 5 : 6];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
 			int switchIndex = noFederated && i > 0 ? i + 1 : i;
@@ -92,7 +89,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 				case 3 -> R.id.discover_posts;
 				case 4 -> R.id.discover_news;
 				case 5 -> R.id.discover_users;
-				case 6 -> R.id.discover_lists;
 				default -> throw new IllegalStateException("Unexpected value: "+switchIndex);
 			});
 			tabView.setVisibility(View.GONE);
@@ -139,16 +135,12 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			localTimelineFragment=new LocalTimelineFragment();
 			localTimelineFragment.setArguments(args);
 
-			listTimelinesFragment=new ListTimelinesFragment();
-			listTimelinesFragment.setArguments(args);
-
 			FragmentTransaction transaction = getChildFragmentManager().beginTransaction()
 					.add(R.id.discover_posts, postsFragment)
 					.add(R.id.discover_local_timeline, localTimelineFragment)
 					.add(R.id.discover_hashtags, hashtagsFragment)
 					.add(R.id.discover_news, newsFragment)
-					.add(R.id.discover_users, accountsFragment)
-					.add(R.id.discover_lists, listTimelinesFragment);
+					.add(R.id.discover_users, accountsFragment);
 
 			if (!noFederated) {
 				federatedTimelineFragment=new FederatedTimelineFragment();
@@ -170,7 +162,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 					case 3 -> R.string.posts;
 					case 4 -> R.string.news;
 					case 5 -> R.string.for_you;
-					case 6 -> R.string.sk_list_timelines;
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);
@@ -300,7 +291,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			case 3 -> postsFragment;
 			case 4 -> newsFragment;
 			case 5 -> accountsFragment;
-			case 6 -> listTimelinesFragment;
 			default -> throw new IllegalStateException("Unexpected value: "+page);
 		};
 	}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index 52ee0ca7e..1eef7802b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -537,16 +537,18 @@ public class UiUtils{
 	public static void confirmDeleteList(Activity activity, String accountID, String listID, Runnable callback) {
 		showConfirmationAlert(activity, R.string.sk_delete_list, R.string.sk_delete_list_confirm, R.string.delete, R.drawable.ic_fluent_delete_28_regular,
 				() -> new DeleteList(listID).setCallback(new Callback<>() {
-					@Override
-					public void onSuccess(Object o) {
-						callback.run();
-					}
+							@Override
+							public void onSuccess(Object o) {
+								callback.run();
+							}
 
-					@Override
-					public void onError(ErrorResponse error) {
-						error.showToast(activity);
-					}
-				}).exec(accountID));
+							@Override
+							public void onError(ErrorResponse error) {
+								error.showToast(activity);
+							}
+						})
+						.wrapProgress(activity, R.string.deleting, false)
+						.exec(accountID));
 	}
 
 	public static void setRelationshipToActionButton(Relationship relationship, Button button){
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml
new file mode 100644
index 000000000..7e747822e
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M5.5 8c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5S5.5 9.38 5.5 8zM8 4C5.79 4 4 5.79 4 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 6c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zm-2.752 13.038c0.703 0.285 1.604 0.462 2.753 0.462 2.282 0 3.586-0.697 4.297-1.558 0.345-0.418 0.52-0.84 0.61-1.163 0.044-0.16 0.067-0.299 0.08-0.402 0.006-0.052 0.009-0.095 0.01-0.128l0.003-0.043v-0.027c0-1.204-0.975-2.179-2.179-2.179H14.18c-0.028 0-0.055 0-0.082 0.002 0.394 0.41 0.68 0.925 0.816 1.498h4.908c0.372 0 0.674 0.299 0.679 0.669L20.498 16.2c-0.005 0.038-0.015 0.1-0.037 0.18-0.043 0.16-0.133 0.38-0.32 0.605C19.792 17.412 18.97 18 17.002 18c-0.98 0-1.676-0.146-2.17-0.345-0.108 0.4-0.286 0.883-0.583 1.383zM4.25 14C3.007 14 2 15.007 2 16.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 19.974 5.172 21 8 21c2.828 0 4.39-1.025 5.208-2.195 0.396-0.565 0.592-1.127 0.69-1.549 0.05-0.211 0.075-0.39 0.088-0.52 0.007-0.066 0.01-0.12 0.012-0.159L14 16.527V16.25c0-1.243-1.007-2.25-2.25-2.25h-7.5zM3.5 16.507V16.25c0-0.414 0.336-0.75 0.75-0.75h7.5c0.414 0 0.75 0.336 0.75 0.75v0.257l-0.007 0.08c-0.007 0.074-0.023 0.188-0.055 0.329-0.066 0.281-0.198 0.656-0.459 1.029C11.486 18.65 10.422 19.5 8 19.5s-3.486-0.85-3.98-1.555c-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.328-0.004-0.038-0.006-0.065-0.006-0.08z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml
new file mode 100644
index 000000000..84cd0634b
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M5.5 7c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5S9.38 9.5 8 9.5 5.5 8.38 5.5 7zM8 3C5.79 3 4 4.79 4 7s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 5c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zM4.25 13C3.007 13 2 14.007 2 15.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 18.974 5.172 20 8 20c1.369 0 2.441-0.24 3.276-0.62-0.15-0.495-0.241-1.014-0.268-1.55C10.363 18.21 9.413 18.5 8 18.5c-2.422 0-3.486-0.85-3.98-1.555-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.329C3.502 15.55 3.5 15.522 3.5 15.507V15.25c0-0.414 0.336-0.75 0.75-0.75h7.482c0.249-0.477 0.555-0.919 0.909-1.317C12.366 13.065 12.066 13 11.75 13h-7.5zM23 17.5c0-3.038-2.462-5.5-5.5-5.5S12 14.462 12 17.5s2.462 5.5 5.5 5.5 5.5-2.462 5.5-5.5zM18 18l0.001 2.503c0 0.277-0.224 0.5-0.5 0.5s-0.5-0.223-0.5-0.5V18h-2.505c-0.276 0-0.5-0.224-0.5-0.5s0.224-0.5 0.5-0.5H17v-2.5c0-0.277 0.224-0.5 0.5-0.5s0.5 0.223 0.5 0.5V17h2.497c0.276 0 0.5 0.224 0.5 0.5s-0.224 0.5-0.5 0.5H18z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml
new file mode 100644
index 000000000..370ecb02a
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
+    <path android:pathData="M9.5 4C7.015 4 5 6.015 5 8.5S7.015 13 9.5 13 14 10.985 14 8.5 11.985 4 9.5 4zm-3 4.5c0-1.657 1.343-3 3-3s3 1.343 3 3-1.343 3-3 3-3-1.343-3-3zM20 6c-1.933 0-3.5 1.567-3.5 3.5S18.067 13 20 13s3.5-1.567 3.5-3.5S21.933 6 20 6zm-2 3.5c0-1.105 0.895-2 2-2s2 0.895 2 2-0.895 2-2 2-2-0.895-2-2zM4.25 15C3.007 15 2 16.007 2 17.25v0.531l0.003 0.057c0.002 0.046 0.006 0.109 0.014 0.185 0.017 0.153 0.049 0.363 0.11 0.612 0.125 0.497 0.373 1.156 0.867 1.815C4.008 21.803 5.942 23 9.5 23c1.531 0 2.762-0.222 3.747-0.582-0.128-0.489-0.21-0.996-0.236-1.518-0.836 0.355-1.97 0.6-3.511 0.6-3.192 0-4.633-1.053-5.306-1.95-0.35-0.466-0.524-0.932-0.61-1.279-0.044-0.173-0.065-0.314-0.075-0.408-0.005-0.046-0.007-0.08-0.008-0.1L3.5 17.745V17.25c0-0.414 0.336-0.75 0.75-0.75h9.905c0.33-0.523 0.723-1.002 1.168-1.426C15.14 15.026 14.948 15 14.75 15H4.25zM27 20.5c0 3.59-2.91 6.5-6.5 6.5S14 24.09 14 20.5s2.91-6.5 6.5-6.5 6.5 2.91 6.5 6.5zm-6-4c0-0.276-0.224-0.5-0.5-0.5S20 16.224 20 16.5V20h-3.5c-0.276 0-0.5 0.224-0.5 0.5s0.224 0.5 0.5 0.5H20v3.5c0 0.276 0.224 0.5 0.5 0.5s0.5-0.224 0.5-0.5V21h3.5c0.276 0 0.5-0.224 0.5-0.5S24.776 20 24.5 20H21v-3.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml
new file mode 100644
index 000000000..f4b216279
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M5.5 8c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5S5.5 9.38 5.5 8zM8 4C5.79 4 4 5.79 4 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 6c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zM4.25 14C3.007 14 2 15.007 2 16.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 19.974 5.172 21 8 21c1.819 0 3.113-0.424 4.024-1.037 0.061-0.375 0.242-0.709 0.501-0.963-0.29-0.284-0.48-0.667-0.518-1.095l-0.028 0.04C11.486 18.65 10.422 19.5 8 19.5s-3.486-0.85-3.98-1.555c-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.328-0.004-0.038-0.006-0.065-0.006-0.08L3.5 16.495V16.25c0-0.414 0.336-0.75 0.75-0.75h7.5c0.098 0 0.19 0.019 0.276 0.052C12.009 15.454 12 15.353 12 15.25c0-0.438 0.161-0.84 0.428-1.146C12.214 14.036 11.986 14 11.75 14h-7.5zm8.275 2.5l-0.027 0.027 0.002-0.02v-0.032l0.025 0.025zm1.225-2c-0.414 0-0.75 0.336-0.75 0.75S13.336 16 13.75 16h7.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-7.5zm0 2.5C13.336 17 13 17.336 13 17.75s0.336 0.75 0.75 0.75h7.5c0.414 0 0.75-0.336 0.75-0.75S21.664 17 21.25 17h-7.5zm0 2.5c-0.414 0-0.75 0.336-0.75 0.75S13.336 21 13.75 21h7.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-7.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml
new file mode 100644
index 000000000..39394a989
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
+    <path android:pathData="M5 9.5C5 7.015 7.015 5 9.5 5S14 7.015 14 9.5 11.985 14 9.5 14 5 11.985 5 9.5zm4.5-3c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zm7 4C16.5 8.567 18.067 7 20 7s3.5 1.567 3.5 3.5S21.933 14 20 14s-3.5-1.567-3.5-3.5zm3.5-2c-1.105 0-2 0.895-2 2s0.895 2 2 2 2-0.895 2-2-0.895-2-2-2zM2 18.25C2 17.007 3.007 16 4.25 16h10.5c0.236 0 0.464 0.036 0.678 0.104C15.16 16.41 15 16.812 15 17.25c0 0.103 0.009 0.204 0.026 0.302-0.085-0.033-0.178-0.052-0.276-0.052H4.25c-0.414 0-0.75 0.336-0.75 0.75v0.513l0.009 0.1c0.01 0.094 0.03 0.235 0.074 0.408 0.087 0.347 0.261 0.813 0.61 1.279 0.674 0.897 2.115 1.95 5.307 1.95s4.633-1.053 5.306-1.95c0.072-0.096 0.136-0.191 0.194-0.286 0.005 0.608 0.32 1.141 0.793 1.451-0.066 0.078-0.135 0.154-0.208 0.229-0.049 0.044-0.095 0.09-0.139 0.139C14.332 23.155 12.489 24 9.5 24c-3.558 0-5.492-1.197-6.506-2.55-0.495-0.659-0.742-1.318-0.866-1.815-0.062-0.249-0.094-0.459-0.11-0.612-0.009-0.076-0.013-0.139-0.015-0.185L2 18.781V18.25zm14.75-1.75c-0.414 0-0.75 0.336-0.75 0.75S16.336 18 16.75 18h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5zm0 3c-0.414 0-0.75 0.336-0.75 0.75S16.336 21 16.75 21h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5zm0 3c-0.414 0-0.75 0.336-0.75 0.75S16.336 24 16.75 24h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/menu/menu_list.xml b/mastodon/src/main/res/menu/menu_list.xml
index dbd92e417..93123a9f2 100644
--- a/mastodon/src/main/res/menu/menu_list.xml
+++ b/mastodon/src/main/res/menu/menu_list.xml
@@ -3,6 +3,6 @@
     <item
         android:id="@+id/create"
         android:title="@string/sk_create"
-        android:icon="@drawable/ic_fluent_channel_add_24_regular"
+        android:icon="@drawable/ic_fluent_people_add_24_regular"
         android:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/menu/profile.xml b/mastodon/src/main/res/menu/profile.xml
index 1f2a99a2d..abf7b0e03 100644
--- a/mastodon/src/main/res/menu/profile.xml
+++ b/mastodon/src/main/res/menu/profile.xml
@@ -6,6 +6,6 @@
 	<item android:id="@+id/report" android:title="@string/report_user" android:icon="@drawable/ic_fluent_warning_24_regular"/>
 	<item android:id="@+id/block_domain" android:title="@string/block_domain" android:icon="@drawable/ic_fluent_shield_prohibited_24_regular"/>
 	<item android:id="@+id/hide_boosts" android:title="@string/hide_boosts_from_user" android:icon="@drawable/ic_fluent_arrow_repeat_all_off_24_regular"/>
-	<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_community_24_regular"/>
+	<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_list_24_regular"/>
 	<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser" android:icon="@drawable/ic_fluent_globe_24_regular"/>
 </menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/menu/profile_own.xml b/mastodon/src/main/res/menu/profile_own.xml
index 07acdf591..14c7b2c30 100644
--- a/mastodon/src/main/res/menu/profile_own.xml
+++ b/mastodon/src/main/res/menu/profile_own.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:id="@+id/followed_hashtags" android:title="@string/sk_hashtags_you_follow" android:icon="@drawable/ic_fluent_number_symbol_24_regular" android:showAsAction="always"/>
+	<item android:id="@+id/manage_user_lists" android:title="@string/sk_your_lists" android:icon="@drawable/ic_fluent_people_list_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/bookmarks" android:title="@string/bookmarks" android:icon="@drawable/ic_fluent_bookmark_multiple_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/favorites" android:title="@string/your_favorites" android:icon="@drawable/ic_fluent_star_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/scheduled" android:title="@string/sk_unsent_posts" android:icon="@drawable/ic_fluent_drafts_24_regular" android:showAsAction="always"/>

From 7504a1b9cb3d730a9fa9884f10afb467bec8aa48 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 18 Jan 2023 13:47:29 -0300
Subject: [PATCH 093/200] Revert "move lists and change icons"

This reverts commit 3842ecb0d1a66f77dcb92962a192d2222dfb76e5.
---
 .../android/PushNotificationReceiver.java     |  4 +-
 .../fragments/ListTimelineFragment.java       |  1 -
 .../fragments/ListTimelinesFragment.java      |  7 +---
 .../android/fragments/ProfileFragment.java    | 11 +++---
 .../fragments/discover/DiscoverFragment.java  | 37 ++++++++++++++-----
 .../android/ui/utils/UiUtils.java             | 20 +++++-----
 .../drawable/ic_fluent_people_24_regular.xml  |  3 --
 .../ic_fluent_people_add_24_regular.xml       |  3 --
 .../ic_fluent_people_add_28_regular.xml       |  3 --
 .../ic_fluent_people_list_24_regular.xml      |  3 --
 .../ic_fluent_people_list_28_regular.xml      |  3 --
 mastodon/src/main/res/menu/menu_list.xml      |  2 +-
 mastodon/src/main/res/menu/profile.xml        |  2 +-
 mastodon/src/main/res/menu/profile_own.xml    |  1 -
 mastodon/src/main/res/values/strings_sk.xml   |  1 -
 15 files changed, 48 insertions(+), 53 deletions(-)
 delete mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml
 delete mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml
 delete mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml
 delete mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml
 delete mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
index 3cd93eb38..3b8dfbb28 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
@@ -130,14 +130,14 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		contentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 		contentIntent.putExtra("fromNotification", true);
 		contentIntent.putExtra("accountID", accountID);
-		contentIntent.putExtra("notificationID", notificationId);
+		contentIntent.putExtra("notificationID", notificationID);
 		if(notification!=null){
 			contentIntent.putExtra("notification", Parcels.wrap(notification));
 		}
 		builder.setContentTitle(pn.title)
 				.setContentText(pn.body)
 				.setStyle(new Notification.BigTextStyle().bigText(pn.body))
-				.setContentIntent(PendingIntent.getActivity(context, notificationId, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
+				.setContentIntent(PendingIntent.getActivity(context, notificationID, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
 				.setWhen(notification==null ? System.currentTimeMillis() : notification.createdAt.toEpochMilli())
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
index 96bc5165b..5423d65ea 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
@@ -65,7 +65,6 @@ public class ListTimelineFragment extends StatusListFragment {
             editor.applyList(listTitle, repliesPolicy);
             new M3AlertDialogBuilder(getActivity())
                     .setTitle(R.string.sk_edit_list_title)
-                    .setIcon(R.drawable.ic_fluent_people_list_28_regular)
                     .setView(editor)
                     .setPositiveButton(R.string.save, (d, which) -> {
                         new UpdateList(listID, editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
index 4c8e70d5a..794216148 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
@@ -55,14 +55,12 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
         super.onCreate(savedInstanceState);
         Bundle args=getArguments();
         accountId=args.getString("account");
-        setHasOptionsMenu(true);
 
         if(args.containsKey("profileAccount")){
             profileAccountId=args.getString("profileAccount");
             profileDisplayUsername=args.getString("profileDisplayUsername");
             setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
-        } else {
-            setTitle(R.string.sk_your_lists);
+            setHasOptionsMenu(true);
         }
     }
 
@@ -84,7 +82,6 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
             ListTimelineEditor editor = new ListTimelineEditor(getContext());
             new M3AlertDialogBuilder(getActivity())
                     .setTitle(R.string.sk_create_list_title)
-                    .setIcon(R.drawable.ic_fluent_people_add_28_regular)
                     .setView(editor)
                     .setPositiveButton(R.string.sk_create, (d, which) -> {
                         new CreateList(editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
@@ -211,7 +208,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
         @Override
         public void onBind(ListTimeline item) {
             title.setText(item.title);
-            title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_list_24_regular), null, null, null);
+            title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_community_24_regular), null, null, null);
             if (profileAccountId != null) {
                 Boolean checked = userInList.get(item.id);
                 listToggle.setVisibility(View.VISIBLE);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index d6ac22e20..519431d27 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -635,14 +635,17 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
 		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
+		MenuItem manageUserLists=menu.findItem(R.id.manage_user_lists);
 		if(relationship.following) {
 			MenuItem hideBoosts = menu.findItem(R.id.hide_boosts);
 			hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getShortUsername()));
 			hideBoosts.setIcon(relationship.showingReblogs ? R.drawable.ic_fluent_arrow_repeat_all_off_24_regular : R.drawable.ic_fluent_arrow_repeat_all_24_regular);
 			UiUtils.insetPopupMenuIcon(getContext(), hideBoosts);
-			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
+			manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
+			manageUserLists.setVisible(true);
 		}else {
 			menu.findItem(R.id.hide_boosts).setVisible(false);
+			manageUserLists.setVisible(false);
 		}
 		if(!account.isLocal())
 			menu.findItem(R.id.block_domain).setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
@@ -700,10 +703,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}else if(id==R.id.manage_user_lists){
 			final Bundle args=new Bundle();
 			args.putString("account", accountID);
-			if (!isOwnProfile) {
-				args.putString("profileAccount", profileAccountID);
-				args.putString("profileDisplayUsername", account.getDisplayUsername());
-			}
+			args.putString("profileAccount", profileAccountID);
+			args.putString("profileDisplayUsername", account.getDisplayUsername());
 			Nav.go(getActivity(), ListTimelinesFragment.class, args);
 		}else if(id==R.id.followed_hashtags){
 			Bundle args=new Bundle();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
index 6dfea2f68..dd40d2367 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
@@ -18,9 +18,11 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import org.joinmastodon.android.BuildConfig;
 import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.ScrollableToTop;
+import org.joinmastodon.android.fragments.ListTimelinesFragment;
 import org.joinmastodon.android.ui.SimpleViewHolder;
 import org.joinmastodon.android.ui.tabs.TabLayout;
 import org.joinmastodon.android.ui.tabs.TabLayoutMediator;
@@ -55,6 +57,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 	private SearchFragment searchFragment;
 	private LocalTimelineFragment localTimelineFragment;
 	private FederatedTimelineFragment federatedTimelineFragment;
+	private ListTimelinesFragment listTimelinesFragment;
 
 	private String accountID;
 	private Runnable searchDebouncer=this::onSearchChangedDebounced;
@@ -78,17 +81,18 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 		tabLayout=view.findViewById(R.id.tabbar);
 		pager=view.findViewById(R.id.pager);
 
-		tabViews=new FrameLayout[noFederated ? 5 : 6];
+		tabViews=new FrameLayout[noFederated ? 6 : 7];
 		for(int i=0;i<tabViews.length;i++){
 			FrameLayout tabView=new FrameLayout(getActivity());
 			int switchIndex = noFederated && i > 0 ? i + 1 : i;
 			tabView.setId(switch(switchIndex){
 				case 0 -> R.id.discover_local_timeline;
 				case 1 -> R.id.discover_federated_timeline;
-				case 2 -> R.id.discover_hashtags;
-				case 3 -> R.id.discover_posts;
-				case 4 -> R.id.discover_news;
-				case 5 -> R.id.discover_users;
+				case 2 -> R.id.discover_lists;
+				case 3 -> R.id.discover_hashtags;
+				case 4 -> R.id.discover_posts;
+				case 5 -> R.id.discover_news;
+				case 6 -> R.id.discover_users;
 				default -> throw new IllegalStateException("Unexpected value: "+switchIndex);
 			});
 			tabView.setVisibility(View.GONE);
@@ -135,12 +139,16 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			localTimelineFragment=new LocalTimelineFragment();
 			localTimelineFragment.setArguments(args);
 
+			listTimelinesFragment=new ListTimelinesFragment();
+			listTimelinesFragment.setArguments(args);
+
 			FragmentTransaction transaction = getChildFragmentManager().beginTransaction()
 					.add(R.id.discover_posts, postsFragment)
 					.add(R.id.discover_local_timeline, localTimelineFragment)
 					.add(R.id.discover_hashtags, hashtagsFragment)
 					.add(R.id.discover_news, newsFragment)
-					.add(R.id.discover_users, accountsFragment);
+					.add(R.id.discover_users, accountsFragment)
+					.add(R.id.discover_lists, listTimelinesFragment);
 
 			if (!noFederated) {
 				federatedTimelineFragment=new FederatedTimelineFragment();
@@ -158,10 +166,12 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 				tab.setText(switch(position){
 					case 0 -> R.string.local_timeline;
 					case 1 -> R.string.sk_federated_timeline;
-					case 2 -> R.string.hashtags;
-					case 3 -> R.string.posts;
-					case 4 -> R.string.news;
-					case 5 -> R.string.for_you;
+					case 2 -> R.string.sk_list_timelines;
+					case 3 -> R.string.hashtags;
+					case 4 -> R.string.posts;
+					case 5 -> R.string.news;
+					case 6 -> R.string.for_you;
+
 					default -> throw new IllegalStateException("Unexpected value: "+position);
 				});
 				tab.view.textView.setAllCaps(true);
@@ -291,6 +301,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			case 3 -> postsFragment;
 			case 4 -> newsFragment;
 			case 5 -> accountsFragment;
+			case 6 -> listTimelinesFragment;
 			default -> throw new IllegalStateException("Unexpected value: "+page);
 		};
 	}
@@ -347,4 +358,10 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
 			return position;
 		}
 	}
+
+	public void selectSearch(){
+		searchEdit.requestFocus();
+		onSearchEditFocusChanged(searchEdit, true);
+		getActivity().getSystemService(InputMethodManager.class).showSoftInput(searchEdit, 0);
+	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index 1eef7802b..52ee0ca7e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -537,18 +537,16 @@ public class UiUtils{
 	public static void confirmDeleteList(Activity activity, String accountID, String listID, Runnable callback) {
 		showConfirmationAlert(activity, R.string.sk_delete_list, R.string.sk_delete_list_confirm, R.string.delete, R.drawable.ic_fluent_delete_28_regular,
 				() -> new DeleteList(listID).setCallback(new Callback<>() {
-							@Override
-							public void onSuccess(Object o) {
-								callback.run();
-							}
+					@Override
+					public void onSuccess(Object o) {
+						callback.run();
+					}
 
-							@Override
-							public void onError(ErrorResponse error) {
-								error.showToast(activity);
-							}
-						})
-						.wrapProgress(activity, R.string.deleting, false)
-						.exec(accountID));
+					@Override
+					public void onError(ErrorResponse error) {
+						error.showToast(activity);
+					}
+				}).exec(accountID));
 	}
 
 	public static void setRelationshipToActionButton(Relationship relationship, Button button){
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml
deleted file mode 100644
index 7e747822e..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M5.5 8c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5S5.5 9.38 5.5 8zM8 4C5.79 4 4 5.79 4 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 6c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zm-2.752 13.038c0.703 0.285 1.604 0.462 2.753 0.462 2.282 0 3.586-0.697 4.297-1.558 0.345-0.418 0.52-0.84 0.61-1.163 0.044-0.16 0.067-0.299 0.08-0.402 0.006-0.052 0.009-0.095 0.01-0.128l0.003-0.043v-0.027c0-1.204-0.975-2.179-2.179-2.179H14.18c-0.028 0-0.055 0-0.082 0.002 0.394 0.41 0.68 0.925 0.816 1.498h4.908c0.372 0 0.674 0.299 0.679 0.669L20.498 16.2c-0.005 0.038-0.015 0.1-0.037 0.18-0.043 0.16-0.133 0.38-0.32 0.605C19.792 17.412 18.97 18 17.002 18c-0.98 0-1.676-0.146-2.17-0.345-0.108 0.4-0.286 0.883-0.583 1.383zM4.25 14C3.007 14 2 15.007 2 16.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 19.974 5.172 21 8 21c2.828 0 4.39-1.025 5.208-2.195 0.396-0.565 0.592-1.127 0.69-1.549 0.05-0.211 0.075-0.39 0.088-0.52 0.007-0.066 0.01-0.12 0.012-0.159L14 16.527V16.25c0-1.243-1.007-2.25-2.25-2.25h-7.5zM3.5 16.507V16.25c0-0.414 0.336-0.75 0.75-0.75h7.5c0.414 0 0.75 0.336 0.75 0.75v0.257l-0.007 0.08c-0.007 0.074-0.023 0.188-0.055 0.329-0.066 0.281-0.198 0.656-0.459 1.029C11.486 18.65 10.422 19.5 8 19.5s-3.486-0.85-3.98-1.555c-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.328-0.004-0.038-0.006-0.065-0.006-0.08z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml
deleted file mode 100644
index 84cd0634b..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M5.5 7c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5S9.38 9.5 8 9.5 5.5 8.38 5.5 7zM8 3C5.79 3 4 4.79 4 7s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 5c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zM4.25 13C3.007 13 2 14.007 2 15.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 18.974 5.172 20 8 20c1.369 0 2.441-0.24 3.276-0.62-0.15-0.495-0.241-1.014-0.268-1.55C10.363 18.21 9.413 18.5 8 18.5c-2.422 0-3.486-0.85-3.98-1.555-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.329C3.502 15.55 3.5 15.522 3.5 15.507V15.25c0-0.414 0.336-0.75 0.75-0.75h7.482c0.249-0.477 0.555-0.919 0.909-1.317C12.366 13.065 12.066 13 11.75 13h-7.5zM23 17.5c0-3.038-2.462-5.5-5.5-5.5S12 14.462 12 17.5s2.462 5.5 5.5 5.5 5.5-2.462 5.5-5.5zM18 18l0.001 2.503c0 0.277-0.224 0.5-0.5 0.5s-0.5-0.223-0.5-0.5V18h-2.505c-0.276 0-0.5-0.224-0.5-0.5s0.224-0.5 0.5-0.5H17v-2.5c0-0.277 0.224-0.5 0.5-0.5s0.5 0.223 0.5 0.5V17h2.497c0.276 0 0.5 0.224 0.5 0.5s-0.224 0.5-0.5 0.5H18z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml
deleted file mode 100644
index 370ecb02a..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
-    <path android:pathData="M9.5 4C7.015 4 5 6.015 5 8.5S7.015 13 9.5 13 14 10.985 14 8.5 11.985 4 9.5 4zm-3 4.5c0-1.657 1.343-3 3-3s3 1.343 3 3-1.343 3-3 3-3-1.343-3-3zM20 6c-1.933 0-3.5 1.567-3.5 3.5S18.067 13 20 13s3.5-1.567 3.5-3.5S21.933 6 20 6zm-2 3.5c0-1.105 0.895-2 2-2s2 0.895 2 2-0.895 2-2 2-2-0.895-2-2zM4.25 15C3.007 15 2 16.007 2 17.25v0.531l0.003 0.057c0.002 0.046 0.006 0.109 0.014 0.185 0.017 0.153 0.049 0.363 0.11 0.612 0.125 0.497 0.373 1.156 0.867 1.815C4.008 21.803 5.942 23 9.5 23c1.531 0 2.762-0.222 3.747-0.582-0.128-0.489-0.21-0.996-0.236-1.518-0.836 0.355-1.97 0.6-3.511 0.6-3.192 0-4.633-1.053-5.306-1.95-0.35-0.466-0.524-0.932-0.61-1.279-0.044-0.173-0.065-0.314-0.075-0.408-0.005-0.046-0.007-0.08-0.008-0.1L3.5 17.745V17.25c0-0.414 0.336-0.75 0.75-0.75h9.905c0.33-0.523 0.723-1.002 1.168-1.426C15.14 15.026 14.948 15 14.75 15H4.25zM27 20.5c0 3.59-2.91 6.5-6.5 6.5S14 24.09 14 20.5s2.91-6.5 6.5-6.5 6.5 2.91 6.5 6.5zm-6-4c0-0.276-0.224-0.5-0.5-0.5S20 16.224 20 16.5V20h-3.5c-0.276 0-0.5 0.224-0.5 0.5s0.224 0.5 0.5 0.5H20v3.5c0 0.276 0.224 0.5 0.5 0.5s0.5-0.224 0.5-0.5V21h3.5c0.276 0 0.5-0.224 0.5-0.5S24.776 20 24.5 20H21v-3.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml
deleted file mode 100644
index f4b216279..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:pathData="M5.5 8c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5S5.5 9.38 5.5 8zM8 4C5.79 4 4 5.79 4 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 6c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zM4.25 14C3.007 14 2 15.007 2 16.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 19.974 5.172 21 8 21c1.819 0 3.113-0.424 4.024-1.037 0.061-0.375 0.242-0.709 0.501-0.963-0.29-0.284-0.48-0.667-0.518-1.095l-0.028 0.04C11.486 18.65 10.422 19.5 8 19.5s-3.486-0.85-3.98-1.555c-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.328-0.004-0.038-0.006-0.065-0.006-0.08L3.5 16.495V16.25c0-0.414 0.336-0.75 0.75-0.75h7.5c0.098 0 0.19 0.019 0.276 0.052C12.009 15.454 12 15.353 12 15.25c0-0.438 0.161-0.84 0.428-1.146C12.214 14.036 11.986 14 11.75 14h-7.5zm8.275 2.5l-0.027 0.027 0.002-0.02v-0.032l0.025 0.025zm1.225-2c-0.414 0-0.75 0.336-0.75 0.75S13.336 16 13.75 16h7.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-7.5zm0 2.5C13.336 17 13 17.336 13 17.75s0.336 0.75 0.75 0.75h7.5c0.414 0 0.75-0.336 0.75-0.75S21.664 17 21.25 17h-7.5zm0 2.5c-0.414 0-0.75 0.336-0.75 0.75S13.336 21 13.75 21h7.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-7.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml
deleted file mode 100644
index 39394a989..000000000
--- a/mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
-    <path android:pathData="M5 9.5C5 7.015 7.015 5 9.5 5S14 7.015 14 9.5 11.985 14 9.5 14 5 11.985 5 9.5zm4.5-3c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zm7 4C16.5 8.567 18.067 7 20 7s3.5 1.567 3.5 3.5S21.933 14 20 14s-3.5-1.567-3.5-3.5zm3.5-2c-1.105 0-2 0.895-2 2s0.895 2 2 2 2-0.895 2-2-0.895-2-2-2zM2 18.25C2 17.007 3.007 16 4.25 16h10.5c0.236 0 0.464 0.036 0.678 0.104C15.16 16.41 15 16.812 15 17.25c0 0.103 0.009 0.204 0.026 0.302-0.085-0.033-0.178-0.052-0.276-0.052H4.25c-0.414 0-0.75 0.336-0.75 0.75v0.513l0.009 0.1c0.01 0.094 0.03 0.235 0.074 0.408 0.087 0.347 0.261 0.813 0.61 1.279 0.674 0.897 2.115 1.95 5.307 1.95s4.633-1.053 5.306-1.95c0.072-0.096 0.136-0.191 0.194-0.286 0.005 0.608 0.32 1.141 0.793 1.451-0.066 0.078-0.135 0.154-0.208 0.229-0.049 0.044-0.095 0.09-0.139 0.139C14.332 23.155 12.489 24 9.5 24c-3.558 0-5.492-1.197-6.506-2.55-0.495-0.659-0.742-1.318-0.866-1.815-0.062-0.249-0.094-0.459-0.11-0.612-0.009-0.076-0.013-0.139-0.015-0.185L2 18.781V18.25zm14.75-1.75c-0.414 0-0.75 0.336-0.75 0.75S16.336 18 16.75 18h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5zm0 3c-0.414 0-0.75 0.336-0.75 0.75S16.336 21 16.75 21h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5zm0 3c-0.414 0-0.75 0.336-0.75 0.75S16.336 24 16.75 24h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5z" android:fillColor="@color/fluent_default_icon_tint"/>
-</vector>
diff --git a/mastodon/src/main/res/menu/menu_list.xml b/mastodon/src/main/res/menu/menu_list.xml
index 93123a9f2..dbd92e417 100644
--- a/mastodon/src/main/res/menu/menu_list.xml
+++ b/mastodon/src/main/res/menu/menu_list.xml
@@ -3,6 +3,6 @@
     <item
         android:id="@+id/create"
         android:title="@string/sk_create"
-        android:icon="@drawable/ic_fluent_people_add_24_regular"
+        android:icon="@drawable/ic_fluent_channel_add_24_regular"
         android:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/menu/profile.xml b/mastodon/src/main/res/menu/profile.xml
index abf7b0e03..1f2a99a2d 100644
--- a/mastodon/src/main/res/menu/profile.xml
+++ b/mastodon/src/main/res/menu/profile.xml
@@ -6,6 +6,6 @@
 	<item android:id="@+id/report" android:title="@string/report_user" android:icon="@drawable/ic_fluent_warning_24_regular"/>
 	<item android:id="@+id/block_domain" android:title="@string/block_domain" android:icon="@drawable/ic_fluent_shield_prohibited_24_regular"/>
 	<item android:id="@+id/hide_boosts" android:title="@string/hide_boosts_from_user" android:icon="@drawable/ic_fluent_arrow_repeat_all_off_24_regular"/>
-	<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_list_24_regular"/>
+	<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_community_24_regular"/>
 	<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser" android:icon="@drawable/ic_fluent_globe_24_regular"/>
 </menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/menu/profile_own.xml b/mastodon/src/main/res/menu/profile_own.xml
index 14c7b2c30..07acdf591 100644
--- a/mastodon/src/main/res/menu/profile_own.xml
+++ b/mastodon/src/main/res/menu/profile_own.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:id="@+id/followed_hashtags" android:title="@string/sk_hashtags_you_follow" android:icon="@drawable/ic_fluent_number_symbol_24_regular" android:showAsAction="always"/>
-	<item android:id="@+id/manage_user_lists" android:title="@string/sk_your_lists" android:icon="@drawable/ic_fluent_people_list_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/bookmarks" android:title="@string/bookmarks" android:icon="@drawable/ic_fluent_bookmark_multiple_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/favorites" android:title="@string/your_favorites" android:icon="@drawable/ic_fluent_star_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/scheduled" android:title="@string/sk_unsent_posts" android:icon="@drawable/ic_fluent_drafts_24_regular" android:showAsAction="always"/>
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 88f0772fc..5f8c9c6f9 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -154,7 +154,6 @@
     <string name="sk_delete_list">Delete list</string>
     <string name="sk_delete_list_confirm">Are you sure you want to delete this list?</string>
     <string name="sk_edit_list_title">Edit list</string>
-    <string name="sk_your_lists">Your lists</string>
 
     <!--    accessibility labels-->
     <string name="sk_poll_option_add">Add new poll option</string>

From af953e294dfaa2292ab2a41f0fdf733edbb02231 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Tue, 10 Jan 2023 10:26:18 -0300
Subject: [PATCH 094/200] move lists and change icons

---
 .../android/PushNotificationReceiver.java     |  4 ++--
 .../fragments/ListTimelineFragment.java       |  1 +
 .../fragments/ListTimelinesFragment.java      |  7 +++++--
 .../android/fragments/ProfileFragment.java    | 11 +++++-----
 .../android/ui/utils/UiUtils.java             | 20 ++++++++++---------
 .../drawable/ic_fluent_people_24_regular.xml  |  3 +++
 .../ic_fluent_people_add_24_regular.xml       |  3 +++
 .../ic_fluent_people_add_28_regular.xml       |  3 +++
 .../ic_fluent_people_list_24_regular.xml      |  3 +++
 .../ic_fluent_people_list_28_regular.xml      |  3 +++
 mastodon/src/main/res/menu/menu_list.xml      |  2 +-
 mastodon/src/main/res/menu/profile.xml        |  2 +-
 mastodon/src/main/res/menu/profile_own.xml    |  1 +
 mastodon/src/main/res/values/strings_sk.xml   |  1 +
 14 files changed, 43 insertions(+), 21 deletions(-)
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml
 create mode 100644 mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml

diff --git a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
index 3b8dfbb28..3cd93eb38 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
@@ -130,14 +130,14 @@ public class PushNotificationReceiver extends BroadcastReceiver{
 		contentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 		contentIntent.putExtra("fromNotification", true);
 		contentIntent.putExtra("accountID", accountID);
-		contentIntent.putExtra("notificationID", notificationID);
+		contentIntent.putExtra("notificationID", notificationId);
 		if(notification!=null){
 			contentIntent.putExtra("notification", Parcels.wrap(notification));
 		}
 		builder.setContentTitle(pn.title)
 				.setContentText(pn.body)
 				.setStyle(new Notification.BigTextStyle().bigText(pn.body))
-				.setContentIntent(PendingIntent.getActivity(context, notificationID, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
+				.setContentIntent(PendingIntent.getActivity(context, notificationId, contentIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT))
 				.setWhen(notification==null ? System.currentTimeMillis() : notification.createdAt.toEpochMilli())
 				.setShowWhen(true)
 				.setCategory(Notification.CATEGORY_SOCIAL)
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
index 5423d65ea..96bc5165b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
@@ -65,6 +65,7 @@ public class ListTimelineFragment extends StatusListFragment {
             editor.applyList(listTitle, repliesPolicy);
             new M3AlertDialogBuilder(getActivity())
                     .setTitle(R.string.sk_edit_list_title)
+                    .setIcon(R.drawable.ic_fluent_people_list_28_regular)
                     .setView(editor)
                     .setPositiveButton(R.string.save, (d, which) -> {
                         new UpdateList(listID, editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
index 794216148..4c8e70d5a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
@@ -55,12 +55,14 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
         super.onCreate(savedInstanceState);
         Bundle args=getArguments();
         accountId=args.getString("account");
+        setHasOptionsMenu(true);
 
         if(args.containsKey("profileAccount")){
             profileAccountId=args.getString("profileAccount");
             profileDisplayUsername=args.getString("profileDisplayUsername");
             setTitle(getString(R.string.sk_lists_with_user, profileDisplayUsername));
-            setHasOptionsMenu(true);
+        } else {
+            setTitle(R.string.sk_your_lists);
         }
     }
 
@@ -82,6 +84,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
             ListTimelineEditor editor = new ListTimelineEditor(getContext());
             new M3AlertDialogBuilder(getActivity())
                     .setTitle(R.string.sk_create_list_title)
+                    .setIcon(R.drawable.ic_fluent_people_add_28_regular)
                     .setView(editor)
                     .setPositiveButton(R.string.sk_create, (d, which) -> {
                         new CreateList(editor.getTitle(), editor.getRepliesPolicy()).setCallback(new Callback<>() {
@@ -208,7 +211,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
         @Override
         public void onBind(ListTimeline item) {
             title.setText(item.title);
-            title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_community_24_regular), null, null, null);
+            title.setCompoundDrawablesRelativeWithIntrinsicBounds(itemView.getContext().getDrawable(R.drawable.ic_fluent_people_list_24_regular), null, null, null);
             if (profileAccountId != null) {
                 Boolean checked = userInList.get(item.id);
                 listToggle.setVisibility(View.VISIBLE);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 519431d27..d6ac22e20 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -635,17 +635,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
 		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
-		MenuItem manageUserLists=menu.findItem(R.id.manage_user_lists);
 		if(relationship.following) {
 			MenuItem hideBoosts = menu.findItem(R.id.hide_boosts);
 			hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getShortUsername()));
 			hideBoosts.setIcon(relationship.showingReblogs ? R.drawable.ic_fluent_arrow_repeat_all_off_24_regular : R.drawable.ic_fluent_arrow_repeat_all_24_regular);
 			UiUtils.insetPopupMenuIcon(getContext(), hideBoosts);
-			manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
-			manageUserLists.setVisible(true);
+			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
 		}else {
 			menu.findItem(R.id.hide_boosts).setVisible(false);
-			manageUserLists.setVisible(false);
 		}
 		if(!account.isLocal())
 			menu.findItem(R.id.block_domain).setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
@@ -703,8 +700,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}else if(id==R.id.manage_user_lists){
 			final Bundle args=new Bundle();
 			args.putString("account", accountID);
-			args.putString("profileAccount", profileAccountID);
-			args.putString("profileDisplayUsername", account.getDisplayUsername());
+			if (!isOwnProfile) {
+				args.putString("profileAccount", profileAccountID);
+				args.putString("profileDisplayUsername", account.getDisplayUsername());
+			}
 			Nav.go(getActivity(), ListTimelinesFragment.class, args);
 		}else if(id==R.id.followed_hashtags){
 			Bundle args=new Bundle();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index 52ee0ca7e..1eef7802b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -537,16 +537,18 @@ public class UiUtils{
 	public static void confirmDeleteList(Activity activity, String accountID, String listID, Runnable callback) {
 		showConfirmationAlert(activity, R.string.sk_delete_list, R.string.sk_delete_list_confirm, R.string.delete, R.drawable.ic_fluent_delete_28_regular,
 				() -> new DeleteList(listID).setCallback(new Callback<>() {
-					@Override
-					public void onSuccess(Object o) {
-						callback.run();
-					}
+							@Override
+							public void onSuccess(Object o) {
+								callback.run();
+							}
 
-					@Override
-					public void onError(ErrorResponse error) {
-						error.showToast(activity);
-					}
-				}).exec(accountID));
+							@Override
+							public void onError(ErrorResponse error) {
+								error.showToast(activity);
+							}
+						})
+						.wrapProgress(activity, R.string.deleting, false)
+						.exec(accountID));
 	}
 
 	public static void setRelationshipToActionButton(Relationship relationship, Button button){
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml
new file mode 100644
index 000000000..7e747822e
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_people_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M5.5 8c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5S5.5 9.38 5.5 8zM8 4C5.79 4 4 5.79 4 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 6c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zm-2.752 13.038c0.703 0.285 1.604 0.462 2.753 0.462 2.282 0 3.586-0.697 4.297-1.558 0.345-0.418 0.52-0.84 0.61-1.163 0.044-0.16 0.067-0.299 0.08-0.402 0.006-0.052 0.009-0.095 0.01-0.128l0.003-0.043v-0.027c0-1.204-0.975-2.179-2.179-2.179H14.18c-0.028 0-0.055 0-0.082 0.002 0.394 0.41 0.68 0.925 0.816 1.498h4.908c0.372 0 0.674 0.299 0.679 0.669L20.498 16.2c-0.005 0.038-0.015 0.1-0.037 0.18-0.043 0.16-0.133 0.38-0.32 0.605C19.792 17.412 18.97 18 17.002 18c-0.98 0-1.676-0.146-2.17-0.345-0.108 0.4-0.286 0.883-0.583 1.383zM4.25 14C3.007 14 2 15.007 2 16.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 19.974 5.172 21 8 21c2.828 0 4.39-1.025 5.208-2.195 0.396-0.565 0.592-1.127 0.69-1.549 0.05-0.211 0.075-0.39 0.088-0.52 0.007-0.066 0.01-0.12 0.012-0.159L14 16.527V16.25c0-1.243-1.007-2.25-2.25-2.25h-7.5zM3.5 16.507V16.25c0-0.414 0.336-0.75 0.75-0.75h7.5c0.414 0 0.75 0.336 0.75 0.75v0.257l-0.007 0.08c-0.007 0.074-0.023 0.188-0.055 0.329-0.066 0.281-0.198 0.656-0.459 1.029C11.486 18.65 10.422 19.5 8 19.5s-3.486-0.85-3.98-1.555c-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.328-0.004-0.038-0.006-0.065-0.006-0.08z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml
new file mode 100644
index 000000000..84cd0634b
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_people_add_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M5.5 7c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5S9.38 9.5 8 9.5 5.5 8.38 5.5 7zM8 3C5.79 3 4 4.79 4 7s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 5c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zM4.25 13C3.007 13 2 14.007 2 15.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 18.974 5.172 20 8 20c1.369 0 2.441-0.24 3.276-0.62-0.15-0.495-0.241-1.014-0.268-1.55C10.363 18.21 9.413 18.5 8 18.5c-2.422 0-3.486-0.85-3.98-1.555-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.329C3.502 15.55 3.5 15.522 3.5 15.507V15.25c0-0.414 0.336-0.75 0.75-0.75h7.482c0.249-0.477 0.555-0.919 0.909-1.317C12.366 13.065 12.066 13 11.75 13h-7.5zM23 17.5c0-3.038-2.462-5.5-5.5-5.5S12 14.462 12 17.5s2.462 5.5 5.5 5.5 5.5-2.462 5.5-5.5zM18 18l0.001 2.503c0 0.277-0.224 0.5-0.5 0.5s-0.5-0.223-0.5-0.5V18h-2.505c-0.276 0-0.5-0.224-0.5-0.5s0.224-0.5 0.5-0.5H17v-2.5c0-0.277 0.224-0.5 0.5-0.5s0.5 0.223 0.5 0.5V17h2.497c0.276 0 0.5 0.224 0.5 0.5s-0.224 0.5-0.5 0.5H18z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml
new file mode 100644
index 000000000..370ecb02a
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_people_add_28_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
+    <path android:pathData="M9.5 4C7.015 4 5 6.015 5 8.5S7.015 13 9.5 13 14 10.985 14 8.5 11.985 4 9.5 4zm-3 4.5c0-1.657 1.343-3 3-3s3 1.343 3 3-1.343 3-3 3-3-1.343-3-3zM20 6c-1.933 0-3.5 1.567-3.5 3.5S18.067 13 20 13s3.5-1.567 3.5-3.5S21.933 6 20 6zm-2 3.5c0-1.105 0.895-2 2-2s2 0.895 2 2-0.895 2-2 2-2-0.895-2-2zM4.25 15C3.007 15 2 16.007 2 17.25v0.531l0.003 0.057c0.002 0.046 0.006 0.109 0.014 0.185 0.017 0.153 0.049 0.363 0.11 0.612 0.125 0.497 0.373 1.156 0.867 1.815C4.008 21.803 5.942 23 9.5 23c1.531 0 2.762-0.222 3.747-0.582-0.128-0.489-0.21-0.996-0.236-1.518-0.836 0.355-1.97 0.6-3.511 0.6-3.192 0-4.633-1.053-5.306-1.95-0.35-0.466-0.524-0.932-0.61-1.279-0.044-0.173-0.065-0.314-0.075-0.408-0.005-0.046-0.007-0.08-0.008-0.1L3.5 17.745V17.25c0-0.414 0.336-0.75 0.75-0.75h9.905c0.33-0.523 0.723-1.002 1.168-1.426C15.14 15.026 14.948 15 14.75 15H4.25zM27 20.5c0 3.59-2.91 6.5-6.5 6.5S14 24.09 14 20.5s2.91-6.5 6.5-6.5 6.5 2.91 6.5 6.5zm-6-4c0-0.276-0.224-0.5-0.5-0.5S20 16.224 20 16.5V20h-3.5c-0.276 0-0.5 0.224-0.5 0.5s0.224 0.5 0.5 0.5H20v3.5c0 0.276 0.224 0.5 0.5 0.5s0.5-0.224 0.5-0.5V21h3.5c0.276 0 0.5-0.224 0.5-0.5S24.776 20 24.5 20H21v-3.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml
new file mode 100644
index 000000000..f4b216279
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_people_list_24_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:pathData="M5.5 8c0-1.38 1.12-2.5 2.5-2.5s2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5S5.5 9.38 5.5 8zM8 4C5.79 4 4 5.79 4 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm7.5 5c0-0.828 0.672-1.5 1.5-1.5s1.5 0.672 1.5 1.5-0.672 1.5-1.5 1.5-1.5-0.672-1.5-1.5zM17 6c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zM4.25 14C3.007 14 2 15.007 2 16.25v0.278l0.002 0.05c0.002 0.039 0.006 0.093 0.012 0.158 0.013 0.13 0.038 0.309 0.088 0.52 0.098 0.422 0.295 0.984 0.69 1.55C3.61 19.974 5.172 21 8 21c1.819 0 3.113-0.424 4.024-1.037 0.061-0.375 0.242-0.709 0.501-0.963-0.29-0.284-0.48-0.667-0.518-1.095l-0.028 0.04C11.486 18.65 10.422 19.5 8 19.5s-3.486-0.85-3.98-1.555c-0.26-0.373-0.392-0.748-0.458-1.03-0.032-0.14-0.048-0.254-0.055-0.328-0.004-0.038-0.006-0.065-0.006-0.08L3.5 16.495V16.25c0-0.414 0.336-0.75 0.75-0.75h7.5c0.098 0 0.19 0.019 0.276 0.052C12.009 15.454 12 15.353 12 15.25c0-0.438 0.161-0.84 0.428-1.146C12.214 14.036 11.986 14 11.75 14h-7.5zm8.275 2.5l-0.027 0.027 0.002-0.02v-0.032l0.025 0.025zm1.225-2c-0.414 0-0.75 0.336-0.75 0.75S13.336 16 13.75 16h7.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-7.5zm0 2.5C13.336 17 13 17.336 13 17.75s0.336 0.75 0.75 0.75h7.5c0.414 0 0.75-0.336 0.75-0.75S21.664 17 21.25 17h-7.5zm0 2.5c-0.414 0-0.75 0.336-0.75 0.75S13.336 21 13.75 21h7.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-7.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml
new file mode 100644
index 000000000..39394a989
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_people_list_28_regular.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="28dp" android:height="28dp" android:viewportWidth="28" android:viewportHeight="28">
+    <path android:pathData="M5 9.5C5 7.015 7.015 5 9.5 5S14 7.015 14 9.5 11.985 14 9.5 14 5 11.985 5 9.5zm4.5-3c-1.657 0-3 1.343-3 3s1.343 3 3 3 3-1.343 3-3-1.343-3-3-3zm7 4C16.5 8.567 18.067 7 20 7s3.5 1.567 3.5 3.5S21.933 14 20 14s-3.5-1.567-3.5-3.5zm3.5-2c-1.105 0-2 0.895-2 2s0.895 2 2 2 2-0.895 2-2-0.895-2-2-2zM2 18.25C2 17.007 3.007 16 4.25 16h10.5c0.236 0 0.464 0.036 0.678 0.104C15.16 16.41 15 16.812 15 17.25c0 0.103 0.009 0.204 0.026 0.302-0.085-0.033-0.178-0.052-0.276-0.052H4.25c-0.414 0-0.75 0.336-0.75 0.75v0.513l0.009 0.1c0.01 0.094 0.03 0.235 0.074 0.408 0.087 0.347 0.261 0.813 0.61 1.279 0.674 0.897 2.115 1.95 5.307 1.95s4.633-1.053 5.306-1.95c0.072-0.096 0.136-0.191 0.194-0.286 0.005 0.608 0.32 1.141 0.793 1.451-0.066 0.078-0.135 0.154-0.208 0.229-0.049 0.044-0.095 0.09-0.139 0.139C14.332 23.155 12.489 24 9.5 24c-3.558 0-5.492-1.197-6.506-2.55-0.495-0.659-0.742-1.318-0.866-1.815-0.062-0.249-0.094-0.459-0.11-0.612-0.009-0.076-0.013-0.139-0.015-0.185L2 18.781V18.25zm14.75-1.75c-0.414 0-0.75 0.336-0.75 0.75S16.336 18 16.75 18h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5zm0 3c-0.414 0-0.75 0.336-0.75 0.75S16.336 21 16.75 21h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5zm0 3c-0.414 0-0.75 0.336-0.75 0.75S16.336 24 16.75 24h8.5c0.414 0 0.75-0.336 0.75-0.75s-0.336-0.75-0.75-0.75h-8.5z" android:fillColor="@color/fluent_default_icon_tint"/>
+</vector>
diff --git a/mastodon/src/main/res/menu/menu_list.xml b/mastodon/src/main/res/menu/menu_list.xml
index dbd92e417..93123a9f2 100644
--- a/mastodon/src/main/res/menu/menu_list.xml
+++ b/mastodon/src/main/res/menu/menu_list.xml
@@ -3,6 +3,6 @@
     <item
         android:id="@+id/create"
         android:title="@string/sk_create"
-        android:icon="@drawable/ic_fluent_channel_add_24_regular"
+        android:icon="@drawable/ic_fluent_people_add_24_regular"
         android:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/menu/profile.xml b/mastodon/src/main/res/menu/profile.xml
index 1f2a99a2d..abf7b0e03 100644
--- a/mastodon/src/main/res/menu/profile.xml
+++ b/mastodon/src/main/res/menu/profile.xml
@@ -6,6 +6,6 @@
 	<item android:id="@+id/report" android:title="@string/report_user" android:icon="@drawable/ic_fluent_warning_24_regular"/>
 	<item android:id="@+id/block_domain" android:title="@string/block_domain" android:icon="@drawable/ic_fluent_shield_prohibited_24_regular"/>
 	<item android:id="@+id/hide_boosts" android:title="@string/hide_boosts_from_user" android:icon="@drawable/ic_fluent_arrow_repeat_all_off_24_regular"/>
-	<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_community_24_regular"/>
+	<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_list_24_regular"/>
 	<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser" android:icon="@drawable/ic_fluent_globe_24_regular"/>
 </menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/menu/profile_own.xml b/mastodon/src/main/res/menu/profile_own.xml
index 07acdf591..14c7b2c30 100644
--- a/mastodon/src/main/res/menu/profile_own.xml
+++ b/mastodon/src/main/res/menu/profile_own.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:id="@+id/followed_hashtags" android:title="@string/sk_hashtags_you_follow" android:icon="@drawable/ic_fluent_number_symbol_24_regular" android:showAsAction="always"/>
+	<item android:id="@+id/manage_user_lists" android:title="@string/sk_your_lists" android:icon="@drawable/ic_fluent_people_list_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/bookmarks" android:title="@string/bookmarks" android:icon="@drawable/ic_fluent_bookmark_multiple_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/favorites" android:title="@string/your_favorites" android:icon="@drawable/ic_fluent_star_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/scheduled" android:title="@string/sk_unsent_posts" android:icon="@drawable/ic_fluent_drafts_24_regular" android:showAsAction="always"/>
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 5f8c9c6f9..88f0772fc 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -154,6 +154,7 @@
     <string name="sk_delete_list">Delete list</string>
     <string name="sk_delete_list_confirm">Are you sure you want to delete this list?</string>
     <string name="sk_edit_list_title">Edit list</string>
+    <string name="sk_your_lists">Your lists</string>
 
     <!--    accessibility labels-->
     <string name="sk_poll_option_add">Add new poll option</string>

From 6f447909eb55741ef45582ef8e23c258bc8bd7fd Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Tue, 10 Jan 2023 14:29:21 +0100
Subject: [PATCH 095/200] add dividers to lists

---
 .../android/fragments/FollowedHashtagsFragment.java       | 8 ++++++++
 .../android/fragments/ListTimelinesFragment.java          | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
index 933503f77..e90034360 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
@@ -1,6 +1,7 @@
 package org.joinmastodon.android.fragments;
 
 import android.os.Bundle;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
@@ -11,6 +12,7 @@ import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.tags.GetFollowedHashtags;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.HeaderPaginationList;
+import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
 import me.grishka.appkit.api.SimpleCallback;
@@ -41,6 +43,12 @@ public class FollowedHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
             loadData();
     }
 
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 0));
+    }
+
     @Override
     protected void doLoadData(int offset, int count){
         currentRequest=new GetFollowedHashtags(offset==0 ? null : nextMaxID, null, count, null)
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
index 4c8e70d5a..e72ca5af4 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
@@ -19,6 +19,7 @@ import org.joinmastodon.android.api.requests.lists.CreateList;
 import org.joinmastodon.android.api.requests.lists.GetLists;
 import org.joinmastodon.android.api.requests.lists.RemoveAccountsFromList;
 import org.joinmastodon.android.model.ListTimeline;
+import org.joinmastodon.android.ui.DividerItemDecoration;
 import org.joinmastodon.android.ui.M3AlertDialogBuilder;
 import org.joinmastodon.android.ui.views.ListTimelineEditor;
 
@@ -73,6 +74,12 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
             loadData();
     }
 
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 0));
+    }
+
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.menu_list, menu);

From 58cb338cb22022240115662ce0a8386f3c6f96e0 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Tue, 10 Jan 2023 15:25:06 +0100
Subject: [PATCH 096/200] add missing icons to popup

---
 .../account_list/BaseAccountListFragment.java | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
index ca69067a4..87f04f443 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
@@ -225,6 +225,7 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 			contextMenu=new PopupMenu(getActivity(), menuAnchor);
 			contextMenu.inflate(R.menu.profile);
 			contextMenu.setOnMenuItemClickListener(this::onContextMenuItemSelected);
+			UiUtils.enablePopupMenuIcons(getActivity(), contextMenu);
 		}
 
 		@Override
@@ -283,29 +284,31 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 			Menu menu=contextMenu.getMenu();
 			Account account=item.account;
 
-			menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getDisplayUsername()));
-			menu.findItem(R.id.mute).setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
-			menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getDisplayUsername()));
-			menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getDisplayUsername()));
-			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getDisplayUsername())).setVisible(relationship.following);
+			menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getShortUsername()));
+
+			MenuItem mute = menu.findItem(R.id.mute);
+			mute.setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getShortUsername()));
+			mute.setIcon(relationship.muting ? R.drawable.ic_fluent_speaker_0_24_regular : R.drawable.ic_fluent_speaker_off_24_regular);
+			UiUtils.insetPopupMenuIcon(getContext(), mute);
+
+			menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
+			menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
+			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername())).setVisible(relationship.following);
 			MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
 			MenuItem manageUserLists=menu.findItem(R.id.manage_user_lists);
 			if(relationship.following){
-				hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getDisplayUsername()));
+				hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getShortUsername()));
+				hideBoosts.setIcon(relationship.showingReblogs ? R.drawable.ic_fluent_arrow_repeat_all_off_24_regular : R.drawable.ic_fluent_arrow_repeat_all_24_regular);
 				hideBoosts.setVisible(true);
-				manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getDisplayUsername()));
+				UiUtils.insetPopupMenuIcon(getContext(), hideBoosts);
+
+				manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
 				manageUserLists.setVisible(true);
 			}else{
 				hideBoosts.setVisible(false);
 				manageUserLists.setVisible(true);
 			}
-			MenuItem blockDomain=menu.findItem(R.id.block_domain);
-			if(!account.isLocal()){
-				blockDomain.setTitle(getString(relationship.domainBlocking ? R.string.unblock_domain : R.string.block_domain, account.getDomain()));
-				blockDomain.setVisible(true);
-			}else{
-				blockDomain.setVisible(false);
-			}
+			menu.findItem(R.id.block_domain).setVisible(false);
 
 			menuAnchor.setTranslationX(x);
 			menuAnchor.setTranslationY(y);

From 9f3bd186ba13c07aa436ee642527637e9272caf8 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Tue, 10 Jan 2023 15:41:46 +0100
Subject: [PATCH 097/200] improve domain check logic

---
 .../android/api/MastodonAPIController.java             | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
index 6a2dfe8a3..3f8696dd2 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
@@ -61,7 +61,11 @@ public class MastodonAPIController{
 			String line;
 			while ((line = reader.readLine()) != null) {
 				if (line.isBlank() || line.startsWith("#")) continue;
-				badDomains.add(line.toLowerCase().trim());
+				String[] parts = line.replaceAll("\"", "").split("[\s,;]");
+				if (parts.length == 0) continue;
+				String domain = parts[0].toLowerCase().trim();
+				if (domain.isBlank()) continue;
+				badDomains.add(domain);
 			}
 		} catch (IOException e) {
 			e.printStackTrace();
@@ -73,8 +77,8 @@ public class MastodonAPIController{
 	}
 
 	public <T> void submitRequest(final MastodonAPIRequest<T> req){
-		final String host = req.getURL().getHost().toLowerCase();
-		final boolean isBad = badDomains.stream().anyMatch(host::endsWith);
+		final String host = req.getURL().getHost();
+		final boolean isBad = host == null || badDomains.stream().anyMatch(h -> h.equalsIgnoreCase(host) || host.toLowerCase().endsWith("." + h));
 		thread.postRunnable(()->{
 			try{
 				if (isBad) throw new IllegalArgumentException();

From 83822b8f69fd70e8a33cb32c694c685d0bc90926 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Tue, 10 Jan 2023 15:41:52 +0100
Subject: [PATCH 098/200] add more domains

---
 mastodon/src/main/assets/blocks.tsv | 48 ++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/assets/blocks.tsv b/mastodon/src/main/assets/blocks.tsv
index 8075bbb4b..4eaee7053 100644
--- a/mastodon/src/main/assets/blocks.tsv
+++ b/mastodon/src/main/assets/blocks.tsv
@@ -36,4 +36,50 @@ shadowsocial.org
 kiwifarms.net
 kiwifarms.cc
 kiwifarms.is
-kiwifarms.pleroma.net
\ No newline at end of file
+kiwifarms.pleroma.net
+
+
+# https://mastodon.art/@Curator/109649354849593592
+
+poa.st antisemitic racist homophobic
+nicecrew.digital antisemitic
+beefyboys.win antisemitic racist homophobic harassment
+cawfee.club antisemitic racist homophobic
+comfyboy.club antisemitic racist homophobic
+freespeechextremist.com racist homophobic
+cum.salon racist misogynist
+bae.st racist
+natehiggers.online racist
+rapemeat.solutions misogynist
+rapist.town misogynist
+rapefeminists.network misogynist
+kiwifarms.cc harassment
+noagendasocial.com noagenda
+posting.lolicon.rocks underage
+urchan.org harassment homophobic racist
+ryona.agency harassment
+yggdrasil.social antisemitic homophobic racist
+genderheretics.xyz transphobic
+baraag.net underage
+lolison.top underage
+shota.house underage
+shota.social underage
+aethy.com underage
+taullo.social underage
+childpawn.shop underage
+posting.lolicon.rocks underage
+loli.best underage
+gothloli.club underage
+smuglo.li underage
+youjo.love underage
+pedo.school underage
+lolison.network underage
+freak.university underage
+mirr0r.city underage
+xhais.love underage
+refusal.biz underage
+refusal.llc underage
+mirr0r.city underage
+nnia.space underage
+ignorelist.com malicious
+repl.co malicious

From 94fa1133fd1e32e3f8b7a4d91606b9d7385f6bb8 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Tue, 10 Jan 2023 15:54:08 +0100
Subject: [PATCH 099/200] fix editing sensitive option

closes sk22#260
---
 .../joinmastodon/android/fragments/ComposeFragment.java    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index 97484f220..300803ecd 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -435,6 +435,13 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			spoilerBtn.setSelected(true);
 		}
 
+		sensitive = savedInstanceState==null && editingStatus != null ? editingStatus.sensitive
+				: savedInstanceState!=null && savedInstanceState.getBoolean("sensitive", false);
+		if (sensitive) {
+			sensitiveItem.setVisibility(View.VISIBLE);
+			sensitiveIcon.setSelected(true);
+		}
+
 		if(savedInstanceState!=null && savedInstanceState.containsKey("attachments")){
 			ArrayList<Parcelable> serializedAttachments=savedInstanceState.getParcelableArrayList("attachments");
 			for(Parcelable a:serializedAttachments){

From bb08d6585cc4db65c757573b5d9945a813732cab Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Tue, 10 Jan 2023 12:09:55 -0300
Subject: [PATCH 100/200] disable more button when read

closes #262
---
 .../android/ui/displayitems/HeaderStatusDisplayItem.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
index a543cddd6..0b99871ef 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
@@ -11,6 +11,7 @@ import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ImageSpan;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.SubMenu;
@@ -353,7 +354,9 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
 				desc = item.parentFragment.getString(R.string.sk_mark_as_read);
 				more.animate().alpha(alpha);
 				unreadIndicator.animate().alpha(alpha);
+				more.setEnabled(!item.announcement.read);
 				more.setOnClickListener(v -> {
+					if (item.announcement.read) return;
 					new DismissAnnouncement(item.announcement.id).setCallback(new Callback<>() {
 						@Override
 						public void onSuccess(Object o) {

From 87ce6b8bb16742516b34a465279b69f868a69dfb Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Wed, 11 Jan 2023 13:06:40 +0300
Subject: [PATCH 101/200] Fix #498

---
 .../android/fragments/ComposeFragment.java          | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index 300803ecd..9a4684b6d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -527,6 +527,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 		mainEditText.setSelectionListener(this);
 		mainEditText.addTextChangedListener(new TextWatcher(){
+			private int lastChangeStart, lastChangeCount;
+
 			@Override
 			public void beforeTextChanged(CharSequence s, int start, int count, int after){
 
@@ -536,6 +538,14 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			public void onTextChanged(CharSequence s, int start, int before, int count){
 				if(s.length()==0)
 					return;
+				lastChangeStart=start;
+				lastChangeCount=count;
+			}
+
+			@Override
+			public void afterTextChanged(Editable s){
+				int start=lastChangeStart;
+				int count=lastChangeCount;
 				// offset one char back to catch an already typed '@' or '#' or ':'
 				int realStart=start;
 				start=Math.max(0, start-1);
@@ -581,10 +591,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 						editable.removeSpan(span);
 					}
 				}
-			}
 
-			@Override
-			public void afterTextChanged(Editable s){
 				updateCharCounter();
 			}
 		});

From a31e33415e8e86745a139dc16fde1ad8b33250a3 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Wed, 11 Jan 2023 14:44:26 +0100
Subject: [PATCH 102/200] fix edit user lists always visible

closes sk22#272
---
 .../java/org/joinmastodon/android/fragments/ProfileFragment.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index d6ac22e20..99e61436a 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -635,6 +635,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
 		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
+		menu.findItem(R.id.manage_user_lists).setVisible(relationship.following);
 		if(relationship.following) {
 			MenuItem hideBoosts = menu.findItem(R.id.hide_boosts);
 			hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getShortUsername()));

From 928b04eda6e1c575e64331370b3798b6a4683f54 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Wed, 11 Jan 2023 14:46:09 +0100
Subject: [PATCH 103/200] tweak list decoration

closes sk22#273
---
 .../android/fragments/FollowedHashtagsFragment.java             | 2 +-
 .../joinmastodon/android/fragments/ListTimelinesFragment.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
index e90034360..1a9ecb862 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
@@ -46,7 +46,7 @@ public class FollowedHashtagsFragment extends BaseRecyclerFragment<Hashtag> impl
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 0));
+        list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 16));
     }
 
     @Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
index e72ca5af4..2a22ae0d1 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
@@ -77,7 +77,7 @@ public class ListTimelinesFragment extends BaseRecyclerFragment<ListTimeline> im
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 0));
+        list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 0.5f, 56, 16));
     }
 
     @Override

From 24640423298ce8c13b118b4c1ce1bd7e632e43f4 Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Thu, 12 Jan 2023 00:40:50 +0300
Subject: [PATCH 104/200] Fix #499

---
 .../org/joinmastodon/android/fragments/ComposeFragment.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index 9a4684b6d..def85ee47 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -544,6 +544,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 
 			@Override
 			public void afterTextChanged(Editable s){
+				if(s.length()==0)
+					return;
 				int start=lastChangeStart;
 				int count=lastChangeCount;
 				// offset one char back to catch an already typed '@' or '#' or ':'

From 096aa23f69097564a5078c6c6afc86597f6d3f81 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Fri, 13 Jan 2023 04:52:35 +0100
Subject: [PATCH 105/200] don't use person icon for unblock

close #245
---
 .../main/java/org/joinmastodon/android/ui/utils/UiUtils.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index 1eef7802b..2560c6051 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -362,7 +362,7 @@ public class UiUtils{
 		showConfirmationAlert(activity, activity.getString(currentlyBlocked ? R.string.confirm_unblock_title : R.string.confirm_block_title),
 				activity.getString(currentlyBlocked ? R.string.confirm_unblock : R.string.confirm_block, account.displayName),
 				activity.getString(currentlyBlocked ? R.string.do_unblock : R.string.do_block),
-				currentlyBlocked ? R.drawable.ic_fluent_person_28_regular : R.drawable.ic_fluent_person_prohibited_28_regular,
+				R.drawable.ic_fluent_person_prohibited_28_regular,
 				()->{
 					new SetAccountBlocked(account.id, !currentlyBlocked)
 							.setCallback(new Callback<>(){

From d06cf1bb1ed8a175e2218fa7c845f8ea403ecbdb Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Sun, 15 Jan 2023 11:09:53 +0300
Subject: [PATCH 106/200] Paginate trending posts

---
 .../android/api/requests/trends/GetTrendingStatuses.java      | 4 +++-
 .../android/fragments/discover/DiscoverPostsFragment.java     | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingStatuses.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingStatuses.java
index b902563c2..ea781d716 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingStatuses.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingStatuses.java
@@ -8,9 +8,11 @@ import org.joinmastodon.android.model.Status;
 import java.util.List;
 
 public class GetTrendingStatuses extends MastodonAPIRequest<List<Status>>{
-	public GetTrendingStatuses(int limit){
+	public GetTrendingStatuses(int offset, int limit){
 		super(HttpMethod.GET, "/trends/statuses", new TypeToken<>(){});
 		if(limit>0)
 			addQueryParameter("limit", ""+limit);
+		if(offset>0)
+			addQueryParameter("offset", ""+offset);
 	}
 }
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java
index c79b51203..ebf8b7620 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java
@@ -17,11 +17,11 @@ public class DiscoverPostsFragment extends StatusListFragment{
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetTrendingStatuses(count)
+		currentRequest=new GetTrendingStatuses(offset, count)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){
-						onDataLoaded(result, false);
+						onDataLoaded(result, !result.isEmpty());
 					}
 				}).exec(accountID);
 	}

From ad87efa7e25ba36a1e466a7d36902ace5c8c4014 Mon Sep 17 00:00:00 2001
From: Grishka <git@grishka.me>
Date: Sun, 15 Jan 2023 11:40:06 +0300
Subject: [PATCH 107/200] Fix #484

---
 .../org/joinmastodon/android/fragments/ComposeFragment.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
index def85ee47..3ff757f08 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -720,7 +720,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 						DraftMediaAttachment da=new DraftMediaAttachment();
 						da.serverAttachment=att;
 						da.description=att.description;
-						da.uri=Uri.parse(att.previewUrl);
+						da.uri=att.previewUrl!=null ? Uri.parse(att.previewUrl) : null;
 						da.state=AttachmentUploadState.DONE;
 						attachmentsView.addView(createMediaAttachmentView(da));
 						attachments.add(da);
@@ -1307,7 +1307,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 		View thumb=getActivity().getLayoutInflater().inflate(R.layout.compose_media_thumb, attachmentsView, false);
 		ImageView img=thumb.findViewById(R.id.thumb);
 		if(draft.serverAttachment!=null){
-			ViewImageLoader.load(img, draft.serverAttachment.blurhashPlaceholder, new UrlImageLoaderRequest(draft.serverAttachment.previewUrl, V.dp(250), V.dp(250)));
+			if(draft.serverAttachment.previewUrl!=null)
+				ViewImageLoader.load(img, draft.serverAttachment.blurhashPlaceholder, new UrlImageLoaderRequest(draft.serverAttachment.previewUrl, V.dp(250), V.dp(250)));
 		}else{
 			if(draft.mimeType.startsWith("image/")){
 				ViewImageLoader.load(img, null, new UrlImageLoaderRequest(draft.uri, V.dp(250), V.dp(250)));

From 6666f8232913da6edc6083a44157a38d76e80424 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 16 Jan 2023 09:48:29 +0100
Subject: [PATCH 108/200] don't require unused fields

---
 .../main/java/org/joinmastodon/android/model/Instance.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Instance.java b/mastodon/src/main/java/org/joinmastodon/android/model/Instance.java
index d2bba026f..7b546e0ab 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Instance.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Instance.java
@@ -27,7 +27,7 @@ public class Instance extends BaseModel{
 	/**
 	 * Admin-defined description of the Mastodon site.
 	 */
-	@RequiredField
+//	@RequiredField
 	public String description;
 	/**
 	 * A shorter description defined by the admin.
@@ -37,7 +37,7 @@ public class Instance extends BaseModel{
 	/**
 	 * An email that may be contacted for any inquiries.
 	 */
-	@RequiredField
+//	@RequiredField
 	public String email;
 	/**
 	 * The version of Mastodon installed on the instance.

From 3064b549cd61383f2ee844d02183a501aec1ce07 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 16 Jan 2023 17:55:44 +0100
Subject: [PATCH 109/200] fix cut off text

closes sk22#295
---
 mastodon/src/main/res/layout/compose_media_thumb.xml         | 4 ++--
 mastodon/src/main/res/layout/item_recent_searches_header.xml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/res/layout/compose_media_thumb.xml b/mastodon/src/main/res/layout/compose_media_thumb.xml
index c795ef218..aeeeb492b 100644
--- a/mastodon/src/main/res/layout/compose_media_thumb.xml
+++ b/mastodon/src/main/res/layout/compose_media_thumb.xml
@@ -103,7 +103,7 @@
 			<TextView
 				android:id="@+id/state_title"
 				android:layout_width="match_parent"
-				android:layout_height="16dp"
+				android:layout_height="wrap_content"
 				android:layout_below="@id/retry_or_cancel_upload"
 				android:layout_marginTop="16dp"
 				android:textColor="?colorGray200"
@@ -118,7 +118,7 @@
 			<TextView
 				android:id="@+id/state_text"
 				android:layout_width="match_parent"
-				android:layout_height="32dp"
+				android:layout_height="wrap_content"
 				android:layout_below="@id/state_title"
 				android:includeFontPadding="false"
 				android:textColor="?colorGray200"
diff --git a/mastodon/src/main/res/layout/item_recent_searches_header.xml b/mastodon/src/main/res/layout/item_recent_searches_header.xml
index 29352a7b3..0452d7baa 100644
--- a/mastodon/src/main/res/layout/item_recent_searches_header.xml
+++ b/mastodon/src/main/res/layout/item_recent_searches_header.xml
@@ -6,7 +6,7 @@
 
 	<TextView
 		android:layout_width="0dp"
-		android:layout_height="28dp"
+		android:layout_height="wrap_content"
 		android:layout_weight="1"
 		android:layout_marginTop="12dp"
 		android:layout_marginStart="16dp"
@@ -22,6 +22,7 @@
 		android:layout_height="44dp"
 		android:layout_marginTop="4dp"
 		android:layout_marginEnd="6dp"
+		android:layout_gravity="center_vertical"
 		android:tint="?android:textColorSecondary"
 		android:background="?android:selectableItemBackgroundBorderless"
 		android:contentDescription="@string/clear"

From a4b18de72c380d2fdbe1650a3c10e2c7918c2582 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 16 Jan 2023 18:12:21 +0100
Subject: [PATCH 110/200] add missing draft params

closes sk22#302
---
 .../java/org/joinmastodon/android/model/ScheduledStatus.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/ScheduledStatus.java b/mastodon/src/main/java/org/joinmastodon/android/model/ScheduledStatus.java
index f9422dd0f..cb08ad1f3 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/ScheduledStatus.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/ScheduledStatus.java
@@ -66,10 +66,12 @@ public class ScheduledStatus extends BaseModel implements DisplayItemsParent{
         s.id = id;
         s.mediaAttachments = mediaAttachments;
         s.createdAt = scheduledAt;
+        s.inReplyToId = "" + params.inReplyToId;
         s.content = s.text = params.text;
         s.spoilerText = params.spoilerText;
         s.visibility = params.visibility;
         s.language = params.language;
+        s.sensitive = params.sensitive;
         s.mentions = List.of();
         s.tags = List.of();
         s.emojis = List.of();

From 87342782d797a26a4d5b4c7db352e83bbae6b2b6 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 16 Jan 2023 18:32:42 +0100
Subject: [PATCH 111/200] fix clearing notifications

closes sk22#292
---
 .../org/joinmastodon/android/fragments/HomeFragment.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
index 30b38ffbf..8425ad236 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
@@ -5,6 +5,7 @@ import android.app.NotificationManager;
 import android.graphics.Outline;
 import android.os.Build;
 import android.os.Bundle;
+import android.service.notification.StatusBarNotification;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -233,7 +234,11 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			((NotificationsFragment) newFragment).loadData();
 			// TODO make an interface?
 			NotificationManager nm=getActivity().getSystemService(NotificationManager.class);
-			nm.cancel(accountID, PushNotificationReceiver.NOTIFICATION_ID);
+			for (StatusBarNotification notification : nm.getActiveNotifications()) {
+				if (accountID.equals(notification.getTag())) {
+					nm.cancel(accountID, notification.getId());
+				}
+			}
 		}
 	}
 

From c6164b1bcdd796679e975bd65120ad137ed3e96f Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 16 Jan 2023 15:06:40 -0300
Subject: [PATCH 112/200] display image cache size

closes sk22#301
---
 .../android/fragments/SettingsFragment.java   | 37 +++++++++++++------
 .../main/res/layout/item_settings_text.xml    |  9 ++++-
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
index dfad92489..85fbc26d2 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
@@ -85,7 +85,8 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	private PushSubscription pushSubscription;
 
 	private ImageView themeTransitionWindowView;
-	private TextItem checkForUpdateItem;
+	private TextItem checkForUpdateItem, clearImageCacheItem;
+	private ImageCache imageCache;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState){
@@ -93,6 +94,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		if(Build.VERSION.SDK_INT>=Build.VERSION_CODES.N)
 			setRetainInstance(true);
 		setTitle(R.string.settings);
+		imageCache = ImageCache.getInstance(getActivity());
 		accountID=getArguments().getString("account");
 		AccountSession session=AccountSessionManager.getInstance().getAccount(accountID);
 		Instance instance = AccountSessionManager.getInstance().getInstanceInfo(session.domain);
@@ -282,6 +284,8 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		items.add(new TextItem(R.string.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/LucasGGamerM/moshidon"), R.drawable.ic_fluent_open_24_regular));
 		items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sponsors/LucasGGamerM"), R.drawable.ic_fluent_heart_24_regular));
 		items.add(new TextItem(R.string.settings_clear_cache, this::clearImageCache));
+		clearImageCacheItem = new TextItem(R.string.settings_clear_cache, UiUtils.formatFileSize(getContext(), imageCache.getDiskCache().size(), true), this::clearImageCache, 0);
+		items.add(clearImageCacheItem);
 		items.add(new TextItem(R.string.sk_clear_recent_languages, ()->UiUtils.showConfirmationAlert(getActivity(), R.string.sk_clear_recent_languages, R.string.sk_confirm_clear_recent_languages, R.string.clear, ()->{
 			GlobalUserPreferences.recentLanguages.remove(accountID);
 			GlobalUserPreferences.save();
@@ -530,9 +534,13 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	private void clearImageCache(){
 		MastodonAPIController.runInBackground(()->{
 			Activity activity=getActivity();
-			ImageCache.getInstance(getActivity()).clear();
+			imageCache.clear();
 			Toast.makeText(activity, R.string.media_cache_cleared, Toast.LENGTH_SHORT).show();
 		});
+		if (list.findViewHolderForAdapterPosition(items.indexOf(clearImageCacheItem)) instanceof TextViewHolder tvh) {
+			clearImageCacheItem.secondaryText = UiUtils.formatFileSize(getContext(), 0, true);
+			tvh.rebind();
+		}
 	}
 
 	@Subscribe
@@ -663,27 +671,29 @@ public class SettingsFragment extends MastodonToolbarFragment{
 
 	private class TextItem extends Item{
 		private String text;
+		private String secondaryText;
 		private Runnable onClick;
 		private boolean loading;
 		private int icon;
 
 		public TextItem(@StringRes int text, Runnable onClick) {
-			this(text, onClick, false, 0);
-		}
-
-		public TextItem(@StringRes int text, Runnable onClick, boolean loading) {
-			this(text, onClick, loading, 0);
+			this(text, null, onClick, false, 0);
 		}
 
 		public TextItem(@StringRes int text, Runnable onClick, @DrawableRes int icon) {
-			this(text, onClick, false, icon);
+			this(text, null, onClick, false, icon);
 		}
 
-		public TextItem(@StringRes int text, Runnable onClick, boolean loading, @DrawableRes int icon){
+		public TextItem(@StringRes int text, String secondaryText, Runnable onClick, @DrawableRes int icon) {
+			this(text, secondaryText, onClick, false, icon);
+		}
+
+		public TextItem(@StringRes int text, String secondaryText, Runnable onClick, boolean loading, @DrawableRes int icon){
 			this.text=getString(text);
 			this.onClick=onClick;
 			this.loading=loading;
 			this.icon=icon;
+			this.secondaryText = secondaryText;
 		}
 
 		@Override
@@ -935,22 +945,27 @@ public class SettingsFragment extends MastodonToolbarFragment{
 	}
 
 	private class TextViewHolder extends BindableViewHolder<TextItem> implements UsableRecyclerView.Clickable{
-		private final TextView text;
+		private final TextView text, secondaryText;
 		private final ProgressBar progress;
 		private final ImageView icon;
 
 		public TextViewHolder(){
 			super(getActivity(), R.layout.item_settings_text, list);
 			text = itemView.findViewById(R.id.text);
+			secondaryText = itemView.findViewById(R.id.secondary_text);
 			progress = itemView.findViewById(R.id.progress);
 			icon = itemView.findViewById(R.id.icon);
 		}
 
 		@Override
 		public void onBind(TextItem item){
+			icon.setVisibility(item.icon != 0 ? View.VISIBLE : View.GONE);
+			secondaryText.setVisibility(item.secondaryText != null ? View.VISIBLE : View.GONE);
+
 			text.setText(item.text);
 			progress.animate().alpha(item.loading ? 1 : 0);
-			if (item.icon != 0) icon.setImageDrawable(getActivity().getTheme().getDrawable(item.icon));
+			icon.setImageResource(item.icon);
+			secondaryText.setText(item.secondaryText);
 		}
 
 		@Override
diff --git a/mastodon/src/main/res/layout/item_settings_text.xml b/mastodon/src/main/res/layout/item_settings_text.xml
index d976eecf7..78f1a2ca8 100644
--- a/mastodon/src/main/res/layout/item_settings_text.xml
+++ b/mastodon/src/main/res/layout/item_settings_text.xml
@@ -24,8 +24,13 @@
 		android:layout_width="24dp"
 		android:layout_height="24dp"
 		android:layout_gravity="center"
-		android:alpha="0"
-	/>
+		android:alpha="0" />
+	<TextView
+		android:id="@+id/secondary_text"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:textColor="?android:textColorSecondary" />
 	<ImageView
 		android:id="@+id/icon"
 		android:importantForAccessibility="no"

From 513736f7650c4390f55e929729f59b24dc902d22 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 18 Jan 2023 14:02:04 -0300
Subject: [PATCH 113/200] Fixing duplicate settings item

---
 .../org/joinmastodon/android/fragments/SettingsFragment.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
index 85fbc26d2..abf111f1b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
@@ -283,7 +283,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 		items.add(new TextItem(R.string.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/LucasGGamerM/moshidon"), R.drawable.ic_fluent_open_24_regular));
 		items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sponsors/LucasGGamerM"), R.drawable.ic_fluent_heart_24_regular));
-		items.add(new TextItem(R.string.settings_clear_cache, this::clearImageCache));
+//		items.add(new TextItem(R.string.settings_clear_cache, this::clearImageCache));
 		clearImageCacheItem = new TextItem(R.string.settings_clear_cache, UiUtils.formatFileSize(getContext(), imageCache.getDiskCache().size(), true), this::clearImageCache, 0);
 		items.add(clearImageCacheItem);
 		items.add(new TextItem(R.string.sk_clear_recent_languages, ()->UiUtils.showConfirmationAlert(getActivity(), R.string.sk_clear_recent_languages, R.string.sk_confirm_clear_recent_languages, R.string.clear, ()->{

From 5a547015e625212bf3b1b76f9f7245315e9b3d5e Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 16 Jan 2023 19:12:37 +0100
Subject: [PATCH 114/200] include list title in delete prompt

closes sk22#304
---
 .../android/fragments/ListTimelineFragment.java           | 2 +-
 .../java/org/joinmastodon/android/ui/utils/UiUtils.java   | 8 ++++++--
 mastodon/src/main/res/values/strings_sk.xml               | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
index 96bc5165b..236636370 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
@@ -88,7 +88,7 @@ public class ListTimelineFragment extends StatusListFragment {
                     .setNegativeButton(R.string.cancel, (d, which) -> {})
                     .show();
         } else if (item.getItemId() == R.id.delete) {
-            UiUtils.confirmDeleteList(getActivity(), accountID, listID, () -> {
+            UiUtils.confirmDeleteList(getActivity(), accountID, listID, listTitle, () -> {
                 args.putBoolean("deleted", true);
                 setResult(true, args);
                 Nav.finish(this);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index 2560c6051..e7cbdd3fd 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -534,8 +534,12 @@ public class UiUtils{
 		);
 	}
 
-	public static void confirmDeleteList(Activity activity, String accountID, String listID, Runnable callback) {
-		showConfirmationAlert(activity, R.string.sk_delete_list, R.string.sk_delete_list_confirm, R.string.delete, R.drawable.ic_fluent_delete_28_regular,
+	public static void confirmDeleteList(Activity activity, String accountID, String listID, String listTitle, Runnable callback) {
+		showConfirmationAlert(activity,
+				activity.getString(R.string.sk_delete_list),
+				activity.getString(R.string.sk_delete_list_confirm, listTitle),
+				activity.getString(R.string.delete),
+				R.drawable.ic_fluent_delete_28_regular,
 				() -> new DeleteList(listID).setCallback(new Callback<>() {
 							@Override
 							public void onSuccess(Object o) {
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 88f0772fc..fb27bc231 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -152,7 +152,7 @@
     <string name="sk_list_replies_policy_followed">followed users</string>
     <string name="sk_list_replies_policy_none">no one</string>
     <string name="sk_delete_list">Delete list</string>
-    <string name="sk_delete_list_confirm">Are you sure you want to delete this list?</string>
+    <string name="sk_delete_list_confirm">Are you sure you want to delete the list “%s”?</string>
     <string name="sk_edit_list_title">Edit list</string>
     <string name="sk_your_lists">Your lists</string>
 

From 7fa52247e8a71ad5009c6ca404e22f91857e6c08 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 16 Jan 2023 19:46:44 +0100
Subject: [PATCH 115/200] display unread announcements first

closes sk22#274
---
 .../android/fragments/AnnouncementsFragment.java  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
index eb03ddd78..b2b42bc7e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
@@ -1,5 +1,7 @@
 package org.joinmastodon.android.fragments;
 
+import static java.util.stream.Collectors.toList;
+
 import android.app.Activity;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -34,6 +36,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import me.grishka.appkit.Nav;
 import me.grishka.appkit.api.PaginatedList;
@@ -87,19 +90,17 @@ public class AnnouncementsFragment extends BaseStatusListFragment<Announcement>
 	public void onItemClick(String id) {
 	}
 
-	@Override
-	protected void onDataLoaded(List<Announcement> d, boolean more) {
-		unreadIDs = d.stream().filter(a -> !a.read).map(a -> a.id).collect(Collectors.toList());
-		super.onDataLoaded(d, more);
-	}
-
 	@Override
 	protected void doLoadData(int offset, int count){
 		currentRequest=new GetAnnouncements(true)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Announcement> result){
-						onDataLoaded(result, false);
+						List<Announcement> unread = result.stream().filter(a -> !a.read).collect(toList());
+						List<Announcement> read = result.stream().filter(a -> a.read).collect(toList());
+						onDataLoaded(unread, true);
+						onDataLoaded(read, false);
+						unreadIDs = unread.stream().map(a -> a.id).collect(toList());
 					}
 				})
 				.exec(accountID);

From 480d4ad9046f75a363a47360fc55f49bf15e9598 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 16 Jan 2023 20:23:38 +0100
Subject: [PATCH 116/200] make announcements selectable

closes sk22#275
---
 .../android/fragments/AnnouncementsFragment.java           | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
index b2b42bc7e..74ea115e8 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
@@ -66,9 +66,11 @@ public class AnnouncementsFragment extends BaseStatusListFragment<Announcement>
 		instanceUser.avatar = instanceUser.avatarStatic = instance.thumbnail;
 		instanceUser.emojis = List.of();
 		Status fakeStatus = a.toStatus();
+		TextStatusDisplayItem textItem = new TextStatusDisplayItem(a.id, HtmlParser.parse(a.content, a.emojis, a.mentions, a.tags, accountID), this, fakeStatus);
+		textItem.textSelectable = true;
 		return List.of(
 				HeaderStatusDisplayItem.fromAnnouncement(a, fakeStatus, instanceUser, this, accountID, this::onMarkAsRead),
-				new TextStatusDisplayItem(a.id, HtmlParser.parse(a.content, a.emojis, a.mentions, a.tags, accountID), this, fakeStatus)
+				textItem
 		);
 	}
 
@@ -87,8 +89,7 @@ public class AnnouncementsFragment extends BaseStatusListFragment<Announcement>
 	protected void addAccountToKnown(Announcement s) {}
 
 	@Override
-	public void onItemClick(String id) {
-	}
+	public void onItemClick(String id) {}
 
 	@Override
 	protected void doLoadData(int offset, int count){

From 13b5462f6323d92831ec92e80c80048491d85695 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 16 Jan 2023 21:38:47 +0100
Subject: [PATCH 117/200] fix images not loading on akkoma

closes sk22#25
---
 .../org/joinmastodon/android/model/Attachment.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java b/mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java
index 9dff2c4d9..212ca9417 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java
@@ -14,9 +14,11 @@ import org.parceler.Parcel;
 import org.parceler.ParcelConstructor;
 import org.parceler.ParcelProperty;
 
+import java.util.UUID;
+
 @Parcel
 public class Attachment extends BaseModel{
-	@RequiredField
+//	@RequiredField
 	public String id;
 	@RequiredField
 	public Type type;
@@ -85,6 +87,12 @@ public class Attachment extends BaseModel{
 			if(placeholder!=null)
 				blurhashPlaceholder=new BlurHashDrawable(placeholder, getWidth(), getHeight());
 		}
+
+		if (id == null) {
+			// akkoma servers doesn't provide IDs for attachments,
+			// but IDs are needed by the AudioPlayerService
+			id = "" + this.hashCode();
+		}
 	}
 
 	@Override

From d32a57a18d8d909c01e7f4e242688355cc59bdfe Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 16 Jan 2023 22:06:20 +0100
Subject: [PATCH 118/200] fix akkoma link previews not showing

closes sk22#183
---
 .../android/ui/displayitems/LinkCardStatusDisplayItem.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java
index abfe546c1..42ac3b429 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java
@@ -73,7 +73,12 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
 
 			photo.setImageDrawable(null);
 			if(item.imgRequest!=null){
-				crossfadeDrawable.setSize(card.width, card.height);
+				if (card.width > 0) {
+					// akkoma servers don't provide width and height
+					crossfadeDrawable.setSize(card.width, card.height);
+				} else {
+					crossfadeDrawable.setSize(itemView.getWidth(), itemView.getHeight());
+				}
 				crossfadeDrawable.setBlurhashDrawable(card.blurhashPlaceholder);
 				crossfadeDrawable.setCrossfadeAlpha(item.status.spoilerRevealed ? 0f : 1f);
 				photo.setImageDrawable(crossfadeDrawable);

From 93255903197183f25e1fd9b4baa126d6bc380678 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 16 Jan 2023 18:09:10 -0300
Subject: [PATCH 119/200] change search placeholder string

---
 mastodon/src/main/res/values/strings_sk.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index fb27bc231..ae6811678 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -155,6 +155,10 @@
     <string name="sk_delete_list_confirm">Are you sure you want to delete the list “%s”?</string>
     <string name="sk_edit_list_title">Edit list</string>
     <string name="sk_your_lists">Your lists</string>
+    <string name="sk_timeline_home">Home</string>
+    <string name="sk_timeline_local">Local</string>
+    <string name="sk_timeline_federated">Federation</string>
+    <string name="sk_recent_searches_placeholder">Type something to start searching</string>
 
     <!--    accessibility labels-->
     <string name="sk_poll_option_add">Add new poll option</string>

From eb41d77d540ea3309a8f36def09ca2c28031773a Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Mon, 16 Jan 2023 19:56:32 -0300
Subject: [PATCH 120/200] implement soft-blocking

sk22#297
---
 .../android/fragments/ProfileFragment.java    |  7 ++++
 .../account_list/BaseAccountListFragment.java |  3 ++
 .../android/ui/utils/UiUtils.java             | 32 +++++++++++++++++++
 mastodon/src/main/res/menu/profile.xml        |  1 +
 mastodon/src/main/res/values/strings_sk.xml   |  4 +++
 5 files changed, 47 insertions(+)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 99e61436a..21c85ea68 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -636,6 +636,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
 		menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
 		menu.findItem(R.id.manage_user_lists).setVisible(relationship.following);
+		menu.findItem(R.id.soft_block).setVisible(relationship.followedBy && !relationship.following);
 		if(relationship.following) {
 			MenuItem hideBoosts = menu.findItem(R.id.hide_boosts);
 			hideBoosts.setTitle(getString(relationship.showingReblogs ? R.string.hide_boosts_from_user : R.string.show_boosts_from_user, account.getShortUsername()));
@@ -663,6 +664,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			confirmToggleMuted();
 		}else if(id==R.id.block){
 			confirmToggleBlocked();
+		}else if(id==R.id.soft_block){
+			confirmSoftBlockUser();
 		}else if(id==R.id.report){
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
@@ -973,6 +976,10 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		UiUtils.confirmToggleBlockUser(getActivity(), accountID, account, relationship.blocking, this::updateRelationship);
 	}
 
+	private void confirmSoftBlockUser(){
+		UiUtils.confirmSoftBlockUser(getActivity(), accountID, account, this::updateRelationship);
+	}
+
 	private void updateRelationship(Relationship r){
 		relationship=r;
 		updateRelationship();
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
index 87f04f443..b8dd2017b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
@@ -294,6 +294,7 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 			menu.findItem(R.id.block).setTitle(getString(relationship.blocking ? R.string.unblock_user : R.string.block_user, account.getShortUsername()));
 			menu.findItem(R.id.report).setTitle(getString(R.string.report_user, account.getShortUsername()));
 			menu.findItem(R.id.manage_user_lists).setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername())).setVisible(relationship.following);
+			menu.findItem(R.id.soft_block).setVisible(relationship.followedBy && !relationship.following);
 			MenuItem hideBoosts=menu.findItem(R.id.hide_boosts);
 			MenuItem manageUserLists=menu.findItem(R.id.manage_user_lists);
 			if(relationship.following){
@@ -349,6 +350,8 @@ public abstract class BaseAccountListFragment extends BaseRecyclerFragment<BaseA
 				UiUtils.confirmToggleMuteUser(getActivity(), accountID, account, relationship.muting, this::updateRelationship);
 			}else if(id==R.id.block){
 				UiUtils.confirmToggleBlockUser(getActivity(), accountID, account, relationship.blocking, this::updateRelationship);
+			}else if(id==R.id.soft_block){
+				UiUtils.confirmSoftBlockUser(getActivity(), accountID, account, this::updateRelationship);
 			}else if(id==R.id.report){
 				Bundle args=new Bundle();
 				args.putString("account", accountID);
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index e7cbdd3fd..8f9013631 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -384,6 +384,38 @@ public class UiUtils{
 				});
 	}
 
+	public static void confirmSoftBlockUser(Activity activity, String accountID, Account account, Consumer<Relationship> resultCallback){
+		showConfirmationAlert(activity,
+				activity.getString(R.string.sk_remove_follower),
+				activity.getString(R.string.sk_remove_follower_confirm, account.displayName),
+				activity.getString(R.string.sk_do_remove_follower),
+				R.drawable.ic_fluent_person_delete_24_regular,
+				() -> new SetAccountBlocked(account.id, true).setCallback(new Callback<>() {
+						@Override
+						public void onSuccess(Relationship relationship) {
+							new SetAccountBlocked(account.id, false).setCallback(new Callback<>() {
+								@Override
+								public void onSuccess(Relationship relationship) {
+									Toast.makeText(activity, R.string.sk_remove_follower_success, Toast.LENGTH_SHORT).show();
+									resultCallback.accept(relationship);
+								}
+
+								@Override
+								public void onError(ErrorResponse error) {
+									error.showToast(activity);
+									resultCallback.accept(relationship);
+								}
+							}).exec(accountID);
+						}
+
+						@Override
+						public void onError(ErrorResponse error) {
+							error.showToast(activity);
+						}
+					}).exec(accountID)
+		);
+	}
+
 	public static void confirmToggleBlockDomain(Activity activity, String accountID, String domain, boolean currentlyBlocked, Runnable resultCallback){
 		showConfirmationAlert(activity, activity.getString(currentlyBlocked ? R.string.confirm_unblock_domain_title : R.string.confirm_block_domain_title),
 				activity.getString(currentlyBlocked ? R.string.confirm_unblock : R.string.confirm_block, domain),
diff --git a/mastodon/src/main/res/menu/profile.xml b/mastodon/src/main/res/menu/profile.xml
index abf7b0e03..b857b148f 100644
--- a/mastodon/src/main/res/menu/profile.xml
+++ b/mastodon/src/main/res/menu/profile.xml
@@ -4,6 +4,7 @@
 	<item android:id="@+id/mute" android:title="@string/mute_user" android:icon="@drawable/ic_fluent_speaker_mute_24_regular"/>
 	<item android:id="@+id/block" android:title="@string/block_user" android:icon="@drawable/ic_fluent_person_prohibited_24_regular"/>
 	<item android:id="@+id/report" android:title="@string/report_user" android:icon="@drawable/ic_fluent_warning_24_regular"/>
+	<item android:id="@+id/soft_block" android:title="@string/sk_remove_follower" android:icon="@drawable/ic_fluent_person_delete_24_regular"/>
 	<item android:id="@+id/block_domain" android:title="@string/block_domain" android:icon="@drawable/ic_fluent_shield_prohibited_24_regular"/>
 	<item android:id="@+id/hide_boosts" android:title="@string/hide_boosts_from_user" android:icon="@drawable/ic_fluent_arrow_repeat_all_off_24_regular"/>
 	<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_list_24_regular"/>
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index ae6811678..86ec76cad 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -159,6 +159,10 @@
     <string name="sk_timeline_local">Local</string>
     <string name="sk_timeline_federated">Federation</string>
     <string name="sk_recent_searches_placeholder">Type something to start searching</string>
+    <string name="sk_remove_follower">Remove as follower</string>
+    <string name="sk_remove_follower_confirm">Remove %s as a follower by blocking and immediately unblocking them?</string>
+    <string name="sk_do_remove_follower">Remove</string>
+    <string name="sk_remove_follower_success">Successfully removed follower</string>
 
     <!--    accessibility labels-->
     <string name="sk_poll_option_add">Add new poll option</string>

From a04e16c5720f16cc869c013a96c730b647c774ae Mon Sep 17 00:00:00 2001
From: AiOO <ahnkiwook@gmail.com>
Date: Sun, 1 Jan 2023 09:03:20 +0000
Subject: [PATCH 121/200] Translated using Weblate (Korean)

Currently translated at 100.0% (124 of 124 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
---
 .../src/main/res/values-ko-rKR/strings_sk.xml | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
index c7bad5ad6..69b2b0591 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
@@ -101,4 +101,26 @@
     <string name="sk_resource_not_found">리소스를 찾을 수 없습니다</string>
     <string name="sk_loading_resource_on_instance_title">%s에서 찾아보는 중</string>
     <string name="sk_quote_post">언급하여 게시</string>
+    <string name="sk_unsent_posts">게시하지 않은 게시물</string>
+    <string name="sk_draft">초안 작성</string>
+    <string name="sk_schedule">게시 예약</string>
+    <string name="sk_confirm_delete_draft_title">초안 삭제</string>
+    <string name="sk_confirm_delete_draft">정말로 이 초안을 삭제하시겠습니까\?</string>
+    <string name="sk_confirm_delete_scheduled_post_title">예약 게시물 삭제</string>
+    <string name="sk_confirm_delete_scheduled_post">정말로 이 예약 게시물을 삭제하시겠습니까\?</string>
+    <string name="sk_compose_draft">게시물이 초안으로 저장됩니다.</string>
+    <string name="sk_compose_scheduled">예약한 시각</string>
+    <string name="sk_post_scheduled">게시 예약함</string>
+    <string name="sk_scheduled_too_soon">게시 예약은 최소한 10분 뒤로 설정해야 합니다.</string>
+    <string name="sk_draft_or_schedule">초안 작성 및 게시 예약</string>
+    <string name="sk_scheduled_too_soon_title">예약한 시각이 머지않았습니다</string>
+    <string name="sk_draft_saved">초안 저장함</string>
+    <string name="sk_forward_report_to">%s 인스턴스로 전달</string>
+    <string name="sk_schedule_post">게시 예약</string>
+    <string name="sk_confirm_save_changes">변경 사항을 저장하시겠습니까\?</string>
+    <string name="sk_compose_no_schedule">예약하지 않음</string>
+    <string name="sk_compose_no_draft">초안 작성하지 않음</string>
+    <string name="sk_confirm_save_draft">초안을 저장하시겠습니까\?</string>
+    <string name="sk_schedule_or_draft">게시 예약 및 초안 작성</string>
+    <string name="sk_mark_as_draft">초안으로 표시</string>
 </resources>
\ No newline at end of file

From 2de003c5bb01b9897269297cc9923807cf063565 Mon Sep 17 00:00:00 2001
From: Choukajohn <choukajohn@gmail.com>
Date: Sun, 1 Jan 2023 10:52:14 +0000
Subject: [PATCH 122/200] Translated using Weblate (French)

Currently translated at 100.0% (124 of 124 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
---
 mastodon/src/main/res/values-fr-rFR/strings_sk.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
index 44111e782..220b4374f 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -91,7 +91,7 @@
     <string name="sk_loading_resource_on_instance_title">Rechercher sur %s</string>
     <string name="sk_open_with_account">Ouvrir avec un autre compte</string>
     <string name="sk_resource_not_found">La ressource est introuvable</string>
-    <string name="sk_favorite_as">Favoris d\'un autre compte</string>
+    <string name="sk_favorite_as">Mettre en favoris sur un autre compte</string>
     <string name="sk_already_bookmarked">Déjà mis en signet</string>
     <string name="sk_already_favorited">Déjà mis en favori</string>
     <string name="sk_reblogged_as">Reposté en tant que %s</string>
@@ -110,9 +110,9 @@
     <string name="sk_confirm_delete_scheduled_post">Voulez-vous vraiment supprimer ce message planifié \?</string>
     <string name="sk_schedule">Planifier</string>
     <string name="sk_confirm_delete_scheduled_post_title">Supprimer le message planifié</string>
-    <string name="sk_draft_or_schedule">Rédiger ou planifier</string>
+    <string name="sk_draft_or_schedule">Rédiger un brouillon ou planifier</string>
     <string name="sk_compose_draft">Le message sera enregistré en tant que brouillon.</string>
-    <string name="sk_compose_scheduled">Planifié pour</string>
+    <string name="sk_compose_scheduled">Planifié pour le</string>
     <string name="sk_draft_saved">Brouillon enregistré</string>
     <string name="sk_post_scheduled">Message planifié</string>
     <string name="sk_scheduled_too_soon_title">L\'heure prévue est trop proche</string>
@@ -121,4 +121,7 @@
     <string name="sk_mark_as_draft">Marquer comme brouillon</string>
     <string name="sk_schedule_post">Planifier le message</string>
     <string name="sk_confirm_save_changes">Sauvegarder les modifications \?</string>
+    <string name="sk_compose_no_schedule">Ne pas planifier</string>
+    <string name="sk_compose_no_draft">Ne pas marquer comme brouillon</string>
+    <string name="sk_schedule_or_draft">Planifier ou rédiger un brouillon</string>
 </resources>
\ No newline at end of file

From 2bde95b4d248cd7e8a190166441b06e97346d5ad Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Sun, 1 Jan 2023 06:59:29 +0000
Subject: [PATCH 123/200] Translated using Weblate (Indonesian)

Currently translated at 100.0% (124 of 124 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
---
 mastodon/src/main/res/values-in-rID/strings_sk.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mastodon/src/main/res/values-in-rID/strings_sk.xml b/mastodon/src/main/res/values-in-rID/strings_sk.xml
index da2b3d6d3..257e4d807 100644
--- a/mastodon/src/main/res/values-in-rID/strings_sk.xml
+++ b/mastodon/src/main/res/values-in-rID/strings_sk.xml
@@ -123,4 +123,7 @@
     <string name="sk_mark_as_draft">Tandai sebagai draf</string>
     <string name="sk_schedule_post">Jadwalkan kiriman</string>
     <string name="sk_confirm_save_draft">Simpan draf\?</string>
+    <string name="sk_compose_no_schedule">Jangan dijadwalkan</string>
+    <string name="sk_compose_no_draft">Jangan didraf</string>
+    <string name="sk_schedule_or_draft">Jadwalkan atau draf</string>
 </resources>
\ No newline at end of file

From 1645ce448639c47f406696a279df49049534fc06 Mon Sep 17 00:00:00 2001
From: AiOO <ahnkiwook@gmail.com>
Date: Sun, 1 Jan 2023 06:24:07 -0300
Subject: [PATCH 124/200] Translated using Weblate (Korean)

Currently translated at 100.0% (12 of 12 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ko/
---
 metadata/ko/changelogs/64.txt | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 metadata/ko/changelogs/64.txt

diff --git a/metadata/ko/changelogs/64.txt b/metadata/ko/changelogs/64.txt
new file mode 100644
index 000000000..fbfe2ad35
--- /dev/null
+++ b/metadata/ko/changelogs/64.txt
@@ -0,0 +1,8 @@
+- 초안 및 예약 게시물
+- @thiagojedi 님이 제공한 마스토돈 4.0과 호환되는 필터
+- 길게 눌러서 로그인한 다른 계정으로 게시물에 반응 (답글, 부스트, 좋아요, 북마크)
+- 모든 메뉴에 아이콘 표시
+- "언급하여 게시" 기능으로 멘션을 추가
+- 알림 아이콘을 모두 같은 아이콘 혹은 서로 다른 아이콘으로 설정하는 옵션 제공
+- 설정에서 앱으로 규칙 목록을 확인할 수 있는 옵션 제공
+- 버그 수정

From 952416fefca23a384673a88846019479b2bc233f Mon Sep 17 00:00:00 2001
From: AiOO <ahnkiwook@gmail.com>
Date: Mon, 2 Jan 2023 17:14:16 +0000
Subject: [PATCH 125/200] Translated using Weblate (Korean)

Currently translated at 100.0% (125 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
---
 mastodon/src/main/res/values-ko-rKR/strings_sk.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
index 69b2b0591..88a2ee19e 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
@@ -123,4 +123,5 @@
     <string name="sk_confirm_save_draft">초안을 저장하시겠습니까\?</string>
     <string name="sk_schedule_or_draft">게시 예약 및 초안 작성</string>
     <string name="sk_mark_as_draft">초안으로 표시</string>
+    <string name="sk_settings_reduce_motion">애니메이션의 동작 감소</string>
 </resources>
\ No newline at end of file

From cf5fbe3b55d8bd9fbd6e5cbe24ad6d3067c0f2bc Mon Sep 17 00:00:00 2001
From: ling0412 <xll520yzl@gmail.com>
Date: Mon, 2 Jan 2023 10:28:51 +0000
Subject: [PATCH 126/200] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (125 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hans/
---
 mastodon/src/main/res/values-zh-rCN/strings_sk.xml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
index 555d3e26a..4ee890749 100644
--- a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
@@ -90,13 +90,13 @@
     <string name="sk_loading_resource_on_instance_title">在 %s 上查找</string>
     <string name="sk_resource_not_found">找不到资源</string>
     <string name="sk_open_with_account">用另一个帐户打开</string>
-    <string name="sk_bookmark_as">在其他帐户中添加书签</string>
+    <string name="sk_bookmark_as">与其他帐户的书签</string>
     <string name="sk_bookmarked_as">已标记为 %s</string>
     <string name="sk_already_bookmarked">已加入书签</string>
-    <string name="sk_favorite_as">从其他帐户收藏</string>
+    <string name="sk_favorite_as">用其他账号收藏</string>
     <string name="sk_favorited_as">收藏为 %s</string>
     <string name="sk_already_favorited">已收藏</string>
-    <string name="sk_reblog_as">从其他帐户重新登录</string>
+    <string name="sk_reblog_as">用其他账号转发</string>
     <string name="sk_reblogged_as">重新登录为 %s</string>
     <string name="sk_already_reblogged">已重新登录</string>
     <string name="sk_reply_as">用其他帐号回复</string>
@@ -118,4 +118,12 @@
     <string name="sk_scheduled_too_soon">嘟文必须预订在未来至少 10 分钟后。</string>
     <string name="sk_save_draft">保存草稿？</string>
     <string name="sk_save_changes">保存更改？</string>
+    <string name="sk_confirm_save_draft">保存草稿？</string>
+    <string name="sk_confirm_save_changes">保存更改？</string>
+    <string name="sk_mark_as_draft">标记为草稿</string>
+    <string name="sk_schedule_post">预订嘟文</string>
+    <string name="sk_compose_no_schedule">不预订</string>
+    <string name="sk_compose_no_draft">不要标记为草稿</string>
+    <string name="sk_settings_reduce_motion">减少动画中的效果</string>
+    <string name="sk_schedule_or_draft">预订或草稿</string>
 </resources>
\ No newline at end of file

From 4e86314df5e968ad4d56e2d9b27834c768ffad69 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Mon, 2 Jan 2023 18:13:36 +0000
Subject: [PATCH 127/200] Translated using Weblate (Spanish)

Currently translated at 100.0% (125 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/
---
 mastodon/src/main/res/values-es-rES/strings_sk.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/res/values-es-rES/strings_sk.xml b/mastodon/src/main/res/values-es-rES/strings_sk.xml
index c396b2caf..0919ef561 100644
--- a/mastodon/src/main/res/values-es-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-es-rES/strings_sk.xml
@@ -94,12 +94,12 @@
     <string name="sk_already_bookmarked">Ya marcado</string>
     <string name="sk_favorited_as">Favorito como %s</string>
     <string name="sk_already_favorited">Ya es un favorito</string>
-    <string name="sk_reblog_as">Compartir desde otra cuenta</string>
+    <string name="sk_reblog_as">Compartir con otra cuenta</string>
     <string name="sk_reblogged_as">Compartido como %s</string>
     <string name="sk_already_reblogged">Ya se volvió a publicar</string>
     <string name="sk_reply_as">Responder con otra cuenta</string>
-    <string name="sk_bookmark_as">Marcador de otra cuenta</string>
-    <string name="sk_favorite_as">Favoritos de otra cuenta</string>
+    <string name="sk_bookmark_as">Marcar con otra cuenta</string>
+    <string name="sk_favorite_as">Favoritos con otra cuenta</string>
     <string name="sk_settings_uniform_icon_for_notifications">Mismo icono para todas las notificaciones</string>
     <string name="sk_forward_report_to">Reenviar a %s</string>
     <string name="sk_unsent_posts">Mensajes no enviados</string>
@@ -120,4 +120,8 @@
     <string name="sk_confirm_save_changes">¿Guardar los cambios\?</string>
     <string name="sk_mark_as_draft">Marcar como borrador</string>
     <string name="sk_schedule_post">Programar la publicación</string>
+    <string name="sk_schedule_or_draft">Calendario o proyecto</string>
+    <string name="sk_compose_no_schedule">No programar</string>
+    <string name="sk_compose_no_draft">No hagas borradores</string>
+    <string name="sk_settings_reduce_motion">Reducir el movimiento en las animaciones</string>
 </resources>
\ No newline at end of file

From ee8b087b616167e519fb39a5a45977e234e8edc2 Mon Sep 17 00:00:00 2001
From: Choukajohn <choukajohn@gmail.com>
Date: Mon, 2 Jan 2023 01:28:15 +0000
Subject: [PATCH 128/200] Translated using Weblate (French)

Currently translated at 100.0% (125 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
---
 mastodon/src/main/res/values-fr-rFR/strings_sk.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
index 220b4374f..3f1f93f23 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -91,7 +91,7 @@
     <string name="sk_loading_resource_on_instance_title">Rechercher sur %s</string>
     <string name="sk_open_with_account">Ouvrir avec un autre compte</string>
     <string name="sk_resource_not_found">La ressource est introuvable</string>
-    <string name="sk_favorite_as">Mettre en favoris sur un autre compte</string>
+    <string name="sk_favorite_as">Mettre en favoris avec un autre compte</string>
     <string name="sk_already_bookmarked">Déjà mis en signet</string>
     <string name="sk_already_favorited">Déjà mis en favori</string>
     <string name="sk_reblogged_as">Reposté en tant que %s</string>
@@ -99,8 +99,8 @@
     <string name="sk_bookmarked_as">Ajouté aux signets en tant que %s</string>
     <string name="sk_favorited_as">Ajouté aux favoris en tant que %s</string>
     <string name="sk_reply_as">Répondre avec un autre compte</string>
-    <string name="sk_bookmark_as">Mettre en signet sur un autre compte</string>
-    <string name="sk_reblog_as">Reposter depuis un autre compte</string>
+    <string name="sk_bookmark_as">Mettre en signet avec un autre compte</string>
+    <string name="sk_reblog_as">Reposter avec un autre compte</string>
     <string name="sk_settings_uniform_icon_for_notifications">Icône uniforme pour toutes les notifications</string>
     <string name="sk_forward_report_to">Transférer à %s</string>
     <string name="sk_unsent_posts">Messages non envoyés</string>
@@ -124,4 +124,5 @@
     <string name="sk_compose_no_schedule">Ne pas planifier</string>
     <string name="sk_compose_no_draft">Ne pas marquer comme brouillon</string>
     <string name="sk_schedule_or_draft">Planifier ou rédiger un brouillon</string>
+    <string name="sk_settings_reduce_motion">Réduire le mouvement dans les animations</string>
 </resources>
\ No newline at end of file

From e7d856acf49976dc49e1c756bddb034317587606 Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Mon, 2 Jan 2023 13:13:38 +0000
Subject: [PATCH 129/200] Translated using Weblate (Indonesian)

Currently translated at 100.0% (125 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
---
 mastodon/src/main/res/values-in-rID/strings_sk.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/res/values-in-rID/strings_sk.xml b/mastodon/src/main/res/values-in-rID/strings_sk.xml
index 257e4d807..143be7f7d 100644
--- a/mastodon/src/main/res/values-in-rID/strings_sk.xml
+++ b/mastodon/src/main/res/values-in-rID/strings_sk.xml
@@ -95,12 +95,12 @@
     <string name="sk_already_bookmarked">Sudah dimarkahi</string>
     <string name="sk_favorited_as">Difavorit sebagai %s</string>
     <string name="sk_already_favorited">Sudah difavorit</string>
-    <string name="sk_reblog_as">Bagikan dari akun lain</string>
+    <string name="sk_reblog_as">Bagikan dengan akun lain</string>
     <string name="sk_reblogged_as">Dibagikan sebagai %s</string>
     <string name="sk_already_reblogged">Sudah dibagikan</string>
     <string name="sk_reply_as">Balas dengan akun lain</string>
-    <string name="sk_bookmark_as">Markahi dalam akun lain</string>
-    <string name="sk_favorite_as">Favorit dari akun lain</string>
+    <string name="sk_bookmark_as">Markahi dengan akun lain</string>
+    <string name="sk_favorite_as">Favorit dengan akun lain</string>
     <string name="sk_settings_uniform_icon_for_notifications">Ikon yang sama untuk semua notifikasi</string>
     <string name="sk_unsent_posts">Kiriman yang belum dikirim</string>
     <string name="sk_draft">Draf</string>
@@ -126,4 +126,5 @@
     <string name="sk_compose_no_schedule">Jangan dijadwalkan</string>
     <string name="sk_compose_no_draft">Jangan didraf</string>
     <string name="sk_schedule_or_draft">Jadwalkan atau draf</string>
+    <string name="sk_settings_reduce_motion">Kurangi gerakan dalam animasi</string>
 </resources>
\ No newline at end of file

From b22c0a5d3d667229530770f3a5c7eb306ec030c4 Mon Sep 17 00:00:00 2001
From: edxkl <edu200399lim@gmail.com>
Date: Tue, 3 Jan 2023 01:24:42 +0000
Subject: [PATCH 130/200] Translated using Weblate (Portuguese (Brazil))

Currently translated at 84.0% (105 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/pt_BR/
---
 .../src/main/res/values-pt-rBR/strings_sk.xml | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
index 4af1e71fe..bec510996 100644
--- a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
@@ -81,7 +81,7 @@
     <string name="sk_undo_reblog">Desfazer reblog</string>
     <string name="sk_reblog_with_visibility">Reblog com visibilidade</string>
     <string name="sk_hashtags_you_follow">Hashtags que você segue</string>
-    <string name="sk_copy_link_to_post">Copiar link para postagem</string>
+    <string name="sk_copy_link_to_post">Copiar link da postagem</string>
     <string name="sk_loading_resource_on_instance_title">Procurando em %s</string>
     <string name="sk_open_with_account">Abrir com outra conta</string>
     <string name="sk_resource_not_found">Recurso não pode ser encontrado</string>
@@ -89,4 +89,28 @@
     <string name="sk_settings_auth">Configurações de segurança</string>
     <string name="sk_settings_publish_button_text">Texto do botão de publicar</string>
     <string name="sk_clear_all_notifications_confirm">Você tem certeza que deseja excluir todas as notificações\?</string>
+    <string name="sk_favorite_as">Favoritar com outra conta</string>
+    <string name="sk_bookmark_as">Salvar com outra conta</string>
+    <string name="sk_already_bookmarked">Já salvo</string>
+    <string name="sk_already_favorited">Já favoritado</string>
+    <string name="sk_reply_as">Responder com outra conta</string>
+    <string name="sk_already_reblogged">Já reblogado</string>
+    <string name="sk_reblog_as">Reblogar com outra conta</string>
+    <string name="sk_schedule">Agendar</string>
+    <string name="sk_draft">Rascunho</string>
+    <string name="sk_unsent_posts">Postagens não enviadas</string>
+    <string name="sk_confirm_delete_draft_title">Excluir rascunho</string>
+    <string name="sk_confirm_delete_draft">Você tem certeza que deseja excluir este rascunho\?</string>
+    <string name="sk_confirm_delete_scheduled_post_title">Excluir postagem agendada</string>
+    <string name="sk_confirm_delete_scheduled_post">Você tem certeza que deseja excluir esta postagem agendada\?</string>
+    <string name="sk_compose_draft">A postagem será salva como rascunho.</string>
+    <string name="sk_compose_scheduled">Agendado para</string>
+    <string name="sk_draft_saved">Rascunho salvo</string>
+    <string name="sk_post_scheduled">Postagem agendada</string>
+    <string name="sk_forward_report_to">Encaminhar para %s</string>
+    <string name="sk_scheduled_too_soon_title">O horário agendado está muito próximo</string>
+    <string name="sk_scheduled_too_soon">A postagem deve ser agendada com pelo menos 10 minutos de antecedência.</string>
+    <string name="sk_confirm_save_draft">Salvar rascunho\?</string>
+    <string name="sk_confirm_save_changes">Salvar alterações\?</string>
+    <string name="sk_mark_as_draft">Marcar como rascunho</string>
 </resources>
\ No newline at end of file

From e31db6d5067bdc46675225f89136d833d2fc02e6 Mon Sep 17 00:00:00 2001
From: ihor_ck <igor_ck@outlook.com>
Date: Mon, 2 Jan 2023 10:47:53 +0000
Subject: [PATCH 131/200] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (125 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
---
 mastodon/src/main/res/values-uk-rUA/strings_sk.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
index 2a66b3c66..51918cb93 100644
--- a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
@@ -94,11 +94,11 @@
     <string name="sk_already_bookmarked">Уже в закладках</string>
     <string name="sk_favorited_as">Уподобано як %s</string>
     <string name="sk_already_favorited">Уже вподобано</string>
-    <string name="sk_reblog_as">Поширити з іншого облікового запису</string>
+    <string name="sk_reblog_as">Поширити в іншому обліковому записі</string>
     <string name="sk_already_reblogged">Уже поширено</string>
     <string name="sk_settings_uniform_icon_for_notifications">Єдина піктограма для всіх сповіщень</string>
     <string name="sk_bookmark_as">Додати до закладок іншого облікового запису</string>
-    <string name="sk_favorite_as">Уподобане з іншого облікового запису</string>
+    <string name="sk_favorite_as">Уподобане іншим обліковим записом</string>
     <string name="sk_reblogged_as">Поширено як %s</string>
     <string name="sk_reply_as">Відповісти з іншого облікового запису</string>
     <string name="sk_forward_report_to">Переслати до %s</string>
@@ -120,4 +120,8 @@
     <string name="sk_mark_as_draft">Позначити чернеткою</string>
     <string name="sk_schedule_post">Запланувати допис</string>
     <string name="sk_confirm_save_draft">Зберегти чернетку\?</string>
+    <string name="sk_schedule_or_draft">Запланувати або перемістити до чернеток</string>
+    <string name="sk_compose_no_schedule">Не планувати</string>
+    <string name="sk_compose_no_draft">Не переміщувати до чернеток</string>
+    <string name="sk_settings_reduce_motion">Зменшити рух в анімації</string>
 </resources>
\ No newline at end of file

From 3a1b12306bca41dcbf6f2c0f2fd41419d6a566ee Mon Sep 17 00:00:00 2001
From: khant <tzfygqp9@duck.com>
Date: Mon, 2 Jan 2023 12:24:23 +0000
Subject: [PATCH 132/200] Translated using Weblate (Burmese)

Currently translated at 80.0% (100 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/my/
---
 .../src/main/res/values-my/strings_sk.xml     | 74 ++++++++++++++++++-
 1 file changed, 71 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/res/values-my/strings_sk.xml b/mastodon/src/main/res/values-my/strings_sk.xml
index b861fc01a..411f6dbfa 100644
--- a/mastodon/src/main/res/values-my/strings_sk.xml
+++ b/mastodon/src/main/res/values-my/strings_sk.xml
@@ -17,9 +17,9 @@
     <string name="sk_update_available">Moshidon %s ကို ဒေါင်းလုဒ်ဆွဲလို့ရပါပြီ။</string>
     <string name="sk_update_ready">Moshidon %s ကို ဒေါင်းလုဒ်ဆွဲပြီးပြီမလို့ အင်စတောလုပ်နိုင်ပါပြီ။</string>
     <string name="sk_no_update_available">မည်သည့်အပ်ဒိတ်မျှ မရှိသေးပါ</string>
-    <string name="sk_follow_requests">ဖောလိုဝါအဖြစ် တောင်းဆိုမှုများ</string>
-    <string name="sk_accept_follow_request">ဖောလိုဝါအဖြစ်တောင်းဆိုမှုကို လက်ခံမည်</string>
-    <string name="sk_reject_follow_request">ဖောလိုဝါအဖြစ်တောင်းဆိုမှုကို ငြင်းပယ်မည်</string>
+    <string name="sk_follow_requests">ဖော်လိုဝါအဖြစ် တောင်းဆိုမှုများ</string>
+    <string name="sk_accept_follow_request">ဖော်လိုဝါအဖြစ်တောင်းဆိုမှုကို လက်ခံမည်</string>
+    <string name="sk_reject_follow_request">ဖော်လိုဝါအဖြစ်တောင်းဆိုမှုကို ငြင်းပယ်မည်</string>
     <string name="sk_confirm_pin_post_title">ပို့စ်အား ပရိုဖိုင်းတွင် ပင်တွဲခြင်း</string>
     <string name="sk_confirm_delete_and_redraft_title">ပို့စ်အား ဖျက်ပြီးပြန်ရေးခြင်း</string>
     <string name="sk_confirm_delete_and_redraft">ဖျက်ပြီးပြန်ရေးမှာ သေချာပြီလား\?</string>
@@ -31,4 +31,72 @@
     <string name="sk_federated_timeline_info_banner">သင့်ဖက်ဒရေးရှင်းကလူတွေရဲ့ လတ်တလောပို့စ်တွေ ဖြစ်ပါတယ်။</string>
     <string name="sk_check_for_update">အပ်ဒိတ်ရှိလားစစ်ဆေးမည်</string>
     <string name="sk_disable_marquee">ခေါင်းစီးဘားများတွင် စာများရွေ့လျားမှု ပိတ်မည်</string>
+    <string name="sk_poll_allow_multiple">တစ်ခုထက်ပိုသောရွေးချယ်မှုများကို ခွင့်ပြုမည်</string>
+    <string name="sk_clear_recent_languages">လတ်တလောသုံးထားသည့် ဘာသာစကားများကို ရှင်းလင်းမည်</string>
+    <string name="sk_welcome_title">မင်္ဂလာပါ</string>
+    <string name="sk_pinned_posts">ပင်တွဲထားသည်များ</string>
+    <string name="sk_bookmark_as">တခြားအကောင့်ဖြင့် ဘွတ်ခ်မာ့ခ်လုပ်မည်</string>
+    <string name="sk_favorite_as">တခြားအကောင့်ဖြင့် favorite လုပ်မည်</string>
+    <string name="sk_favorited_as">%s ဖြင့် favorite လုပ်လိုက်သည်</string>
+    <string name="sk_bookmarked_as">%s ဖြင့် ဘွတ်ခ်မာ့ခ်လုပ်လိုက်သည်</string>
+    <string name="sk_already_favorited">Favorite လုပ်ပြီးသားဖြစ်သည်</string>
+    <string name="sk_reblogged_as">%s ဖြင့် reblog လုပ်လိုက်သည်</string>
+    <string name="sk_already_reblogged">Reblog လုပ်ပြီးသားဖြစ်သည်</string>
+    <string name="sk_reply_as">တခြားအကောင့်ဖြင့် ရီပလိုင်းပြန်မည်</string>
+    <string name="sk_translated_using">%s ဖြင့် ဘာသာပြန်ထားသည်</string>
+    <string name="sk_post_language">"ဘာသာစကား။  ။%s"</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_settings_filters">Filter များကို စီစဉ်မည်</string>
+    <string name="sk_settings_auth">လုံခြုံရေးဆိုင်ရာ ဆက်တင်များ</string>
+    <string name="sk_settings_rules">စည်းကမ်းချက်များ</string>
+    <string name="sk_settings_about">အက်ပ်အကြောင်း</string>
+    <string name="sk_settings_donate">လှူဒါန်းမည်</string>
+    <string name="sk_settings_posting">ပို့စ်တင်ခြင်းဆိုင်ရာ အပြင်အဆင်များ</string>
+    <string name="sk_color_palette_purple">ခရမ်းရောင်</string>
+    <string name="sk_color_palette_green">အစိမ်းရောင်</string>
+    <string name="sk_color_palette_blue">အပြာရောင်</string>
+    <string name="sk_color_palette_brown">အညိုရောင်</string>
+    <string name="sk_color_palette_yellow">အဝါရောင်</string>
+    <string name="sk_settings_translation_availability_note_available">%s က ဘာသာပြန်တာကို အထောက်အပံ့ပေးထားပါတယ်။</string>
+    <string name="sk_settings_translation_availability_note_unavailable">%s က ဘာသာပြန်တာကို အထောက်အပံ့ပေးထားပုံမရပါဘူး။</string>
+    <string name="sk_clear_all_notifications_confirm_action">အားလုံးဖျက်</string>
+    <string name="sk_clear_all_notifications">နိုတီအားလုံးကို ရှင်းလင်းမည်</string>
+    <string name="sk_clear_all_notifications_confirm">နိုတီအားလုံးကို ရှင်းလင်းမှာ သေချာပြီလား\?</string>
+    <string name="sk_undo_reblog">Reblog မလုပ်တော့ပါ</string>
+    <string name="sk_hashtags_you_follow">သင်ဖော်လိုးထားသည့် ဟက်ရှ်တက်များ</string>
+    <string name="sk_copy_link_to_post">ပို့စ်လင့်ခ်ကို ကော်ပီကူးမည်</string>
+    <string name="sk_open_with_account">တခြားအကောင့်ဖြင့် ဖွင့်မည်</string>
+    <string name="sk_resource_not_found">ရင်းမြစ်ရှာမတွေ့ပါ</string>
+    <string name="sk_draft">အကြမ်း</string>
+    <string name="sk_schedule">စီစဉ်မည်</string>
+    <string name="sk_confirm_delete_draft_title">အကြမ်းကို ဖျက်မည်</string>
+    <string name="sk_unsent_posts">မတင်ဖြစ်ခဲ့သော ပို့စ်များ</string>
+    <string name="sk_confirm_delete_scheduled_post_title">စီစဉ်ထားသောပို့စ်ကို ဖျက်မည်</string>
+    <string name="sk_confirm_delete_scheduled_post">စီစဉ်ထားတဲ့ ဒီပို့စ်ကိုဖျက်မှာ သေချာပြီလား\?</string>
+    <string name="sk_confirm_delete_draft">ဒီပို့စ်အကြမ်းကို ဖျက်မှာသေချာပြီလား\?</string>
+    <string name="sk_compose_draft">ပို့စ်ကို အကြမ်းအဖြစ် သိမ်းထားမှာဖြစ်ပါတယ်။</string>
+    <string name="sk_compose_scheduled">စီစဉ်ထားသည့်အချိန်</string>
+    <string name="sk_draft_saved">အကြမ်းမှတ်လိုက်သည်</string>
+    <string name="sk_post_scheduled">ပို့စ်ကို စီစဉ်လိုက်သည်</string>
+    <string name="sk_confirm_save_draft">အကြမ်းမှတ်ထားမှာလား\?</string>
+    <string name="sk_confirm_save_changes">အပြောင်းအလဲလုပ်ထားတာတွေကို သိမ်းမှာလား\?</string>
+    <string name="sk_mark_as_draft">အကြမ်းသတ်မှတ်မည်</string>
+    <string name="sk_schedule_post">ပိုစ့်စီစဉ်မည်</string>
+    <string name="sk_settings_reduce_motion">အန်နီမေးရှင်းများတွင် ရွေ့လျားမှုလျှော့မည်</string>
+    <string name="sk_settings_always_reveal_content_warnings">အကြောင်းအရာသတိပေးချက်များကို အမြဲတမ်းဖော်ပြမည်</string>
+    <string name="sk_color_palette_pink">ပန်းရောင်</string>
+    <string name="sk_color_palette_red">အနီရောင်</string>
+    <string name="sk_translate_post">ဘာသာပြန်မည်</string>
+    <string name="sk_example_domain">example.social</string>
+    <string name="sk_settings_profile">ပရိုဖိုင်းကို ပြင်မည်</string>
+    <string name="sk_already_bookmarked">ဘွတ်ခ်မာ့ခ်လုပ်ပြီးသားဖြစ်သည်</string>
+    <string name="sk_reblog_as">တခြားအကောင့်ဖြင့် reblog လုပ်မည်</string>
+    <string name="sk_settings_uniform_icon_for_notifications">နိုတီအားလုံးကို အိုင်ကွန်တူတူထားမည်</string>
+    <string name="sk_notification_type_status">ပို့စ်များ</string>
+    <string name="sk_translate_show_original">မူရင်းပို့စ်ကို ပြသမည်</string>
+    <string name="sk_settings_translate_only_opened">ဖွင့်ထားသည့်ပို့စ်များကိုသာ ဘာသာပြန်မည်</string>
+    <string name="sk_confirm_clear_recent_languages">အခုနောက်ပိုင်းသုံးထားတဲ့ ဘာသာစကားတွေကို ရှင်းလင်းမှာ သေချာပြီလား</string>
+    <string name="sk_welcome_text">ငါးမန်းလေးက သင့်ကိုအလေးပြုကြိုဆိုပါတယ်။ စတင်ဖို့အတွက် Home instance ရဲ့ဒိုမိန်းနာမည်ကိုအောက်တွင် ရိုက်ထည့်ပါ။</string>
+    <string name="sk_scheduled_too_soon_title">စီစဉ်ထားသည့်အချိန်မှာ စောလွန်းနေသည်</string>
+    <string name="sk_scheduled_too_soon">စီစဉ်ထားသည့်ပို့စ်သည် လက်ရှိအချိန်နှင့် အနည်းဆုံး ၁၀ မိနစ်ကွာရမည်။</string>
 </resources>
\ No newline at end of file

From 1e99862d40b4da917688c5189744ff5d13365129 Mon Sep 17 00:00:00 2001
From: ling0412 <xll520yzl@gmail.com>
Date: Mon, 2 Jan 2023 07:33:51 -0300
Subject: [PATCH 133/200] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (12 of 12 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/zh_Hans/
---
 metadata/zh-Hans/changelogs/65.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 metadata/zh-Hans/changelogs/65.txt

diff --git a/metadata/zh-Hans/changelogs/65.txt b/metadata/zh-Hans/changelogs/65.txt
new file mode 100644
index 000000000..c69495807
--- /dev/null
+++ b/metadata/zh-Hans/changelogs/65.txt
@@ -0,0 +1,10 @@
+- 草稿和预定嘟文
+- 回复时显示原帖
+- Mastodon 4.0 兼容过滤器（尚无“隐藏警告”功能）
+- 长按与来自其他已登录帐户的帖子（回复、提升、喜欢、书签）进行交互
+- 所有菜单中的图标
+- 切换转发报告
+- 在使用“关于此嘟文”功能时添加提及
+- 选择使用统一的通知图标而不是不同的图标
+- 从设置中访问应用内规则列表的选项
+- Bug修复

From 6a151e00ac0fa8fe7272135639672aaaac3fce9d Mon Sep 17 00:00:00 2001
From: HitaloM <hitalomarquete331@gmail.com>
Date: Mon, 2 Jan 2023 11:25:53 -0300
Subject: [PATCH 134/200] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (12 of 12 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/pt_BR/
---
 metadata/pt-BR/changelogs/65.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 metadata/pt-BR/changelogs/65.txt

diff --git a/metadata/pt-BR/changelogs/65.txt b/metadata/pt-BR/changelogs/65.txt
new file mode 100644
index 000000000..5913ddde0
--- /dev/null
+++ b/metadata/pt-BR/changelogs/65.txt
@@ -0,0 +1,10 @@
+- Rascunhos e postagens agendadas
+- Exibir postagem original ao responder
+- Filtros compatíveis com Mastodon 4.0 (ainda sem a função "ocultar com aviso")
+- Clique longo para interagir com postagens (responder, aumentar, curtir, marcar) de outras contas conectadas
+- Ícones em todos os menus
+- Alternar para encaminhar relatórios
+- Adicionar menção ao usar a função "Postar sobre isso"
+- Opção para usar o ícone de notificações uniforme em vez de ícones distintos
+- Opção para acessar a lista de regras no aplicativo nas configurações
+- Correções de bugs

From 2cc5872ec7f5bbae3d464c8f8335b2439db9090f Mon Sep 17 00:00:00 2001
From: AiOO <ahnkiwook@gmail.com>
Date: Mon, 2 Jan 2023 17:24:41 +0000
Subject: [PATCH 135/200] Translated using Weblate (Korean)

Currently translated at 100.0% (12 of 12 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ko/
---
 metadata/ko/changelogs/65.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 metadata/ko/changelogs/65.txt

diff --git a/metadata/ko/changelogs/65.txt b/metadata/ko/changelogs/65.txt
new file mode 100644
index 000000000..ceef08013
--- /dev/null
+++ b/metadata/ko/changelogs/65.txt
@@ -0,0 +1,10 @@
+- 초안 작성 및 예약 게시
+- 답글을 달면서 원본 게시물 확인
+- 마스토돈 4.0 호환 필터 ("경고와 함께 숨기기" 기능은 아직입니다)
+- 길게 눌러 로그인한 다른 계정으로 게시물에 반응 (답글, 부스트, 좋아요, 보관)
+- 모든 메뉴에 아이콘 표시
+- 신고 전달 여부 선택
+- "언급하여 게시" 기능으로 게시물에 대해 언급
+- 모든 알림에 대해 같은 아이콘을 사용하는 대신 각각 다른 아이콘을 사용할 수 있는 옵션
+- 설정 메뉴에서 앱을 벗어나지 않고 규칙을 확인할 수 있는 옵션
+- 버그 수정

From 0cf0f07f2d95f97af5cb3c679600f2c56933043f Mon Sep 17 00:00:00 2001
From: khant <tzfygqp9@duck.com>
Date: Mon, 2 Jan 2023 13:38:54 +0000
Subject: [PATCH 136/200] Translated using Weblate (Burmese)

Currently translated at 16.6% (2 of 12 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/my/
---
 metadata/my-MM/short_description.txt | 1 +
 metadata/my-MM/title.txt             | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 metadata/my-MM/short_description.txt
 create mode 100644 metadata/my-MM/title.txt

diff --git a/metadata/my-MM/short_description.txt b/metadata/my-MM/short_description.txt
new file mode 100644
index 000000000..62c3cbed7
--- /dev/null
+++ b/metadata/my-MM/short_description.txt
@@ -0,0 +1 @@
+ပန်းရောင်ရှိပြီး feature လည်းပိုစုံတဲ့ Android အတွက် Mastodon
diff --git a/metadata/my-MM/title.txt b/metadata/my-MM/title.txt
new file mode 100644
index 000000000..cf946e02c
--- /dev/null
+++ b/metadata/my-MM/title.txt
@@ -0,0 +1 @@
+Megalodon

From 795d4b08011a291483b41de5b7e629a17ef972b0 Mon Sep 17 00:00:00 2001
From: edxkl <edu200399lim@gmail.com>
Date: Tue, 3 Jan 2023 01:36:16 +0000
Subject: [PATCH 137/200] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (12 of 12 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/pt_BR/
---
 metadata/pt-BR/changelogs/65.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/metadata/pt-BR/changelogs/65.txt b/metadata/pt-BR/changelogs/65.txt
index 5913ddde0..2324f855b 100644
--- a/metadata/pt-BR/changelogs/65.txt
+++ b/metadata/pt-BR/changelogs/65.txt
@@ -1,10 +1,10 @@
 - Rascunhos e postagens agendadas
-- Exibir postagem original ao responder
+- Exibe postagem original ao responder
 - Filtros compatíveis com Mastodon 4.0 (ainda sem a função "ocultar com aviso")
-- Clique longo para interagir com postagens (responder, aumentar, curtir, marcar) de outras contas conectadas
+- Clique longo para interagir com posts (responder, aumentar, curtir, marcar) de outras contas conectadas
 - Ícones em todos os menus
 - Alternar para encaminhar relatórios
-- Adicionar menção ao usar a função "Postar sobre isso"
-- Opção para usar o ícone de notificações uniforme em vez de ícones distintos
-- Opção para acessar a lista de regras no aplicativo nas configurações
-- Correções de bugs
+- Adicionada menção na função "Postar sobre isso"
+- Opção para usar ícones de notificações uniforme
+- Opção para acessar a lista de regras nas configurações
+- Correção de bugs

From e3d054ae3eae00ca612921a527794531e8710659 Mon Sep 17 00:00:00 2001
From: mondstern <mondstern@snopyta.org>
Date: Tue, 3 Jan 2023 18:55:05 +0000
Subject: [PATCH 138/200] Translated using Weblate (Hungarian)

Currently translated at 100.0% (125 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/hu/
---
 .../src/main/res/values-hu-rHU/strings_sk.xml | 126 +++++++++++++++++-
 1 file changed, 125 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-hu-rHU/strings_sk.xml b/mastodon/src/main/res/values-hu-rHU/strings_sk.xml
index 045e125f3..39397a9ab 100644
--- a/mastodon/src/main/res/values-hu-rHU/strings_sk.xml
+++ b/mastodon/src/main/res/values-hu-rHU/strings_sk.xml
@@ -1,3 +1,127 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
+    <string name="sk_notification_type_status">Hozzászólások</string>
+    <string name="sk_notify_posts">Postai értesítések</string>
+    <string name="sk_translate_post">Lefordítani</string>
+    <string name="sk_post_language">Nyelv: %s</string>
+    <string name="sk_clear_recent_languages">Nemrég használt nyelvek törlése</string>
+    <string name="sk_welcome_title">Üdvözöljük!</string>
+    <string name="sk_example_domain">példa.social</string>
+    <string name="sk_confirm_pin_post">Szeretné ezt a bejegyzést a profiljához tűzni\?</string>
+    <string name="sk_confirm_unpin_post">Biztos vagy benne, hogy vissza akarod törölni ezt a posztot\?</string>
+    <string name="sk_pinned_posts">Tűzött</string>
+    <string name="sk_delete_and_redraft">Törlés és újraszövegezés</string>
+    <string name="sk_pin_post">Pin a profilhoz</string>
+    <string name="sk_confirm_pin_post_title">Hozzászólás rögzítése a profilhoz</string>
+    <string name="sk_pinning">Pinning poszt…</string>
+    <string name="sk_unpin_post">Unpin a profilból</string>
+    <string name="sk_confirm_unpin_post_title">Hozzászólás feloldása a profilból</string>
+    <string name="sk_unpinning">Unpinning poszt…</string>
+    <string name="sk_settings_show_replies">Válaszok megjelenítése</string>
+    <string name="sk_visibility_unlisted">Felsorolatlan</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_settings_load_new_posts">Automatikusan töltse be az új hozzászólásokat</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_user_post_notifications_on">Bekapcsoltuk a postai értesítéseket %s számára</string>
+    <string name="sk_user_post_notifications_off">Kikapcsoltam a postai értesítéseket %s számára</string>
+    <string name="sk_mark_media_as_sensitive">A média érzékenynek jelölése</string>
+    <string name="sk_federated_timeline">Föderáció</string>
+    <string name="sk_update_ready">A Megalodon %s letöltődött és telepítésre kész.</string>
+    <string name="sk_disable_marquee">A görgethető szöveg kikapcsolása a címsorokban</string>
+    <string name="sk_check_for_update">Frissítés ellenőrzése</string>
+    <string name="sk_no_update_available">Nincs frissítés elérhető</string>
+    <string name="sk_list_timelines">Listák</string>
+    <string name="sk_follow_requests">Kérések követése</string>
+    <string name="sk_accept_follow_request">Követési kérés elfogadása</string>
+    <string name="sk_lists_with_user">%s-t tartalmazó listák</string>
+    <string name="sk_settings_always_reveal_content_warnings">Mindig fedje fel a tartalmi figyelmeztetéseket</string>
+    <string name="sk_settings_contribute">Hozzájárulni Megalodon</string>
+    <string name="sk_settings_show_federated_timeline">Összevont idővonal megjelenítése</string>
+    <string name="sk_confirm_clear_recent_languages">Biztos, hogy törölni szeretné a nemrég használt nyelveket\?</string>
+    <string name="sk_available_languages">Elérhető nyelvek</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_settings_translate_only_opened">Csak a megnyitott hozzászólások lefordítása</string>
+    <string name="sk_already_reblogged">Már reblogoltam</string>
+    <string name="sk_reblogged_as">Átlogolva mint %s</string>
+    <string name="sk_reblog_as">Reblog más fiókkal</string>
+    <string name="sk_already_favorited">Már kedvelt</string>
+    <string name="sk_favorited_as">Kedvelt mint %s</string>
+    <string name="sk_favorite_as">Kedvenc más fiókkal</string>
+    <string name="sk_already_bookmarked">Már könyvjelzővel van ellátva</string>
+    <string name="sk_bookmarked_as">Könyvjelzőként %s</string>
+    <string name="sk_bookmark_as">Könyvjelző más fiókkal</string>
+    <string name="sk_settings_uniform_icon_for_notifications">Egységes ikon minden értesítéshez</string>
+    <string name="sk_reply_as">Válasz más fiókkal</string>
+    <string name="sk_translate_show_original">Eredeti megjelenítése</string>
+    <string name="sk_translated_using">Fordítás %s használatával</string>
+    <string name="sk_settings_profile">Profil beállítása</string>
+    <string name="sk_settings_posting">Postázási preferenciák</string>
+    <string name="sk_settings_filters">Szűrők konfigurálása</string>
+    <string name="sk_settings_auth">Biztonsági beállítások</string>
+    <string name="sk_settings_rules">Szabályok</string>
+    <string name="sk_settings_donate">Adományozni</string>
+    <string name="sk_settings_color_palette">Színek palettája</string>
+    <string name="sk_color_palette_material3">Rendszer</string>
+    <string name="sk_color_palette_green">Zöld</string>
+    <string name="sk_color_palette_blue">Kék</string>
+    <string name="sk_color_palette_brown">Barna</string>
+    <string name="sk_color_palette_red">Piros</string>
+    <string name="sk_color_palette_yellow">Sárga</string>
+    <string name="sk_color_palette_pink">Rózsaszín</string>
+    <string name="sk_color_palette_purple">Lila</string>
+    <string name="sk_delete_notification_confirm">Biztos, hogy törölni szeretné ezt az értesítést\?</string>
+    <string name="sk_enable_delete_notifications">Értesítések törlésének engedélyezése</string>
+    <string name="sk_settings_publish_button_text">Közzététel gomb szövege</string>
+    <string name="sk_settings_publish_button_text_title">Közzététel gomb szövegének testreszabása</string>
+    <string name="sk_delete_notification">Értesítés törlése</string>
+    <string name="sk_delete_notification_confirm_action">Értesítés törlése</string>
+    <string name="sk_settings_translation_availability_note_available">%s támogatja a fordítást!</string>
+    <string name="sk_settings_translation_availability_note_unavailable">Úgy tűnik, hogy a %s nem támogatja a fordítást.</string>
+    <string name="sk_clear_all_notifications_confirm">Biztos, hogy törölni szeretné az összes értesítést\?</string>
+    <string name="sk_clear_all_notifications">Minden értesítés törlése</string>
+    <string name="sk_clear_all_notifications_confirm_action">Törölje az összes</string>
+    <string name="sk_loading_fediverse_resource_title">Utánanézek a Fediverse-en</string>
+    <string name="sk_reblog_with_visibility">Reblog láthatósággal</string>
+    <string name="sk_quote_post">Poszt erről</string>
+    <string name="sk_undo_reblog">Reblog visszavonása</string>
+    <string name="sk_copy_link_to_post">Link másolása a bejegyzéshez</string>
+    <string name="sk_hashtags_you_follow">Követett hashtagek</string>
+    <string name="sk_loading_resource_on_instance_title">Utánanézek a %s oldalon</string>
+    <string name="sk_resource_not_found">Az erőforrás nem található</string>
+    <string name="sk_open_with_account">Más számlával együtt nyitva</string>
+    <string name="sk_scheduled_too_soon">A bejegyzést legalább 10 perccel későbbre kell időzíteni.</string>
+    <string name="sk_confirm_delete_draft">Biztos vagy benne, hogy törölni akarod ezt a vázlatos hozzászólást\?</string>
+    <string name="sk_confirm_delete_scheduled_post">Biztos, hogy törölni akarod ezt a tervezett hozzászólást\?</string>
+    <string name="sk_compose_draft">A hozzászólás tervezetként lesz elmentve.</string>
+    <string name="sk_scheduled_too_soon_title">A tervezett időpont túl korai</string>
+    <string name="sk_post_scheduled">Tervezett poszt</string>
+    <string name="sk_draft_saved">Tervezet mentve</string>
+    <string name="sk_compose_scheduled">Beütemezve a</string>
+    <string name="sk_draft_or_schedule">Tervezet vagy ütemterv</string>
+    <string name="sk_confirm_delete_scheduled_post_title">Időzített bejegyzés törlése</string>
+    <string name="sk_confirm_delete_draft_title">Tervezet törlése</string>
+    <string name="sk_schedule">Ütemterv</string>
+    <string name="sk_draft">Tervezet</string>
+    <string name="sk_forward_report_to">Továbbítás %s-re</string>
+    <string name="sk_unsent_posts">Nem elküldött hozzászólások</string>
+    <string name="sk_schedule_post">Ütemterv posta</string>
+    <string name="sk_mark_as_draft">Vázlatként megjelölni</string>
+    <string name="sk_confirm_save_changes">Változások mentése\?</string>
+    <string name="sk_confirm_save_draft">Tervezet mentése\?</string>
+    <string name="sk_compose_no_draft">Ne draftoljon</string>
+    <string name="sk_compose_no_schedule">Ne ütemezzen</string>
+    <string name="sk_schedule_or_draft">Ütemterv vagy tervezet</string>
+    <string name="sk_settings_reduce_motion">Mozgás csökkentése animációkban</string>
+    <string name="sk_welcome_text">A cápa tiszteleg előtted! A kezdéshez kérjük, adja meg az alábbiakban az otthoni domain nevét.</string>
+    <string name="sk_federated_timeline_info_banner">Ezek a szövetséged tagjainak legfrissebb bejegyzései.</string>
+    <string name="sk_confirm_delete_and_redraft">Biztos, hogy törölni és újrafogalmazni akarod ezt a hozzászólást\?</string>
+    <string name="sk_update_available">Megalodon %s készen áll a letöltésre.</string>
+    <string name="sk_confirm_delete_and_redraft_title">Törlés és újraszövegezés Hozzászólás</string>
+    <string name="sk_image_description">Kép leírása</string>
+    <string name="sk_settings_show_boosts">Show boostok</string>
+    <string name="sk_settings_show_interaction_counts">Interakciószámok megjelenítése</string>
+    <string name="sk_reject_follow_request">Követési kérelem elutasítása</string>
+    <string name="sk_poll_allow_multiple">Több választási lehetőség engedélyezése</string>
+    <string name="sk_tabs_disable_swipe">Lapok közötti lapozás letiltása</string>
+    <string name="sk_settings_about">Az alkalmazásról</string>
+</resources>
\ No newline at end of file

From ec1fe07fea7a9f412cfa013026ec47e3e617b7c5 Mon Sep 17 00:00:00 2001
From: irure <ionirure@e.email>
Date: Wed, 4 Jan 2023 19:59:17 +0000
Subject: [PATCH 139/200] Translated using Weblate (Basque)

Currently translated at 93.6% (117 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
---
 .../src/main/res/values-eu-rES/strings_sk.xml | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/mastodon/src/main/res/values-eu-rES/strings_sk.xml b/mastodon/src/main/res/values-eu-rES/strings_sk.xml
index b6d0e5470..e44716804 100644
--- a/mastodon/src/main/res/values-eu-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-eu-rES/strings_sk.xml
@@ -36,12 +36,12 @@
     <string name="sk_translated_using">%s-ekin itzulia</string>
     <string name="sk_post_language">Hizkuntza: %s</string>
     <string name="sk_language_name">%s (%s)</string>
-    <string name="sk_bookmark_as">Beste kontu bateko laster-marka</string>
+    <string name="sk_bookmark_as">Beste kontu baten laster-marka</string>
     <string name="sk_bookmarked_as">%s bezala laster-markara eramana</string>
     <string name="sk_already_bookmarked">Dagoeneko laster-marka da</string>
-    <string name="sk_favorite_as">Beste kontu bateko gogokoa</string>
+    <string name="sk_favorite_as">Beste kontu baten gogokoa</string>
     <string name="sk_favorited_as">%s bezela dago gogokoetan</string>
-    <string name="sk_reblog_as">Beste kontu batetik bultzatua</string>
+    <string name="sk_reblog_as">Beste kontu batekin bultzatua</string>
     <string name="sk_reblogged_as">%s bezela bultzatua</string>
     <string name="sk_already_reblogged">Dagoeneko bultzatua izan da</string>
     <string name="sk_reply_as">Erantzun beste kontu batekin</string>
@@ -70,7 +70,7 @@
     <string name="sk_settings_publish_button_text">Argitaratze botoiaren testua</string>
     <string name="sk_settings_publish_button_text_title">Pertsonalizatu argitaratze botoiaren testua</string>
     <string name="sk_settings_translation_availability_note_available">%s-k itzulpena onartzen du!</string>
-    <string name="sk_settings_translation_availability_note_unavailable">%s ez da itzulpena onartzen duten hizkuntzen artean ageri.</string>
+    <string name="sk_settings_translation_availability_note_unavailable">%s ez da itzulpena onartzen duten instantzien artean ageri.</string>
     <string name="sk_clear_all_notifications">Ezabatu jakinarazpen guztiak</string>
     <string name="sk_clear_all_notifications_confirm_action">Ezabatu dena</string>
     <string name="sk_clear_all_notifications_confirm">Ziur al zaude jakinarazpen guztiak ezabatu nahi dituzula\?</string>
@@ -101,4 +101,19 @@
     <string name="sk_settings_translate_only_opened">Irekitako argitalpenak soilik itzuli</string>
     <string name="sk_already_favorited">Dagoeneko gogokoen artean dago</string>
     <string name="sk_settings_uniform_icon_for_notifications">Ikono berdina jakinarazpen guztietarako</string>
+    <string name="sk_forward_report_to">%s-(e)ri birbidali</string>
+    <string name="sk_unsent_posts">Bidali gabeko argitalpenak</string>
+    <string name="sk_draft">Zirriborroa</string>
+    <string name="sk_schedule">Programatu</string>
+    <string name="sk_confirm_delete_draft_title">Ezabatu zirriborroa</string>
+    <string name="sk_confirm_delete_draft">Ziur al zaude zirriborro hau ezabatu nahi duzula\?</string>
+    <string name="sk_confirm_delete_scheduled_post_title">Ezabatu programatutako argitalpena</string>
+    <string name="sk_confirm_delete_scheduled_post">Ziur al zaude programatutako argitalpena ezabatu nahi duzula\?</string>
+    <string name="sk_draft_or_schedule">Zirriborrotara bidali edo programatu</string>
+    <string name="sk_compose_draft">Argitalpena zirriborro bezala gordeko da.</string>
+    <string name="sk_compose_scheduled">Honentzako programatu</string>
+    <string name="sk_draft_saved">Zirriborroa gorde da</string>
+    <string name="sk_post_scheduled">Argitalpena programatu da</string>
+    <string name="sk_scheduled_too_soon_title">Programatze denbora murritzegia da</string>
+    <string name="sk_scheduled_too_soon">Argitalpena gutxienez 10 minutu lehenago programatu behar da.</string>
 </resources>
\ No newline at end of file

From a3fc1a6a74ec049736e3805d01875291e5350185 Mon Sep 17 00:00:00 2001
From: AiOO <ahnkiwook@gmail.com>
Date: Fri, 6 Jan 2023 00:33:55 +0000
Subject: [PATCH 140/200] Translated using Weblate (Korean)

Currently translated at 100.0% (125 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
---
 mastodon/src/main/res/values-ko-rKR/strings_sk.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
index 88a2ee19e..742192419 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
@@ -106,22 +106,22 @@
     <string name="sk_schedule">게시 예약</string>
     <string name="sk_confirm_delete_draft_title">초안 삭제</string>
     <string name="sk_confirm_delete_draft">정말로 이 초안을 삭제하시겠습니까\?</string>
-    <string name="sk_confirm_delete_scheduled_post_title">예약 게시물 삭제</string>
-    <string name="sk_confirm_delete_scheduled_post">정말로 이 예약 게시물을 삭제하시겠습니까\?</string>
+    <string name="sk_confirm_delete_scheduled_post_title">예약한 게시물 삭제</string>
+    <string name="sk_confirm_delete_scheduled_post">정말로 이 예약한 게시물을 삭제하시겠습니까\?</string>
     <string name="sk_compose_draft">게시물이 초안으로 저장됩니다.</string>
     <string name="sk_compose_scheduled">예약한 시각</string>
     <string name="sk_post_scheduled">게시 예약함</string>
     <string name="sk_scheduled_too_soon">게시 예약은 최소한 10분 뒤로 설정해야 합니다.</string>
-    <string name="sk_draft_or_schedule">초안 작성 및 게시 예약</string>
+    <string name="sk_draft_or_schedule">초안 작성 또는 게시 예약</string>
     <string name="sk_scheduled_too_soon_title">예약한 시각이 머지않았습니다</string>
     <string name="sk_draft_saved">초안 저장함</string>
     <string name="sk_forward_report_to">%s 인스턴스로 전달</string>
     <string name="sk_schedule_post">게시 예약</string>
     <string name="sk_confirm_save_changes">변경 사항을 저장하시겠습니까\?</string>
-    <string name="sk_compose_no_schedule">예약하지 않음</string>
-    <string name="sk_compose_no_draft">초안 작성하지 않음</string>
-    <string name="sk_confirm_save_draft">초안을 저장하시겠습니까\?</string>
-    <string name="sk_schedule_or_draft">게시 예약 및 초안 작성</string>
+    <string name="sk_compose_no_schedule">게시 예약 안 함</string>
+    <string name="sk_compose_no_draft">초안 작성 안 함</string>
+    <string name="sk_confirm_save_draft">초안으로 저장하시겠습니까\?</string>
+    <string name="sk_schedule_or_draft">게시 예약 또는 초안 작성</string>
     <string name="sk_mark_as_draft">초안으로 표시</string>
     <string name="sk_settings_reduce_motion">애니메이션의 동작 감소</string>
 </resources>
\ No newline at end of file

From 120ab8ca549a4b6d571d40e9889b0114d45899a5 Mon Sep 17 00:00:00 2001
From: irure <ionirure@e.email>
Date: Wed, 11 Jan 2023 10:24:29 +0000
Subject: [PATCH 141/200] Translated using Weblate (Basque)

Currently translated at 100.0% (125 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
---
 mastodon/src/main/res/values-eu-rES/strings_sk.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mastodon/src/main/res/values-eu-rES/strings_sk.xml b/mastodon/src/main/res/values-eu-rES/strings_sk.xml
index e44716804..76394c6cb 100644
--- a/mastodon/src/main/res/values-eu-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-eu-rES/strings_sk.xml
@@ -116,4 +116,12 @@
     <string name="sk_post_scheduled">Argitalpena programatu da</string>
     <string name="sk_scheduled_too_soon_title">Programatze denbora murritzegia da</string>
     <string name="sk_scheduled_too_soon">Argitalpena gutxienez 10 minutu lehenago programatu behar da.</string>
+    <string name="sk_confirm_save_changes">Aldaketak gorde nahi dituzu\?</string>
+    <string name="sk_confirm_save_draft">Zirriborroa gorde nahi duzu\?</string>
+    <string name="sk_mark_as_draft">Markatu zirriborro gisa</string>
+    <string name="sk_schedule_post">Argitalpena programatu</string>
+    <string name="sk_schedule_or_draft">Programatu edo zirriborro egin</string>
+    <string name="sk_compose_no_schedule">Ez programatu</string>
+    <string name="sk_compose_no_draft">Ez egin zirriborrorik</string>
+    <string name="sk_settings_reduce_motion">Animazioen mugimenduak gutxitu</string>
 </resources>
\ No newline at end of file

From 28faf4277a0b1d591397536e099e57fa3fa15fe9 Mon Sep 17 00:00:00 2001
From: EifionLlwyd <llwydnant@protonmail.com>
Date: Wed, 11 Jan 2023 20:41:56 +0000
Subject: [PATCH 142/200] Added translation using Weblate (Welsh)

---
 mastodon/src/main/res/values-cy/strings_sk.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 mastodon/src/main/res/values-cy/strings_sk.xml

diff --git a/mastodon/src/main/res/values-cy/strings_sk.xml b/mastodon/src/main/res/values-cy/strings_sk.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/mastodon/src/main/res/values-cy/strings_sk.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From 9075027f69347ca1d4b62282b3a2491dec01890d Mon Sep 17 00:00:00 2001
From: AiOO <ahnkiwook@gmail.com>
Date: Sun, 1 Jan 2023 06:03:20 -0300
Subject: [PATCH 143/200] Translated using Weblate (Korean)

Currently translated at 100.0% (124 of 124 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
---
 .../src/main/res/values-ko-rKR/strings_sk.xml | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
index 742192419..4a0430ed6 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
@@ -32,10 +32,10 @@
     <string name="sk_lists_with_user">%s 님이 포함된 리스트</string>
     <string name="sk_settings_always_reveal_content_warnings">열람주의 게시물을 항상 펼치기</string>
     <string name="sk_disable_marquee">제목 표시줄의 텍스트 스크롤 비활성화</string>
-    <string name="sk_app_name">Moshidon</string>
-    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
-    <string name="sk_update_available">Moshidon %s 버전을 다운로드할 수 있습니다.</string>
-    <string name="sk_update_ready">Moshidon %s 버전을 다운로드하였으며 설치할 수 있습니다.</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_update_available">Megalodon %s 버전을 다운로드할 수 있습니다.</string>
+    <string name="sk_update_ready">Megalodon %s 버전을 다운로드하였으며 설치할 수 있습니다.</string>
     <string name="sk_settings_show_federated_timeline">연합 타임라인 표시</string>
     <string name="sk_notification_type_status">게시물</string>
     <string name="sk_notify_posts">게시물 알림</string>
@@ -46,7 +46,7 @@
     <string name="sk_color_palette_blue">파란색</string>
     <string name="sk_color_palette_brown">갈색</string>
     <string name="sk_color_palette_yellow">노란색</string>
-    <string name="sk_settings_contribute">Moshidon에 기여</string>
+    <string name="sk_settings_contribute">Megalodon에 기여</string>
     <string name="sk_poll_allow_multiple">다중 선택 허용</string>
     <string name="sk_translate_post">번역하기</string>
     <string name="sk_translate_show_original">원본 보기</string>
@@ -73,7 +73,7 @@
     <string name="sk_enable_delete_notifications">알림 삭제 활성화</string>
     <string name="sk_settings_publish_button_text">게시 버튼 텍스트</string>
     <string name="sk_settings_publish_button_text_title">게시 버튼 사용자화</string>
-    <string name="sk_settings_hide_translate_in_timeline">타임라인에서 번역 버튼 숨김</string>
+    <string name="sk_settings_translate_only_opened">타임라인에서 번역 버튼 숨김</string>
     <string name="sk_delete_notification">알림 삭제</string>
     <string name="sk_settings_translation_availability_note_available">%s 서버는 번역을 지원합니다!</string>
     <string name="sk_settings_translation_availability_note_unavailable">%s 서버는 번역을 지원하지 않는 것 같습니다.</string>
@@ -106,22 +106,21 @@
     <string name="sk_schedule">게시 예약</string>
     <string name="sk_confirm_delete_draft_title">초안 삭제</string>
     <string name="sk_confirm_delete_draft">정말로 이 초안을 삭제하시겠습니까\?</string>
-    <string name="sk_confirm_delete_scheduled_post_title">예약한 게시물 삭제</string>
-    <string name="sk_confirm_delete_scheduled_post">정말로 이 예약한 게시물을 삭제하시겠습니까\?</string>
+    <string name="sk_confirm_delete_scheduled_post_title">예약 게시물 삭제</string>
+    <string name="sk_confirm_delete_scheduled_post">정말로 이 예약 게시물을 삭제하시겠습니까\?</string>
     <string name="sk_compose_draft">게시물이 초안으로 저장됩니다.</string>
     <string name="sk_compose_scheduled">예약한 시각</string>
     <string name="sk_post_scheduled">게시 예약함</string>
     <string name="sk_scheduled_too_soon">게시 예약은 최소한 10분 뒤로 설정해야 합니다.</string>
-    <string name="sk_draft_or_schedule">초안 작성 또는 게시 예약</string>
+    <string name="sk_draft_or_schedule">초안 작성 및 게시 예약</string>
     <string name="sk_scheduled_too_soon_title">예약한 시각이 머지않았습니다</string>
     <string name="sk_draft_saved">초안 저장함</string>
     <string name="sk_forward_report_to">%s 인스턴스로 전달</string>
     <string name="sk_schedule_post">게시 예약</string>
     <string name="sk_confirm_save_changes">변경 사항을 저장하시겠습니까\?</string>
-    <string name="sk_compose_no_schedule">게시 예약 안 함</string>
-    <string name="sk_compose_no_draft">초안 작성 안 함</string>
-    <string name="sk_confirm_save_draft">초안으로 저장하시겠습니까\?</string>
-    <string name="sk_schedule_or_draft">게시 예약 또는 초안 작성</string>
+    <string name="sk_compose_no_schedule">예약하지 않음</string>
+    <string name="sk_compose_no_draft">초안 작성하지 않음</string>
+    <string name="sk_confirm_save_draft">초안을 저장하시겠습니까\?</string>
+    <string name="sk_schedule_or_draft">게시 예약 및 초안 작성</string>
     <string name="sk_mark_as_draft">초안으로 표시</string>
-    <string name="sk_settings_reduce_motion">애니메이션의 동작 감소</string>
 </resources>
\ No newline at end of file

From a7b752264f229c473af0cbca480f837c0c82c9ec Mon Sep 17 00:00:00 2001
From: Choukajohn <choukajohn@gmail.com>
Date: Sun, 1 Jan 2023 07:52:14 -0300
Subject: [PATCH 144/200] Translated using Weblate (French)

Currently translated at 100.0% (124 of 124 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
---
 .../src/main/res/values-fr-rFR/strings_sk.xml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
index 3f1f93f23..33d0bbe57 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -13,12 +13,12 @@
     <string name="sk_settings_show_replies">Afficher les réponses</string>
     <string name="sk_settings_show_boosts">Afficher les boosts</string>
     <string name="sk_settings_load_new_posts">Charger automatiquement les nouveaux messages</string>
-    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">Marquer le média comme sensible</string>
     <string name="sk_user_post_notifications_on">Notifications de message activées pour %s</string>
     <string name="sk_user_post_notifications_off">Désactivation des notifications de message pour %s</string>
-    <string name="sk_update_available">Moshidon %s est prête à être téléchargée.</string>
-    <string name="sk_update_ready">Moshidon %s est téléchargée et prête à être installée.</string>
+    <string name="sk_update_available">Megalodon %s est prête à être téléchargée.</string>
+    <string name="sk_update_ready">Megalodon %s est téléchargée et prête à être installée.</string>
     <string name="sk_check_for_update">Vérifier les mises à jour</string>
     <string name="sk_no_update_available">Pas de mise a jour disponible</string>
     <string name="sk_list_timelines">Listes</string>
@@ -28,9 +28,9 @@
     <string name="sk_lists_with_user">Listes avec %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Toujours afficher les avertissements de contenu</string>
     <string name="sk_disable_marquee">Désactiver le défilement du texte dans les barres de titre</string>
-    <string name="sk_settings_contribute">Contribuez à Moshidon</string>
+    <string name="sk_settings_contribute">Contribuez à Megalodon</string>
     <string name="sk_settings_show_federated_timeline">Afficher la timeline fédérée</string>
-    <string name="sk_app_name">Moshidon</string>
+    <string name="sk_app_name">Megalodon</string>
     <string name="sk_delete_and_redraft">Supprimer et rééditer</string>
     <string name="sk_pin_post">Épingler au profil</string>
     <string name="sk_confirm_pin_post_title">Épingler le message au profil</string>
@@ -77,7 +77,7 @@
     <string name="sk_enable_delete_notifications">Activer la suppression des notifications</string>
     <string name="sk_settings_publish_button_text_title">Personnaliser le texte du bouton Publier</string>
     <string name="sk_settings_publish_button_text">Texte du bouton Publier</string>
-    <string name="sk_settings_hide_translate_in_timeline">Masquer le bouton de traduction dans la timeline</string>
+    <string name="sk_settings_translate_only_opened">Masquer le bouton de traduction dans la timeline</string>
     <string name="sk_settings_translation_availability_note_available">%s prend en charge la traduction !</string>
     <string name="sk_settings_translation_availability_note_unavailable">%s ne semble pas prendre en charge la traduction.</string>
     <string name="sk_clear_all_notifications_confirm">Voulez-vous vraiment supprimer toutes les notifications \?</string>
@@ -91,7 +91,7 @@
     <string name="sk_loading_resource_on_instance_title">Rechercher sur %s</string>
     <string name="sk_open_with_account">Ouvrir avec un autre compte</string>
     <string name="sk_resource_not_found">La ressource est introuvable</string>
-    <string name="sk_favorite_as">Mettre en favoris avec un autre compte</string>
+    <string name="sk_favorite_as">Mettre en favoris sur un autre compte</string>
     <string name="sk_already_bookmarked">Déjà mis en signet</string>
     <string name="sk_already_favorited">Déjà mis en favori</string>
     <string name="sk_reblogged_as">Reposté en tant que %s</string>
@@ -99,8 +99,8 @@
     <string name="sk_bookmarked_as">Ajouté aux signets en tant que %s</string>
     <string name="sk_favorited_as">Ajouté aux favoris en tant que %s</string>
     <string name="sk_reply_as">Répondre avec un autre compte</string>
-    <string name="sk_bookmark_as">Mettre en signet avec un autre compte</string>
-    <string name="sk_reblog_as">Reposter avec un autre compte</string>
+    <string name="sk_bookmark_as">Mettre en signet sur un autre compte</string>
+    <string name="sk_reblog_as">Reposter depuis un autre compte</string>
     <string name="sk_settings_uniform_icon_for_notifications">Icône uniforme pour toutes les notifications</string>
     <string name="sk_forward_report_to">Transférer à %s</string>
     <string name="sk_unsent_posts">Messages non envoyés</string>
@@ -124,5 +124,4 @@
     <string name="sk_compose_no_schedule">Ne pas planifier</string>
     <string name="sk_compose_no_draft">Ne pas marquer comme brouillon</string>
     <string name="sk_schedule_or_draft">Planifier ou rédiger un brouillon</string>
-    <string name="sk_settings_reduce_motion">Réduire le mouvement dans les animations</string>
 </resources>
\ No newline at end of file

From c19374101374a09c40125d1f3628ba16087b1af2 Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Sun, 1 Jan 2023 03:59:29 -0300
Subject: [PATCH 145/200] Translated using Weblate (Indonesian)

Currently translated at 100.0% (124 of 124 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
---
 .../src/main/res/values-in-rID/strings_sk.xml | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/mastodon/src/main/res/values-in-rID/strings_sk.xml b/mastodon/src/main/res/values-in-rID/strings_sk.xml
index 143be7f7d..b37d379b8 100644
--- a/mastodon/src/main/res/values-in-rID/strings_sk.xml
+++ b/mastodon/src/main/res/values-in-rID/strings_sk.xml
@@ -12,23 +12,23 @@
     <string name="sk_settings_show_boosts">Lihat boost</string>
     <string name="sk_settings_load_new_posts">Muat kiriman baru secara otomatis</string>
     <string name="sk_settings_show_interaction_counts">Tampilkan jumlah interaksi</string>
-    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
     <string name="sk_user_post_notifications_on">Nyalakan notifikasi kiriman untuk %s</string>
     <string name="sk_user_post_notifications_off">Matikan notifikasi kiriman untuk %s</string>
     <string name="sk_federated_timeline">Federasi</string>
     <string name="sk_federated_timeline_info_banner">Kiriman terbaru dari orang-orang di federasi anda.</string>
-    <string name="sk_update_available">Moshidon %s siap untuk diunduh.</string>
-    <string name="sk_update_ready">Moshidon %s telah diunduh dan siap dipasang.</string>
+    <string name="sk_update_available">Megalodon %s siap untuk diunduh.</string>
+    <string name="sk_update_ready">Megalodon %s telah diunduh dan siap dipasang.</string>
     <string name="sk_check_for_update">Periksa pembaruan</string>
     <string name="sk_no_update_available">Tidak ada pembaruan</string>
     <string name="sk_list_timelines">Daftar</string>
     <string name="sk_unpinning">Menghapus sematan kiriman…</string>
     <string name="sk_accept_follow_request">Terima permintaan pengikut</string>
     <string name="sk_reject_follow_request">Tolak permintaan pengikut</string>
-    <string name="sk_app_name">Moshidon</string>
+    <string name="sk_app_name">Megalodon</string>
     <string name="sk_confirm_delete_and_redraft">Hapus dan tulis ulang kiriman ini\?</string>
     <string name="sk_confirm_unpin_post">Apakah Anda yakin untuk menghapus sematan kiriman ini\?</string>
-    <string name="sk_settings_contribute">Berkontribusi ke Moshidon</string>
+    <string name="sk_settings_contribute">Berkontribusi ke Megalodon</string>
     <string name="sk_pinned_posts">Disematkan</string>
     <string name="sk_pin_post">Sematkan ke profil</string>
     <string name="sk_visibility_unlisted">Tidak terdaftar</string>
@@ -40,25 +40,25 @@
     <string name="sk_settings_show_federated_timeline">Tampilkan lini masa federasi</string>
     <string name="sk_notification_type_status">Kiriman</string>
     <string name="sk_notify_posts">Notifikasi kiriman</string>
-    <string name="sk_settings_color_picker">Warna tema</string>
-    <string name="sk_color_theme_pink">Merah Muda</string>
-    <string name="sk_color_theme_purple">Ungu</string>
-    <string name="sk_color_theme_green">Hijau</string>
-    <string name="sk_color_theme_blue">Biru</string>
-    <string name="sk_color_theme_brown">Cokelat</string>
-    <string name="sk_color_theme_yellow">Kuning</string>
+    <string name="sk_settings_color_palette">Warna tema</string>
+    <string name="sk_color_palette_pink">Merah Muda</string>
+    <string name="sk_color_palette_purple">Ungu</string>
+    <string name="sk_color_palette_green">Hijau</string>
+    <string name="sk_color_palette_blue">Biru</string>
+    <string name="sk_color_palette_brown">Cokelat</string>
+    <string name="sk_color_palette_yellow">Kuning</string>
     <string name="sk_poll_allow_multiple">Perbolehkan beberapa pilihan</string>
     <string name="sk_clear_recent_languages">Hapus bahasa terkini yang digunakan</string>
     <string name="sk_welcome_title">Selamat datang!</string>
     <string name="sk_confirm_clear_recent_languages">Apakah Anda yakin ingin menghapus bahasa terkini yang Anda gunakan\?</string>
-    <string name="sk_color_theme_material3">Sistem</string>
+    <string name="sk_color_palette_material3">Sistem</string>
     <string name="sk_available_languages">Bahasa yang tersedia</string>
     <string name="sk_language_name">%s (%s)</string>
     <string name="sk_translate_post">Terjemahkan</string>
     <string name="sk_translate_show_original">Tampilkan yang asli</string>
     <string name="sk_post_language">Bahasa: %s</string>
     <string name="sk_example_domain">contoh.social</string>
-    <string name="sk_color_theme_red">Merah</string>
+    <string name="sk_color_palette_red">Merah</string>
     <string name="sk_translated_using">Diterjemahkan menggunakan %s</string>
     <string name="sk_welcome_text">Hiu menyapamu! Untuk memulai, silakan memasukkan nama domain instansi Anda di bawah.</string>
     <string name="sk_tabs_disable_swipe">Nonaktifkan mengusap antara tab</string>
@@ -67,7 +67,7 @@
     <string name="sk_enable_delete_notifications">Aktifkan menghapus notifikasi</string>
     <string name="sk_settings_publish_button_text">Teks tombol Terbitkan</string>
     <string name="sk_settings_publish_button_text_title">Ubah teks tombol Terbitkan</string>
-    <string name="sk_settings_hide_translate_in_timeline">Sembunyikan tombol terjemahkan di lini masa</string>
+    <string name="sk_settings_translate_only_opened">Sembunyikan tombol terjemahkan di lini masa</string>
     <string name="sk_settings_translation_availability_note_available">%s mendukung penerjemahan!</string>
     <string name="sk_settings_translation_availability_note_unavailable">%s sepertinya tidak mendukung penerjemahan.</string>
     <string name="sk_clear_all_notifications_confirm">Apakah Anda yakin ingin menghapus semua notifikasi\?</string>
@@ -95,12 +95,12 @@
     <string name="sk_already_bookmarked">Sudah dimarkahi</string>
     <string name="sk_favorited_as">Difavorit sebagai %s</string>
     <string name="sk_already_favorited">Sudah difavorit</string>
-    <string name="sk_reblog_as">Bagikan dengan akun lain</string>
+    <string name="sk_reblog_as">Bagikan dari akun lain</string>
     <string name="sk_reblogged_as">Dibagikan sebagai %s</string>
     <string name="sk_already_reblogged">Sudah dibagikan</string>
     <string name="sk_reply_as">Balas dengan akun lain</string>
-    <string name="sk_bookmark_as">Markahi dengan akun lain</string>
-    <string name="sk_favorite_as">Favorit dengan akun lain</string>
+    <string name="sk_bookmark_as">Markahi dalam akun lain</string>
+    <string name="sk_favorite_as">Favorit dari akun lain</string>
     <string name="sk_settings_uniform_icon_for_notifications">Ikon yang sama untuk semua notifikasi</string>
     <string name="sk_unsent_posts">Kiriman yang belum dikirim</string>
     <string name="sk_draft">Draf</string>
@@ -126,5 +126,4 @@
     <string name="sk_compose_no_schedule">Jangan dijadwalkan</string>
     <string name="sk_compose_no_draft">Jangan didraf</string>
     <string name="sk_schedule_or_draft">Jadwalkan atau draf</string>
-    <string name="sk_settings_reduce_motion">Kurangi gerakan dalam animasi</string>
 </resources>
\ No newline at end of file

From fe800a259de3bd348b14455b3c23be224427666c Mon Sep 17 00:00:00 2001
From: AiOO <ahnkiwook@gmail.com>
Date: Mon, 2 Jan 2023 17:14:16 +0000
Subject: [PATCH 146/200] Translated using Weblate (Korean)

Currently translated at 100.0% (125 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
---
 mastodon/src/main/res/values-ko-rKR/strings_sk.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
index 4a0430ed6..f147706a0 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
@@ -123,4 +123,5 @@
     <string name="sk_confirm_save_draft">초안을 저장하시겠습니까\?</string>
     <string name="sk_schedule_or_draft">게시 예약 및 초안 작성</string>
     <string name="sk_mark_as_draft">초안으로 표시</string>
+    <string name="sk_settings_reduce_motion">애니메이션의 동작 감소</string>
 </resources>
\ No newline at end of file

From 587212cf467ca212c3e1aa7d78f8537912674e76 Mon Sep 17 00:00:00 2001
From: Choukajohn <choukajohn@gmail.com>
Date: Mon, 2 Jan 2023 01:28:15 +0000
Subject: [PATCH 147/200] Translated using Weblate (French)

Currently translated at 100.0% (125 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
---
 mastodon/src/main/res/values-fr-rFR/strings_sk.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
index 33d0bbe57..f58841529 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -91,7 +91,7 @@
     <string name="sk_loading_resource_on_instance_title">Rechercher sur %s</string>
     <string name="sk_open_with_account">Ouvrir avec un autre compte</string>
     <string name="sk_resource_not_found">La ressource est introuvable</string>
-    <string name="sk_favorite_as">Mettre en favoris sur un autre compte</string>
+    <string name="sk_favorite_as">Mettre en favoris avec un autre compte</string>
     <string name="sk_already_bookmarked">Déjà mis en signet</string>
     <string name="sk_already_favorited">Déjà mis en favori</string>
     <string name="sk_reblogged_as">Reposté en tant que %s</string>
@@ -99,8 +99,8 @@
     <string name="sk_bookmarked_as">Ajouté aux signets en tant que %s</string>
     <string name="sk_favorited_as">Ajouté aux favoris en tant que %s</string>
     <string name="sk_reply_as">Répondre avec un autre compte</string>
-    <string name="sk_bookmark_as">Mettre en signet sur un autre compte</string>
-    <string name="sk_reblog_as">Reposter depuis un autre compte</string>
+    <string name="sk_bookmark_as">Mettre en signet avec un autre compte</string>
+    <string name="sk_reblog_as">Reposter avec un autre compte</string>
     <string name="sk_settings_uniform_icon_for_notifications">Icône uniforme pour toutes les notifications</string>
     <string name="sk_forward_report_to">Transférer à %s</string>
     <string name="sk_unsent_posts">Messages non envoyés</string>
@@ -124,4 +124,5 @@
     <string name="sk_compose_no_schedule">Ne pas planifier</string>
     <string name="sk_compose_no_draft">Ne pas marquer comme brouillon</string>
     <string name="sk_schedule_or_draft">Planifier ou rédiger un brouillon</string>
+    <string name="sk_settings_reduce_motion">Réduire le mouvement dans les animations</string>
 </resources>
\ No newline at end of file

From 456c50f69ed988cab0f901111b062a056f5d9658 Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Mon, 2 Jan 2023 13:13:38 +0000
Subject: [PATCH 148/200] Translated using Weblate (Indonesian)

Currently translated at 100.0% (125 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
---
 mastodon/src/main/res/values-in-rID/strings_sk.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mastodon/src/main/res/values-in-rID/strings_sk.xml b/mastodon/src/main/res/values-in-rID/strings_sk.xml
index b37d379b8..b2526727a 100644
--- a/mastodon/src/main/res/values-in-rID/strings_sk.xml
+++ b/mastodon/src/main/res/values-in-rID/strings_sk.xml
@@ -95,12 +95,12 @@
     <string name="sk_already_bookmarked">Sudah dimarkahi</string>
     <string name="sk_favorited_as">Difavorit sebagai %s</string>
     <string name="sk_already_favorited">Sudah difavorit</string>
-    <string name="sk_reblog_as">Bagikan dari akun lain</string>
+    <string name="sk_reblog_as">Bagikan dengan akun lain</string>
     <string name="sk_reblogged_as">Dibagikan sebagai %s</string>
     <string name="sk_already_reblogged">Sudah dibagikan</string>
     <string name="sk_reply_as">Balas dengan akun lain</string>
-    <string name="sk_bookmark_as">Markahi dalam akun lain</string>
-    <string name="sk_favorite_as">Favorit dari akun lain</string>
+    <string name="sk_bookmark_as">Markahi dengan akun lain</string>
+    <string name="sk_favorite_as">Favorit dengan akun lain</string>
     <string name="sk_settings_uniform_icon_for_notifications">Ikon yang sama untuk semua notifikasi</string>
     <string name="sk_unsent_posts">Kiriman yang belum dikirim</string>
     <string name="sk_draft">Draf</string>
@@ -126,4 +126,5 @@
     <string name="sk_compose_no_schedule">Jangan dijadwalkan</string>
     <string name="sk_compose_no_draft">Jangan didraf</string>
     <string name="sk_schedule_or_draft">Jadwalkan atau draf</string>
+    <string name="sk_settings_reduce_motion">Kurangi gerakan dalam animasi</string>
 </resources>
\ No newline at end of file

From bf35161c9f79cb63dffc4034000403cd993a6679 Mon Sep 17 00:00:00 2001
From: irure <ionirure@e.email>
Date: Wed, 4 Jan 2023 16:59:17 -0300
Subject: [PATCH 149/200] Translated using Weblate (Basque)

Currently translated at 93.6% (117 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
---
 .../src/main/res/values-eu-rES/strings_sk.xml  | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/mastodon/src/main/res/values-eu-rES/strings_sk.xml b/mastodon/src/main/res/values-eu-rES/strings_sk.xml
index 76394c6cb..16191b377 100644
--- a/mastodon/src/main/res/values-eu-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-eu-rES/strings_sk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sk_app_name">Moshidon</string>
+    <string name="sk_app_name">Megalodon</string>
     <string name="sk_delete_and_redraft">Ezabatu eta editatu</string>
     <string name="sk_confirm_delete_and_redraft_title">Argitalpena ezabatu eta editatu</string>
     <string name="sk_pin_post">Profilean finkatu</string>
@@ -15,12 +15,12 @@
     <string name="sk_settings_show_replies">Erakutsi erantzunak</string>
     <string name="sk_settings_show_boosts">Erakutsi bultzadak</string>
     <string name="sk_settings_show_interaction_counts">Erakutsi interakzio zenbaketak</string>
-    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">Markatu multimedia sentikor gisa</string>
     <string name="sk_user_post_notifications_on">Gaitu %s-en argitalpen jakinarazpenak</string>
     <string name="sk_federated_timeline">Federatua</string>
     <string name="sk_federated_timeline_info_banner">Hauek dira zure federazioko pertsonen argitalpen berrienak.</string>
-    <string name="sk_update_available">Moshidon %s deskargatzeko prest dago.</string>
+    <string name="sk_update_available">Megalodon %s deskargatzeko prest dago.</string>
     <string name="sk_check_for_update">Eguneraketak egiaztatu</string>
     <string name="sk_no_update_available">Ez dago eguneraketarik eskuragarri</string>
     <string name="sk_list_timelines">Zerrendak</string>
@@ -32,7 +32,7 @@
     <string name="sk_lists_with_user">%s-ekin zerrendatu</string>
     <string name="sk_settings_always_reveal_content_warnings">Erakutsi beti edukiaren abisua</string>
     <string name="sk_disable_marquee">Desgaitu izenburu-barretako testuaren desplazamendua</string>
-    <string name="sk_settings_contribute">Lagundu Moshidon</string>
+    <string name="sk_settings_contribute">Lagundu Megalodon</string>
     <string name="sk_translated_using">%s-ekin itzulia</string>
     <string name="sk_post_language">Hizkuntza: %s</string>
     <string name="sk_language_name">%s (%s)</string>
@@ -88,7 +88,7 @@
     <string name="sk_confirm_unpin_post_title">Argitalpen finkatua kendu profiletik</string>
     <string name="sk_settings_load_new_posts">Kargatu automatikoki argitalpen berriak</string>
     <string name="sk_user_post_notifications_off">Desgaitu %s-en argitalpen jakinarazpenak</string>
-    <string name="sk_update_ready">Moshidon %s deskargatuta eta instalatzeko prest dago.</string>
+    <string name="sk_update_ready">Megalodon %s deskargatuta eta instalatzeko prest dago.</string>
     <string name="sk_accept_follow_request">Onartu jarraitzeko eskaerak</string>
     <string name="sk_reject_follow_request">Alboratu jarraitzeko eskaerak</string>
     <string name="sk_settings_show_federated_timeline">Erakutsi federatutako denbora-lerroa</string>
@@ -116,12 +116,4 @@
     <string name="sk_post_scheduled">Argitalpena programatu da</string>
     <string name="sk_scheduled_too_soon_title">Programatze denbora murritzegia da</string>
     <string name="sk_scheduled_too_soon">Argitalpena gutxienez 10 minutu lehenago programatu behar da.</string>
-    <string name="sk_confirm_save_changes">Aldaketak gorde nahi dituzu\?</string>
-    <string name="sk_confirm_save_draft">Zirriborroa gorde nahi duzu\?</string>
-    <string name="sk_mark_as_draft">Markatu zirriborro gisa</string>
-    <string name="sk_schedule_post">Argitalpena programatu</string>
-    <string name="sk_schedule_or_draft">Programatu edo zirriborro egin</string>
-    <string name="sk_compose_no_schedule">Ez programatu</string>
-    <string name="sk_compose_no_draft">Ez egin zirriborrorik</string>
-    <string name="sk_settings_reduce_motion">Animazioen mugimenduak gutxitu</string>
 </resources>
\ No newline at end of file

From eb40211582486951beb29e8808924c1383c62fa3 Mon Sep 17 00:00:00 2001
From: AiOO <ahnkiwook@gmail.com>
Date: Fri, 6 Jan 2023 00:33:55 +0000
Subject: [PATCH 150/200] Translated using Weblate (Korean)

Currently translated at 100.0% (125 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
---
 mastodon/src/main/res/values-ko-rKR/strings_sk.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
index f147706a0..a75852b95 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
@@ -106,22 +106,22 @@
     <string name="sk_schedule">게시 예약</string>
     <string name="sk_confirm_delete_draft_title">초안 삭제</string>
     <string name="sk_confirm_delete_draft">정말로 이 초안을 삭제하시겠습니까\?</string>
-    <string name="sk_confirm_delete_scheduled_post_title">예약 게시물 삭제</string>
-    <string name="sk_confirm_delete_scheduled_post">정말로 이 예약 게시물을 삭제하시겠습니까\?</string>
+    <string name="sk_confirm_delete_scheduled_post_title">예약한 게시물 삭제</string>
+    <string name="sk_confirm_delete_scheduled_post">정말로 이 예약한 게시물을 삭제하시겠습니까\?</string>
     <string name="sk_compose_draft">게시물이 초안으로 저장됩니다.</string>
     <string name="sk_compose_scheduled">예약한 시각</string>
     <string name="sk_post_scheduled">게시 예약함</string>
     <string name="sk_scheduled_too_soon">게시 예약은 최소한 10분 뒤로 설정해야 합니다.</string>
-    <string name="sk_draft_or_schedule">초안 작성 및 게시 예약</string>
+    <string name="sk_draft_or_schedule">초안 작성 또는 게시 예약</string>
     <string name="sk_scheduled_too_soon_title">예약한 시각이 머지않았습니다</string>
     <string name="sk_draft_saved">초안 저장함</string>
     <string name="sk_forward_report_to">%s 인스턴스로 전달</string>
     <string name="sk_schedule_post">게시 예약</string>
     <string name="sk_confirm_save_changes">변경 사항을 저장하시겠습니까\?</string>
-    <string name="sk_compose_no_schedule">예약하지 않음</string>
-    <string name="sk_compose_no_draft">초안 작성하지 않음</string>
-    <string name="sk_confirm_save_draft">초안을 저장하시겠습니까\?</string>
-    <string name="sk_schedule_or_draft">게시 예약 및 초안 작성</string>
+    <string name="sk_compose_no_schedule">게시 예약 안 함</string>
+    <string name="sk_compose_no_draft">초안 작성 안 함</string>
+    <string name="sk_confirm_save_draft">초안으로 저장하시겠습니까\?</string>
+    <string name="sk_schedule_or_draft">게시 예약 또는 초안 작성</string>
     <string name="sk_mark_as_draft">초안으로 표시</string>
     <string name="sk_settings_reduce_motion">애니메이션의 동작 감소</string>
 </resources>
\ No newline at end of file

From 8acf23ddac3b933c94af0fa797bf6c9382789781 Mon Sep 17 00:00:00 2001
From: Hiajen <info+codeberg@hiajen.de>
Date: Tue, 10 Jan 2023 08:43:14 -0300
Subject: [PATCH 151/200] Translated using Weblate (German)

Currently translated at 97.6% (122 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
---
 .../src/main/res/values-de-rDE/strings_sk.xml | 78 +++++++------------
 1 file changed, 29 insertions(+), 49 deletions(-)

diff --git a/mastodon/src/main/res/values-de-rDE/strings_sk.xml b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
index f95b1ffad..4fe4d6102 100644
--- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sk_app_name">Moshidon</string>
+    <string name="sk_app_name">Megalodon</string>
     <string name="sk_pinned_posts">Angeheftet</string>
     <string name="sk_delete_and_redraft">Löschen und neu erstellen</string>
     <string name="sk_confirm_delete_and_redraft_title">Beitrag löschen und neu erstellen</string>
-    <string name="sk_confirm_delete_and_redraft">Bist du dir sicher, dass du diesen Beitrag löschen und neu erstellen möchtest\?</string>
+    <string name="sk_confirm_delete_and_redraft">Bist du dir sicher, dass du diesen Beitrag löschen und neu erstellen möchtest?</string>
     <string name="sk_pin_post">An Profil anheften</string>
     <string name="sk_confirm_pin_post_title">Beitrag an Profil anheften</string>
     <string name="sk_confirm_pin_post">Möchtest du den Beitrag an dein Profil anheften?</string>
     <string name="sk_pinning">Wird angeheftet…</string>
     <string name="sk_unpin_post">Von Profil lösen</string>
     <string name="sk_confirm_unpin_post_title">Angehefteten Beitrag von Profil lösen</string>
-    <string name="sk_confirm_unpin_post">Bist du dir sicher, dass du den angehefteten Beitrag von deinem Profil lösen möchtest\?</string>
+    <string name="sk_confirm_unpin_post">Bist du dir sicher, dass du den angehefteten Beitrag von deinem Profil lösen möchtest?</string>
     <string name="sk_unpinning">Wird vom Profil gelöst…</string>
     <string name="sk_image_description">Bildbeschreibung</string>
     <string name="sk_visibility_unlisted">Nicht gelistet</string>
@@ -19,15 +19,14 @@
     <string name="sk_settings_show_boosts">Geteilte Beiträge anzeigen</string>
     <string name="sk_settings_load_new_posts">Automatisch neue Beiträge laden</string>
     <string name="sk_settings_show_interaction_counts">Interaktions-Anzahlen anzeigen</string>
-    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">Medien als sensibel markieren</string>
     <string name="sk_user_post_notifications_on">Benachrichtigungen über Beiträge von %s aktiviert</string>
     <string name="sk_user_post_notifications_off">Benachrichtigungen über Beiträge von %s deaktiviert</string>
     <string name="sk_federated_timeline">Föderation</string>
     <string name="sk_federated_timeline_info_banner">Das sind die neuesten Beiträge von Personen, die in der Föderation deines Servers sind.</string>
-    <string name="sk_update_available">Moshidon %s ist zum Herunterladen bereit.</string>
-    <string name="sk_update_ready">Moshidon %s wurde heruntergeladen und kann jetzt installiert werden.</string>
-    <string name="sk_changelog">Changelog:</string>
+    <string name="sk_update_available">Megalodon %s ist zum Herunterladen bereit.</string>
+    <string name="sk_update_ready">Megalodon %s wurde heruntergeladen und kann jetzt installiert werden.</string>
     <string name="sk_check_for_update">Auf Update prüfen</string>
     <string name="sk_no_update_available">Kein Update verfügbar</string>
     <string name="sk_list_timelines">Listen</string>
@@ -37,35 +36,31 @@
     <string name="sk_lists_with_user">Listen mit %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Inhaltswarnungen immer ausklappen</string>
     <string name="sk_disable_marquee">Laufschrift in Titelleisten deaktivieren</string>
-    <string name="sk_disable_dividers">Beitrags Trennung deaktivieren</string>
-    <string name="sk_relocate_publish_button">Veröffentlichen Schaltfläche verschieben</string>
-    <string name="sk_settings_contribute">Zu Moshidon beitragen</string>
+    <string name="sk_settings_contribute">Zu Megalodon beitragen</string>
     <string name="sk_settings_show_federated_timeline">Föderierte Timeline anzeigen</string>
-    <string name="sk_notification_type_status">Beiträge</string>
     <string name="sk_notify_posts">Beitrags-​Benachrichtigungen</string>
     <string name="sk_settings_color_palette">Farbschema</string>
-    <string name="sk_color_palette_material3">System</string>
     <string name="sk_color_palette_pink">Pink</string>
     <string name="sk_color_palette_purple">Violett</string>
     <string name="sk_color_palette_green">Grün</string>
-    <string name="sk_color_palette_blue">Blau</string>
     <string name="sk_color_palette_brown">Braun</string>
-    <string name="sk_color_palette_red">Rot</string>
     <string name="sk_color_palette_yellow">Gelb</string>
-    <string name="sk_color_palette_nord">Nord</string>
+    <string name="sk_notification_type_status">Beiträge</string>
+    <string name="sk_color_palette_blue">Blau</string>
     <string name="sk_poll_allow_multiple">Mehrfachantworten erlauben</string>
     <string name="sk_translated_using">Übersetzt mit %s</string>
+    <string name="sk_post_language">Sprache: %s</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_confirm_clear_recent_languages">Sicher, dass du die Liste der zuletzt verwendeten Sprachen leeren willst\?</string>
     <string name="sk_translate_post">Übersetzen</string>
     <string name="sk_translate_show_original">Original anzeigen</string>
-    <string name="sk_post_language">Sprache: %s</string>
     <string name="sk_available_languages">Verfügbare Sprachen</string>
-    <string name="sk_language_name">%s (%s)</string>
     <string name="sk_clear_recent_languages">Zuletzt verwendete Sprachen leeren</string>
-    <string name="sk_confirm_clear_recent_languages">Sicher, dass du die Liste der zuletzt verwendeten Sprachen leeren willst\?</string>
     <string name="sk_welcome_title">Willkommen!</string>
-    <string name="sk_welcome_text">Moshidon sagt Hi! gib den Domain-Namen deiner Heimat-Instanz unten ein.</string>
     <string name="sk_example_domain">beispiel.social</string>
-    <string name="sk_tabs_disable_swipe">Wischen zwischen Tabs deaktivieren</string>
+    <string name="sk_welcome_text">Der Hai sagt Hi! Um anzufangen, gib den Domain-Namen deiner Heimat-Instanz unten ein.</string>
+    <string name="sk_color_palette_material3">System</string>
+    <string name="sk_color_palette_red">Rot</string>
     <string name="sk_settings_profile">Profil einrichten</string>
     <string name="sk_settings_posting">Einstellungen für Beiträge</string>
     <string name="sk_settings_filters">Filter konfigurieren</string>
@@ -73,35 +68,35 @@
     <string name="sk_settings_rules">Regelwerk</string>
     <string name="sk_settings_about">Über die App</string>
     <string name="sk_settings_donate">Spenden</string>
-    <string name="sk_delete_notification">Benachrichtigung löschen</string>
+    <string name="sk_tabs_disable_swipe">Wischen zwischen Tabs deaktivieren</string>
     <string name="sk_delete_notification_confirm_action">Benachrichtigung löschen</string>
     <string name="sk_delete_notification_confirm">Benachrichtigung wirklich löschen\?</string>
-    <string name="sk_clear_all_notifications">Alle Benachrichtigungen löschen</string>
     <string name="sk_clear_all_notifications_confirm_action">Alle löschen</string>
-    <string name="sk_clear_all_notifications_confirm">Wirklich alle Benachrichtigungen löschen\?</string>
     <string name="sk_enable_delete_notifications">Löschen von Benachrichtigungen aktivieren</string>
     <string name="sk_settings_publish_button_text">Veröffentlichen-Button-Text</string>
-    <string name="sk_settings_publish_button_text_title">Veröffentlichen-Button-Text anpassen</string>
     <string name="sk_settings_translate_only_opened">Nur geöffnete Beiträge übersetzen</string>
+    <string name="sk_delete_notification">Benachrichtigung löschen</string>
+    <string name="sk_clear_all_notifications">Alle Benachrichtigungen löschen</string>
+    <string name="sk_settings_publish_button_text_title">Veröffentlichen-Button-Text anpassen</string>
+    <string name="sk_clear_all_notifications_confirm">Wirklich alle Benachrichtigungen löschen\?</string>
     <string name="sk_settings_translation_availability_note_available">%s unterstützt Übersetzung!</string>
     <string name="sk_settings_translation_availability_note_unavailable">%s scheint keine Übersetzung zu unterstützen.</string>
     <string name="sk_loading_fediverse_resource_title">Suche im Fediverse</string>
-    <string name="sk_loading_resource_on_instance_title">Suche auf %s</string>
     <string name="sk_undo_reblog">Reblog rückgängig machen</string>
     <string name="sk_reblog_with_visibility">Rebloggen mit Sichtbarkeit</string>
     <string name="sk_quote_post">Drüberkommentieren</string>
     <string name="sk_hashtags_you_follow">Hashtags, denen du folgst</string>
     <string name="sk_copy_link_to_post">Link zum Beitrag kopieren</string>
-    <string name="sk_open_in_account">In anderem Konto öffnen</string>
     <string name="sk_open_with_account">Mit anderem Konto öffnen</string>
     <string name="sk_resource_not_found">Ressource nicht gefunden</string>
-    <string name="sk_bookmark_as">Lesezeichen in anderem Konto</string>
+    <string name="sk_loading_resource_on_instance_title">Suche auf %s</string>
+    <string name="sk_bookmark_as">Lesezeichen mit anderem Konto</string>
     <string name="sk_bookmarked_as">Lesezeichen gesetzt als %s</string>
     <string name="sk_already_bookmarked">Bereits in den Lesezeichen</string>
-    <string name="sk_favorite_as">Favorit von anderem Konto</string>
+    <string name="sk_favorite_as">Favorit mit anderem Konto</string>
     <string name="sk_favorited_as">Favorisiert als %s</string>
     <string name="sk_already_favorited">Bereits favorisiert</string>
-    <string name="sk_reblog_as">Von einem anderen Konto boosten</string>
+    <string name="sk_reblog_as">Mit einem anderen Konto boosten</string>
     <string name="sk_reblogged_as">Geboostet als %s</string>
     <string name="sk_already_reblogged">Bereits geboostet</string>
     <string name="sk_reply_as">Antworten mit anderem Konto</string>
@@ -121,24 +116,9 @@
     <string name="sk_post_scheduled">Beitrag geplant</string>
     <string name="sk_scheduled_too_soon_title">Geplante Zeit ist zu früh</string>
     <string name="sk_scheduled_too_soon">Der Beitrag muss mindestens 10 Minuten in der Zukunft eingeplant werden.</string>
-    <string name="sk_confirm_save_draft">Entwurf speichern?</string>
-    <string name="sk_confirm_save_changes">Änderungen speichern?</string>
-    <string name="sk_mark_as_draft">Als Entwurf markieren</string>
+    <string name="sk_confirm_save_changes">Änderungen speichern\?</string>
     <string name="sk_schedule_post">Beitrag planen</string>
-    <string name="sk_schedule_or_draft">Planen oder Entwurf</string>
-    <string name="sk_compose_no_schedule">Nicht planen</string>
-    <string name="sk_compose_no_draft">Nicht entwerfen</string>
-    <string name="sk_settings_reduce_motion">Bewegungen in Animationen reduzieren</string>
-    <string name="sk_bot_account">Dies ist ein Bot-Konto</string>
-    <string name="sk_no_image_desc_title">Keine Bildbeschreibung</string>
-    <string name="sk_no_image_desc">Die enthaltenen Bilder haben keine Beschreibung. Bitte füge eine Beschreibung hinzu, damit auch sehbehinderte Personen teilnehmen können.</string>
-    <string name="sk_emoji_recent">Kürzlich verwendet</string>
-    <string name="sk_clear_recent_emoji">Kürzlich verwendete Emojis löschen</string>
-    <string name="sk_disable_relocate_publish_button_to_enable_customization">Deaktiviere die Funktion "Veröffentlichen Schaltfläche verschieben", um eine Anpassung zu ermöglichen.</string>
-    <string name="sk_keep_only_latest_notification">Nur neueste Benachrichtigung behalten</string>
-    <string name="sk_announcements">Ankündigungen</string>
-    <string name="sk_mark_as_read">Als gelesen markieren</string>
-    <string name="sk_poll_option_add">Neue Umfrageoption hinzufügen</string>
-    <string name="sk_fab_compose">Verfassen</string>
-    <string name="sk_sending_error">Fehler beim Veröffentlichen</string>
-</resources>
+    <string name="sk_confirm_save_draft">Entwurf speichern\?</string>
+    <string name="sk_mark_as_draft">Als Entwurf markieren</string>
+    <string name="sk_schedule_or_draft">Planen oder Vorlage</string>
+</resources>
\ No newline at end of file

From 168ae807434ccc8b5269afda81819e3983853eec Mon Sep 17 00:00:00 2001
From: irure <ionirure@e.email>
Date: Wed, 11 Jan 2023 10:24:29 +0000
Subject: [PATCH 152/200] Translated using Weblate (Basque)

Currently translated at 100.0% (125 of 125 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/eu/
---
 mastodon/src/main/res/values-eu-rES/strings_sk.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mastodon/src/main/res/values-eu-rES/strings_sk.xml b/mastodon/src/main/res/values-eu-rES/strings_sk.xml
index 16191b377..e8d089f64 100644
--- a/mastodon/src/main/res/values-eu-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-eu-rES/strings_sk.xml
@@ -116,4 +116,12 @@
     <string name="sk_post_scheduled">Argitalpena programatu da</string>
     <string name="sk_scheduled_too_soon_title">Programatze denbora murritzegia da</string>
     <string name="sk_scheduled_too_soon">Argitalpena gutxienez 10 minutu lehenago programatu behar da.</string>
+    <string name="sk_confirm_save_changes">Aldaketak gorde nahi dituzu\?</string>
+    <string name="sk_confirm_save_draft">Zirriborroa gorde nahi duzu\?</string>
+    <string name="sk_mark_as_draft">Markatu zirriborro gisa</string>
+    <string name="sk_schedule_post">Argitalpena programatu</string>
+    <string name="sk_schedule_or_draft">Programatu edo zirriborro egin</string>
+    <string name="sk_compose_no_schedule">Ez programatu</string>
+    <string name="sk_compose_no_draft">Ez egin zirriborrorik</string>
+    <string name="sk_settings_reduce_motion">Animazioen mugimenduak gutxitu</string>
 </resources>
\ No newline at end of file

From 31e2a322330f210c58b2b1544b16551d407d901d Mon Sep 17 00:00:00 2001
From: sk22 <sk22@mailbox.org>
Date: Wed, 11 Jan 2023 13:00:03 +0000
Subject: [PATCH 153/200] Translated using Weblate (German)

Currently translated at 100.0% (140 of 140 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
---
 .../src/main/res/values-de-rDE/strings_sk.xml | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/res/values-de-rDE/strings_sk.xml b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
index 4fe4d6102..31f1fd8a3 100644
--- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
@@ -11,7 +11,7 @@
     <string name="sk_pinning">Wird angeheftet…</string>
     <string name="sk_unpin_post">Von Profil lösen</string>
     <string name="sk_confirm_unpin_post_title">Angehefteten Beitrag von Profil lösen</string>
-    <string name="sk_confirm_unpin_post">Bist du dir sicher, dass du den angehefteten Beitrag von deinem Profil lösen möchtest?</string>
+    <string name="sk_confirm_unpin_post">Diesen angehefteten Beitrag wirklich von deinem Profil lösen\?</string>
     <string name="sk_unpinning">Wird vom Profil gelöst…</string>
     <string name="sk_image_description">Bildbeschreibung</string>
     <string name="sk_visibility_unlisted">Nicht gelistet</string>
@@ -33,7 +33,7 @@
     <string name="sk_follow_requests">Folgeanfragen</string>
     <string name="sk_accept_follow_request">Folgeanfrage akzeptieren</string>
     <string name="sk_reject_follow_request">Folgeanfrage ablehnen</string>
-    <string name="sk_lists_with_user">Listen mit %s</string>
+    <string name="sk_lists_with_user">Listen mit %s bearbeiten</string>
     <string name="sk_settings_always_reveal_content_warnings">Inhaltswarnungen immer ausklappen</string>
     <string name="sk_disable_marquee">Laufschrift in Titelleisten deaktivieren</string>
     <string name="sk_settings_contribute">Zu Megalodon beitragen</string>
@@ -121,4 +121,22 @@
     <string name="sk_confirm_save_draft">Entwurf speichern\?</string>
     <string name="sk_mark_as_draft">Als Entwurf markieren</string>
     <string name="sk_schedule_or_draft">Planen oder Vorlage</string>
+    <string name="sk_compose_no_schedule">Nicht planen</string>
+    <string name="sk_compose_no_draft">Nicht entwerfen</string>
+    <string name="sk_settings_reduce_motion">Bewegung in Animationen reduzieren</string>
+    <string name="sk_mark_as_read">Als gelesen markieren</string>
+    <string name="sk_settings_about_instance">Über die Instanz</string>
+    <string name="sk_create">Erstellen</string>
+    <string name="sk_create_list_title">Liste erstellen</string>
+    <string name="sk_list_name_hint">Name der Liste</string>
+    <string name="sk_list_replies_policy">Mit Antworten von</string>
+    <string name="sk_list_replies_policy_list">Listen-Mitgliedern</string>
+    <string name="sk_list_replies_policy_followed">gefolgten User_innen</string>
+    <string name="sk_list_replies_policy_none">niemandem</string>
+    <string name="sk_delete_list">Liste löschen</string>
+    <string name="sk_edit_list_title">Liste bearbeiten</string>
+    <string name="sk_your_lists">Deine Listen</string>
+    <string name="sk_announcements">Ankündigungen</string>
+    <string name="sk_settings_single_notification">Nur eine Benachrichtigung anzeigen</string>
+    <string name="sk_delete_list_confirm">Liste wirklich löschen\?</string>
 </resources>
\ No newline at end of file

From 1ef96ed5e60e9fd764aedcdb204279e02a5ac127 Mon Sep 17 00:00:00 2001
From: ling0412 <xll520yzl@gmail.com>
Date: Wed, 11 Jan 2023 13:03:10 +0000
Subject: [PATCH 154/200] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (140 of 140 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hans/
---
 .../src/main/res/values-zh-rCN/strings_sk.xml   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
index 4ee890749..0ea3909df 100644
--- a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
@@ -32,7 +32,7 @@
     <string name="sk_list_timelines">列表</string>
     <string name="sk_accept_follow_request">接受关注请求</string>
     <string name="sk_reject_follow_request">拒绝关注请求</string>
-    <string name="sk_lists_with_user">%s 的列表</string>
+    <string name="sk_lists_with_user">使用 %s 编辑列表</string>
     <string name="sk_disable_marquee">禁用标题栏的滚动文本</string>
     <string name="sk_settings_contribute">向 Moshidon 贡献</string>
     <string name="sk_settings_show_federated_timeline">显示联邦时间轴</string>
@@ -126,4 +126,19 @@
     <string name="sk_compose_no_draft">不要标记为草稿</string>
     <string name="sk_settings_reduce_motion">减少动画中的效果</string>
     <string name="sk_schedule_or_draft">预订或草稿</string>
+    <string name="sk_announcements">公告</string>
+    <string name="sk_mark_as_read">标记为已读</string>
+    <string name="sk_settings_about_instance">关于实例</string>
+    <string name="sk_settings_single_notification">只显示一个通知</string>
+    <string name="sk_create">创建</string>
+    <string name="sk_create_list_title">创建列表</string>
+    <string name="sk_list_name_hint">列表名</string>
+    <string name="sk_list_replies_policy">显示回复</string>
+    <string name="sk_list_replies_policy_list">列出成员</string>
+    <string name="sk_list_replies_policy_followed">关注的用户</string>
+    <string name="sk_list_replies_policy_none">没有人</string>
+    <string name="sk_delete_list">删除列表</string>
+    <string name="sk_delete_list_confirm">您确定要删除此列表吗？</string>
+    <string name="sk_edit_list_title">编辑列表</string>
+    <string name="sk_your_lists">你的列表</string>
 </resources>
\ No newline at end of file

From 23dccef4b48b5560b710a1d94ef0b39ecc8b33ab Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Wed, 11 Jan 2023 15:57:05 +0000
Subject: [PATCH 155/200] Translated using Weblate (Spanish)

Currently translated at 100.0% (140 of 140 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/
---
 .../src/main/res/values-es-rES/strings_sk.xml   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-es-rES/strings_sk.xml b/mastodon/src/main/res/values-es-rES/strings_sk.xml
index 0919ef561..f0280adee 100644
--- a/mastodon/src/main/res/values-es-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-es-rES/strings_sk.xml
@@ -32,7 +32,7 @@
     <string name="sk_follow_requests">Solicitudes de seguimiento</string>
     <string name="sk_accept_follow_request">Aceptar solicitud de seguimiento</string>
     <string name="sk_reject_follow_request">Rechazar solicitud de seguimiento</string>
-    <string name="sk_lists_with_user">Listas con %s</string>
+    <string name="sk_lists_with_user">Editar listas con %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Mostrar siempre advertencias de contenido</string>
     <string name="sk_disable_marquee">Desactivar desplazamiento de texto en barras del título</string>
     <string name="sk_settings_contribute">Contribuir a Moshidon</string>
@@ -124,4 +124,19 @@
     <string name="sk_compose_no_schedule">No programar</string>
     <string name="sk_compose_no_draft">No hagas borradores</string>
     <string name="sk_settings_reduce_motion">Reducir el movimiento en las animaciones</string>
+    <string name="sk_announcements">Anuncios</string>
+    <string name="sk_mark_as_read">Marcar como leído</string>
+    <string name="sk_settings_about_instance">Sobre la instancia</string>
+    <string name="sk_settings_single_notification">Mostrar solo una notificación</string>
+    <string name="sk_create">Crear</string>
+    <string name="sk_create_list_title">Crear una lista</string>
+    <string name="sk_list_name_hint">Lista de nombres</string>
+    <string name="sk_list_replies_policy">Mostrar respuestas a</string>
+    <string name="sk_list_replies_policy_followed">Usuarios a los que sigues</string>
+    <string name="sk_list_replies_policy_none">Ninguno</string>
+    <string name="sk_delete_list">Eliminar la lista</string>
+    <string name="sk_delete_list_confirm">¿Está seguro de que desea eliminar esta lista\?</string>
+    <string name="sk_edit_list_title">Editar la lista</string>
+    <string name="sk_your_lists">Tus listas</string>
+    <string name="sk_list_replies_policy_list">Lista de miembros</string>
 </resources>
\ No newline at end of file

From aa4b007d25727d1c8f78b41d93981b122a8ab836 Mon Sep 17 00:00:00 2001
From: Choukajohn <choukajohn@gmail.com>
Date: Wed, 11 Jan 2023 18:16:00 +0000
Subject: [PATCH 156/200] Translated using Weblate (French)

Currently translated at 100.0% (140 of 140 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
---
 .../src/main/res/values-fr-rFR/strings_sk.xml   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
index f58841529..77e03039a 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -25,7 +25,7 @@
     <string name="sk_follow_requests">Suivre les demandes</string>
     <string name="sk_accept_follow_request">Accepter la demande de suivi</string>
     <string name="sk_reject_follow_request">Refuser la demande de suivi</string>
-    <string name="sk_lists_with_user">Listes avec %s</string>
+    <string name="sk_lists_with_user">Modifier les listes avec %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Toujours afficher les avertissements de contenu</string>
     <string name="sk_disable_marquee">Désactiver le défilement du texte dans les barres de titre</string>
     <string name="sk_settings_contribute">Contribuez à Megalodon</string>
@@ -125,4 +125,19 @@
     <string name="sk_compose_no_draft">Ne pas marquer comme brouillon</string>
     <string name="sk_schedule_or_draft">Planifier ou rédiger un brouillon</string>
     <string name="sk_settings_reduce_motion">Réduire le mouvement dans les animations</string>
+    <string name="sk_mark_as_read">Marquer comme lu</string>
+    <string name="sk_settings_about_instance">À propos de l\'instance</string>
+    <string name="sk_create">Créer</string>
+    <string name="sk_create_list_title">Créer une liste</string>
+    <string name="sk_list_name_hint">Nom de la liste</string>
+    <string name="sk_list_replies_policy">Afficher les réponses à</string>
+    <string name="sk_list_replies_policy_list">membres de la liste</string>
+    <string name="sk_list_replies_policy_followed">utilisateurs suivis</string>
+    <string name="sk_list_replies_policy_none">personne</string>
+    <string name="sk_delete_list">Supprimer la liste</string>
+    <string name="sk_edit_list_title">Modifier la liste</string>
+    <string name="sk_announcements">Annonces</string>
+    <string name="sk_settings_single_notification">Afficher une seule notification</string>
+    <string name="sk_delete_list_confirm">Voulez-vous vraiment supprimer cette liste \?</string>
+    <string name="sk_your_lists">Vos listes</string>
 </resources>
\ No newline at end of file

From efbca327c147d6847e41bf5a0be5114e969e5475 Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Wed, 11 Jan 2023 16:51:15 +0000
Subject: [PATCH 157/200] Translated using Weblate (Indonesian)

Currently translated at 88.5% (124 of 140 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
---
 mastodon/src/main/res/values-in-rID/strings_sk.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-in-rID/strings_sk.xml b/mastodon/src/main/res/values-in-rID/strings_sk.xml
index b2526727a..870e9f242 100644
--- a/mastodon/src/main/res/values-in-rID/strings_sk.xml
+++ b/mastodon/src/main/res/values-in-rID/strings_sk.xml
@@ -34,7 +34,7 @@
     <string name="sk_visibility_unlisted">Tidak terdaftar</string>
     <string name="sk_mark_media_as_sensitive">Tandai media sebagai sensitif</string>
     <string name="sk_follow_requests">Permintaan pengikut</string>
-    <string name="sk_lists_with_user">Daftar dengan %s</string>
+    <string name="sk_lists_with_user">Sunting daftar dengan %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Selalu ungkap peringatan konten</string>
     <string name="sk_disable_marquee">Nonaktifkan teks bergulir dalam bilah judul</string>
     <string name="sk_settings_show_federated_timeline">Tampilkan lini masa federasi</string>

From 84b2994b99d9734ad98f0faa9aba168e6044d85f Mon Sep 17 00:00:00 2001
From: brenno <brenno.pm@gmail.com>
Date: Wed, 11 Jan 2023 12:22:11 -0300
Subject: [PATCH 158/200] Translated using Weblate (Portuguese (Brazil))

Currently translated at 96.4% (135 of 140 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/pt_BR/
---
 .../src/main/res/values-pt-rBR/strings_sk.xml | 52 ++++++++++++++-----
 1 file changed, 39 insertions(+), 13 deletions(-)

diff --git a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
index bec510996..193f50190 100644
--- a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
@@ -6,8 +6,8 @@
     <string name="sk_pin_post">Fixar no perfil</string>
     <string name="sk_confirm_pin_post_title">Fixar postagem no perfil</string>
     <string name="sk_confirm_pin_post">Você deseja fixar esta postagem em seu perfil\?</string>
-    <string name="sk_pinning">Fixando postagem…</string>
-    <string name="sk_app_name">Moshidon</string>
+    <string name="sk_pinning">Fixando publicação…</string>
+    <string name="sk_app_name">Megalodon</string>
     <string name="sk_pinned_posts">Fixado</string>
     <string name="sk_unpin_post">Desafixar do perfil</string>
     <string name="sk_confirm_unpin_post_title">Desafixar postagem do perfil</string>
@@ -18,13 +18,13 @@
     <string name="sk_settings_show_boosts">Mostrar boosts</string>
     <string name="sk_settings_load_new_posts">Carregar novas postagens automaticamente</string>
     <string name="sk_mark_media_as_sensitive">Marcar mídia como sensível</string>
-    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
-    <string name="sk_lists_with_user">Listas com %s</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_lists_with_user">Editar listas com %s</string>
     <string name="sk_user_post_notifications_on">Ativar as notificações de postagem para %s</string>
     <string name="sk_federated_timeline">Federação</string>
     <string name="sk_federated_timeline_info_banner">Estas são as postagens mais recentes das pessoas em sua federação.</string>
-    <string name="sk_update_available">Moshidon %s está pronto para baixar.</string>
-    <string name="sk_update_ready">Moshidon %s foi baixado e está pronto para instalar.</string>
+    <string name="sk_update_available">Megalodon %s está pronto para baixar.</string>
+    <string name="sk_update_ready">Megalodon %s foi baixado e está pronto para instalar.</string>
     <string name="sk_check_for_update">Verificar se há atualizações</string>
     <string name="sk_no_update_available">Nenhuma atualização disponível</string>
     <string name="sk_list_timelines">Listas</string>
@@ -34,7 +34,7 @@
     <string name="sk_reject_follow_request">Recusar solicitação para seguir</string>
     <string name="sk_settings_always_reveal_content_warnings">Sempre revelar avisos de conteúdo</string>
     <string name="sk_disable_marquee">Desative o texto de rolagem nas barras de título</string>
-    <string name="sk_settings_contribute">Contribua para o Moshidon</string>
+    <string name="sk_settings_contribute">Contribua para o Megalodon</string>
     <string name="sk_settings_show_federated_timeline">Mostre a linha do tempo federada</string>
     <string name="sk_visibility_unlisted">Não-listado</string>
     <string name="sk_settings_show_interaction_counts">Mostrar contagens de interação</string>
@@ -44,7 +44,7 @@
     <string name="sk_color_palette_brown">Marrom</string>
     <string name="sk_color_palette_yellow">Amarelo</string>
     <string name="sk_color_palette_pink">Rosa</string>
-    <string name="sk_notification_type_status">Postagens</string>
+    <string name="sk_notification_type_status">Publicações</string>
     <string name="sk_settings_color_palette">Cor do tema</string>
     <string name="sk_translate_post">Traduzir</string>
     <string name="sk_translate_show_original">Mostrar original</string>
@@ -54,7 +54,7 @@
     <string name="sk_language_name">%s (%s)</string>
     <string name="sk_confirm_clear_recent_languages">Você tem certeza que deseja limpar os idiomas usados recentemente\?</string>
     <string name="sk_clear_recent_languages">Limpar idiomas usados recentemente</string>
-    <string name="sk_notify_posts">Notificações de posts</string>
+    <string name="sk_notify_posts">Notificações de publicações</string>
     <string name="sk_poll_allow_multiple">Permitir múltiplas escolhas</string>
     <string name="sk_welcome_text">O tubarão te cumprimenta! Para começar, por favor, digite abaixo o nome de domínio de sua instância de origem.</string>
     <string name="sk_example_domain">exemplo.social</string>
@@ -63,7 +63,7 @@
     <string name="sk_color_palette_red">Vermelho</string>
     <string name="sk_settings_donate">Doar</string>
     <string name="sk_settings_rules">Regras</string>
-    <string name="sk_tabs_disable_swipe">Desativar deslizamento entre as abas</string>
+    <string name="sk_tabs_disable_swipe">Desativar deslizamento entre abas</string>
     <string name="sk_settings_profile">Configurar perfil</string>
     <string name="sk_settings_posting">Preferências de postagem</string>
     <string name="sk_settings_filters">Configurar filtros</string>
@@ -71,15 +71,15 @@
     <string name="sk_delete_notification">Excluir notificação</string>
     <string name="sk_delete_notification_confirm_action">Excluir notificação</string>
     <string name="sk_enable_delete_notifications">Habilitar a exclusão de notificações</string>
-    <string name="sk_settings_publish_button_text_title">Customizar o texto do botão de publicar</string>
+    <string name="sk_settings_publish_button_text_title">Customizar texto do botão publicar</string>
     <string name="sk_settings_translate_only_opened">Esconder botão de tradução na linha do tempo</string>
     <string name="sk_settings_translation_availability_note_available">%s suporta tradução!</string>
     <string name="sk_settings_translation_availability_note_unavailable">%s parece não suportar tradução.</string>
     <string name="sk_clear_all_notifications">Limpar todas as notificações</string>
     <string name="sk_clear_all_notifications_confirm_action">Excluir tudo</string>
     <string name="sk_loading_fediverse_resource_title">Procurando no Fediverso</string>
-    <string name="sk_undo_reblog">Desfazer reblog</string>
-    <string name="sk_reblog_with_visibility">Reblog com visibilidade</string>
+    <string name="sk_undo_reblog">Desfazer repostagem</string>
+    <string name="sk_reblog_with_visibility">Repostar com visibilidade</string>
     <string name="sk_hashtags_you_follow">Hashtags que você segue</string>
     <string name="sk_copy_link_to_post">Copiar link da postagem</string>
     <string name="sk_loading_resource_on_instance_title">Procurando em %s</string>
@@ -113,4 +113,30 @@
     <string name="sk_confirm_save_draft">Salvar rascunho\?</string>
     <string name="sk_confirm_save_changes">Salvar alterações\?</string>
     <string name="sk_mark_as_draft">Marcar como rascunho</string>
+    <string name="sk_bookmarked_as">Salvo em %s</string>
+    <string name="sk_favorited_as">Favoritado em %s</string>
+    <string name="sk_reblogged_as">Repostado em %s</string>
+    <string name="sk_settings_uniform_icon_for_notifications">Padronizar ícone para todas as notificações</string>
+    <string name="sk_quote_post">Publique sobre isso</string>
+    <string name="sk_draft_or_schedule">Rascunhar ou agendar</string>
+    <string name="sk_schedule_post">Agendar publicação</string>
+    <string name="sk_schedule_or_draft">Agendar ou rascunhar</string>
+    <string name="sk_compose_no_schedule">Não agendar</string>
+    <string name="sk_compose_no_draft">Não rascunhar</string>
+    <string name="sk_mark_as_read">Marcar como lido</string>
+    <string name="sk_settings_about_instance">Sobre a instância</string>
+    <string name="sk_create">Criar</string>
+    <string name="sk_create_list_title">Criar lista</string>
+    <string name="sk_list_replies_policy">Mostrar respostas para</string>
+    <string name="sk_list_replies_policy_list">listar membros</string>
+    <string name="sk_list_replies_policy_none">ninguém</string>
+    <string name="sk_delete_list">Deletar lista</string>
+    <string name="sk_delete_list_confirm">Você tem certeza que quer deletar essa lista\?</string>
+    <string name="sk_edit_list_title">Editar lista</string>
+    <string name="sk_your_lists">Suas listas</string>
+    <string name="sk_list_name_hint">Lista de nomes</string>
+    <string name="sk_settings_reduce_motion">Reduzir movimento nas animações</string>
+    <string name="sk_announcements">Comunicados</string>
+    <string name="sk_settings_single_notification">Mostrar apenas uma notificação</string>
+    <string name="sk_list_replies_policy_followed">usuários seguidos</string>
 </resources>
\ No newline at end of file

From 4d0a642fd95fd95a11b8aa75f576c18f919cd122 Mon Sep 17 00:00:00 2001
From: ihor_ck <igor_ck@outlook.com>
Date: Wed, 11 Jan 2023 14:41:31 +0000
Subject: [PATCH 159/200] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (140 of 140 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
---
 .../src/main/res/values-uk-rUA/strings_sk.xml   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
index 51918cb93..d7af1b247 100644
--- a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
@@ -41,7 +41,7 @@
     <string name="sk_follow_requests">Запити на стеження</string>
     <string name="sk_accept_follow_request">Погодити запит на стеження</string>
     <string name="sk_reject_follow_request">Відхилити запит на стеження</string>
-    <string name="sk_lists_with_user">Списки з %s</string>
+    <string name="sk_lists_with_user">Редагувати списки з %s</string>
     <string name="sk_disable_marquee">Вимкнути прокручування тексту у рядках заголовка</string>
     <string name="sk_settings_contribute">Допомогти у розробці Moshidon</string>
     <string name="sk_mark_media_as_sensitive">Позначити медіа делікатним</string>
@@ -124,4 +124,19 @@
     <string name="sk_compose_no_schedule">Не планувати</string>
     <string name="sk_compose_no_draft">Не переміщувати до чернеток</string>
     <string name="sk_settings_reduce_motion">Зменшити рух в анімації</string>
+    <string name="sk_mark_as_read">Позначити прочитаним</string>
+    <string name="sk_settings_about_instance">Про сервер</string>
+    <string name="sk_create">Створити</string>
+    <string name="sk_create_list_title">Створити список</string>
+    <string name="sk_list_name_hint">Назва списку</string>
+    <string name="sk_list_replies_policy">Показати відповіді для</string>
+    <string name="sk_list_replies_policy_list">учасники списку</string>
+    <string name="sk_list_replies_policy_none">ніхто</string>
+    <string name="sk_delete_list">Видалити список</string>
+    <string name="sk_delete_list_confirm">Ви впевнені, що хочете видалити цей список\?</string>
+    <string name="sk_edit_list_title">Редагувати список</string>
+    <string name="sk_your_lists">Ваші списки</string>
+    <string name="sk_announcements">Оголошення</string>
+    <string name="sk_settings_single_notification">Показувати лише одне сповіщення</string>
+    <string name="sk_list_replies_policy_followed">відстежувані користувачі</string>
 </resources>
\ No newline at end of file

From 990f8189e44f5663cf10816c3f3e3729f02a59c2 Mon Sep 17 00:00:00 2001
From: EifionLlwyd <llwydnant@protonmail.com>
Date: Wed, 11 Jan 2023 20:43:02 +0000
Subject: [PATCH 160/200] Translated using Weblate (Welsh)

Currently translated at 23.5% (33 of 140 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/cy/
---
 .../src/main/res/values-cy/strings_sk.xml     | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-cy/strings_sk.xml b/mastodon/src/main/res/values-cy/strings_sk.xml
index a6b3daec9..95a6b1c3f 100644
--- a/mastodon/src/main/res/values-cy/strings_sk.xml
+++ b/mastodon/src/main/res/values-cy/strings_sk.xml
@@ -1,2 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="sk_delete_and_redraft">Dileu ac ailddrafftio</string>
+    <string name="sk_confirm_delete_and_redraft_title">Dileu ac ailddrafftio\'r neges</string>
+    <string name="sk_confirm_pin_post_title">Pinio i\'ch proffil</string>
+    <string name="sk_pinning">Wrthi\'n pinio\'r neges…</string>
+    <string name="sk_unpin_post">Dadbinio o\'ch proffil</string>
+    <string name="sk_confirm_unpin_post_title">Dadbinio neges o\'ch proffil</string>
+    <string name="sk_unpinning">Wrthi\'n dadbinio\'r neges…</string>
+    <string name="sk_settings_show_replies">Dangos ymatebion</string>
+    <string name="sk_list_timelines">Rhestri</string>
+    <string name="sk_settings_always_reveal_content_warnings">Datguddio rhybuddion cynnwys bob tro</string>
+    <string name="sk_settings_contribute">Cyfrannu at Megalodon</string>
+    <string name="sk_notification_type_status">Negeseuon</string>
+    <string name="sk_color_palette_material3">System</string>
+    <string name="sk_color_palette_pink">Pinc</string>
+    <string name="sk_color_palette_purple">Porffor</string>
+    <string name="sk_color_palette_green">Gwyrdd</string>
+    <string name="sk_color_palette_blue">Glas</string>
+    <string name="sk_color_palette_brown">Brown</string>
+    <string name="sk_color_palette_red">Coch</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_confirm_pin_post">Hoffech chi binio\'r neges hon i\'ch proffil\?</string>
+    <string name="sk_visibility_unlisted">Heb ei restru</string>
+    <string name="sk_settings_load_new_posts">Llwytho negeseuon newydd yn ddiofyn</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_update_available">Mae Megalodon %s yn barod i\'w lawrlwytho.</string>
+    <string name="sk_update_ready">Mae Megalodon %s wedi ei lawrlwytho ac yn barod i\'w osod.</string>
+    <string name="sk_color_palette_yellow">Melyn</string>
+    <string name="sk_translate_post">Cyfieithu</string>
+    <string name="sk_translate_show_original">Dangos y gwreiddiol</string>
+    <string name="sk_post_language">Iaith: %s</string>
+    <string name="sk_welcome_title">Croeso!</string>
+    <string name="sk_settings_auth">Gosodiadau diogelwch</string>
+</resources>
\ No newline at end of file

From 164579cbb5a54964fcbb88181050a6e13fde541a Mon Sep 17 00:00:00 2001
From: NovaQ64 <alphancube@proton.me>
Date: Thu, 12 Jan 2023 01:14:32 +0000
Subject: [PATCH 161/200] Translated using Weblate (Portuguese (Brazil))

Currently translated at 97.1% (136 of 140 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/pt_BR/
---
 mastodon/src/main/res/values-pt-rBR/strings_sk.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
index 193f50190..28392a5f5 100644
--- a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
@@ -78,13 +78,13 @@
     <string name="sk_clear_all_notifications">Limpar todas as notificações</string>
     <string name="sk_clear_all_notifications_confirm_action">Excluir tudo</string>
     <string name="sk_loading_fediverse_resource_title">Procurando no Fediverso</string>
-    <string name="sk_undo_reblog">Desfazer repostagem</string>
-    <string name="sk_reblog_with_visibility">Repostar com visibilidade</string>
+    <string name="sk_undo_reblog">Desfazer reblog</string>
+    <string name="sk_reblog_with_visibility">Reblogar com visibilidade</string>
     <string name="sk_hashtags_you_follow">Hashtags que você segue</string>
     <string name="sk_copy_link_to_post">Copiar link da postagem</string>
     <string name="sk_loading_resource_on_instance_title">Procurando em %s</string>
     <string name="sk_open_with_account">Abrir com outra conta</string>
-    <string name="sk_resource_not_found">Recurso não pode ser encontrado</string>
+    <string name="sk_resource_not_found">Recurso não foi encontrado</string>
     <string name="sk_settings_about">Sobre o app</string>
     <string name="sk_settings_auth">Configurações de segurança</string>
     <string name="sk_settings_publish_button_text">Texto do botão de publicar</string>
@@ -115,7 +115,7 @@
     <string name="sk_mark_as_draft">Marcar como rascunho</string>
     <string name="sk_bookmarked_as">Salvo em %s</string>
     <string name="sk_favorited_as">Favoritado em %s</string>
-    <string name="sk_reblogged_as">Repostado em %s</string>
+    <string name="sk_reblogged_as">Reblogou como %s</string>
     <string name="sk_settings_uniform_icon_for_notifications">Padronizar ícone para todas as notificações</string>
     <string name="sk_quote_post">Publique sobre isso</string>
     <string name="sk_draft_or_schedule">Rascunhar ou agendar</string>

From 859ba5ebb9cbce8aa1bda67064cd3741ea8105d7 Mon Sep 17 00:00:00 2001
From: mondstern <mondstern@snopyta.org>
Date: Thu, 12 Jan 2023 22:15:32 +0000
Subject: [PATCH 162/200] Translated using Weblate (Czech)

Currently translated at 13.5% (19 of 140 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/cs/
---
 .../src/main/res/values-cs-rCZ/strings_sk.xml | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-cs-rCZ/strings_sk.xml b/mastodon/src/main/res/values-cs-rCZ/strings_sk.xml
index 045e125f3..2a7a7317a 100644
--- a/mastodon/src/main/res/values-cs-rCZ/strings_sk.xml
+++ b/mastodon/src/main/res/values-cs-rCZ/strings_sk.xml
@@ -1,3 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
+    <string name="sk_confirm_delete_and_redraft">Jste si jisti, že chcete tento příspěvek smazat a přepsat\?</string>
+    <string name="sk_confirm_unpin_post">Jste si jisti, že chcete tento příspěvek odepnout\?</string>
+    <string name="sk_confirm_pin_post">Chcete si tento příspěvek připnout na svůj profil\?</string>
+    <string name="sk_federated_timeline_info_banner">Toto jsou nejnovější příspěvky lidí z vaší federace.</string>
+    <string name="sk_disable_marquee">Zakázat posouvání textu v titulkových lištách</string>
+    <string name="sk_welcome_text">Žralok tě zdraví! Chcete-li začít, zadejte níže název domény své domovské instance.</string>
+    <string name="sk_clear_recent_languages">Vymazat nedávno použité jazyky</string>
+    <string name="sk_confirm_clear_recent_languages">Jste si jisti, že chcete vymazat nedávno použité jazyky\?</string>
+    <string name="sk_delete_notification_confirm">Opravdu chcete toto oznámení odstranit\?</string>
+    <string name="sk_settings_translation_availability_note_unavailable">%s zřejmě nepodporuje překlad.</string>
+    <string name="sk_clear_all_notifications_confirm">Opravdu chcete vymazat všechna oznámení\?</string>
+    <string name="sk_loading_fediverse_resource_title">Podívejte se na Fediverse</string>
+    <string name="sk_loading_resource_on_instance_title">Vyhledávání na %s</string>
+    <string name="sk_resource_not_found">Zdroj se nepodařilo najít</string>
+    <string name="sk_scheduled_too_soon">Příspěvek musí být naplánován alespoň 10 minut dopředu.</string>
+    <string name="sk_confirm_delete_draft">Jste si jistý, že chcete tento navržený příspěvek smazat\?</string>
+    <string name="sk_confirm_delete_scheduled_post">Určitě chcete tento naplánovaný příspěvek smazat\?</string>
+    <string name="sk_delete_list_confirm">Opravdu chcete tento seznam odstranit\?</string>
+</resources>
\ No newline at end of file

From b17e63acaeb4b9b450864ba1f403f3168e546c47 Mon Sep 17 00:00:00 2001
From: ghose <correo@xmgz.eu>
Date: Thu, 12 Jan 2023 05:17:18 +0000
Subject: [PATCH 163/200] Translated using Weblate (Galician)

Currently translated at 10.7% (15 of 140 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/gl/
---
 .../src/main/res/values-gl-rES/strings_sk.xml    | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-gl-rES/strings_sk.xml b/mastodon/src/main/res/values-gl-rES/strings_sk.xml
index 045e125f3..fb8407c8e 100644
--- a/mastodon/src/main/res/values-gl-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-gl-rES/strings_sk.xml
@@ -1,3 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_delete_and_redraft">Eliminar e rescribir</string>
+    <string name="sk_confirm_delete_and_redraft">Tes a certeza de querere eliminar e rescribir esta publicación\?</string>
+    <string name="sk_pinned_posts">Fixado</string>
+    <string name="sk_confirm_delete_and_redraft_title">Elimina e rescribe a Publicación</string>
+    <string name="sk_pin_post">Fixar no perfil</string>
+    <string name="sk_confirm_pin_post_title">Fixar publicación ao perfil</string>
+    <string name="sk_confirm_pin_post">Queres fixar esta publicación ao teu perfil\?</string>
+    <string name="sk_pinning">Fixando a publicación…</string>
+    <string name="sk_unpin_post">Desafixar do perfil</string>
+    <string name="sk_confirm_unpin_post_title">Desafixar publicación do perfil</string>
+    <string name="sk_confirm_unpin_post">Tes a certeza de querer desafixar esta publicación\?</string>
+    <string name="sk_unpinning">Desafixando publicación…</string>
+    <string name="sk_image_description">Descrición da imaxe</string>
+</resources>
\ No newline at end of file

From 3c45215fca5163eeb4bf9cb7ba796f5f5f622ee4 Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Thu, 12 Jan 2023 06:32:27 +0000
Subject: [PATCH 164/200] Translated using Weblate (Indonesian)

Currently translated at 100.0% (140 of 140 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
---
 .../src/main/res/values-in-rID/strings_sk.xml     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/mastodon/src/main/res/values-in-rID/strings_sk.xml b/mastodon/src/main/res/values-in-rID/strings_sk.xml
index 870e9f242..55142abbb 100644
--- a/mastodon/src/main/res/values-in-rID/strings_sk.xml
+++ b/mastodon/src/main/res/values-in-rID/strings_sk.xml
@@ -127,4 +127,19 @@
     <string name="sk_compose_no_draft">Jangan didraf</string>
     <string name="sk_schedule_or_draft">Jadwalkan atau draf</string>
     <string name="sk_settings_reduce_motion">Kurangi gerakan dalam animasi</string>
+    <string name="sk_list_replies_policy">Tampilkan balasan ke</string>
+    <string name="sk_announcements">Pengumuman</string>
+    <string name="sk_mark_as_read">Tandai sebagai dibaca</string>
+    <string name="sk_settings_about_instance">Tentang server</string>
+    <string name="sk_settings_single_notification">Hanya tampilkan satu notifikasi</string>
+    <string name="sk_create">Buat</string>
+    <string name="sk_create_list_title">Buat daftar</string>
+    <string name="sk_list_name_hint">Nama daftar</string>
+    <string name="sk_list_replies_policy_list">anggota daftar</string>
+    <string name="sk_list_replies_policy_followed">pengguna mengikuti</string>
+    <string name="sk_list_replies_policy_none">tidak ada siapa pun</string>
+    <string name="sk_delete_list">Hapus daftar</string>
+    <string name="sk_delete_list_confirm">Apakah Anda yakin ingin menghapus daftar ini\?</string>
+    <string name="sk_edit_list_title">Sunting daftar</string>
+    <string name="sk_your_lists">Daftar Anda</string>
 </resources>
\ No newline at end of file

From ce22cb46785c6b18abc325bef18172c7d64c5f83 Mon Sep 17 00:00:00 2001
From: Anonymous <anonymous58630@gmail.com>
Date: Fri, 13 Jan 2023 04:44:38 +0000
Subject: [PATCH 165/200] Translated using Weblate (Burmese)

Currently translated at 71.4% (100 of 140 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/my/
---
 mastodon/src/main/res/values-my/strings_sk.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-my/strings_sk.xml b/mastodon/src/main/res/values-my/strings_sk.xml
index 411f6dbfa..2f33cf1e6 100644
--- a/mastodon/src/main/res/values-my/strings_sk.xml
+++ b/mastodon/src/main/res/values-my/strings_sk.xml
@@ -44,7 +44,7 @@
     <string name="sk_already_reblogged">Reblog လုပ်ပြီးသားဖြစ်သည်</string>
     <string name="sk_reply_as">တခြားအကောင့်ဖြင့် ရီပလိုင်းပြန်မည်</string>
     <string name="sk_translated_using">%s ဖြင့် ဘာသာပြန်ထားသည်</string>
-    <string name="sk_post_language">"ဘာသာစကား။  ။%s"</string>
+    <string name="sk_post_language">ဘာသာစကား။ ။%s</string>
     <string name="sk_language_name">%s (%s)</string>
     <string name="sk_settings_filters">Filter များကို စီစဉ်မည်</string>
     <string name="sk_settings_auth">လုံခြုံရေးဆိုင်ရာ ဆက်တင်များ</string>

From e4b1bf452f02f5ce14dd6d5d9c3c6870e8b51b6b Mon Sep 17 00:00:00 2001
From: ca <rubenx@duck.com>
Date: Sat, 14 Jan 2023 17:40:05 +0000
Subject: [PATCH 166/200] Translated using Weblate (Catalan)

Currently translated at 98.6% (141 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ca/
---
 .../src/main/res/values-ca-rES/strings_sk.xml | 95 ++++++++++++++++++-
 1 file changed, 94 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-ca-rES/strings_sk.xml b/mastodon/src/main/res/values-ca-rES/strings_sk.xml
index 3ef6f6a71..c987c392a 100644
--- a/mastodon/src/main/res/values-ca-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-ca-rES/strings_sk.xml
@@ -34,7 +34,7 @@
     <string name="sk_list_timelines">Llistes</string>
     <string name="sk_follow_requests">Sol·licituds de seguiment</string>
     <string name="sk_reject_follow_request">Rebutja la sol·licitud</string>
-    <string name="sk_lists_with_user">Llistes amb %s</string>
+    <string name="sk_lists_with_user">Edita les llistes amb %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Mostra sempre els avisos de contingut</string>
     <string name="sk_settings_contribute">Contribueix a Moshidon</string>
     <string name="sk_settings_show_federated_timeline">Mostra la línia de temps federada</string>
@@ -47,4 +47,97 @@
     <string name="sk_color_palette_blue">Blau</string>
     <string name="sk_color_palette_brown">Marró</string>
     <string name="sk_color_palette_yellow">Groc</string>
+    <string name="sk_timeline_local">Local</string>
+    <string name="sk_timeline_federated">Federació</string>
+    <string name="sk_poll_allow_multiple">Permet resposta múltiple</string>
+    <string name="sk_translate_post">Tradueix</string>
+    <string name="sk_example_domain">exemple.social</string>
+    <string name="sk_welcome_title">Et donem la benvinguda!</string>
+    <string name="sk_clear_recent_languages">Esborra les llengües recents</string>
+    <string name="sk_settings_translate_only_opened">Tradueix només les publicacions obertes</string>
+    <string name="sk_bookmark_as">Afig als marcadors amb un altre compte</string>
+    <string name="sk_bookmarked_as">Afegit marcador com a %s</string>
+    <string name="sk_already_bookmarked">Ja està als marcadors</string>
+    <string name="sk_favorite_as">Marca com a preferit amb un altre compte</string>
+    <string name="sk_favorited_as">Marcat com a preferit com a %s</string>
+    <string name="sk_already_favorited">Ja està marcat com a preferit</string>
+    <string name="sk_reblog_as">Impulsa amb un altre compte</string>
+    <string name="sk_already_reblogged">Ja s\'ha impulsat</string>
+    <string name="sk_reply_as">Respon amb un altre compte</string>
+    <string name="sk_settings_uniform_icon_for_notifications">Unifica la icona per a totes les notificacions</string>
+    <string name="sk_translate_show_original">Mostra l\'original</string>
+    <string name="sk_translated_using">Traduït amb %s</string>
+    <string name="sk_post_language">Llengua: %s</string>
+    <string name="sk_available_languages">Llengües disponibles</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_confirm_clear_recent_languages">Segur que vols esborrar les llengües recents\?</string>
+    <string name="sk_welcome_text">El tauró et saluda! Per a començar, introdueix el domini de la instància a continuació.</string>
+    <string name="sk_tabs_disable_swipe">Desactiva el desplaçament entre pestanyes</string>
+    <string name="sk_settings_auth">Configuració de seguretat</string>
+    <string name="sk_reblogged_as">Impulsat com a %s</string>
+    <string name="sk_announcements">Anuncis</string>
+    <string name="sk_list_name_hint">Nom de la llista</string>
+    <string name="sk_delete_list_confirm">Segur que vols eliminar la llista\?</string>
+    <string name="sk_timeline_home">Inici</string>
+    <string name="sk_settings_profile">Configura el perfil</string>
+    <string name="sk_settings_posting">Preferències de publicació</string>
+    <string name="sk_settings_filters">Configura filtres</string>
+    <string name="sk_settings_rules">Normes</string>
+    <string name="sk_settings_about">Quant a l\'aplicació</string>
+    <string name="sk_settings_donate">Dona</string>
+    <string name="sk_color_palette_material3">Sistema</string>
+    <string name="sk_color_palette_red">Vermell</string>
+    <string name="sk_delete_notification">Elimina la notificació</string>
+    <string name="sk_delete_notification_confirm_action">Elimina la notificació</string>
+    <string name="sk_delete_notification_confirm">Segur que vols eliminar la notificació\?</string>
+    <string name="sk_settings_publish_button_text">Text del botó de publicació</string>
+    <string name="sk_settings_publish_button_text_title">Personalitza el text del botó de publicació</string>
+    <string name="sk_enable_delete_notifications">Activa l\'eliminació de notificacions</string>
+    <string name="sk_settings_translation_availability_note_available">%s admet la traducció!</string>
+    <string name="sk_settings_translation_availability_note_unavailable">Sembla que %s no admet la traducció.</string>
+    <string name="sk_clear_all_notifications">Esborr totes les notificacions</string>
+    <string name="sk_clear_all_notifications_confirm_action">Elimina-ho tot</string>
+    <string name="sk_clear_all_notifications_confirm">Segur que vols esborrar totes les notificacions\?</string>
+    <string name="sk_undo_reblog">Desfés l\'impuls</string>
+    <string name="sk_reblog_with_visibility">Impulsa amb visibilitat</string>
+    <string name="sk_quote_post">Publica sobre açò</string>
+    <string name="sk_hashtags_you_follow">Etiquetes que segueixes</string>
+    <string name="sk_copy_link_to_post">Copia l\'enllaç a la publicació</string>
+    <string name="sk_open_with_account">Obri amb un altre compte</string>
+    <string name="sk_resource_not_found">No s\'ha trobat el recurs</string>
+    <string name="sk_forward_report_to">Reenvia a %s</string>
+    <string name="sk_unsent_posts">Publicacions sense enviar</string>
+    <string name="sk_draft">Esborrany</string>
+    <string name="sk_schedule">Programa</string>
+    <string name="sk_confirm_delete_draft_title">Elimina l\'esborrany</string>
+    <string name="sk_confirm_delete_draft">Segur que vols eliminar l\'esborrany\?</string>
+    <string name="sk_confirm_delete_scheduled_post_title">Elimina la publicació programada</string>
+    <string name="sk_confirm_delete_scheduled_post">Segur que vols eliminar la publicació programada\?</string>
+    <string name="sk_compose_draft">La publicació es desarà com a esborrany.</string>
+    <string name="sk_draft_or_schedule">Com a esborrany o programa</string>
+    <string name="sk_compose_scheduled">Programada per a</string>
+    <string name="sk_post_scheduled">S\'ha programat la publicació</string>
+    <string name="sk_draft_saved">S\'ha desat l\'esborrany</string>
+    <string name="sk_scheduled_too_soon_title">L\'hora de programació és massa prompte</string>
+    <string name="sk_scheduled_too_soon">La programació s\'ha de fer amb almenys 10 minuts d\'antelació.</string>
+    <string name="sk_confirm_save_draft">Vols desar com a esborrany\?</string>
+    <string name="sk_confirm_save_changes">Vols desar els canvis\?</string>
+    <string name="sk_mark_as_draft">Desa com a esborrany</string>
+    <string name="sk_schedule_post">Programa la publicació</string>
+    <string name="sk_schedule_or_draft">Programa o com a esborrany</string>
+    <string name="sk_compose_no_schedule">No la programes</string>
+    <string name="sk_compose_no_draft">No deses com a esborrany</string>
+    <string name="sk_settings_reduce_motion">Redueix el moviment de les animacions</string>
+    <string name="sk_mark_as_read">Marca com a llegit</string>
+    <string name="sk_settings_about_instance">Quant a la instància</string>
+    <string name="sk_settings_single_notification">Mostra només una notificació</string>
+    <string name="sk_create">Crea</string>
+    <string name="sk_create_list_title">Crea una llista</string>
+    <string name="sk_list_replies_policy">Mostra les respostes a</string>
+    <string name="sk_list_replies_policy_list">membres de la llista</string>
+    <string name="sk_list_replies_policy_followed">usuaris seguits</string>
+    <string name="sk_list_replies_policy_none">ningú</string>
+    <string name="sk_delete_list">Elimina la llista</string>
+    <string name="sk_edit_list_title">Edita la llista</string>
+    <string name="sk_your_lists">Llistes</string>
 </resources>
\ No newline at end of file

From 1acd177e81313b0e5d5500d0251cc709e1eb1727 Mon Sep 17 00:00:00 2001
From: maxocito <codeberg@krmax44.de>
Date: Sat, 14 Jan 2023 16:02:10 +0000
Subject: [PATCH 167/200] Translated using Weblate (German)

Currently translated at 100.0% (143 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
---
 mastodon/src/main/res/values-de-rDE/strings_sk.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mastodon/src/main/res/values-de-rDE/strings_sk.xml b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
index 31f1fd8a3..f4a3322a3 100644
--- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
@@ -139,4 +139,7 @@
     <string name="sk_announcements">Ankündigungen</string>
     <string name="sk_settings_single_notification">Nur eine Benachrichtigung anzeigen</string>
     <string name="sk_delete_list_confirm">Liste wirklich löschen\?</string>
+    <string name="sk_timeline_home">Start</string>
+    <string name="sk_timeline_local">Lokal</string>
+    <string name="sk_timeline_federated">Föderiert</string>
 </resources>
\ No newline at end of file

From 4f357637de90b4593fe63297be12b4de14da2754 Mon Sep 17 00:00:00 2001
From: AiOO <ahnkiwook@gmail.com>
Date: Sat, 14 Jan 2023 13:59:24 +0000
Subject: [PATCH 168/200] Translated using Weblate (Korean)

Currently translated at 100.0% (143 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
---
 .../src/main/res/values-ko-rKR/strings_sk.xml | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
index a75852b95..08fd10776 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
@@ -29,7 +29,7 @@
     <string name="sk_follow_requests">팔로우 요청</string>
     <string name="sk_accept_follow_request">팔로우 요청 허가</string>
     <string name="sk_reject_follow_request">팔로우 요청 거부</string>
-    <string name="sk_lists_with_user">%s 님이 포함된 리스트</string>
+    <string name="sk_lists_with_user">%s 님이 포함된 리스트 수정</string>
     <string name="sk_settings_always_reveal_content_warnings">열람주의 게시물을 항상 펼치기</string>
     <string name="sk_disable_marquee">제목 표시줄의 텍스트 스크롤 비활성화</string>
     <string name="sk_app_name">Megalodon</string>
@@ -124,4 +124,22 @@
     <string name="sk_schedule_or_draft">게시 예약 또는 초안 작성</string>
     <string name="sk_mark_as_draft">초안으로 표시</string>
     <string name="sk_settings_reduce_motion">애니메이션의 동작 감소</string>
+    <string name="sk_timeline_home">홈</string>
+    <string name="sk_timeline_local">로컬</string>
+    <string name="sk_timeline_federated">연합</string>
+    <string name="sk_list_replies_policy">답글을 표시할 대상</string>
+    <string name="sk_delete_list_confirm">정말로 이 리스트를 삭제하시겠습니까\?</string>
+    <string name="sk_announcements">공지사항</string>
+    <string name="sk_mark_as_read">읽음으로 표시</string>
+    <string name="sk_settings_about_instance">인스턴스에 대하여</string>
+    <string name="sk_create_list_title">리스트 만들기</string>
+    <string name="sk_list_name_hint">리스트 이름</string>
+    <string name="sk_create">만들기</string>
+    <string name="sk_list_replies_policy_list">리스트의 구성원들</string>
+    <string name="sk_list_replies_policy_followed">팔로우한 사용자 누구나</string>
+    <string name="sk_list_replies_policy_none">아무도 없음</string>
+    <string name="sk_delete_list">리스트 삭제</string>
+    <string name="sk_edit_list_title">리스트 편집</string>
+    <string name="sk_your_lists">리스트</string>
+    <string name="sk_settings_single_notification">하나의 알림만 표시</string>
 </resources>
\ No newline at end of file

From 9fb9ffc269fc664b2df25ac0678db0c6f47ce993 Mon Sep 17 00:00:00 2001
From: ling0412 <xll520yzl@gmail.com>
Date: Fri, 13 Jan 2023 06:47:04 +0000
Subject: [PATCH 169/200] Translated using Weblate (Chinese (Simplified))

Currently translated at 98.6% (141 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hans/
---
 mastodon/src/main/res/values-zh-rCN/strings_sk.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
index 0ea3909df..ace1cdba5 100644
--- a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
@@ -141,4 +141,5 @@
     <string name="sk_delete_list_confirm">您确定要删除此列表吗？</string>
     <string name="sk_edit_list_title">编辑列表</string>
     <string name="sk_your_lists">你的列表</string>
+    <string name="sk_timeline_federated">联邦</string>
 </resources>
\ No newline at end of file

From 978c1cfdc4fcde8733840695bb98c4a4a63e8f63 Mon Sep 17 00:00:00 2001
From: gallegonovato <fran-carro@hotmail.es>
Date: Fri, 13 Jan 2023 14:31:19 +0000
Subject: [PATCH 170/200] Translated using Weblate (Spanish)

Currently translated at 100.0% (143 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/
---
 mastodon/src/main/res/values-es-rES/strings_sk.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mastodon/src/main/res/values-es-rES/strings_sk.xml b/mastodon/src/main/res/values-es-rES/strings_sk.xml
index f0280adee..21c071dd8 100644
--- a/mastodon/src/main/res/values-es-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-es-rES/strings_sk.xml
@@ -139,4 +139,7 @@
     <string name="sk_edit_list_title">Editar la lista</string>
     <string name="sk_your_lists">Tus listas</string>
     <string name="sk_list_replies_policy_list">Lista de miembros</string>
+    <string name="sk_timeline_home">Inicio</string>
+    <string name="sk_timeline_federated">Federación</string>
+    <string name="sk_timeline_local">Local</string>
 </resources>
\ No newline at end of file

From a1ef3e1cae6526b91c697921fa2b64ced5f7533f Mon Sep 17 00:00:00 2001
From: Choukajohn <choukajohn@gmail.com>
Date: Fri, 13 Jan 2023 06:18:17 +0000
Subject: [PATCH 171/200] Translated using Weblate (French)

Currently translated at 100.0% (143 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
---
 mastodon/src/main/res/values-fr-rFR/strings_sk.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
index 77e03039a..52ea0d4b2 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -140,4 +140,7 @@
     <string name="sk_settings_single_notification">Afficher une seule notification</string>
     <string name="sk_delete_list_confirm">Voulez-vous vraiment supprimer cette liste \?</string>
     <string name="sk_your_lists">Vos listes</string>
+    <string name="sk_timeline_federated">Fédération</string>
+    <string name="sk_timeline_local">Communauté</string>
+    <string name="sk_timeline_home">Accueil</string>
 </resources>
\ No newline at end of file

From 9bce9349446f610522bfb0126d3eb8b639aaa2bf Mon Sep 17 00:00:00 2001
From: ghose <correo@xmgz.eu>
Date: Fri, 13 Jan 2023 05:16:43 +0000
Subject: [PATCH 172/200] Translated using Weblate (Galician)

Currently translated at 25.1% (36 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/gl/
---
 .../src/main/res/values-gl-rES/strings_sk.xml | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/mastodon/src/main/res/values-gl-rES/strings_sk.xml b/mastodon/src/main/res/values-gl-rES/strings_sk.xml
index fb8407c8e..cbc63f47a 100644
--- a/mastodon/src/main/res/values-gl-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-gl-rES/strings_sk.xml
@@ -14,4 +14,25 @@
     <string name="sk_confirm_unpin_post">Tes a certeza de querer desafixar esta publicación\?</string>
     <string name="sk_unpinning">Desafixando publicación…</string>
     <string name="sk_image_description">Descrición da imaxe</string>
+    <string name="sk_lists_with_user">Editar listas con %s</string>
+    <string name="sk_visibility_unlisted">Non listado</string>
+    <string name="sk_settings_show_replies">Mostrar respostas</string>
+    <string name="sk_settings_show_boosts">Mostrar promocións</string>
+    <string name="sk_settings_load_new_posts">Cargar automáticamente novas publicacións</string>
+    <string name="sk_settings_show_interaction_counts">Mostrar contadores de interaccións</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_mark_media_as_sensitive">Marcar multimedia como sensible</string>
+    <string name="sk_user_post_notifications_on">Acender notificación de publicación para %s</string>
+    <string name="sk_user_post_notifications_off">Apagar notificación de publicación para %s</string>
+    <string name="sk_federated_timeline">Federación</string>
+    <string name="sk_federated_timeline_info_banner">Estas son as publicacións máis recentes das persoas da túa federación.</string>
+    <string name="sk_update_available">Megalodon %s está lista para descargar.</string>
+    <string name="sk_update_ready">Megalodon %s foi descargada e está lista para instalar.</string>
+    <string name="sk_check_for_update">Comprobar actualizacións</string>
+    <string name="sk_no_update_available">Non hai actualizacións</string>
+    <string name="sk_list_timelines">Listas</string>
+    <string name="sk_follow_requests">Solicitudes de seguimento</string>
+    <string name="sk_accept_follow_request">Aceptar solicitude</string>
+    <string name="sk_reject_follow_request">Rexeitar solicitude</string>
+    <string name="sk_settings_always_reveal_content_warnings">Mostrar sempre o contido con avisos</string>
 </resources>
\ No newline at end of file

From 217d8348d4b3be6738c18053502f30d50b4e1b6a Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Fri, 13 Jan 2023 04:47:59 +0000
Subject: [PATCH 173/200] Translated using Weblate (Indonesian)

Currently translated at 100.0% (143 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
---
 mastodon/src/main/res/values-in-rID/strings_sk.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mastodon/src/main/res/values-in-rID/strings_sk.xml b/mastodon/src/main/res/values-in-rID/strings_sk.xml
index 55142abbb..89426f11a 100644
--- a/mastodon/src/main/res/values-in-rID/strings_sk.xml
+++ b/mastodon/src/main/res/values-in-rID/strings_sk.xml
@@ -142,4 +142,7 @@
     <string name="sk_delete_list_confirm">Apakah Anda yakin ingin menghapus daftar ini\?</string>
     <string name="sk_edit_list_title">Sunting daftar</string>
     <string name="sk_your_lists">Daftar Anda</string>
+    <string name="sk_timeline_federated">Federasi</string>
+    <string name="sk_timeline_home">Beranda</string>
+    <string name="sk_timeline_local">Lokal</string>
 </resources>
\ No newline at end of file

From 6dcfdb97353289bda0860df083e14236f8575ada Mon Sep 17 00:00:00 2001
From: McKris <kristoff.brewer@gmail.com>
Date: Fri, 13 Jan 2023 16:18:42 -0300
Subject: [PATCH 174/200] Translated using Weblate (Polish)

Currently translated at 100.0% (143 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/pl/
---
 .../src/main/res/values-pl-rPL/strings_sk.xml | 103 ++++++++++++++++--
 1 file changed, 93 insertions(+), 10 deletions(-)

diff --git a/mastodon/src/main/res/values-pl-rPL/strings_sk.xml b/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
index 6fab89d4a..6b2f01d44 100644
--- a/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
+++ b/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
@@ -13,17 +13,17 @@
     <string name="sk_settings_load_new_posts">Automatycznie wczytuj nowe wpisy</string>
     <string name="sk_settings_show_interaction_counts">Pokaż dane ilości interakcji</string>
     <string name="sk_mark_media_as_sensitive">Oznacz jako wrażliwe</string>
-    <string name="sk_user_post_notifications_on">Włączono powiadomienia dla postu %s</string>
-    <string name="sk_user_post_notifications_off">Wyłączono powiadomienia dla postu %s</string>
+    <string name="sk_user_post_notifications_on">Włączono powiadomienia dla wpisu %s</string>
+    <string name="sk_user_post_notifications_off">Wyłączono powiadomienia dla wpisu %s</string>
     <string name="sk_federated_timeline">fediwersum</string>
-    <string name="sk_federated_timeline_info_banner">To są najnowsze post ze znanej sieci fediwersum dla twojego serwera.</string>
-    <string name="sk_update_available">Moshidon %s jest dostępny do pobrania.</string>
-    <string name="sk_update_ready">Moshidon %s został pobrany i jest gotowy do instalacji.</string>
+    <string name="sk_federated_timeline_info_banner">To są najnowsze wpisy z wszystkich serwerów z którymi twoja instancja jest sfederowana.</string>
+    <string name="sk_update_available">Megalodon %s jest dostępny do pobrania.</string>
+    <string name="sk_update_ready">Megalodon %s został pobrany i jest gotowy do instalacji.</string>
     <string name="sk_check_for_update">Sprawdź dostępność aktualizacji</string>
     <string name="sk_no_update_available">Brak dostępnych aktualizacji</string>
-    <string name="sk_app_name">Moshidon</string>
+    <string name="sk_app_name">Megalodon</string>
     <string name="sk_pinned_posts">Przypięte</string>
-    <string name="sk_confirm_delete_and_redraft">Jesteś pewnien, że chcesz usunąć zmodyfikowany wpis\?</string>
+    <string name="sk_confirm_delete_and_redraft">Jesteś pewien, że chcesz usunąć wpis i utworzyć jego kopię roboczą\?</string>
     <string name="sk_confirm_unpin_post">Jesteś pewien, że chcesz odpiąć ten wpis\?</string>
     <string name="sk_image_description">Opis zdjęcia</string>
     <string name="sk_confirm_delete_and_redraft_title">Usuń i zmodyfikuj wpis</string>
@@ -31,12 +31,12 @@
     <string name="sk_follow_requests">Prośby o obserwację</string>
     <string name="sk_accept_follow_request">Zaakceptuj prośby o obserwację</string>
     <string name="sk_reject_follow_request">Odrzuć prośby o obserwację</string>
-    <string name="sk_lists_with_user">Listy z %s</string>
+    <string name="sk_lists_with_user">Edytuj listy z %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Zawsze odkrywaj ostrzeżenia o zawartości</string>
     <string name="sk_disable_marquee">Wyłącz tekst przewijany w paskach tytułowych</string>
-    <string name="sk_settings_contribute">Wspomóż Moshidon</string>
+    <string name="sk_settings_contribute">Wspomóż Megalodon</string>
     <string name="sk_settings_show_federated_timeline">Pokaż globalną oś czasu</string>
-    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
     <string name="sk_visibility_unlisted">Niewidoczny</string>
     <string name="sk_notification_type_status">Wpisy</string>
     <string name="sk_notify_posts">Powiadomienia wpisów</string>
@@ -59,4 +59,87 @@
     <string name="sk_example_domain">przykład.social</string>
     <string name="sk_welcome_title">Witaj!</string>
     <string name="sk_welcome_text">Rekin się kłania! Aby zacząć, wpisz adres swojej instancji poniżej.</string>
+    <string name="sk_timeline_local">Lokalne</string>
+    <string name="sk_timeline_federated">Federacja</string>
+    <string name="sk_announcements">Ogłoszenia</string>
+    <string name="sk_list_name_hint">Nazwa listy</string>
+    <string name="sk_timeline_home">Główny widok</string>
+    <string name="sk_bookmark_as">Zapisz zakładkę w innym koncie</string>
+    <string name="sk_bookmarked_as">Zapisano zakładkę jako %s</string>
+    <string name="sk_already_bookmarked">Zakładka została już zapisana</string>
+    <string name="sk_favorited_as">Polubiono jako %s</string>
+    <string name="sk_already_favorited">Już polubiono</string>
+    <string name="sk_reblogged_as">Zrebloguj jako %s</string>
+    <string name="sk_already_reblogged">Już zreblogowano</string>
+    <string name="sk_reply_as">Odpowiedz innym kontem</string>
+    <string name="sk_settings_uniform_icon_for_notifications">Identyczna ikona dla wszystkich notyfikacji</string>
+    <string name="sk_settings_translate_only_opened">Tłumacz tylko otwarte wpisy</string>
+    <string name="sk_tabs_disable_swipe">Wyłącz przeskakiwanie między zakładkami poprzez przesuwanie</string>
+    <string name="sk_settings_profile">Skonfiguruj profil</string>
+    <string name="sk_settings_posting">Preferencje publikowania</string>
+    <string name="sk_settings_filters">Skonfiguruj filtry</string>
+    <string name="sk_settings_auth">Ustawienia bezpieczeństwa</string>
+    <string name="sk_settings_rules">Zasady</string>
+    <string name="sk_settings_about">O aplikacji</string>
+    <string name="sk_settings_donate">Donacje</string>
+    <string name="sk_color_palette_material3">System</string>
+    <string name="sk_color_palette_red">Czerwony</string>
+    <string name="sk_delete_notification">Usuń powiadomienie</string>
+    <string name="sk_delete_notification_confirm_action">Usuń powiadomienie</string>
+    <string name="sk_delete_notification_confirm">Czy jesteś pewien że chcesz usunąć to powiadomienie\?</string>
+    <string name="sk_enable_delete_notifications">Włącz usuwanie notyfikacji</string>
+    <string name="sk_settings_publish_button_text">Opis przycisku publikacji</string>
+    <string name="sk_settings_publish_button_text_title">Skonfiguruj opis przycisku publikacji</string>
+    <string name="sk_settings_translation_availability_note_available">%s wspiera funkcję tłumaczenia!</string>
+    <string name="sk_settings_translation_availability_note_unavailable">Wygląda na to, że %s nie wspiera funkcji tłumaczenia.</string>
+    <string name="sk_clear_all_notifications">Wyczyść wszystkie powiadomienia</string>
+    <string name="sk_clear_all_notifications_confirm_action">Usuń wszystkie</string>
+    <string name="sk_clear_all_notifications_confirm">Czy jesteś pewien że chcesz usunąć wszystkie powiadomienia\?</string>
+    <string name="sk_loading_fediverse_resource_title">Wyszukiwanie na Fediwersum</string>
+    <string name="sk_undo_reblog">Cofnij reblog</string>
+    <string name="sk_reblog_with_visibility">Reblog z widocznością</string>
+    <string name="sk_quote_post">Wpis o tym</string>
+    <string name="sk_hashtags_you_follow">Hashtagi które obserwujesz</string>
+    <string name="sk_copy_link_to_post">Kopiuj link do wpisu</string>
+    <string name="sk_loading_resource_on_instance_title">Wyszukiwanie na %s</string>
+    <string name="sk_open_with_account">Otwórz w innym koncie</string>
+    <string name="sk_resource_not_found">Nie znaleziono zasobu</string>
+    <string name="sk_forward_report_to">Prześlij dalej do %s</string>
+    <string name="sk_draft">Wersja robocza</string>
+    <string name="sk_schedule">Harmonogram</string>
+    <string name="sk_confirm_delete_draft_title">Usuń wersję roboczą</string>
+    <string name="sk_compose_scheduled">Zaplanowany na</string>
+    <string name="sk_draft_saved">Kopia robocza zapisana</string>
+    <string name="sk_scheduled_too_soon_title">Czas publikacji jest za wcześnie</string>
+    <string name="sk_scheduled_too_soon">Czas publikacji musi być najwcześniej za 10 minut.</string>
+    <string name="sk_post_scheduled">Wpis zaplanowany</string>
+    <string name="sk_compose_draft">Wpis zostanie zapisany jako wersja robocza.</string>
+    <string name="sk_draft_or_schedule">Kopia robocza lub zaplanowany wpis</string>
+    <string name="sk_confirm_delete_scheduled_post">Czy chcesz usunąć ten zaplanowany wpis\?</string>
+    <string name="sk_confirm_delete_scheduled_post_title">Usuń zaplanowany wpis</string>
+    <string name="sk_unsent_posts">Niewysłane wpisy</string>
+    <string name="sk_confirm_delete_draft">Czy jesteś pewien że chcesz usunąć tę kopię roboczą\?</string>
+    <string name="sk_confirm_save_draft">Zapisać kopię roboczą\?</string>
+    <string name="sk_confirm_save_changes">Zapisać zmiany\?</string>
+    <string name="sk_mark_as_draft">Oznacz jako wersja robocza</string>
+    <string name="sk_schedule_post">Zaplanuj wpis</string>
+    <string name="sk_compose_no_schedule">Nie planuj publikacji</string>
+    <string name="sk_compose_no_draft">Nie twórz wersji roboczej</string>
+    <string name="sk_schedule_or_draft">Zaplanowany wpis lub kopia robocza</string>
+    <string name="sk_favorite_as">Polub innym kontem</string>
+    <string name="sk_reblog_as">Już zreblogowano</string>
+    <string name="sk_settings_reduce_motion">Zmniejsz ruch animacji</string>
+    <string name="sk_mark_as_read">Oznacz jako przeczytane</string>
+    <string name="sk_settings_about_instance">O instancji</string>
+    <string name="sk_create_list_title">Stwórz listę</string>
+    <string name="sk_create">Stwórz</string>
+    <string name="sk_list_replies_policy">Pokaż odpowiedzi do</string>
+    <string name="sk_list_replies_policy_list">członkowie listy</string>
+    <string name="sk_list_replies_policy_followed">obserwowani użytkownicy</string>
+    <string name="sk_settings_single_notification">Pokazuj tylko jedną notyfikację</string>
+    <string name="sk_list_replies_policy_none">nikt</string>
+    <string name="sk_delete_list">Usuń listę</string>
+    <string name="sk_delete_list_confirm">Czy jesteś pewien że chcesz usunąć tą listę\?</string>
+    <string name="sk_edit_list_title">Edytuj listę</string>
+    <string name="sk_your_lists">Twoje listy</string>
 </resources>
\ No newline at end of file

From 6fc82cf26bff8bd0d3849607b2650255b59ea2e2 Mon Sep 17 00:00:00 2001
From: edxkl <edu200399lim@gmail.com>
Date: Fri, 13 Jan 2023 05:52:28 +0000
Subject: [PATCH 175/200] Translated using Weblate (Portuguese (Brazil))

Currently translated at 95.1% (136 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/pt_BR/
---
 mastodon/src/main/res/values-pt-rBR/strings_sk.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
index 28392a5f5..b7772d0fa 100644
--- a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
@@ -130,8 +130,8 @@
     <string name="sk_list_replies_policy">Mostrar respostas para</string>
     <string name="sk_list_replies_policy_list">listar membros</string>
     <string name="sk_list_replies_policy_none">ninguém</string>
-    <string name="sk_delete_list">Deletar lista</string>
-    <string name="sk_delete_list_confirm">Você tem certeza que quer deletar essa lista\?</string>
+    <string name="sk_delete_list">Excluir lista</string>
+    <string name="sk_delete_list_confirm">Tem certeza que deseja excluir esta lista\?</string>
     <string name="sk_edit_list_title">Editar lista</string>
     <string name="sk_your_lists">Suas listas</string>
     <string name="sk_list_name_hint">Lista de nomes</string>

From 533a51fc7740e3389777907b46ed1bd544dac0c7 Mon Sep 17 00:00:00 2001
From: HudobniVolk <hudobni.volk@tuta.io>
Date: Sun, 15 Jan 2023 09:51:13 +0000
Subject: [PATCH 176/200] Translated using Weblate (Slovenian)

Currently translated at 15.3% (22 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/sl/
---
 .../src/main/res/values-sl-rSI/strings_sk.xml | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-sl-rSI/strings_sk.xml b/mastodon/src/main/res/values-sl-rSI/strings_sk.xml
index 045e125f3..e0651ff1c 100644
--- a/mastodon/src/main/res/values-sl-rSI/strings_sk.xml
+++ b/mastodon/src/main/res/values-sl-rSI/strings_sk.xml
@@ -1,3 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
+    <string name="sk_delete_and_redraft">Izbriši in ponovno izdelaj</string>
+    <string name="sk_pin_post">Pripni na profil</string>
+    <string name="sk_confirm_pin_post_title">Pripni objavo na profil</string>
+    <string name="sk_pinning">Pripenjam objavo…</string>
+    <string name="sk_unpin_post">Odpni iz profila</string>
+    <string name="sk_confirm_unpin_post_title">Odpni objavo iz profila</string>
+    <string name="sk_image_description">Opis slike</string>
+    <string name="sk_visibility_unlisted">Nenavedeno</string>
+    <string name="sk_settings_show_replies">Prikaži odgovor</string>
+    <string name="sk_mark_media_as_sensitive">Označite medij kot občutljiv</string>
+    <string name="sk_federated_timeline">Federacija</string>
+    <string name="sk_clear_recent_languages">Izbriši nazadnje uporabljene jezike</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_pinned_posts">Pripeto</string>
+    <string name="sk_confirm_delete_and_redraft_title">Izbriši ter ponovno izdelaj objavo</string>
+    <string name="sk_confirm_delete_and_redraft">Ali ste prepričani, da želite objavo izbrisati in jo ponovno izdelati\?</string>
+    <string name="sk_confirm_pin_post">Ali želite pripeti to objavo na vaš profil\?</string>
+    <string name="sk_confirm_unpin_post">Ali ste prepričani, da želite odpeti to objavo\?</string>
+    <string name="sk_unpinning">Odpenjanje objave…</string>
+    <string name="sk_settings_load_new_posts">Samodejno naloži nove objave</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+</resources>
\ No newline at end of file

From 82e325062309abe130eec93a6d8acc5964837c2e Mon Sep 17 00:00:00 2001
From: ihor_ck <igor_ck@outlook.com>
Date: Fri, 13 Jan 2023 21:36:35 +0000
Subject: [PATCH 177/200] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (143 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
---
 mastodon/src/main/res/values-uk-rUA/strings_sk.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
index d7af1b247..c28aa50c6 100644
--- a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
@@ -139,4 +139,7 @@
     <string name="sk_announcements">Оголошення</string>
     <string name="sk_settings_single_notification">Показувати лише одне сповіщення</string>
     <string name="sk_list_replies_policy_followed">відстежувані користувачі</string>
+    <string name="sk_timeline_home">Головна</string>
+    <string name="sk_timeline_local">Локальна</string>
+    <string name="sk_timeline_federated">Федерація</string>
 </resources>
\ No newline at end of file

From 0af45e5f56f43c39fa0c8c09dbfc956f3e4f1a52 Mon Sep 17 00:00:00 2001
From: McKris <kristoff.brewer@gmail.com>
Date: Sat, 14 Jan 2023 05:49:20 +0000
Subject: [PATCH 178/200] Translated using Weblate (Polish)

Currently translated at 58.3% (7 of 12 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/pl/
---
 metadata/pl/changelogs/50.txt    |  4 ++++
 metadata/pl/changelogs/51.txt    |  6 ++++++
 metadata/pl/changelogs/55.txt    |  4 ++++
 metadata/pl/changelogs/56.txt    |  6 ++++++
 metadata/pl/full_description.txt | 16 ++++++++++++++++
 5 files changed, 36 insertions(+)
 create mode 100644 metadata/pl/changelogs/50.txt
 create mode 100644 metadata/pl/changelogs/51.txt
 create mode 100644 metadata/pl/changelogs/55.txt
 create mode 100644 metadata/pl/changelogs/56.txt
 create mode 100644 metadata/pl/full_description.txt

diff --git a/metadata/pl/changelogs/50.txt b/metadata/pl/changelogs/50.txt
new file mode 100644
index 000000000..d2991ae19
--- /dev/null
+++ b/metadata/pl/changelogs/50.txt
@@ -0,0 +1,4 @@
+- Przygotowano pliki pod publikację na F-Droid
+- Naprawiono automatyczną aktualizację
+- Dodano monochromatyczne ikony z powrotem do launchera
+- Poprawiono nieodpowiednią ikonę ukrytego postu w rozszerzonej stopce
diff --git a/metadata/pl/changelogs/51.txt b/metadata/pl/changelogs/51.txt
new file mode 100644
index 000000000..ffdef8464
--- /dev/null
+++ b/metadata/pl/changelogs/51.txt
@@ -0,0 +1,6 @@
+- Dodano możliwość otwarcia oryginalnego wpisu podczas odpowiadania
+- Scalono zmiany i naprawy błędów
+- Usunięto nieużywany kod "App Center"
+- Dodano publikację aplikacji bez widoku federacji dla Play Store
+- Dodano customowy URL przekierowujący aby ułatwić logowanie
+- Zmieniono link do kontrybucji
diff --git a/metadata/pl/changelogs/55.txt b/metadata/pl/changelogs/55.txt
new file mode 100644
index 000000000..00fa3f9c0
--- /dev/null
+++ b/metadata/pl/changelogs/55.txt
@@ -0,0 +1,4 @@
+- Naprawiono zepsuty rendering tagów HTML i dodano renderowanie formatowania Markdown
+- Rozpoczęto <a href="https://translate.codeberg.org/projects/megalodon">projekt translacji Weblate</a>
+- Dodano wyłącznik federacyjnej osi czasu
+- Małe poprawki pod publikację na Google Play
diff --git a/metadata/pl/changelogs/56.txt b/metadata/pl/changelogs/56.txt
new file mode 100644
index 000000000..36f1cbfac
--- /dev/null
+++ b/metadata/pl/changelogs/56.txt
@@ -0,0 +1,6 @@
+- Nowe motywy kolorystyczne od @LucasGGamerM
+- Nowe logo "megalodon" od @LucasGGamerM
+- Lepsza wyszukiwarka emoji
+- Ulepszono głosowanie (wyświetl własny głos, zawsze wyświetlaj przycisk głosowania, nie skracaj długich odpowiedzi)
+- Dodano ustawienia notyfikacji push
+- Poprawki błędów
diff --git a/metadata/pl/full_description.txt b/metadata/pl/full_description.txt
new file mode 100644
index 000000000..c67413d75
--- /dev/null
+++ b/metadata/pl/full_description.txt
@@ -0,0 +1,16 @@
+Megalodon jest zmodyfikowaną wersją <a href="https://github.com/mastodon/mastodon-android">oficjalnej aplikacji Mastodon Android</a>, która dodaje brakujące w niej funkcje, takie jak federacyjna oś czasu, publikowanie w trybie ukrytym, a także wyświetlanie opisów obrazków.
+
+<b>Główne funkcje</b>
+
+- <b>Publikowanie w trybie ukrytym</b>: Publikuj publicznie, równocześnie zapobiegając wyświetlaniu się twojego wpisu w trendach, hashtagach oraz publicznych osiach czasu.
+- <b>Federacyjna oś czasu</b>: Zobacz wszystkie wpisy publiczne na innych instancjach w Fediwersum do których podłączona jest twoja własna instancja.
+- <b>Wersje robocze i planowanie czasu publikacji</b>: Przygotuj wpis i zaplanuj jego publikację o określonym czasie.
+- <b>Sprawdzanie opisu obrazu</b>: Szybko sprawdź czy obrazek bądź wideo mają przypisany opis.
+- <b>Przypinanie wpisów</b>: Przypnij najważniejsze wpisy do swojego profilu i zobacz co przypięli inni do swoich w zakładce "Przypięte".
+- <b>Obserwuj hashtagi</b>:Zobacz nowe wpisy z konkretnych hashtagów bezpośrednio w swojej głównej osi czasu.
+- <b>Zarządzanie prośbami o obserwację</b>: Akceptuj bądź odmawiaj na prośby o obserwację twojego konta bezpośrednio w widoku notyfikacji bądź w dedykowanej liście.
+- <b>Usuń wpis i utwórz kopię roboczą</b>: Powszechnie uwielbiana funkcja która zezwoliła na edytowanie wpisów bez istnienia dedykowanej funkcji edycji.
+- <b>Selektor języka</b>: Łatwo wybieraj język dla każdego swojego postu aby filtry i funkcja translacji działała poprawnie.
+- <b>Translacja</b>: Wygodnie sprawdzaj tłumaczenia postów bezpośrednio w Megalodonie! Funkcja zadziała tylko, jeśli translacja jest dostępna również w twoim Mastodon Web.
+- <b>Indykator widoczności wpisu</b>: Po otwarciu wpisu bądź podczas odpowiadania na niego wyświetlona zostanie przydatna ikona informująca o jego widoczności.
+- <b>Motywy kolorystyczne</b>: Jeśli nie podoba ci się domyślny różowy motyw (i chcesz rozczarować rekina), możesz wybrać inny kolor z listy.

From 40eb3e2400d8a73c74447ef719c8c9aa90b79b06 Mon Sep 17 00:00:00 2001
From: EifionLlwyd <llwydnant@protonmail.com>
Date: Sat, 14 Jan 2023 11:28:52 +0000
Subject: [PATCH 179/200] Translated using Weblate (Welsh)

Currently translated at 48.2% (69 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/cy/
---
 .../src/main/res/values-cy/strings_sk.xml     | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/mastodon/src/main/res/values-cy/strings_sk.xml b/mastodon/src/main/res/values-cy/strings_sk.xml
index 95a6b1c3f..30986d4a7 100644
--- a/mastodon/src/main/res/values-cy/strings_sk.xml
+++ b/mastodon/src/main/res/values-cy/strings_sk.xml
@@ -32,4 +32,40 @@
     <string name="sk_post_language">Iaith: %s</string>
     <string name="sk_welcome_title">Croeso!</string>
     <string name="sk_settings_auth">Gosodiadau diogelwch</string>
+    <string name="sk_pin_post">Pinio i\'ch proffil</string>
+    <string name="sk_confirm_delete_and_redraft">Ydych chi\'n siŵr eich bod am ddileu ac ailddrafftio\'r neges hon\?</string>
+    <string name="sk_confirm_unpin_post">Ydych chi\'n siŵr eich bod am ddadbinio\'r neges hon\?</string>
+    <string name="sk_notify_posts">Hysbysiadau negeseuon</string>
+    <string name="sk_settings_color_palette">Palet lliwiau</string>
+    <string name="sk_no_update_available">Dim diweddariad ar gael</string>
+    <string name="sk_check_for_update">Gwirio am ddiweddariad</string>
+    <string name="sk_poll_allow_multiple">Caniatáu mwy nag un dewis</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_tabs_disable_swipe">Analluogi llusgo rhwng tabiau</string>
+    <string name="sk_settings_posting">Dewisiadau postio</string>
+    <string name="sk_settings_rules">Rheolau</string>
+    <string name="sk_settings_donate">Rhoddi</string>
+    <string name="sk_settings_publish_button_text">Testun y botwm cyhoeddi</string>
+    <string name="sk_settings_translation_availability_note_unavailable">Nid yw\'n ymddangos bod %s yn cefnogi cyfieithu.</string>
+    <string name="sk_hashtags_you_follow">Hashnodau rydych chi\'n eu dilyn</string>
+    <string name="sk_copy_link_to_post">Copïo dolen i\'r neges</string>
+    <string name="sk_draft">Drafft</string>
+    <string name="sk_confirm_delete_draft_title">Dileu\'r drafft</string>
+    <string name="sk_draft_saved">Drafft wedi\'i gadw</string>
+    <string name="sk_timeline_home">Hafan</string>
+    <string name="sk_mark_media_as_sensitive">Nodi fel cynnwys sensitif</string>
+    <string name="sk_available_languages">Pob iaith</string>
+    <string name="sk_clear_recent_languages">Clirio\'r ieithoedd a ddefnyddiwyd yn ddiweddar</string>
+    <string name="sk_settings_about">Ynghylch yr ap</string>
+    <string name="sk_clear_all_notifications">Dileu pob hysbysiad</string>
+    <string name="sk_clear_all_notifications_confirm_action">Dileu\'r cwbl</string>
+    <string name="sk_clear_all_notifications_confirm">Ydych chi\'n siŵr eich bod am ddileu pob hysbysiad\?</string>
+    <string name="sk_enable_delete_notifications">Galluogi dileu hysbysiadau</string>
+    <string name="sk_settings_publish_button_text_title">Addasu testun y botwm cyhoeddi</string>
+    <string name="sk_settings_translation_availability_note_available">Mae %s yn cefnogi cyfieithu!</string>
+    <string name="sk_unsent_posts">Negeseuon heb eu hanfon</string>
+    <string name="sk_confirm_delete_draft">Ydych chi\'n siŵr eich bod am ddileu\'r neges ddrafft hon\?</string>
+    <string name="sk_compose_draft">Caiff y neges ei chadw fel drafft.</string>
+    <string name="sk_confirm_save_changes">Cadw newidiadau\?</string>
+    <string name="sk_announcements">Cyhoeddiadau</string>
 </resources>
\ No newline at end of file

From 34d134cb57e633ccd1468de6f043de6101f18a6c Mon Sep 17 00:00:00 2001
From: ca <rubenx@duck.com>
Date: Sun, 15 Jan 2023 15:58:21 +0000
Subject: [PATCH 180/200] Translated using Weblate (Catalan)

Currently translated at 100.0% (143 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ca/
---
 mastodon/src/main/res/values-ca-rES/strings_sk.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mastodon/src/main/res/values-ca-rES/strings_sk.xml b/mastodon/src/main/res/values-ca-rES/strings_sk.xml
index c987c392a..79dda31e5 100644
--- a/mastodon/src/main/res/values-ca-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-ca-rES/strings_sk.xml
@@ -140,4 +140,6 @@
     <string name="sk_delete_list">Elimina la llista</string>
     <string name="sk_edit_list_title">Edita la llista</string>
     <string name="sk_your_lists">Llistes</string>
+    <string name="sk_loading_fediverse_resource_title">Buscant-ho al Fedivers</string>
+    <string name="sk_loading_resource_on_instance_title">Buscant-ho a %s</string>
 </resources>
\ No newline at end of file

From d15d222b72bded85d6f7389b1be0d2f346b6cbeb Mon Sep 17 00:00:00 2001
From: ca <rubenx@duck.com>
Date: Sun, 15 Jan 2023 13:03:51 -0300
Subject: [PATCH 181/200] Translated using Weblate (Catalan)

Currently translated at 100.0% (12 of 12 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ca/
---
 metadata/ca/changelogs/55.txt |  4 ++++
 metadata/ca/changelogs/56.txt |  6 ++++++
 metadata/ca/changelogs/59.txt |  6 ++++++
 metadata/ca/changelogs/61.txt |  5 +++++
 metadata/ca/changelogs/62.txt | 11 +++++++++++
 metadata/ca/changelogs/63.txt |  6 ++++++
 metadata/ca/changelogs/65.txt | 10 ++++++++++
 7 files changed, 48 insertions(+)
 create mode 100644 metadata/ca/changelogs/55.txt
 create mode 100644 metadata/ca/changelogs/56.txt
 create mode 100644 metadata/ca/changelogs/59.txt
 create mode 100644 metadata/ca/changelogs/61.txt
 create mode 100644 metadata/ca/changelogs/62.txt
 create mode 100644 metadata/ca/changelogs/63.txt
 create mode 100644 metadata/ca/changelogs/65.txt

diff --git a/metadata/ca/changelogs/55.txt b/metadata/ca/changelogs/55.txt
new file mode 100644
index 000000000..7b4f3e4df
--- /dev/null
+++ b/metadata/ca/changelogs/55.txt
@@ -0,0 +1,4 @@
+- Corregeix la renderització trencada d'etiquetes HTML i activa la renderització del format Markdown
+- Inicia el <a href="https://translate.codeberg.org/projects/megalodon">projecte de traducció a Weblate</a>
+- Afegeix un commutador per a la línia de temps federada
+- Les versions 52-54 eren xicotets ajustos per a un llançament a Google Play
diff --git a/metadata/ca/changelogs/56.txt b/metadata/ca/changelogs/56.txt
new file mode 100644
index 000000000..6154d5572
--- /dev/null
+++ b/metadata/ca/changelogs/56.txt
@@ -0,0 +1,6 @@
+- Temes colorits personalitzats per @LucasGGamerM
+- Nou logotip de «megalodon» enviat per @LucasGGamerM
+- Millor cerca d'emojis en la redacció
+- Votació ajustada (mostra el propi vot, mostra sempre el botó de vot, no talla les respostes llargues)
+- Afegeix la configuració de notificacions emergents per a les notificacions de publicacions
+- Correccions d'errors
diff --git a/metadata/ca/changelogs/59.txt b/metadata/ca/changelogs/59.txt
new file mode 100644
index 000000000..79f4998bb
--- /dev/null
+++ b/metadata/ca/changelogs/59.txt
@@ -0,0 +1,6 @@
+- Afegeix un selector d'idioma
+- Afegeix la funció de traducció
+- Millora la semàntica per a votar en les enquestes (botons radials i caselles de selecció)
+- Afegeix una opció per a permetre la votació de múltiples opcions en les enquestes
+- Pantalla d'inici de sessió nova
+- Correccions d'errors
diff --git a/metadata/ca/changelogs/61.txt b/metadata/ca/changelogs/61.txt
new file mode 100644
index 000000000..23c3eda3d
--- /dev/null
+++ b/metadata/ca/changelogs/61.txt
@@ -0,0 +1,5 @@
+- Colors de tema nous: Material You i vermell
+- Nous tons grisos foscos per a tots els temes
+- Icona d'impuls plena millor diferenciada
+- Animacions per als botons d'interacció
+- Correccions d'errors (fallada en algunes publicacions, «Llistes amb», llengua de publicació per defecte)
diff --git a/metadata/ca/changelogs/62.txt b/metadata/ca/changelogs/62.txt
new file mode 100644
index 000000000..a21be7d1d
--- /dev/null
+++ b/metadata/ca/changelogs/62.txt
@@ -0,0 +1,11 @@
+- Botó «Publica» personalitzable
+- Obri els enllaços del Fedivers a l'aplicació
+- Pulsació llarga al botó d'impuls per a «citar» una publicació
+- Copia l'URL de la publicació en mantenir polsat el botó de compartir
+- Incorpora l'eliminació de notificacions (desactivat per defecte)
+- Icones dedicades per a diferents tipus de notificacions
+- Colors grisos nous
+- Afegeix una opció de configuració per desactivar el desplaçament entre pestanyes
+- Afegeix diversos enllaços a la configuració del compte
+- Commutador per a mostrar/amagar el botó de traducció a la línia de temps
+- Correccions d'errors i millores
diff --git a/metadata/ca/changelogs/63.txt b/metadata/ca/changelogs/63.txt
new file mode 100644
index 000000000..c289d0c40
--- /dev/null
+++ b/metadata/ca/changelogs/63.txt
@@ -0,0 +1,6 @@
+- Opció per a impulsar amb una visibilitat específica en fer una polsació llarga
+- Mostra la visibilitat dels propis impulsos
+- Afegeix una llista de les etiquetes seguides
+- Pulsació llarga per a copiar enllaços
+- Opció per obrir publicacions des d'un altre compte
+- Correccions d'errors i retocs menors
diff --git a/metadata/ca/changelogs/65.txt b/metadata/ca/changelogs/65.txt
new file mode 100644
index 000000000..3c01edace
--- /dev/null
+++ b/metadata/ca/changelogs/65.txt
@@ -0,0 +1,10 @@
+- Esborranys i publicacions programades
+- Mostra la publicació original en respondre
+- Filtres compatibles amb Mastodon 4.0 (encara no té la funció «amaga amb un avís»)
+- Feu una pulsació llarga per a interactuar amb les publicacions (respondre, impulsar, agradar, afegir com a marcador) des d'altres comptes connectats
+- Icones en tots els menús
+- Commutador per a reenviar informes
+- Afegeix una menció quan s'utilitze la funció «Publica sobre açò»
+- Opció per a utilitzar una única icona de notificacions en lloc de les icones diferents
+- Opció per accedir a la llista de normes des de la configuració de l'aplicació
+- Correccions d'errors

From 00c8a03b809cfe81c9050458fad926545c010423 Mon Sep 17 00:00:00 2001
From: ca <rubenx@duck.com>
Date: Mon, 16 Jan 2023 19:13:16 +0000
Subject: [PATCH 182/200] Translated using Weblate (Catalan)

Currently translated at 100.0% (143 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ca/
---
 mastodon/src/main/res/values-ca-rES/strings_sk.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-ca-rES/strings_sk.xml b/mastodon/src/main/res/values-ca-rES/strings_sk.xml
index 79dda31e5..58183e8ce 100644
--- a/mastodon/src/main/res/values-ca-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-ca-rES/strings_sk.xml
@@ -77,7 +77,7 @@
     <string name="sk_reblogged_as">Impulsat com a %s</string>
     <string name="sk_announcements">Anuncis</string>
     <string name="sk_list_name_hint">Nom de la llista</string>
-    <string name="sk_delete_list_confirm">Segur que vols eliminar la llista\?</string>
+    <string name="sk_delete_list_confirm">Segur que vols eliminar la llista «%s»\?</string>
     <string name="sk_timeline_home">Inici</string>
     <string name="sk_settings_profile">Configura el perfil</string>
     <string name="sk_settings_posting">Preferències de publicació</string>

From d50c37af230fa215f0aee3272736c704ac1ff8f6 Mon Sep 17 00:00:00 2001
From: Nicolas_Horvath <vecosko2@gmail.com>
Date: Mon, 16 Jan 2023 19:21:46 +0000
Subject: [PATCH 183/200] Translated using Weblate (Czech)

Currently translated at 13.9% (20 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/cs/
---
 mastodon/src/main/res/values-cs-rCZ/strings_sk.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mastodon/src/main/res/values-cs-rCZ/strings_sk.xml b/mastodon/src/main/res/values-cs-rCZ/strings_sk.xml
index 2a7a7317a..2dd3020c7 100644
--- a/mastodon/src/main/res/values-cs-rCZ/strings_sk.xml
+++ b/mastodon/src/main/res/values-cs-rCZ/strings_sk.xml
@@ -18,4 +18,7 @@
     <string name="sk_confirm_delete_draft">Jste si jistý, že chcete tento navržený příspěvek smazat\?</string>
     <string name="sk_confirm_delete_scheduled_post">Určitě chcete tento naplánovaný příspěvek smazat\?</string>
     <string name="sk_delete_list_confirm">Opravdu chcete tento seznam odstranit\?</string>
+    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_pinned_posts">Připnutý</string>
+    <string name="sk_delete_and_redraft">vymazat a přepracovat</string>
 </resources>
\ No newline at end of file

From dc859fe91cf73c64e66ae5d208e0c74db0fef913 Mon Sep 17 00:00:00 2001
From: Choukajohn <choukajohn@gmail.com>
Date: Mon, 16 Jan 2023 20:16:34 +0000
Subject: [PATCH 184/200] Translated using Weblate (French)

Currently translated at 100.0% (143 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
---
 mastodon/src/main/res/values-fr-rFR/strings_sk.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
index 52ea0d4b2..72c910aa9 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -138,7 +138,7 @@
     <string name="sk_edit_list_title">Modifier la liste</string>
     <string name="sk_announcements">Annonces</string>
     <string name="sk_settings_single_notification">Afficher une seule notification</string>
-    <string name="sk_delete_list_confirm">Voulez-vous vraiment supprimer cette liste \?</string>
+    <string name="sk_delete_list_confirm">Êtes-vous sûr de vouloir supprimer la liste \"%s\" \?</string>
     <string name="sk_your_lists">Vos listes</string>
     <string name="sk_timeline_federated">Fédération</string>
     <string name="sk_timeline_local">Communauté</string>

From 1af9a712104d1e5faf5f3fb02721fe29b388d244 Mon Sep 17 00:00:00 2001
From: gicorada <gradaellig@protonmail.com>
Date: Mon, 16 Jan 2023 17:01:07 -0300
Subject: [PATCH 185/200] Translated using Weblate (Italian)

Currently translated at 100.0% (143 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/it/
---
 .../src/main/res/values-it-rIT/strings_sk.xml | 94 +++++++++++++++++--
 1 file changed, 88 insertions(+), 6 deletions(-)

diff --git a/mastodon/src/main/res/values-it-rIT/strings_sk.xml b/mastodon/src/main/res/values-it-rIT/strings_sk.xml
index 168083e8b..0d2cb0fb5 100644
--- a/mastodon/src/main/res/values-it-rIT/strings_sk.xml
+++ b/mastodon/src/main/res/values-it-rIT/strings_sk.xml
@@ -9,7 +9,7 @@
     <string name="sk_color_palette_blue">Blu</string>
     <string name="sk_color_palette_brown">Marrone</string>
     <string name="sk_color_palette_yellow">Giallo</string>
-    <string name="sk_app_name">Moshidon</string>
+    <string name="sk_app_name">Megalodon</string>
     <string name="sk_pinned_posts">Fissati</string>
     <string name="sk_delete_and_redraft">Elimina e riscrivi</string>
     <string name="sk_user_post_notifications_on">Attivate notifiche per i post di %s</string>
@@ -32,18 +32,18 @@
     <string name="sk_settings_show_boosts">Mostra boost</string>
     <string name="sk_settings_load_new_posts">Carica automaticamente nuovi post</string>
     <string name="sk_settings_show_interaction_counts">Mostra conteggi interazioni</string>
-    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">Segnala media come sensibile</string>
     <string name="sk_federated_timeline">Federata</string>
     <string name="sk_federated_timeline_info_banner">Questi sono i post più recenti dalle persone nella tua federazione.</string>
-    <string name="sk_update_available">Moshidon %s è pronto da scaricare.</string>
-    <string name="sk_update_ready">Moshidon %s è scaricato e pronto da installare.</string>
+    <string name="sk_update_available">Megalodon %s è pronto da scaricare.</string>
+    <string name="sk_update_ready">Megalodon %s è scaricato e pronto da installare.</string>
     <string name="sk_check_for_update">Verifica aggiornamenti</string>
     <string name="sk_no_update_available">Non ci sono aggiornamenti disponibili</string>
     <string name="sk_list_timelines">Liste</string>
     <string name="sk_settings_always_reveal_content_warnings">Apri sempre contenuti segnalati come sensibili</string>
-    <string name="sk_lists_with_user">Liste con %s</string>
-    <string name="sk_settings_contribute">Contribuisci a Moshidon</string>
+    <string name="sk_lists_with_user">Modifica liste con %s</string>
+    <string name="sk_settings_contribute">Contribuisci a Megalodon</string>
     <string name="sk_settings_show_federated_timeline">Mostra timeline federata</string>
     <string name="sk_disable_marquee">Disabilita scorrimento titoli</string>
     <string name="sk_reject_follow_request">Rifiuta richiesta di seguirti</string>
@@ -60,4 +60,86 @@
     <string name="sk_available_languages">Lingue disponibili</string>
     <string name="sk_welcome_text">Lo squalo ti saluta! Per iniziare inserisci il dominio dell\'istanza a cui sei iscritto.</string>
     <string name="sk_color_palette_material3">Sistema</string>
+    <string name="sk_timeline_local">Locale</string>
+    <string name="sk_timeline_federated">Federazione</string>
+    <string name="sk_bookmark_as">Salva con un altro account</string>
+    <string name="sk_bookmarked_as">Salvato come %s</string>
+    <string name="sk_favorite_as">Inserisci tra i preferiti con un altro account</string>
+    <string name="sk_favorited_as">Inserito tra i preferiti come %s</string>
+    <string name="sk_already_favorited">Già tra i preferiti</string>
+    <string name="sk_reblog_as">Esegui il reblog con un altro account</string>
+    <string name="sk_already_reblogged">Reblog già eseguito</string>
+    <string name="sk_settings_profile">Imposta il profilo</string>
+    <string name="sk_settings_posting">Preferenze dei post</string>
+    <string name="sk_settings_filters">Configura filtri</string>
+    <string name="sk_settings_rules">Regole</string>
+    <string name="sk_settings_about">Riguardo all\'app</string>
+    <string name="sk_settings_donate">Dona</string>
+    <string name="sk_delete_notification_confirm_action">Elimina notifica</string>
+    <string name="sk_enable_delete_notifications">Abilita l\'eliminazione delle notifiche</string>
+    <string name="sk_settings_publish_button_text">Testo del pulsante Pubblica</string>
+    <string name="sk_settings_publish_button_text_title">Personalizza il testo del pulsante Pubblica</string>
+    <string name="sk_settings_translation_availability_note_available">%s supporta la traduzione!</string>
+    <string name="sk_settings_translation_availability_note_unavailable">Sembra che %s non supporti la traduzione.</string>
+    <string name="sk_clear_all_notifications">Elimina tutte le notifiche</string>
+    <string name="sk_clear_all_notifications_confirm_action">Elimina tutto</string>
+    <string name="sk_clear_all_notifications_confirm">Sei sicuro di volere eliminare tutte le notifiche\?</string>
+    <string name="sk_loading_fediverse_resource_title">Cercando nel Fediverso</string>
+    <string name="sk_quote_post">Crea un post riguardo a questo</string>
+    <string name="sk_undo_reblog">Annulla il reblog</string>
+    <string name="sk_reblog_with_visibility">Esegui il reblog con visibilità</string>
+    <string name="sk_copy_link_to_post">Copia il link del post</string>
+    <string name="sk_open_with_account">Apri con un altro account</string>
+    <string name="sk_resource_not_found">La risorsa non può essere trovata</string>
+    <string name="sk_draft">Bozza</string>
+    <string name="sk_schedule">Programma</string>
+    <string name="sk_confirm_delete_draft_title">Elimina bozza</string>
+    <string name="sk_draft_or_schedule">Bozza o programma</string>
+    <string name="sk_compose_scheduled">Programmato per</string>
+    <string name="sk_draft_saved">Bozza salvata</string>
+    <string name="sk_forward_report_to">Inoltra a %s</string>
+    <string name="sk_confirm_delete_scheduled_post_title">Elimina post programmato</string>
+    <string name="sk_confirm_delete_scheduled_post">Sei sicuro di volere eliminare questo post programmato\?</string>
+    <string name="sk_compose_draft">Il post verrà salvato come bozza.</string>
+    <string name="sk_post_scheduled">Post programmato</string>
+    <string name="sk_scheduled_too_soon_title">L\'orario programmato è troppo presto</string>
+    <string name="sk_mark_as_draft">Segna come bozza</string>
+    <string name="sk_schedule_post">Programma post</string>
+    <string name="sk_compose_no_schedule">Non programmare</string>
+    <string name="sk_compose_no_draft">Non tenere in bozza</string>
+    <string name="sk_announcements">Annunci</string>
+    <string name="sk_mark_as_read">Segna come letto</string>
+    <string name="sk_settings_single_notification">Mostra solo una notifica</string>
+    <string name="sk_create">Crea</string>
+    <string name="sk_create_list_title">Crea lista</string>
+    <string name="sk_list_name_hint">Nome della lista</string>
+    <string name="sk_list_replies_policy">Mostra risposte a</string>
+    <string name="sk_list_replies_policy_list">membri della lista</string>
+    <string name="sk_list_replies_policy_followed">utenti seguiti</string>
+    <string name="sk_list_replies_policy_none">nessuno</string>
+    <string name="sk_delete_list">Elimina lista</string>
+    <string name="sk_edit_list_title">Modifica lista</string>
+    <string name="sk_your_lists">Le tue liste</string>
+    <string name="sk_reply_as">Rispondi con un altro account</string>
+    <string name="sk_settings_uniform_icon_for_notifications">Icona uniforme per tutte le notifiche</string>
+    <string name="sk_color_palette_red">Rosso</string>
+    <string name="sk_tabs_disable_swipe">Disabilita lo scorrimento tra schede</string>
+    <string name="sk_settings_auth">Impostazioni della sicurezza</string>
+    <string name="sk_delete_notification">Elimina notifica</string>
+    <string name="sk_delete_notification_confirm">Sei sicuro di volere eliminare questa notifica\?</string>
+    <string name="sk_settings_translate_only_opened">Traduci solamente i post aperti</string>
+    <string name="sk_loading_resource_on_instance_title">Cercando in %s</string>
+    <string name="sk_hashtags_you_follow">Hashtags che segui</string>
+    <string name="sk_already_bookmarked">Già salvato</string>
+    <string name="sk_reblogged_as">Reblog eseguito come %s</string>
+    <string name="sk_unsent_posts">Post annullati</string>
+    <string name="sk_confirm_save_draft">Salva bozza\?</string>
+    <string name="sk_confirm_save_changes">Salva le modifiche\?</string>
+    <string name="sk_schedule_or_draft">Programma o bozza</string>
+    <string name="sk_settings_reduce_motion">Riduci il movimento delle animazioni</string>
+    <string name="sk_settings_about_instance">Riguardo all\'istanza</string>
+    <string name="sk_delete_list_confirm">Sei sicuro di volere eliminare la lista \"%s\"\?</string>
+    <string name="sk_timeline_home">Home</string>
+    <string name="sk_confirm_delete_draft">Sei sicuro di volere eliminare questo post in bozza\?</string>
+    <string name="sk_scheduled_too_soon">I post devono essere programmati almeno tra 10 minuti.</string>
 </resources>
\ No newline at end of file

From c0a2945378e7e32c1712c4bf7edd4ced896414f0 Mon Sep 17 00:00:00 2001
From: Oliebol <schrijfmedan@gmail.com>
Date: Mon, 16 Jan 2023 19:17:02 +0000
Subject: [PATCH 186/200] Translated using Weblate (Dutch)

Currently translated at 93.7% (134 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/nl/
---
 .../src/main/res/values-nl-rNL/strings_sk.xml | 99 ++++++++++++++++++-
 1 file changed, 97 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/res/values-nl-rNL/strings_sk.xml b/mastodon/src/main/res/values-nl-rNL/strings_sk.xml
index 3bbdcb532..6fbf02cbb 100644
--- a/mastodon/src/main/res/values-nl-rNL/strings_sk.xml
+++ b/mastodon/src/main/res/values-nl-rNL/strings_sk.xml
@@ -14,7 +14,7 @@
     <string name="sk_confirm_unpin_post">Weet je zeker dat je dit bericht wilt losmaken\?</string>
     <string name="sk_unpinning">Bericht losmaken…</string>
     <string name="sk_follow_requests">Volgverzoeken</string>
-    <string name="sk_visibility_unlisted">Geheim</string>
+    <string name="sk_visibility_unlisted">Minder openbaar</string>
     <string name="sk_image_description">Afbeelding beschrijving</string>
     <string name="sk_settings_show_replies">Reacties weergeven</string>
     <string name="sk_settings_show_boosts">Boosts weergeven</string>
@@ -33,9 +33,104 @@
     <string name="sk_list_timelines">Lijsten</string>
     <string name="sk_reject_follow_request">Volgverzoek afwijzen</string>
     <string name="sk_accept_follow_request">Volgverzoek accepteren</string>
-    <string name="sk_lists_with_user">Lijsten met %s</string>
+    <string name="sk_lists_with_user">Bewerk lijsten met %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Onthul altijd inhoudswaarschuwingen</string>
     <string name="sk_disable_marquee">Schakel scrollende tekst in titelbalken uit</string>
     <string name="sk_settings_contribute">Bijdragen aan Moshidon</string>
     <string name="sk_settings_show_federated_timeline">Toon gefedereerde tijdlijn</string>
+    <string name="sk_notification_type_status">Berichten</string>
+    <string name="sk_notify_posts">Bericht meldingen</string>
+    <string name="sk_timeline_local">Lokaal</string>
+    <string name="sk_timeline_home">Home</string>
+    <string name="sk_timeline_federated">Federatie</string>
+    <string name="sk_translate_post">Vertaal</string>
+    <string name="sk_poll_allow_multiple">Meerdere keuzes toestaan</string>
+    <string name="sk_clear_recent_languages">Wis recent gebruikte talen</string>
+    <string name="sk_welcome_text">De haai groet je! Graag je home instance naam hieronder invullen om te beginnen.</string>
+    <string name="sk_welcome_title">Welkom!</string>
+    <string name="sk_translated_using">Vertaald met %s</string>
+    <string name="sk_post_language">Taal: %s</string>
+    <string name="sk_bookmarked_as">Als bookmark opgeslagen als %s</string>
+    <string name="sk_already_bookmarked">Al als bookmark opgeslagen</string>
+    <string name="sk_favorited_as">Als favoriet opgeslagen als %s</string>
+    <string name="sk_language_name">%s (%s)</string>
+    <string name="sk_example_domain">example.social</string>
+    <string name="sk_reply_as">Antwoord met ander account</string>
+    <string name="sk_settings_uniform_icon_for_notifications">Zelfde icoon voor alle meldingen</string>
+    <string name="sk_tabs_disable_swipe">Uitschakelen swipen tussen tabs</string>
+    <string name="sk_settings_profile">Profiel instellen</string>
+    <string name="sk_settings_posting">Voorkeuren plaatsen bericht</string>
+    <string name="sk_settings_filters">Filters instellen</string>
+    <string name="sk_settings_auth">Instellingen beveiliging</string>
+    <string name="sk_settings_rules">Regels</string>
+    <string name="sk_settings_about">Over de app</string>
+    <string name="sk_settings_donate">Doneer</string>
+    <string name="sk_settings_color_palette">Kleurpalet</string>
+    <string name="sk_color_palette_material3">Systeem</string>
+    <string name="sk_color_palette_pink">Roze</string>
+    <string name="sk_color_palette_purple">Paars</string>
+    <string name="sk_color_palette_green">Groen</string>
+    <string name="sk_color_palette_blue">Blauw</string>
+    <string name="sk_color_palette_brown">Bruin</string>
+    <string name="sk_color_palette_red">Rood</string>
+    <string name="sk_color_palette_yellow">Geel</string>
+    <string name="sk_delete_notification_confirm_action">Verwijder melding</string>
+    <string name="sk_delete_notification_confirm">Weet je zeker dat je de melding wilt verwijderen\?</string>
+    <string name="sk_enable_delete_notifications">Meldingen verwijderen inschakelen</string>
+    <string name="sk_settings_publish_button_text">Publiceer knop tekst</string>
+    <string name="sk_settings_publish_button_text_title">Tekst publiceer knop aanpassen</string>
+    <string name="sk_settings_translation_availability_note_available">%s ondersteunt vertaling!</string>
+    <string name="sk_settings_translation_availability_note_unavailable">%s lijkt vertaling niet te ondersteunen.</string>
+    <string name="sk_clear_all_notifications">Wis alle meldingen</string>
+    <string name="sk_clear_all_notifications_confirm_action">Verwijder alles</string>
+    <string name="sk_clear_all_notifications_confirm">Weet je zeker dat je alle meldingen wilt verwijderen\?</string>
+    <string name="sk_loading_fediverse_resource_title">Opzoeken in de Fediverse</string>
+    <string name="sk_copy_link_to_post">Kopieer link naar bericht</string>
+    <string name="sk_loading_resource_on_instance_title">Opzoeken op %s</string>
+    <string name="sk_open_with_account">Open met ander account</string>
+    <string name="sk_unsent_posts">Niet-verzonden berichten</string>
+    <string name="sk_draft">Concept</string>
+    <string name="sk_schedule">Inplannen</string>
+    <string name="sk_confirm_delete_draft">Weet je zeker dat je dit concept bericht wilt verwijderen\?</string>
+    <string name="sk_confirm_delete_scheduled_post_title">Verwijder ingepland bericht</string>
+    <string name="sk_draft_or_schedule">Concept of ingepland</string>
+    <string name="sk_compose_draft">Bericht wordt als concept bewaard.</string>
+    <string name="sk_compose_scheduled">Ingepland om</string>
+    <string name="sk_draft_saved">Concept opgeslagen</string>
+    <string name="sk_post_scheduled">Bericht ingepland</string>
+    <string name="sk_scheduled_too_soon_title">Ingeplande tijd is te snel</string>
+    <string name="sk_scheduled_too_soon">Bericht moet minstens 10 minuten in de toekomst ingepland zijn.</string>
+    <string name="sk_confirm_save_changes">Wijzigingen opslaan\?</string>
+    <string name="sk_mark_as_draft">Markeer als concept</string>
+    <string name="sk_schedule_post">Bericht inplannen</string>
+    <string name="sk_settings_reduce_motion">Beweging in animaties verminderen</string>
+    <string name="sk_announcements">Aankondigingen</string>
+    <string name="sk_mark_as_read">Markeer als gelezen</string>
+    <string name="sk_settings_about_instance">Over instance</string>
+    <string name="sk_settings_single_notification">Toon alleen één melding</string>
+    <string name="sk_create">Maken</string>
+    <string name="sk_create_list_title">Maak lijst</string>
+    <string name="sk_list_name_hint">Lijstnaam</string>
+    <string name="sk_list_replies_policy">Toon antwoorden aan</string>
+    <string name="sk_list_replies_policy_none">niemand</string>
+    <string name="sk_list_replies_policy_followed">gevolgde users</string>
+    <string name="sk_delete_list">Verwijder lijst</string>
+    <string name="sk_delete_list_confirm">Weet je zeker dat je deze lijst wilt verwijderen: “%s”\?</string>
+    <string name="sk_edit_list_title">Bewerk lijst</string>
+    <string name="sk_your_lists">Jouw lijsten</string>
+    <string name="sk_translate_show_original">Toon origineel</string>
+    <string name="sk_available_languages">Beschikbare talen</string>
+    <string name="sk_confirm_clear_recent_languages">Weet je zeker dat je de laatst gebruikte talen wilt wissen\?</string>
+    <string name="sk_delete_notification">Verwijder melding</string>
+    <string name="sk_settings_translate_only_opened">Vertaal alleen geopende berichten</string>
+    <string name="sk_hashtags_you_follow">Hashtags die je volgt</string>
+    <string name="sk_resource_not_found">Bron kon niet worden gevonden</string>
+    <string name="sk_bookmark_as">Bookmark met ander account</string>
+    <string name="sk_favorite_as">Maak favoriet met ander account</string>
+    <string name="sk_already_favorited">Al als favoriet opgeslagen</string>
+    <string name="sk_forward_report_to">Doorsturen naar %s</string>
+    <string name="sk_confirm_delete_draft_title">Verwijder concept</string>
+    <string name="sk_confirm_delete_scheduled_post">Weet je zeker dat je dit ingeplande bericht wilt verwijderen\?</string>
+    <string name="sk_confirm_save_draft">Concept opslaan\?</string>
+    <string name="sk_compose_no_schedule">Niet inplannen</string>
 </resources>
\ No newline at end of file

From 8c7364d57d7dc70db27e40780233e74a7ebc5d5a Mon Sep 17 00:00:00 2001
From: ihor_ck <igor_ck@outlook.com>
Date: Mon, 16 Jan 2023 20:45:35 +0000
Subject: [PATCH 187/200] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (143 of 143 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
---
 mastodon/src/main/res/values-uk-rUA/strings_sk.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
index c28aa50c6..40fc4624b 100644
--- a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
@@ -133,7 +133,7 @@
     <string name="sk_list_replies_policy_list">учасники списку</string>
     <string name="sk_list_replies_policy_none">ніхто</string>
     <string name="sk_delete_list">Видалити список</string>
-    <string name="sk_delete_list_confirm">Ви впевнені, що хочете видалити цей список\?</string>
+    <string name="sk_delete_list_confirm">Ви впевнені, що хочете видалити список «%s»\?</string>
     <string name="sk_edit_list_title">Редагувати список</string>
     <string name="sk_your_lists">Ваші списки</string>
     <string name="sk_announcements">Оголошення</string>

From 7577d60f4276459c55f761c8f26667c76120e82b Mon Sep 17 00:00:00 2001
From: gicorada <gradaellig@protonmail.com>
Date: Mon, 16 Jan 2023 20:06:23 +0000
Subject: [PATCH 188/200] Translated using Weblate (Italian)

Currently translated at 100.0% (12 of 12 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/it/
---
 metadata/it-IT/changelogs/50.txt     |  4 ++++
 metadata/it-IT/changelogs/51.txt     |  6 ++++++
 metadata/it-IT/changelogs/55.txt     |  4 ++++
 metadata/it-IT/changelogs/56.txt     |  6 ++++++
 metadata/it-IT/changelogs/59.txt     |  6 ++++++
 metadata/it-IT/changelogs/61.txt     |  5 +++++
 metadata/it-IT/changelogs/62.txt     | 11 +++++++++++
 metadata/it-IT/changelogs/63.txt     |  6 ++++++
 metadata/it-IT/changelogs/65.txt     | 10 ++++++++++
 metadata/it-IT/full_description.txt  | 16 ++++++++++++++++
 metadata/it-IT/short_description.txt |  1 +
 metadata/it-IT/title.txt             |  1 +
 12 files changed, 76 insertions(+)
 create mode 100644 metadata/it-IT/changelogs/50.txt
 create mode 100644 metadata/it-IT/changelogs/51.txt
 create mode 100644 metadata/it-IT/changelogs/55.txt
 create mode 100644 metadata/it-IT/changelogs/56.txt
 create mode 100644 metadata/it-IT/changelogs/59.txt
 create mode 100644 metadata/it-IT/changelogs/61.txt
 create mode 100644 metadata/it-IT/changelogs/62.txt
 create mode 100644 metadata/it-IT/changelogs/63.txt
 create mode 100644 metadata/it-IT/changelogs/65.txt
 create mode 100644 metadata/it-IT/full_description.txt
 create mode 100644 metadata/it-IT/short_description.txt
 create mode 100644 metadata/it-IT/title.txt

diff --git a/metadata/it-IT/changelogs/50.txt b/metadata/it-IT/changelogs/50.txt
new file mode 100644
index 000000000..872f7c1a6
--- /dev/null
+++ b/metadata/it-IT/changelogs/50.txt
@@ -0,0 +1,4 @@
+- Preparati i file per il rilascio su F-Droid
+- Risolto il problema con l'aggiornamento automatico
+- Aggiunte le icone monocromatiche nelle icone di avvio
+- Sostituita l'icona "non elencato" errata nel piè di pagina esteso
diff --git a/metadata/it-IT/changelogs/51.txt b/metadata/it-IT/changelogs/51.txt
new file mode 100644
index 000000000..4cba829be
--- /dev/null
+++ b/metadata/it-IT/changelogs/51.txt
@@ -0,0 +1,6 @@
+- Adesso è consentito aprire il post originale durante la risposta (cliccando sulla riga "In risposta a...")
+- Unite modifiche a monte e correzioni di bug
+- Rimosso il codice "App Center" inutilizzato
+- Aggiunta versione senza timeline federata per Play Store
+- Aggiunto URI di reindirizzamento personalizzato per un accesso più semplice
+- Cambiato il link per contribuire
diff --git a/metadata/it-IT/changelogs/55.txt b/metadata/it-IT/changelogs/55.txt
new file mode 100644
index 000000000..0e045ce94
--- /dev/null
+++ b/metadata/it-IT/changelogs/55.txt
@@ -0,0 +1,4 @@
+- Corretto il rendering interrotto dei tag HTML e abilitato il rendering della formattazione Markdown
+- Inizializzato il <a href="https://translate.codeberg.org/projects/megalodon">progetto di traduzione Weblate</a>
+- Aggiunta dell'interruttore per la sequenza temporale Federata
+- Le versioni 52-54 erano piccoli aggiustamenti per una versione su Google Play
diff --git a/metadata/it-IT/changelogs/56.txt b/metadata/it-IT/changelogs/56.txt
new file mode 100644
index 000000000..bb194e06a
--- /dev/null
+++ b/metadata/it-IT/changelogs/56.txt
@@ -0,0 +1,6 @@
+- Temi colore personalizzati di @LucasGGamerM
+- Nuovo logo di testo "megalodon" inviato da @LucasGGamerM
+- Migliore ricerca delle emoji durante la composizione
+- Voto ottimizzato (mostra il tuo voto, mostra sempre il pulsante di voto, non tagliare le risposte lunghe)
+- Aggiunta l'impostazione di notifica push per le notifiche post
+- Correzioni di bug
diff --git a/metadata/it-IT/changelogs/59.txt b/metadata/it-IT/changelogs/59.txt
new file mode 100644
index 000000000..3cbecd251
--- /dev/null
+++ b/metadata/it-IT/changelogs/59.txt
@@ -0,0 +1,6 @@
+- Aggiunto selettore di lingua
+- Aggiunta funzione di traduzione
+- Migliorata la semantica per il voto nei sondaggi (pulsanti di opzione e caselle di controllo)
+- Aggiunta opzione per consentire il voto per più opzioni sui sondaggi
+- Nuova schermata di accesso
+- Correzioni di bug
diff --git a/metadata/it-IT/changelogs/61.txt b/metadata/it-IT/changelogs/61.txt
new file mode 100644
index 000000000..424d07884
--- /dev/null
+++ b/metadata/it-IT/changelogs/61.txt
@@ -0,0 +1,5 @@
+- Nuovi temi colore: Material You e Red
+- Nuove tonalità di grigio scuro per tutti i temi
+- Icona boost piena più distinta
+- Animazioni per pulsanti di interazione
+- Correzioni di bug (arresto anomalo in alcuni post, "Liste con", lingua di pubblicazione predefinita)
diff --git a/metadata/it-IT/changelogs/62.txt b/metadata/it-IT/changelogs/62.txt
new file mode 100644
index 000000000..9c05dfda2
--- /dev/null
+++ b/metadata/it-IT/changelogs/62.txt
@@ -0,0 +1,11 @@
+- Pulsante Pubblica personalizzato
+- Apri i collegamenti del Fediverse nell'app
+- Clic lungo su boost per "citare" un post
+- Copia l'URL del post quando premi a lungo condividi
+- Aggiunta eliminazione delle notifiche
+- Icone dedicate per diversi tipi di notifica
+- Nuovi colori grigi
+- Aggiunta impostazione per controllare lo scorrimento tra schede
+- Aggiunti collegamenti alle impostazioni dell'account
+- Controlli per nascondere il pulsante di traduzione
+- Correzioni di bug e modifiche
diff --git a/metadata/it-IT/changelogs/63.txt b/metadata/it-IT/changelogs/63.txt
new file mode 100644
index 000000000..997c699a1
--- /dev/null
+++ b/metadata/it-IT/changelogs/63.txt
@@ -0,0 +1,6 @@
+- Opzione per reblog con visibilità specifica con clic lungo
+- Mostra visibilità dei propri reblog
+- Aggiunto elenco di hashtag seguiti
+- Fai clic a lungo per copiare i collegamenti
+- Aggiunta opzione per aprire post con altri account
+- Correzioni di bug e modifiche minori
diff --git a/metadata/it-IT/changelogs/65.txt b/metadata/it-IT/changelogs/65.txt
new file mode 100644
index 000000000..3f7415dba
--- /dev/null
+++ b/metadata/it-IT/changelogs/65.txt
@@ -0,0 +1,10 @@
+- Bozze e post programmati
+- Mostra il post originale quando rispondi
+- Filtri compatibili con Mastodon 4.0 ("nascondi con avviso" ancora assente)
+- Fai clic a lungo per interagire con i post da altri account che hanno effettuato l'accesso
+- Icone in tutti i menu
+- Toggle per l'inoltro dei rapporti
+- Aggiungi menzione quando usi la funzione "Pubblica su questo".
+- Opzione per utilizzare un'icona di notifica uniforme
+- Opzione per accedere all'elenco delle regole in-app
+- Correzioni di bug
diff --git a/metadata/it-IT/full_description.txt b/metadata/it-IT/full_description.txt
new file mode 100644
index 000000000..f65c72ee5
--- /dev/null
+++ b/metadata/it-IT/full_description.txt
@@ -0,0 +1,16 @@
+Megalodon è una versione modificata dell' <a href="https://github.com/mastodon/mastodon-android">app ufficiale di Mastodon per Android</a>, che aggiunge importanti funzionalità mancanti nell'app ufficiale, come la timeline federata, creazione di post non in lista e un visualizzatore della descrizione delle immagini.
+
+<b>Funzionalità chiave</b>
+
+- <b>Creazione di post non in lista</b>: Crea post pubblici senza farli mostrarli nei trend, hashtags o timeline pubbliche.
+- <b>Timeline federata</b>: Vedi tutti i post pubblici delle persone in tutte le istanze federate con la tua.
+- <b>Bozze e post programmati</b>: Permette di preparare un post per essere pubblicato automaticamente in un momento specifico.
+- <b>Visualizzatore della descrizione delle immagini</b>: Controlla velocemente se un'immagine o video ha un testo alternativo allegato.
+- <b>Post fissati</b>: Fissa i tuoi post più importanti sul tuo profilo, e vedi i post fissati degli altri nella scheda "Fissati".
+- <b>Segui gli hashtags</b>: Vedi i nuovi post da hashtags specifici direttamente nella timeline Home seguendoli.
+- <b>Richieste di seguirti</b>: Accetta o rifiuta le richieste di seguirti dalle notifiche o dalla lista delle richieste.
+- <b>Elimina e riscrivi</b>: La funzione più amata, che rende possibile modificare i post senza avere una vera funzione di modifica.
+- <b>Selettore delle lingue</b>: Seleziona facilmente la lingua di ogni post, in modo far fare funzionare correttamente i filtri e le traduzioni.
+- <b>Traduzioni</b>: Traduci facilmente i post in Megalodon! Funziona solo se la traduzione è attivata dall'istanza.
+- <b>Indicatore della visibilità dei post</b>: Quando apri o rispondi ad un post, apparirà un'icona per indicare la visibilità del post.
+- <b>Temi cromatici</b>: Se non ti piace il colore rosa predefinito (lo squalo ti sta giudicando silenziosamente), i temi cromatici di Moshidon ti hanno coperto.
diff --git a/metadata/it-IT/short_description.txt b/metadata/it-IT/short_description.txt
new file mode 100644
index 000000000..0e54fcea5
--- /dev/null
+++ b/metadata/it-IT/short_description.txt
@@ -0,0 +1 @@
+Mastodon per Android, ma rosa e con più funzioni
diff --git a/metadata/it-IT/title.txt b/metadata/it-IT/title.txt
new file mode 100644
index 000000000..cf946e02c
--- /dev/null
+++ b/metadata/it-IT/title.txt
@@ -0,0 +1 @@
+Megalodon

From 356426b5fc1bbeab42cbe50d5a58a39ec9108c90 Mon Sep 17 00:00:00 2001
From: ling0412 <xll520yzl@gmail.com>
Date: Tue, 17 Jan 2023 00:11:16 +0000
Subject: [PATCH 189/200] Translated using Weblate (Chinese (Simplified))

Currently translated at 98.6% (142 of 144 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hans/
---
 mastodon/src/main/res/values-zh-rCN/strings_sk.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
index ace1cdba5..6dfe3a050 100644
--- a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
@@ -138,8 +138,9 @@
     <string name="sk_list_replies_policy_followed">关注的用户</string>
     <string name="sk_list_replies_policy_none">没有人</string>
     <string name="sk_delete_list">删除列表</string>
-    <string name="sk_delete_list_confirm">您确定要删除此列表吗？</string>
+    <string name="sk_delete_list_confirm">您确定要删除列表“%s”吗？</string>
     <string name="sk_edit_list_title">编辑列表</string>
     <string name="sk_your_lists">你的列表</string>
     <string name="sk_timeline_federated">联邦</string>
+    <string name="sk_recent_searches_placeholder">输入内容开始搜索</string>
 </resources>
\ No newline at end of file

From 5cdea99eb0a0431fa246c49dd68e42f4da57847d Mon Sep 17 00:00:00 2001
From: Choukajohn <choukajohn@gmail.com>
Date: Mon, 16 Jan 2023 22:48:40 +0000
Subject: [PATCH 190/200] Translated using Weblate (French)

Currently translated at 100.0% (144 of 144 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
---
 mastodon/src/main/res/values-fr-rFR/strings_sk.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
index 72c910aa9..8cd8764eb 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -143,4 +143,5 @@
     <string name="sk_timeline_federated">Fédération</string>
     <string name="sk_timeline_local">Communauté</string>
     <string name="sk_timeline_home">Accueil</string>
+    <string name="sk_recent_searches_placeholder">Tapez quelque chose pour commencer la recherche</string>
 </resources>
\ No newline at end of file

From bbbf1683aa00e692a9d06dd6de0fbceeb87b8dcd Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Mon, 16 Jan 2023 22:56:12 +0000
Subject: [PATCH 191/200] Translated using Weblate (Indonesian)

Currently translated at 100.0% (144 of 144 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
---
 mastodon/src/main/res/values-in-rID/strings_sk.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-in-rID/strings_sk.xml b/mastodon/src/main/res/values-in-rID/strings_sk.xml
index 89426f11a..47304a6e7 100644
--- a/mastodon/src/main/res/values-in-rID/strings_sk.xml
+++ b/mastodon/src/main/res/values-in-rID/strings_sk.xml
@@ -139,10 +139,11 @@
     <string name="sk_list_replies_policy_followed">pengguna mengikuti</string>
     <string name="sk_list_replies_policy_none">tidak ada siapa pun</string>
     <string name="sk_delete_list">Hapus daftar</string>
-    <string name="sk_delete_list_confirm">Apakah Anda yakin ingin menghapus daftar ini\?</string>
+    <string name="sk_delete_list_confirm">Apakah Anda yakin ingin menghapus daftar “%s”\?</string>
     <string name="sk_edit_list_title">Sunting daftar</string>
     <string name="sk_your_lists">Daftar Anda</string>
     <string name="sk_timeline_federated">Federasi</string>
     <string name="sk_timeline_home">Beranda</string>
     <string name="sk_timeline_local">Lokal</string>
+    <string name="sk_recent_searches_placeholder">Ketik sesuatu untuk memulai mencari</string>
 </resources>
\ No newline at end of file

From 6650bb946f365603d77ebaa48a1cabc86caa899d Mon Sep 17 00:00:00 2001
From: ihor_ck <igor_ck@outlook.com>
Date: Tue, 17 Jan 2023 00:15:32 +0000
Subject: [PATCH 192/200] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (144 of 144 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
---
 mastodon/src/main/res/values-uk-rUA/strings_sk.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
index 40fc4624b..91ee3b375 100644
--- a/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
+++ b/mastodon/src/main/res/values-uk-rUA/strings_sk.xml
@@ -142,4 +142,5 @@
     <string name="sk_timeline_home">Головна</string>
     <string name="sk_timeline_local">Локальна</string>
     <string name="sk_timeline_federated">Федерація</string>
+    <string name="sk_recent_searches_placeholder">Введіть щось, щоб почати пошук</string>
 </resources>
\ No newline at end of file

From 7ff19ef481130c20716610bc6f4b652f5626e146 Mon Sep 17 00:00:00 2001
From: sk22 <sk22@mailbox.org>
Date: Tue, 17 Jan 2023 00:52:06 +0000
Subject: [PATCH 193/200] Translated using Weblate (German)

Currently translated at 100.0% (149 of 149 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
---
 mastodon/src/main/res/values-de-rDE/strings_sk.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mastodon/src/main/res/values-de-rDE/strings_sk.xml b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
index f4a3322a3..742203a73 100644
--- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
@@ -138,8 +138,14 @@
     <string name="sk_your_lists">Deine Listen</string>
     <string name="sk_announcements">Ankündigungen</string>
     <string name="sk_settings_single_notification">Nur eine Benachrichtigung anzeigen</string>
-    <string name="sk_delete_list_confirm">Liste wirklich löschen\?</string>
+    <string name="sk_delete_list_confirm">Liste “%s” wirklich löschen\?</string>
     <string name="sk_timeline_home">Start</string>
     <string name="sk_timeline_local">Lokal</string>
     <string name="sk_timeline_federated">Föderiert</string>
+    <string name="sk_recent_searches_placeholder">Tippe, um die Suche zu starten</string>
+    <string name="sk_do_remove_follower">Entfernen</string>
+    <string name="sk_remove_follower_success">Follower_in erfolgreich entfernt</string>
+    <string name="sk_changelog">Änderungsverlauf</string>
+    <string name="sk_remove_follower">Nicht mehr folgen lassen</string>
+    <string name="sk_remove_follower_confirm">%s als Follower_in entfernen\? Die Person wird dabei blockiert und gleich wieder freigegeben.</string>
 </resources>
\ No newline at end of file

From 76d306aef76c92a5c8c63e28c648ff21f91afef5 Mon Sep 17 00:00:00 2001
From: ling0412 <xll520yzl@gmail.com>
Date: Tue, 17 Jan 2023 00:53:42 +0000
Subject: [PATCH 194/200] Translated using Weblate (Chinese (Simplified))

Currently translated at 97.9% (146 of 149 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hans/
---
 mastodon/src/main/res/values-zh-rCN/strings_sk.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
index 6dfe3a050..f498d1512 100644
--- a/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
+++ b/mastodon/src/main/res/values-zh-rCN/strings_sk.xml
@@ -143,4 +143,8 @@
     <string name="sk_your_lists">你的列表</string>
     <string name="sk_timeline_federated">联邦</string>
     <string name="sk_recent_searches_placeholder">输入内容开始搜索</string>
+    <string name="sk_remove_follower">删除关注者</string>
+    <string name="sk_do_remove_follower">删除</string>
+    <string name="sk_remove_follower_success">成功删除关注者</string>
+    <string name="sk_changelog">变更日志</string>
 </resources>
\ No newline at end of file

From 1e411c0c2380878ba55c983d4ce516827b58a207 Mon Sep 17 00:00:00 2001
From: sk22 <sk22@mailbox.org>
Date: Tue, 17 Jan 2023 00:50:44 +0000
Subject: [PATCH 195/200] Translated using Weblate (German)

Currently translated at 100.0% (13 of 13 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
---
 metadata/de-DE/changelogs/67.txt | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 metadata/de-DE/changelogs/67.txt

diff --git a/metadata/de-DE/changelogs/67.txt b/metadata/de-DE/changelogs/67.txt
new file mode 100644
index 000000000..11948e093
--- /dev/null
+++ b/metadata/de-DE/changelogs/67.txt
@@ -0,0 +1,9 @@
+- Neuer Home-Tab mit öffentlichen Timelines
+- Server-Ankündigungen werden nun angezeigt
+- Text wird nach Systemeinstellungen skaliert
+- Verbesserte Filter (noch ohne "Mit Warnung verbergen"-Feature) von @thiagojedi
+- Features zum Listen-Management
+- Keine Verbindungen mit Faschos
+- Fehler beim Laden von Bildern auf Akkoma-Instanzen behoben
+- Fehlerbehebungen und UI-Verbesserungen
+- Versionsverlauf zu Updater hinzugefügt, von @LucasGGamerM

From 0949ad1ce67d87281552f755bfde862b289a5ac2 Mon Sep 17 00:00:00 2001
From: sk22 <sk22@mailbox.org>
Date: Tue, 17 Jan 2023 00:58:19 +0000
Subject: [PATCH 196/200] Translated using Weblate (German)

Currently translated at 100.0% (13 of 13 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
---
 metadata/de-DE/changelogs/67.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata/de-DE/changelogs/67.txt b/metadata/de-DE/changelogs/67.txt
index 11948e093..9b91c80bc 100644
--- a/metadata/de-DE/changelogs/67.txt
+++ b/metadata/de-DE/changelogs/67.txt
@@ -3,6 +3,7 @@
 - Text wird nach Systemeinstellungen skaliert
 - Verbesserte Filter (noch ohne "Mit Warnung verbergen"-Feature) von @thiagojedi
 - Features zum Listen-Management
+- Follower via “Soft-Block” entfernen
 - Keine Verbindungen mit Faschos
 - Fehler beim Laden von Bildern auf Akkoma-Instanzen behoben
 - Fehlerbehebungen und UI-Verbesserungen

From 77cee4c46af92f338f8e4ac186f7791c4533d063 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Tue, 17 Jan 2023 02:17:40 +0100
Subject: [PATCH 197/200] fix "0" reply to ID

---
 .../java/org/joinmastodon/android/model/ScheduledStatus.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/ScheduledStatus.java b/mastodon/src/main/java/org/joinmastodon/android/model/ScheduledStatus.java
index cb08ad1f3..02746c771 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/model/ScheduledStatus.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/model/ScheduledStatus.java
@@ -66,7 +66,7 @@ public class ScheduledStatus extends BaseModel implements DisplayItemsParent{
         s.id = id;
         s.mediaAttachments = mediaAttachments;
         s.createdAt = scheduledAt;
-        s.inReplyToId = "" + params.inReplyToId;
+        s.inReplyToId = params.inReplyToId > 0 ? "" + params.inReplyToId : null;
         s.content = s.text = params.text;
         s.spoilerText = params.spoilerText;
         s.visibility = params.visibility;

From d43cbe642ff153752b6e469461ee0ef80bf404a1 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Wed, 18 Jan 2023 11:39:49 +0100
Subject: [PATCH 198/200] disable translating scheduled posts

closes sk22#318
---
 .../android/fragments/AnnouncementsFragment.java           | 2 +-
 .../android/fragments/ScheduledStatusListFragment.java     | 2 +-
 .../android/ui/displayitems/StatusDisplayItem.java         | 6 +++++-
 .../android/ui/displayitems/TextStatusDisplayItem.java     | 7 +++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
index 74ea115e8..385d3464c 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/AnnouncementsFragment.java
@@ -66,7 +66,7 @@ public class AnnouncementsFragment extends BaseStatusListFragment<Announcement>
 		instanceUser.avatar = instanceUser.avatarStatic = instance.thumbnail;
 		instanceUser.emojis = List.of();
 		Status fakeStatus = a.toStatus();
-		TextStatusDisplayItem textItem = new TextStatusDisplayItem(a.id, HtmlParser.parse(a.content, a.emojis, a.mentions, a.tags, accountID), this, fakeStatus);
+		TextStatusDisplayItem textItem = new TextStatusDisplayItem(a.id, HtmlParser.parse(a.content, a.emojis, a.mentions, a.tags, accountID), this, fakeStatus, true);
 		textItem.textSelectable = true;
 		return List.of(
 				HeaderStatusDisplayItem.fromAnnouncement(a, fakeStatus, instanceUser, this, accountID, this::onMarkAsRead),
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
index 35525a406..4a17d51a4 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
@@ -69,7 +69,7 @@ public class ScheduledStatusListFragment extends BaseStatusListFragment<Schedule
 
 	@Override
 	protected List<StatusDisplayItem> buildDisplayItems(ScheduledStatus s) {
-		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, false, false, null);
+		return StatusDisplayItem.buildItems(this, s.toStatus(), accountID, s, knownAccounts, false, false, null, true);
 	}
 
 	@Override
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
index 3bed895d5..43f50020e 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
@@ -77,6 +77,10 @@ public abstract class StatusDisplayItem{
 	}
 
 	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification){
+		return buildItems(fragment, status, accountID, parentObject, knownAccounts, inset, addFooter, notification, false);
+	}
+
+	public static ArrayList<StatusDisplayItem> buildItems(BaseStatusListFragment fragment, Status status, String accountID, DisplayItemsParent parentObject, Map<String, Account> knownAccounts, boolean inset, boolean addFooter, Notification notification, boolean disableTranslate){
 		String parentID=parentObject.getID();
 		ArrayList<StatusDisplayItem> items=new ArrayList<>();
 		Status statusForContent=status.getContentStatus();
@@ -100,7 +104,7 @@ public abstract class StatusDisplayItem{
 		HeaderStatusDisplayItem header;
 		items.add(header=new HeaderStatusDisplayItem(parentID, statusForContent.account, statusForContent.createdAt, fragment, accountID, statusForContent, null, notification, scheduledStatus));
 		if(!TextUtils.isEmpty(statusForContent.content))
-			items.add(new TextStatusDisplayItem(parentID, HtmlParser.parse(statusForContent.content, statusForContent.emojis, statusForContent.mentions, statusForContent.tags, accountID), fragment, statusForContent));
+			items.add(new TextStatusDisplayItem(parentID, HtmlParser.parse(statusForContent.content, statusForContent.emojis, statusForContent.mentions, statusForContent.tags, accountID), fragment, statusForContent, disableTranslate));
 		else
 			header.needBottomPadding=true;
 		List<Attachment> imageAttachments=statusForContent.mediaAttachments.stream().filter(att->att.type.isImage()).collect(Collectors.toList());
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
index 8501abd2e..14a0a518b 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
@@ -40,14 +40,16 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 	private CharSequence parsedSpoilerText;
 	public boolean textSelectable;
 	public final Status status;
+	public boolean disableTranslate;
 	public boolean translated = false;
 	public TranslatedStatus translation = null;
 	private AccountSession session;
 
-	public TextStatusDisplayItem(String parentID, CharSequence text, BaseStatusListFragment parentFragment, Status status){
+	public TextStatusDisplayItem(String parentID, CharSequence text, BaseStatusListFragment parentFragment, Status status, boolean disableTranslate){
 		super(parentID, parentFragment);
 		this.text=text;
 		this.status=status;
+		this.disableTranslate=disableTranslate;
 		emojiHelper.setText(text);
 		if(!TextUtils.isEmpty(status.spoilerText)){
 			parsedSpoilerText=HtmlParser.parseCustomEmoji(status.spoilerText, status.emojis);
@@ -143,7 +145,8 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
 			}
 
 			Instance instanceInfo = AccountSessionManager.getInstance().getInstanceInfo(item.session.domain);
-			boolean translateEnabled = instanceInfo.v2 != null && instanceInfo.v2.configuration.translation != null && instanceInfo.v2.configuration.translation.enabled;
+			boolean translateEnabled = !item.disableTranslate && instanceInfo.v2 != null &&
+					instanceInfo.v2.configuration.translation != null && instanceInfo.v2.configuration.translation.enabled;
 
 			translateWrap.setVisibility(translateEnabled &&
 					!item.status.visibility.isLessVisibleThan(StatusPrivacy.UNLISTED) &&

From 1a79bc0b61404e55fd10c1a836750fecf0ffb9df Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Wed, 18 Jan 2023 12:10:35 +0100
Subject: [PATCH 199/200] Changing Megalodon to Moshidon in the strings. The
 command I use for automating this is "find values* -type f -exec sed -i
 's/Megalodon/Moshidon/g' {} \;". Run this in the resources folder and it
 should all be changed

---
 mastodon/src/main/res/values-cs-rCZ/strings_sk.xml |  2 +-
 mastodon/src/main/res/values-cy/strings_sk.xml     | 10 +++++-----
 mastodon/src/main/res/values-de-rDE/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-eu-rES/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-fr-rFR/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-gl-rES/strings_sk.xml |  8 ++++----
 mastodon/src/main/res/values-hu-rHU/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-in-rID/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-it-rIT/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-ko-rKR/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-pl-rPL/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-pt-rBR/strings_sk.xml | 10 +++++-----
 mastodon/src/main/res/values-sl-rSI/strings_sk.xml |  4 ++--
 13 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/mastodon/src/main/res/values-cs-rCZ/strings_sk.xml b/mastodon/src/main/res/values-cs-rCZ/strings_sk.xml
index 2dd3020c7..cea45aade 100644
--- a/mastodon/src/main/res/values-cs-rCZ/strings_sk.xml
+++ b/mastodon/src/main/res/values-cs-rCZ/strings_sk.xml
@@ -18,7 +18,7 @@
     <string name="sk_confirm_delete_draft">Jste si jistý, že chcete tento navržený příspěvek smazat\?</string>
     <string name="sk_confirm_delete_scheduled_post">Určitě chcete tento naplánovaný příspěvek smazat\?</string>
     <string name="sk_delete_list_confirm">Opravdu chcete tento seznam odstranit\?</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_pinned_posts">Připnutý</string>
     <string name="sk_delete_and_redraft">vymazat a přepracovat</string>
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values-cy/strings_sk.xml b/mastodon/src/main/res/values-cy/strings_sk.xml
index 30986d4a7..57eace6a9 100644
--- a/mastodon/src/main/res/values-cy/strings_sk.xml
+++ b/mastodon/src/main/res/values-cy/strings_sk.xml
@@ -10,7 +10,7 @@
     <string name="sk_settings_show_replies">Dangos ymatebion</string>
     <string name="sk_list_timelines">Rhestri</string>
     <string name="sk_settings_always_reveal_content_warnings">Datguddio rhybuddion cynnwys bob tro</string>
-    <string name="sk_settings_contribute">Cyfrannu at Megalodon</string>
+    <string name="sk_settings_contribute">Cyfrannu at Moshidon</string>
     <string name="sk_notification_type_status">Negeseuon</string>
     <string name="sk_color_palette_material3">System</string>
     <string name="sk_color_palette_pink">Pinc</string>
@@ -19,13 +19,13 @@
     <string name="sk_color_palette_blue">Glas</string>
     <string name="sk_color_palette_brown">Brown</string>
     <string name="sk_color_palette_red">Coch</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_confirm_pin_post">Hoffech chi binio\'r neges hon i\'ch proffil\?</string>
     <string name="sk_visibility_unlisted">Heb ei restru</string>
     <string name="sk_settings_load_new_posts">Llwytho negeseuon newydd yn ddiofyn</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
-    <string name="sk_update_available">Mae Megalodon %s yn barod i\'w lawrlwytho.</string>
-    <string name="sk_update_ready">Mae Megalodon %s wedi ei lawrlwytho ac yn barod i\'w osod.</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
+    <string name="sk_update_available">Mae Moshidon %s yn barod i\'w lawrlwytho.</string>
+    <string name="sk_update_ready">Mae Moshidon %s wedi ei lawrlwytho ac yn barod i\'w osod.</string>
     <string name="sk_color_palette_yellow">Melyn</string>
     <string name="sk_translate_post">Cyfieithu</string>
     <string name="sk_translate_show_original">Dangos y gwreiddiol</string>
diff --git a/mastodon/src/main/res/values-de-rDE/strings_sk.xml b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
index 742203a73..6113498dd 100644
--- a/mastodon/src/main/res/values-de-rDE/strings_sk.xml
+++ b/mastodon/src/main/res/values-de-rDE/strings_sk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_pinned_posts">Angeheftet</string>
     <string name="sk_delete_and_redraft">Löschen und neu erstellen</string>
     <string name="sk_confirm_delete_and_redraft_title">Beitrag löschen und neu erstellen</string>
@@ -19,14 +19,14 @@
     <string name="sk_settings_show_boosts">Geteilte Beiträge anzeigen</string>
     <string name="sk_settings_load_new_posts">Automatisch neue Beiträge laden</string>
     <string name="sk_settings_show_interaction_counts">Interaktions-Anzahlen anzeigen</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">Medien als sensibel markieren</string>
     <string name="sk_user_post_notifications_on">Benachrichtigungen über Beiträge von %s aktiviert</string>
     <string name="sk_user_post_notifications_off">Benachrichtigungen über Beiträge von %s deaktiviert</string>
     <string name="sk_federated_timeline">Föderation</string>
     <string name="sk_federated_timeline_info_banner">Das sind die neuesten Beiträge von Personen, die in der Föderation deines Servers sind.</string>
-    <string name="sk_update_available">Megalodon %s ist zum Herunterladen bereit.</string>
-    <string name="sk_update_ready">Megalodon %s wurde heruntergeladen und kann jetzt installiert werden.</string>
+    <string name="sk_update_available">Moshidon %s ist zum Herunterladen bereit.</string>
+    <string name="sk_update_ready">Moshidon %s wurde heruntergeladen und kann jetzt installiert werden.</string>
     <string name="sk_check_for_update">Auf Update prüfen</string>
     <string name="sk_no_update_available">Kein Update verfügbar</string>
     <string name="sk_list_timelines">Listen</string>
@@ -36,7 +36,7 @@
     <string name="sk_lists_with_user">Listen mit %s bearbeiten</string>
     <string name="sk_settings_always_reveal_content_warnings">Inhaltswarnungen immer ausklappen</string>
     <string name="sk_disable_marquee">Laufschrift in Titelleisten deaktivieren</string>
-    <string name="sk_settings_contribute">Zu Megalodon beitragen</string>
+    <string name="sk_settings_contribute">Zu Moshidon beitragen</string>
     <string name="sk_settings_show_federated_timeline">Föderierte Timeline anzeigen</string>
     <string name="sk_notify_posts">Beitrags-​Benachrichtigungen</string>
     <string name="sk_settings_color_palette">Farbschema</string>
diff --git a/mastodon/src/main/res/values-eu-rES/strings_sk.xml b/mastodon/src/main/res/values-eu-rES/strings_sk.xml
index e8d089f64..76394c6cb 100644
--- a/mastodon/src/main/res/values-eu-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-eu-rES/strings_sk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_delete_and_redraft">Ezabatu eta editatu</string>
     <string name="sk_confirm_delete_and_redraft_title">Argitalpena ezabatu eta editatu</string>
     <string name="sk_pin_post">Profilean finkatu</string>
@@ -15,12 +15,12 @@
     <string name="sk_settings_show_replies">Erakutsi erantzunak</string>
     <string name="sk_settings_show_boosts">Erakutsi bultzadak</string>
     <string name="sk_settings_show_interaction_counts">Erakutsi interakzio zenbaketak</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">Markatu multimedia sentikor gisa</string>
     <string name="sk_user_post_notifications_on">Gaitu %s-en argitalpen jakinarazpenak</string>
     <string name="sk_federated_timeline">Federatua</string>
     <string name="sk_federated_timeline_info_banner">Hauek dira zure federazioko pertsonen argitalpen berrienak.</string>
-    <string name="sk_update_available">Megalodon %s deskargatzeko prest dago.</string>
+    <string name="sk_update_available">Moshidon %s deskargatzeko prest dago.</string>
     <string name="sk_check_for_update">Eguneraketak egiaztatu</string>
     <string name="sk_no_update_available">Ez dago eguneraketarik eskuragarri</string>
     <string name="sk_list_timelines">Zerrendak</string>
@@ -32,7 +32,7 @@
     <string name="sk_lists_with_user">%s-ekin zerrendatu</string>
     <string name="sk_settings_always_reveal_content_warnings">Erakutsi beti edukiaren abisua</string>
     <string name="sk_disable_marquee">Desgaitu izenburu-barretako testuaren desplazamendua</string>
-    <string name="sk_settings_contribute">Lagundu Megalodon</string>
+    <string name="sk_settings_contribute">Lagundu Moshidon</string>
     <string name="sk_translated_using">%s-ekin itzulia</string>
     <string name="sk_post_language">Hizkuntza: %s</string>
     <string name="sk_language_name">%s (%s)</string>
@@ -88,7 +88,7 @@
     <string name="sk_confirm_unpin_post_title">Argitalpen finkatua kendu profiletik</string>
     <string name="sk_settings_load_new_posts">Kargatu automatikoki argitalpen berriak</string>
     <string name="sk_user_post_notifications_off">Desgaitu %s-en argitalpen jakinarazpenak</string>
-    <string name="sk_update_ready">Megalodon %s deskargatuta eta instalatzeko prest dago.</string>
+    <string name="sk_update_ready">Moshidon %s deskargatuta eta instalatzeko prest dago.</string>
     <string name="sk_accept_follow_request">Onartu jarraitzeko eskaerak</string>
     <string name="sk_reject_follow_request">Alboratu jarraitzeko eskaerak</string>
     <string name="sk_settings_show_federated_timeline">Erakutsi federatutako denbora-lerroa</string>
diff --git a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
index 8cd8764eb..d37012eea 100644
--- a/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
+++ b/mastodon/src/main/res/values-fr-rFR/strings_sk.xml
@@ -13,12 +13,12 @@
     <string name="sk_settings_show_replies">Afficher les réponses</string>
     <string name="sk_settings_show_boosts">Afficher les boosts</string>
     <string name="sk_settings_load_new_posts">Charger automatiquement les nouveaux messages</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">Marquer le média comme sensible</string>
     <string name="sk_user_post_notifications_on">Notifications de message activées pour %s</string>
     <string name="sk_user_post_notifications_off">Désactivation des notifications de message pour %s</string>
-    <string name="sk_update_available">Megalodon %s est prête à être téléchargée.</string>
-    <string name="sk_update_ready">Megalodon %s est téléchargée et prête à être installée.</string>
+    <string name="sk_update_available">Moshidon %s est prête à être téléchargée.</string>
+    <string name="sk_update_ready">Moshidon %s est téléchargée et prête à être installée.</string>
     <string name="sk_check_for_update">Vérifier les mises à jour</string>
     <string name="sk_no_update_available">Pas de mise a jour disponible</string>
     <string name="sk_list_timelines">Listes</string>
@@ -28,9 +28,9 @@
     <string name="sk_lists_with_user">Modifier les listes avec %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Toujours afficher les avertissements de contenu</string>
     <string name="sk_disable_marquee">Désactiver le défilement du texte dans les barres de titre</string>
-    <string name="sk_settings_contribute">Contribuez à Megalodon</string>
+    <string name="sk_settings_contribute">Contribuez à Moshidon</string>
     <string name="sk_settings_show_federated_timeline">Afficher la timeline fédérée</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_delete_and_redraft">Supprimer et rééditer</string>
     <string name="sk_pin_post">Épingler au profil</string>
     <string name="sk_confirm_pin_post_title">Épingler le message au profil</string>
diff --git a/mastodon/src/main/res/values-gl-rES/strings_sk.xml b/mastodon/src/main/res/values-gl-rES/strings_sk.xml
index cbc63f47a..5ef3ef04c 100644
--- a/mastodon/src/main/res/values-gl-rES/strings_sk.xml
+++ b/mastodon/src/main/res/values-gl-rES/strings_sk.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_delete_and_redraft">Eliminar e rescribir</string>
     <string name="sk_confirm_delete_and_redraft">Tes a certeza de querere eliminar e rescribir esta publicación\?</string>
     <string name="sk_pinned_posts">Fixado</string>
@@ -20,14 +20,14 @@
     <string name="sk_settings_show_boosts">Mostrar promocións</string>
     <string name="sk_settings_load_new_posts">Cargar automáticamente novas publicacións</string>
     <string name="sk_settings_show_interaction_counts">Mostrar contadores de interaccións</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">Marcar multimedia como sensible</string>
     <string name="sk_user_post_notifications_on">Acender notificación de publicación para %s</string>
     <string name="sk_user_post_notifications_off">Apagar notificación de publicación para %s</string>
     <string name="sk_federated_timeline">Federación</string>
     <string name="sk_federated_timeline_info_banner">Estas son as publicacións máis recentes das persoas da túa federación.</string>
-    <string name="sk_update_available">Megalodon %s está lista para descargar.</string>
-    <string name="sk_update_ready">Megalodon %s foi descargada e está lista para instalar.</string>
+    <string name="sk_update_available">Moshidon %s está lista para descargar.</string>
+    <string name="sk_update_ready">Moshidon %s foi descargada e está lista para instalar.</string>
     <string name="sk_check_for_update">Comprobar actualizacións</string>
     <string name="sk_no_update_available">Non hai actualizacións</string>
     <string name="sk_list_timelines">Listas</string>
diff --git a/mastodon/src/main/res/values-hu-rHU/strings_sk.xml b/mastodon/src/main/res/values-hu-rHU/strings_sk.xml
index 39397a9ab..0ce86034b 100644
--- a/mastodon/src/main/res/values-hu-rHU/strings_sk.xml
+++ b/mastodon/src/main/res/values-hu-rHU/strings_sk.xml
@@ -19,14 +19,14 @@
     <string name="sk_unpinning">Unpinning poszt…</string>
     <string name="sk_settings_show_replies">Válaszok megjelenítése</string>
     <string name="sk_visibility_unlisted">Felsorolatlan</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_settings_load_new_posts">Automatikusan töltse be az új hozzászólásokat</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_user_post_notifications_on">Bekapcsoltuk a postai értesítéseket %s számára</string>
     <string name="sk_user_post_notifications_off">Kikapcsoltam a postai értesítéseket %s számára</string>
     <string name="sk_mark_media_as_sensitive">A média érzékenynek jelölése</string>
     <string name="sk_federated_timeline">Föderáció</string>
-    <string name="sk_update_ready">A Megalodon %s letöltődött és telepítésre kész.</string>
+    <string name="sk_update_ready">A Moshidon %s letöltődött és telepítésre kész.</string>
     <string name="sk_disable_marquee">A görgethető szöveg kikapcsolása a címsorokban</string>
     <string name="sk_check_for_update">Frissítés ellenőrzése</string>
     <string name="sk_no_update_available">Nincs frissítés elérhető</string>
@@ -35,7 +35,7 @@
     <string name="sk_accept_follow_request">Követési kérés elfogadása</string>
     <string name="sk_lists_with_user">%s-t tartalmazó listák</string>
     <string name="sk_settings_always_reveal_content_warnings">Mindig fedje fel a tartalmi figyelmeztetéseket</string>
-    <string name="sk_settings_contribute">Hozzájárulni Megalodon</string>
+    <string name="sk_settings_contribute">Hozzájárulni Moshidon</string>
     <string name="sk_settings_show_federated_timeline">Összevont idővonal megjelenítése</string>
     <string name="sk_confirm_clear_recent_languages">Biztos, hogy törölni szeretné a nemrég használt nyelveket\?</string>
     <string name="sk_available_languages">Elérhető nyelvek</string>
@@ -115,7 +115,7 @@
     <string name="sk_welcome_text">A cápa tiszteleg előtted! A kezdéshez kérjük, adja meg az alábbiakban az otthoni domain nevét.</string>
     <string name="sk_federated_timeline_info_banner">Ezek a szövetséged tagjainak legfrissebb bejegyzései.</string>
     <string name="sk_confirm_delete_and_redraft">Biztos, hogy törölni és újrafogalmazni akarod ezt a hozzászólást\?</string>
-    <string name="sk_update_available">Megalodon %s készen áll a letöltésre.</string>
+    <string name="sk_update_available">Moshidon %s készen áll a letöltésre.</string>
     <string name="sk_confirm_delete_and_redraft_title">Törlés és újraszövegezés Hozzászólás</string>
     <string name="sk_image_description">Kép leírása</string>
     <string name="sk_settings_show_boosts">Show boostok</string>
diff --git a/mastodon/src/main/res/values-in-rID/strings_sk.xml b/mastodon/src/main/res/values-in-rID/strings_sk.xml
index 47304a6e7..772e17c5a 100644
--- a/mastodon/src/main/res/values-in-rID/strings_sk.xml
+++ b/mastodon/src/main/res/values-in-rID/strings_sk.xml
@@ -12,23 +12,23 @@
     <string name="sk_settings_show_boosts">Lihat boost</string>
     <string name="sk_settings_load_new_posts">Muat kiriman baru secara otomatis</string>
     <string name="sk_settings_show_interaction_counts">Tampilkan jumlah interaksi</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_user_post_notifications_on">Nyalakan notifikasi kiriman untuk %s</string>
     <string name="sk_user_post_notifications_off">Matikan notifikasi kiriman untuk %s</string>
     <string name="sk_federated_timeline">Federasi</string>
     <string name="sk_federated_timeline_info_banner">Kiriman terbaru dari orang-orang di federasi anda.</string>
-    <string name="sk_update_available">Megalodon %s siap untuk diunduh.</string>
-    <string name="sk_update_ready">Megalodon %s telah diunduh dan siap dipasang.</string>
+    <string name="sk_update_available">Moshidon %s siap untuk diunduh.</string>
+    <string name="sk_update_ready">Moshidon %s telah diunduh dan siap dipasang.</string>
     <string name="sk_check_for_update">Periksa pembaruan</string>
     <string name="sk_no_update_available">Tidak ada pembaruan</string>
     <string name="sk_list_timelines">Daftar</string>
     <string name="sk_unpinning">Menghapus sematan kiriman…</string>
     <string name="sk_accept_follow_request">Terima permintaan pengikut</string>
     <string name="sk_reject_follow_request">Tolak permintaan pengikut</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_confirm_delete_and_redraft">Hapus dan tulis ulang kiriman ini\?</string>
     <string name="sk_confirm_unpin_post">Apakah Anda yakin untuk menghapus sematan kiriman ini\?</string>
-    <string name="sk_settings_contribute">Berkontribusi ke Megalodon</string>
+    <string name="sk_settings_contribute">Berkontribusi ke Moshidon</string>
     <string name="sk_pinned_posts">Disematkan</string>
     <string name="sk_pin_post">Sematkan ke profil</string>
     <string name="sk_visibility_unlisted">Tidak terdaftar</string>
diff --git a/mastodon/src/main/res/values-it-rIT/strings_sk.xml b/mastodon/src/main/res/values-it-rIT/strings_sk.xml
index 0d2cb0fb5..681fb17c3 100644
--- a/mastodon/src/main/res/values-it-rIT/strings_sk.xml
+++ b/mastodon/src/main/res/values-it-rIT/strings_sk.xml
@@ -9,7 +9,7 @@
     <string name="sk_color_palette_blue">Blu</string>
     <string name="sk_color_palette_brown">Marrone</string>
     <string name="sk_color_palette_yellow">Giallo</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_pinned_posts">Fissati</string>
     <string name="sk_delete_and_redraft">Elimina e riscrivi</string>
     <string name="sk_user_post_notifications_on">Attivate notifiche per i post di %s</string>
@@ -32,18 +32,18 @@
     <string name="sk_settings_show_boosts">Mostra boost</string>
     <string name="sk_settings_load_new_posts">Carica automaticamente nuovi post</string>
     <string name="sk_settings_show_interaction_counts">Mostra conteggi interazioni</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_mark_media_as_sensitive">Segnala media come sensibile</string>
     <string name="sk_federated_timeline">Federata</string>
     <string name="sk_federated_timeline_info_banner">Questi sono i post più recenti dalle persone nella tua federazione.</string>
-    <string name="sk_update_available">Megalodon %s è pronto da scaricare.</string>
-    <string name="sk_update_ready">Megalodon %s è scaricato e pronto da installare.</string>
+    <string name="sk_update_available">Moshidon %s è pronto da scaricare.</string>
+    <string name="sk_update_ready">Moshidon %s è scaricato e pronto da installare.</string>
     <string name="sk_check_for_update">Verifica aggiornamenti</string>
     <string name="sk_no_update_available">Non ci sono aggiornamenti disponibili</string>
     <string name="sk_list_timelines">Liste</string>
     <string name="sk_settings_always_reveal_content_warnings">Apri sempre contenuti segnalati come sensibili</string>
     <string name="sk_lists_with_user">Modifica liste con %s</string>
-    <string name="sk_settings_contribute">Contribuisci a Megalodon</string>
+    <string name="sk_settings_contribute">Contribuisci a Moshidon</string>
     <string name="sk_settings_show_federated_timeline">Mostra timeline federata</string>
     <string name="sk_disable_marquee">Disabilita scorrimento titoli</string>
     <string name="sk_reject_follow_request">Rifiuta richiesta di seguirti</string>
diff --git a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
index 08fd10776..155c07bef 100644
--- a/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
+++ b/mastodon/src/main/res/values-ko-rKR/strings_sk.xml
@@ -32,10 +32,10 @@
     <string name="sk_lists_with_user">%s 님이 포함된 리스트 수정</string>
     <string name="sk_settings_always_reveal_content_warnings">열람주의 게시물을 항상 펼치기</string>
     <string name="sk_disable_marquee">제목 표시줄의 텍스트 스크롤 비활성화</string>
-    <string name="sk_app_name">Megalodon</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
-    <string name="sk_update_available">Megalodon %s 버전을 다운로드할 수 있습니다.</string>
-    <string name="sk_update_ready">Megalodon %s 버전을 다운로드하였으며 설치할 수 있습니다.</string>
+    <string name="sk_app_name">Moshidon</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
+    <string name="sk_update_available">Moshidon %s 버전을 다운로드할 수 있습니다.</string>
+    <string name="sk_update_ready">Moshidon %s 버전을 다운로드하였으며 설치할 수 있습니다.</string>
     <string name="sk_settings_show_federated_timeline">연합 타임라인 표시</string>
     <string name="sk_notification_type_status">게시물</string>
     <string name="sk_notify_posts">게시물 알림</string>
@@ -46,7 +46,7 @@
     <string name="sk_color_palette_blue">파란색</string>
     <string name="sk_color_palette_brown">갈색</string>
     <string name="sk_color_palette_yellow">노란색</string>
-    <string name="sk_settings_contribute">Megalodon에 기여</string>
+    <string name="sk_settings_contribute">Moshidon에 기여</string>
     <string name="sk_poll_allow_multiple">다중 선택 허용</string>
     <string name="sk_translate_post">번역하기</string>
     <string name="sk_translate_show_original">원본 보기</string>
diff --git a/mastodon/src/main/res/values-pl-rPL/strings_sk.xml b/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
index 6b2f01d44..f59f7d50f 100644
--- a/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
+++ b/mastodon/src/main/res/values-pl-rPL/strings_sk.xml
@@ -17,11 +17,11 @@
     <string name="sk_user_post_notifications_off">Wyłączono powiadomienia dla wpisu %s</string>
     <string name="sk_federated_timeline">fediwersum</string>
     <string name="sk_federated_timeline_info_banner">To są najnowsze wpisy z wszystkich serwerów z którymi twoja instancja jest sfederowana.</string>
-    <string name="sk_update_available">Megalodon %s jest dostępny do pobrania.</string>
-    <string name="sk_update_ready">Megalodon %s został pobrany i jest gotowy do instalacji.</string>
+    <string name="sk_update_available">Moshidon %s jest dostępny do pobrania.</string>
+    <string name="sk_update_ready">Moshidon %s został pobrany i jest gotowy do instalacji.</string>
     <string name="sk_check_for_update">Sprawdź dostępność aktualizacji</string>
     <string name="sk_no_update_available">Brak dostępnych aktualizacji</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_pinned_posts">Przypięte</string>
     <string name="sk_confirm_delete_and_redraft">Jesteś pewien, że chcesz usunąć wpis i utworzyć jego kopię roboczą\?</string>
     <string name="sk_confirm_unpin_post">Jesteś pewien, że chcesz odpiąć ten wpis\?</string>
@@ -34,9 +34,9 @@
     <string name="sk_lists_with_user">Edytuj listy z %s</string>
     <string name="sk_settings_always_reveal_content_warnings">Zawsze odkrywaj ostrzeżenia o zawartości</string>
     <string name="sk_disable_marquee">Wyłącz tekst przewijany w paskach tytułowych</string>
-    <string name="sk_settings_contribute">Wspomóż Megalodon</string>
+    <string name="sk_settings_contribute">Wspomóż Moshidon</string>
     <string name="sk_settings_show_federated_timeline">Pokaż globalną oś czasu</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_visibility_unlisted">Niewidoczny</string>
     <string name="sk_notification_type_status">Wpisy</string>
     <string name="sk_notify_posts">Powiadomienia wpisów</string>
diff --git a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
index b7772d0fa..5d89a2ede 100644
--- a/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
+++ b/mastodon/src/main/res/values-pt-rBR/strings_sk.xml
@@ -7,7 +7,7 @@
     <string name="sk_confirm_pin_post_title">Fixar postagem no perfil</string>
     <string name="sk_confirm_pin_post">Você deseja fixar esta postagem em seu perfil\?</string>
     <string name="sk_pinning">Fixando publicação…</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_pinned_posts">Fixado</string>
     <string name="sk_unpin_post">Desafixar do perfil</string>
     <string name="sk_confirm_unpin_post_title">Desafixar postagem do perfil</string>
@@ -18,13 +18,13 @@
     <string name="sk_settings_show_boosts">Mostrar boosts</string>
     <string name="sk_settings_load_new_posts">Carregar novas postagens automaticamente</string>
     <string name="sk_mark_media_as_sensitive">Marcar mídia como sensível</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
     <string name="sk_lists_with_user">Editar listas com %s</string>
     <string name="sk_user_post_notifications_on">Ativar as notificações de postagem para %s</string>
     <string name="sk_federated_timeline">Federação</string>
     <string name="sk_federated_timeline_info_banner">Estas são as postagens mais recentes das pessoas em sua federação.</string>
-    <string name="sk_update_available">Megalodon %s está pronto para baixar.</string>
-    <string name="sk_update_ready">Megalodon %s foi baixado e está pronto para instalar.</string>
+    <string name="sk_update_available">Moshidon %s está pronto para baixar.</string>
+    <string name="sk_update_ready">Moshidon %s foi baixado e está pronto para instalar.</string>
     <string name="sk_check_for_update">Verificar se há atualizações</string>
     <string name="sk_no_update_available">Nenhuma atualização disponível</string>
     <string name="sk_list_timelines">Listas</string>
@@ -34,7 +34,7 @@
     <string name="sk_reject_follow_request">Recusar solicitação para seguir</string>
     <string name="sk_settings_always_reveal_content_warnings">Sempre revelar avisos de conteúdo</string>
     <string name="sk_disable_marquee">Desative o texto de rolagem nas barras de título</string>
-    <string name="sk_settings_contribute">Contribua para o Megalodon</string>
+    <string name="sk_settings_contribute">Contribua para o Moshidon</string>
     <string name="sk_settings_show_federated_timeline">Mostre a linha do tempo federada</string>
     <string name="sk_visibility_unlisted">Não-listado</string>
     <string name="sk_settings_show_interaction_counts">Mostrar contagens de interação</string>
diff --git a/mastodon/src/main/res/values-sl-rSI/strings_sk.xml b/mastodon/src/main/res/values-sl-rSI/strings_sk.xml
index e0651ff1c..6792c7a58 100644
--- a/mastodon/src/main/res/values-sl-rSI/strings_sk.xml
+++ b/mastodon/src/main/res/values-sl-rSI/strings_sk.xml
@@ -12,7 +12,7 @@
     <string name="sk_mark_media_as_sensitive">Označite medij kot občutljiv</string>
     <string name="sk_federated_timeline">Federacija</string>
     <string name="sk_clear_recent_languages">Izbriši nazadnje uporabljene jezike</string>
-    <string name="sk_app_name">Megalodon</string>
+    <string name="sk_app_name">Moshidon</string>
     <string name="sk_pinned_posts">Pripeto</string>
     <string name="sk_confirm_delete_and_redraft_title">Izbriši ter ponovno izdelaj objavo</string>
     <string name="sk_confirm_delete_and_redraft">Ali ste prepričani, da želite objavo izbrisati in jo ponovno izdelati\?</string>
@@ -20,5 +20,5 @@
     <string name="sk_confirm_unpin_post">Ali ste prepričani, da želite odpeti to objavo\?</string>
     <string name="sk_unpinning">Odpenjanje objave…</string>
     <string name="sk_settings_load_new_posts">Samodejno naloži nove objave</string>
-    <string name="sk_settings_app_version">Megalodon v%1$s (%2$d)</string>
+    <string name="sk_settings_app_version">Moshidon v%1$s (%2$d)</string>
 </resources>
\ No newline at end of file

From 616049bff2497843d867036ed92d0828c8fdd157 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Wed, 18 Jan 2023 14:15:07 -0300
Subject: [PATCH 200/200] Fixing weird icon in the profile

---
 .../org/joinmastodon/android/fragments/ProfileFragment.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
index 21c85ea68..2c0d9e3d9 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
@@ -620,7 +620,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			return;
 		inflater.inflate(isOwnProfile ? R.menu.profile_own : R.menu.profile, menu);
 		if(isOwnProfile){
-			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags, R.id.favorites, R.id.scheduled, R.id.share);
+			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.manage_user_lists, R.id.bookmarks, R.id.followed_hashtags, R.id.favorites, R.id.scheduled, R.id.share);
 		}else{
 			UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags, R.id.favorites, R.id.scheduled);
 		}