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 c8efe44b0..c72d7e982 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -948,8 +948,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr && 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) + .setTitle(R.string.mo_no_image_desc_title) + .setMessage(R.string.mo_no_image_desc) .setNegativeButton(R.string.cancel, null) .setPositiveButton(R.string.publish, (dialog, i)-> publish()) .show(); 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 0e4e353ea..367e60c20 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.java @@ -157,7 +157,7 @@ public class ProfileAboutFragment extends Fragment implements WindowInsetsAwareF @Override public void onError(ErrorResponse result) { - Toast.makeText(getActivity(), getString(R.string.sk_personal_note_update_failed), Toast.LENGTH_LONG).show(); + Toast.makeText(getActivity(), getString(R.string.mo_personal_note_update_failed), Toast.LENGTH_LONG).show(); } }).exec(accountID); } 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 e77314e75..678601203 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java @@ -17,13 +17,11 @@ import android.os.Bundle; 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; import android.view.MenuInflater; import android.view.MenuItem; -import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.view.ViewOutlineProvider; @@ -371,7 +369,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList @Override public void onError(ErrorResponse result) { - Toast.makeText(getActivity(), getString(R.string.sk_personal_note_update_failed), Toast.LENGTH_LONG).show(); + Toast.makeText(getActivity(), getString(R.string.mo_personal_note_update_failed), Toast.LENGTH_LONG).show(); } }).exec(accountID); } 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 63e0a3867..fb33ccdcd 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java @@ -146,7 +146,7 @@ public class SettingsFragment extends MastodonToolbarFragment{ updatePublishText(b); if (GlobalUserPreferences.relocatePublishButton) { b.setOnClickListener(l -> { - Toast.makeText(getActivity(), R.string.sk_disable_relocate_publish_button_to_enable_customization, + Toast.makeText(getActivity(), R.string.mo_disable_relocate_publish_button_to_enable_customization, Toast.LENGTH_LONG).show(); }); } else { @@ -295,7 +295,7 @@ public class SettingsFragment extends MastodonToolbarFragment{ GlobalUserPreferences.recentLanguages.remove(accountID); GlobalUserPreferences.save(); }))); - items.add(new TextItem(R.string.sk_clear_recent_emoji, ()-> { + items.add(new TextItem(R.string.mo_clear_recent_emoji, ()-> { GlobalUserPreferences.recentEmojis.clear(); GlobalUserPreferences.save(); })); diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java b/mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java index ad469ea87..5eef47b71 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java @@ -99,7 +99,7 @@ public class CustomEmojiPopupKeyboard extends PopupKeyboard{ Optional 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)); + emojis.add(0, new EmojiCategory(activity.getString(R.string.mo_emoji_recent), recentEmojiList)); } for(EmojiCategory category:emojis) diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml index ed849de9b..728e1520c 100644 --- a/mastodon/src/main/res/layout/fragment_profile.xml +++ b/mastodon/src/main/res/layout/fragment_profile.xml @@ -278,7 +278,7 @@ android:paddingHorizontal="16dp" android:elevation="0dp" android:visibility="gone" - android:hint="@string/sk_personal_note"/> + android:hint="@string/mo_personal_note"/>