From 3822263b1c33e7ef5943a2d3c4c984807fa005b3 Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Fri, 27 Jan 2023 15:24:17 -0300 Subject: [PATCH] Making it compile again --- .../android/fragments/SettingsFragment.java | 11 +++++++---- .../org/joinmastodon/android/ui/utils/UiUtils.java | 3 ++- .../main/res/drawable/ic_fluent_eye_24_regular.xml | 3 +++ 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 mastodon/src/main/res/drawable/ic_fluent_eye_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 85f8cb423..f227e3aef 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java @@ -287,10 +287,6 @@ public class SettingsFragment extends MastodonToolbarFragment{ 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)); - boolean translationAvailable = instance.v2 != null && instance.v2.configuration.translation != null && instance.v2.configuration.translation.enabled; - items.add(new SmallTextItem(getString(translationAvailable ? - R.string.sk_settings_translation_availability_note_available : - R.string.sk_settings_translation_availability_note_unavailable, instance.title))); items.add(new SwitchItem(R.string.sk_settings_support_local_only, 0, GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID), i->{ glitchModeItem.enabled = i.checked; @@ -312,6 +308,13 @@ public class SettingsFragment extends MastodonToolbarFragment{ })); glitchModeItem.enabled = GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID); + + boolean translationAvailable = instance.v2 != null && instance.v2.configuration.translation != null && instance.v2.configuration.translation.enabled; + items.add(new SmallTextItem(getString(translationAvailable ? + R.string.sk_settings_translation_availability_note_available : + R.string.sk_settings_translation_availability_note_unavailable, instance.title))); + + items.add(new HeaderItem(R.string.sk_settings_about)); // items.add(new TextItem(R.string.sk_settings_contribute, ()->UiUtils.launchWebBrowser(getActivity(), "https://github.com/sk22/megalodon"), R.drawable.ic_fluent_open_24_regular)); // items.add(new TextItem(R.string.sk_settings_donate, ()->UiUtils.launchWebBrowser(getActivity(), "https://ko-fi.com/xsk22"), R.drawable.ic_fluent_heart_24_regular)); 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 3ce026036..ce976f7a9 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 @@ -83,6 +83,7 @@ import org.joinmastodon.android.model.Relationship; import org.joinmastodon.android.model.ScheduledStatus; import org.joinmastodon.android.model.SearchResults; import org.joinmastodon.android.model.Status; +import org.joinmastodon.android.model.StatusPrivacy; import org.joinmastodon.android.ui.M3AlertDialogBuilder; import org.joinmastodon.android.ui.text.CustomEmojiSpan; import org.parceler.Parcels; @@ -914,7 +915,7 @@ public class UiUtils{ public static boolean setExtraTextInfo(Context ctx, TextView extraText, StatusPrivacy visibility, boolean localOnly) { List extraParts = new ArrayList<>(); if (localOnly) extraParts.add(ctx.getString(R.string.sk_inline_local_only)); - if (visibility != null &&visibility.equals(StatusPrivacy.DIRECT)) + if (visibility != null && visibility.equals(StatusPrivacy.DIRECT)) extraParts.add(ctx.getString(R.string.sk_inline_direct)); if (!extraParts.isEmpty()) { String sep = ctx.getString(R.string.sk_separator); diff --git a/mastodon/src/main/res/drawable/ic_fluent_eye_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_eye_24_regular.xml new file mode 100644 index 000000000..7cd0b6757 --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_eye_24_regular.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file