Adding the ability to long click or to double click the search icon to bring up the keyboard

(cherry picked from commit ee0737c9c7)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,32 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Screenshots and screen recordings**
-If applicable, add screenshots (and screen recordings, if possible) to help explain your problem.
-
-**Version**
-Megalodon version: [e.g. v1.1.4+fork.#]
-
-**Additional context**
-- Does this issue also occur with the respective upstream release? (Please test using the respective `upstream-xxxxxx.apk` provided in [Releases](https://github.com/sk22/megalodon/releases)) No / Yes (`mastodon#…`)
-
-  > In this case, please consider filing an [upstream bug report](https://github.com/mastodon/mastodon-android/issues) instead. If this bug is seriously impacting your usage or you think I might want to try to fix it for Megalodon, feel free to still create this issue!
-
-**Crash log**
-If you know your way around Android development tools, please consider attaching a crash log, if possible.

.github/ISSUE_TEMPLATE/feature-ui-request.md

@@ -1,20 +0,0 @@
----
-name: Feature/UI request
-about: Suggest an idea for this project
-title: ''
-labels: feature
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-If applicable: a clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/something-else.md

@@ -1,10 +0,0 @@
----
-name: It's something else…
-about: Issues that can't be categorized as feature requests or bug reports
-title: ''
-labels: ''
-assignees: ''
-
----
-
-

mastodon/build.gradle

@@ -9,8 +9,8 @@ android {
 		applicationId "org.joinmastodon.android.moshinda"
 		minSdk 23
 		targetSdk 33
-		versionCode 82
+		versionCode 84
-		versionName "1.1.4+fork.82.moshinda"
+		versionName "1.1.4+fork.84.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"
 	}

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

@@ -39,6 +39,9 @@ public class GlobalUserPreferences{
 	private final static Type recentLanguagesType = new TypeToken<Map<String, List<String>>>() {}.getType();
 	public static Map<String, List<String>> recentLanguages;
 
+	private final static Type recentEmojisType = new TypeToken<Map<String, Integer>>() {}.getType();
+	public static Map<String, Integer> recentEmojis;
+
 	private static SharedPreferences getPrefs(){
 		return MastodonApp.context.getSharedPreferences("global", Context.MODE_PRIVATE);
 	}
@@ -68,6 +71,7 @@ public class GlobalUserPreferences{
 		enableDeleteNotifications=prefs.getBoolean("enableDeleteNotifications", true);
 		theme=ThemePreference.values()[prefs.getInt("theme", 0)];
 		recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
+		recentEmojis=fromJson(prefs.getString("recentEmojis", "{}"), recentEmojisType, new HashMap<>());
 		publishButtonText=prefs.getString("publishButtonText", "");
 
 		try {
@@ -104,6 +108,7 @@ public class GlobalUserPreferences{
 				.putInt("theme", theme.ordinal())
 				.putString("color", color.name())
 				.putString("recentLanguages", gson.toJson(recentLanguages))
+				.putString("recentEmojis", gson.toJson(recentEmojis))
 				.apply();
 	}
 

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

@@ -917,8 +917,19 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 	}
 
 	private void onPublishClick(View v){
+		if (!attachments.isEmpty()
+				&& statusVisibility != StatusPrivacy.DIRECT
+				&& !attachments.stream().allMatch(attachment -> attachment.description != null && !attachment.description.isBlank())) {
+			new M3AlertDialogBuilder(getActivity())
+					.setTitle(R.string.sk_no_image_desc_title)
+					.setMessage(R.string.sk_no_image_desc)
+					.setNegativeButton(R.string.cancel, null)
+					.setPositiveButton(R.string.publish, (dialog, i)-> publish())
+					.show();
+		} else {
 			publish();
 		}
+	}
 
 	private void publishErrorCallback(ErrorResponse error) {
 		wm.removeView(sendingOverlay);
@@ -1030,6 +1041,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			}
 		};
 
+
 		if(editingStatus!=null && !redraftStatus){
 			new EditStatus(req, editingStatus.id)
 					.setCallback(resCallback)

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

@@ -202,6 +202,17 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 	private void onTabSelected(@IdRes int tab){
 		Fragment newFragment=fragmentForTab(tab);
 		if(tab==currentTab){
+			if(tab == R.id.tab_search){
+				if(newFragment instanceof ScrollableToTop scrollable)
+					scrollable.scrollToTop();
+				searchFragment.selectSearch();
+				return;
+			}
+			if(newFragment instanceof ScrollableToTop scrollable)
+				scrollable.scrollToTop();
+			return;
+		}
+		if(tab==currentTab && tab == R.id.tab_search){
 			if(newFragment instanceof ScrollableToTop scrollable)
 				scrollable.scrollToTop();
 			return;
@@ -235,6 +246,12 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			new AccountSwitcherSheet(getActivity()).show();
 			return true;
 		}
+		if(tab==R.id.tab_search){
+			onTabSelected(R.id.tab_search);
+			tabBar.selectTab(R.id.tab_search);
+			searchFragment.selectSearch();
+			return true;
+		}
 		return false;
 	}
 

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

@@ -1,11 +1,16 @@
 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;
@@ -14,10 +19,11 @@ 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;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -32,6 +38,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -97,9 +104,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private static final int COVER_RESULT=343;
 
 	private ImageView avatar;
-	private Button botIcon;
 	private CoverImageView cover;
 	private View avatarBorder;
+	private Button botIcon;
 	private TextView name, username, bio, followersCount, followersLabel, followingCount, followingLabel, postsCount, postsLabel;
 	private ProgressBarButton actionButton, notifyButton;
 	private ViewPager2 pager;
@@ -132,7 +139,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private WindowInsets childInsets;
 	private PhotoViewer currentPhotoViewer;
 	private boolean editModeLoading;
-	private String prefilledText;
 
 	public ProfileFragment(){
 		super(R.layout.loader_fragment_overlay_toolbar);
@@ -157,8 +163,11 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			if(!getArguments().getBoolean("noAutoLoad", false))
 				loadData();
 		}
+	}
 
-		prefilledText = AccountSessionManager.getInstance().isSelf(accountID, account) ? null : '@'+account.acct+' ';
+	private String getPrefilledText() {
+		return account == null || AccountSessionManager.getInstance().isSelf(accountID, account)
+				? null : '@'+account.acct+' ';
 	}
 
 	@Override
@@ -174,11 +183,6 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		avatar=content.findViewById(R.id.avatar);
 		cover=content.findViewById(R.id.cover);
 		avatarBorder=content.findViewById(R.id.avatar_border);
-		botIcon=content.findViewById(R.id.bot_icon);
-		botIcon.setOnClickListener(v ->{
-			Toast.makeText(getActivity(), R.string.sk_bot_account,
-					Toast.LENGTH_LONG).show();
-		});
 		name=content.findViewById(R.id.name);
 		username=content.findViewById(R.id.username);
 		bio=content.findViewById(R.id.bio);
@@ -188,6 +192,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		followingCount=content.findViewById(R.id.following_count);
 		followingLabel=content.findViewById(R.id.following_label);
 		followingBtn=content.findViewById(R.id.following_btn);
+
 		postsCount=content.findViewById(R.id.posts_count);
 		postsLabel=content.findViewById(R.id.posts_label);
 		postsBtn=content.findViewById(R.id.posts_btn);
@@ -271,15 +276,13 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			}
 		});
 
-		botIcon.setVisibility(account.bot ? View.VISIBLE : View.GONE);
-
 		actionButton.setOnClickListener(this::onActionButtonClick);
 		notifyButton.setOnClickListener(this::onNotifyButtonClick);
 		avatar.setOnClickListener(this::onAvatarClick);
 		cover.setOnClickListener(this::onCoverClick);
 		refreshLayout.setOnRefreshListener(this);
 		fab.setOnClickListener(this::onFabClick);
-		fab.setOnLongClickListener(v->UiUtils.pickAccountForCompose(getActivity(), accountID, prefilledText));
+		fab.setOnLongClickListener(v->UiUtils.pickAccountForCompose(getActivity(), accountID, getPrefilledText()));
 
 		if(loaded){
 			bindHeaderView();
@@ -554,25 +557,28 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if(relationship==null && !isOwnProfile)
 			return;
 		inflater.inflate(isOwnProfile ? R.menu.profile_own : R.menu.profile, menu);
-//		UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags);
+		UiUtils.enableOptionsMenuIcons(getActivity(), menu, R.id.bookmarks, R.id.followed_hashtags, R.id.favorites, R.id.scheduled, R.id.share, R.id.bot_icon);
-		menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getDisplayUsername()));
+		menu.findItem(R.id.share).setTitle(getString(R.string.share_user, account.getShortUsername()));
 		if(isOwnProfile)
 			return;
 
+		MenuItem botIcon = menu.findItem(R.id.bot_icon);
+		botIcon.setVisible(account.bot);
+
 		MenuItem mute = menu.findItem(R.id.mute);
-		mute.setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getDisplayUsername()));
+		mute.setTitle(getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getShortUsername()));
-		mute.setIcon(relationship.muting ? R.drawable.ic_fluent_speaker_2_24_regular : R.drawable.ic_fluent_speaker_mute_24_regular);
+		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.getDisplayUsername()));
+		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.getDisplayUsername()));
+		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.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);
 			UiUtils.insetPopupMenuIcon(getContext(), hideBoosts);
-			manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getDisplayUsername()));
+			manageUserLists.setTitle(getString(R.string.sk_lists_with_user, account.getShortUsername()));
 			manageUserLists.setVisible(true);
 		}else {
 			menu.findItem(R.id.hide_boosts).setVisible(false);
@@ -645,6 +651,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 			Bundle args=new Bundle();
 			args.putString("account", accountID);
 			Nav.go(getActivity(), ScheduledStatusListFragment.class, args);
+		}else if(id==R.id.bot_icon){
+			Toast.makeText(getActivity(), R.string.sk_bot_account, Toast.LENGTH_LONG).show();
 		}
 		return true;
 	}
@@ -956,7 +964,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 	private void onFabClick(View v){
 		Bundle args=new Bundle();
 		args.putString("account", accountID);
-		if(prefilledText != null) args.putString("prefilledText", prefilledText);
+		if(getPrefilledText() != null) args.putString("prefilledText", getPrefilledText());
 		Nav.go(getActivity(), ComposeFragment.class, args);
 	}
 

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

@@ -273,6 +273,10 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.recentLanguages.remove(accountID);
 			GlobalUserPreferences.save();
 		})));
+		items.add(new TextItem(R.string.sk_clear_recent_emoji, ()-> {
+			GlobalUserPreferences.recentEmojis.clear();
+			GlobalUserPreferences.save();
+		}));
 //		items.add(new TextItem(R.string.log_out, this::confirmLogOut));
 
 		items.add(new FooterItem(getString(R.string.sk_settings_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)));

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

@@ -358,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);
+	}
 }

mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java

@@ -1,8 +1,9 @@
 package org.joinmastodon.android.ui;
 
+import static org.joinmastodon.android.GlobalUserPreferences.recentEmojis;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.res.TypedArray;
 import android.graphics.Rect;
 import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
@@ -12,8 +13,13 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.squareup.otto.Subscribe;
 
+import org.joinmastodon.android.GlobalUserPreferences;
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.EmojiUpdatedEvent;
@@ -21,13 +27,13 @@ import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.EmojiCategory;
 import org.joinmastodon.android.ui.utils.UiUtils;
 
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import me.grishka.appkit.imageloader.ImageLoaderRecyclerAdapter;
 import me.grishka.appkit.imageloader.ImageLoaderViewHolder;
 import me.grishka.appkit.imageloader.ListImageLoaderWrapper;
@@ -40,6 +46,9 @@ import me.grishka.appkit.utils.V;
 import me.grishka.appkit.views.UsableRecyclerView;
 
 public class CustomEmojiPopupKeyboard extends PopupKeyboard{
+	//determines how many emoji need to be clicked, before it disappears from the recent emojis
+	private static final int NEW_RECENT_VALUE=15;
+
 	private List<EmojiCategory> emojis;
 	private UsableRecyclerView list;
 	private ListImageLoaderWrapper imgLoader;
@@ -82,6 +91,17 @@ public class CustomEmojiPopupKeyboard extends PopupKeyboard{
 		list.setLayoutManager(lm);
 		imgLoader=new ListImageLoaderWrapper(activity, list, new RecyclerViewDelegate(list), null);
 
+		// inject category with last used emojis
+		if (!recentEmojis.isEmpty()) {
+			List<Emoji> allAvailableEmojis =  emojis.stream().flatMap(category -> category.emojis.stream()).collect(Collectors.toList());
+			List<Emoji> recentEmojiList = new ArrayList<>();
+			for (String emojiCode : recentEmojis.keySet().stream().sorted(Comparator.comparingInt(GlobalUserPreferences.recentEmojis::get).reversed()).collect(Collectors.toList())) {
+				Optional<Emoji> element = allAvailableEmojis.stream().filter(e -> e.shortcode.equals(emojiCode)).findFirst();
+				element.ifPresent(recentEmojiList::add);
+			}
+			emojis.add(0, new EmojiCategory(activity.getString(R.string.sk_emoji_recent), recentEmojiList));
+		}
+
 		for(EmojiCategory category:emojis)
 			adapter.addAdapter(new SingleCategoryAdapter(category));
 		list.setAdapter(adapter);
@@ -100,6 +120,11 @@ public class CustomEmojiPopupKeyboard extends PopupKeyboard{
 		list.setBackgroundColor(UiUtils.getThemeColor(activity, android.R.attr.colorBackground));
 		list.setSelector(null);
 
+		//remove recently used afterwards, it would get duplicated otherwise
+		if (!recentEmojis.isEmpty()) {
+			emojis.remove(0);
+		}
+
 		return list;
 	}
 
@@ -107,6 +132,19 @@ public class CustomEmojiPopupKeyboard extends PopupKeyboard{
 		this.listener=listener;
 	}
 
+	private void increaseEmojiCount(Emoji emoji) {
+		Integer usageCount = recentEmojis.get(emoji.shortcode);
+		if (usageCount != null) {
+			recentEmojis.put(emoji.shortcode, usageCount + 1);
+		} else {
+			recentEmojis.put(emoji.shortcode, NEW_RECENT_VALUE);
+		}
+
+		recentEmojis.entrySet().removeIf(e -> e.getValue() <= 0);
+		recentEmojis.replaceAll((k, v) -> v - 1);
+		GlobalUserPreferences.save();
+	}
+
 	@SuppressLint("NotifyDataSetChanged")
 	@Subscribe
 	public void onEmojiUpdated(EmojiUpdatedEvent ev){
@@ -203,6 +241,7 @@ public class CustomEmojiPopupKeyboard extends PopupKeyboard{
 
 		@Override
 		public void onClick(){
+			increaseEmojiCount(item);
 			listener.accept(item);
 		}
 	}

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

@@ -45,7 +45,6 @@ public class LinkSpan extends CharacterStyle {
 		UiUtils.copyText(view, getType() == Type.URL ? link : text);
 	}
 
-
 	public String getLink(){
 		return link;
 	}

mastodon/src/main/res/layout/fragment_profile.xml

@@ -176,18 +176,16 @@
 						<FrameLayout
 							android:clipToPadding="false"
 							android:paddingVertical="16dp"
-							android:paddingLeft="8dp"
+							android:paddingLeft="16dp"
 							android:paddingRight="4dp"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content">
-
 							<org.joinmastodon.android.ui.views.ProgressBarButton
 								android:id="@+id/notify_btn"
 								android:layout_width="wrap_content"
 								android:layout_height="wrap_content"
-								android:drawableStart="@drawable/ic_fluent_alert_24_selector"
 								android:paddingHorizontal="8dp"
-								tools:ignore="SpeakableTextPresentCheck" />
+								android:drawableStart="@drawable/ic_fluent_alert_24_selector" />
 
 							<ProgressBar
 								android:id="@+id/notify_progress"
@@ -200,7 +198,6 @@
 								android:indeterminateTint="?colorButtonText"
 								android:outlineProvider="none"
 								android:visibility="gone" />
-
 						</FrameLayout>
 
 						<FrameLayout
@@ -210,7 +207,6 @@
 							android:paddingLeft="4dp"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content">
-
 							<org.joinmastodon.android.ui.views.ProgressBarButton
 								android:id="@+id/profile_action_btn"
 								android:layout_width="wrap_content"
@@ -231,44 +227,26 @@
 						</FrameLayout>
 					</LinearLayout>
 
-					<LinearLayout
+					<TextView
-						android:id="@id/name_wrap"
+						android:id="@+id/name"
-						android:layout_width="wrap_content"
+						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:layout_below="@id/avatar_border"
 						android:layout_alignParentStart="true"
-						android:layout_toStartOf="@id/profile_action_btn_wrap"
-						android:layout_alignParentEnd="true">
-
-						<TextView
-							android:id="@+id/name"
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
 						android:layout_marginStart="16dp"
 						android:layout_marginTop="17dp"
 						android:layout_marginBottom="0.4dp"
-							android:layout_marginEnd="0dp"
+						android:layout_toStartOf="@id/profile_action_btn_wrap"
 						android:textAlignment="viewStart"
 						android:textAppearance="@style/m3_headline_small"
 						tools:text="Eugen" />
 
-						<Button
-							android:id="@+id/bot_icon"
-							android:layout_width="wrap_content"
-							android:layout_height="28dp"
-							android:layout_marginTop="14dp"
-							android:paddingHorizontal="8dp"
-							android:background="?colorWindowBackground"
-							android:drawableStart="@drawable/ic_fluent_bot_24_regular"
-							/>
-					</LinearLayout>
-
 					<TextView
 						android:id="@+id/username"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_marginStart="16dp"
-						android:layout_below="@id/name_wrap"
+						android:layout_below="@id/name"
 						android:paddingTop="4dp"
 						android:paddingBottom="8dp"
 						android:textAppearance="@style/m3_title_medium"

mastodon/src/main/res/menu/profile.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:id="@+id/bot_icon" android:title="@string/sk_bot_account" android:icon="@drawable/ic_fluent_bot_24_regular" android:showAsAction="always"/>
 	<item android:id="@+id/share" android:title="@string/share_user" android:icon="@drawable/ic_fluent_share_24_regular"/>
 	<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"/>

mastodon/src/main/res/values-de-rDE/strings_sk.xml

@@ -75,7 +75,7 @@
     <string name="sk_settings_donate">Spenden</string>
     <string name="sk_delete_notification">Benachrichtigung löschen</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_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>
@@ -111,9 +111,9 @@
     <string name="sk_draft">Entwurf</string>
     <string name="sk_schedule">Planen</string>
     <string name="sk_confirm_delete_draft_title">Entwurf löschen</string>
-    <string name="sk_confirm_delete_draft">Möchtest du diesen entworfenen Beitrag wirklich löschen\?</string>
+    <string name="sk_confirm_delete_draft">Möchtest du diesen entworfenen Beitrag wirklich löschen?</string>
     <string name="sk_confirm_delete_scheduled_post_title">Geplanten Beitrag löschen</string>
-    <string name="sk_confirm_delete_scheduled_post">Möchtest du diesen geplanten Beitrag wirklich löschen\?</string>
+    <string name="sk_confirm_delete_scheduled_post">Möchtest du diesen geplanten Beitrag wirklich löschen?</string>
     <string name="sk_draft_or_schedule">Entwurf oder Planen</string>
     <string name="sk_compose_draft">Beitrag wird als Entwurf gespeichert.</string>
     <string name="sk_compose_scheduled">Geplant für</string>
@@ -129,4 +129,9 @@
     <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 verwendetes Emoji löschen</string>
 </resources>

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

@@ -131,4 +131,8 @@
     <string name="sk_compose_no_draft">Don’t draft</string>
     <string name="sk_settings_reduce_motion">Reduce motion in animations</string>
     <string name="sk_bot_account">This is a bot account</string>
+    <string name="sk_no_image_desc_title">No Image description</string>
+    <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>
 </resources>

metadata/en-US/changelogs/82.txt

@@ -3,7 +3,7 @@ Release 82 adds a lot of features from upstream, such as:
 - A settings page rework
 - The ability to choose the publish button text
 - The ability to reduce animations
-- A bot icon for bot account profiles
+- A bot icon for bot account profiles! Thanks @FineFindus
 - And updated German translation! Thanks @dantobi
 - A lot of minor UI improvements
 - Major usability improvements, as the ability to hold action buttons to interact with another account

metadata/en-US/changelogs/83.txt

@@ -0,0 +1,4 @@
+Release 83 brings some minor improvements, such as:
+- Fixing crashing issues when clicking mentions
+- Reworking the bot icon
+- Adding a reminder to add an image description if you post an attachment allow visually impaired people to better participate. Thanks @FineFindus!

metadata/en-US/changelogs/84.txt

@@ -0,0 +1,3 @@
+Release 84 fixes a few bugs, such as:
+- Login callback not working
+- Updating german translation. Thanks @DanTobi!