diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index d3b8a94b0..5aafe8adb 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -8,25 +8,35 @@ assignees: '' --- **Describe the bug** + A clear and concise description of what the bug is. -**To Reproduce** +**To reproduce** + Steps to reproduce the behavior: 1. Go to '...' 2. Click on '....' 3. Scroll down to '....' 4. See error +**Does this happen in the official app?** + +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) or at least using the current Mastodon version from the Play Store) + +> No / Yes + +> In case it does, 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! + **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. diff --git a/fix-metadata-markdown-lists.sh b/fix-metadata-markdown-lists.sh new file mode 100755 index 000000000..3de9d970a --- /dev/null +++ b/fix-metadata-markdown-lists.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +find metadata -name '*.txt' -exec sed -Ei 's/^[–—─•·*]\s+/- /' {} \; diff --git a/img/izzy-badge.png b/img/izzy-badge.png new file mode 100644 index 000000000..0af969fbb Binary files /dev/null and b/img/izzy-badge.png differ diff --git a/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java b/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java index 263af871c..32d7c74cd 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java @@ -12,7 +12,6 @@ import android.widget.Toast; import org.joinmastodon.android.api.session.AccountSession; import org.joinmastodon.android.api.session.AccountSessionManager; import org.joinmastodon.android.fragments.ComposeFragment; -import org.joinmastodon.android.ui.M3AlertDialogBuilder; import org.joinmastodon.android.ui.utils.UiUtils; import java.util.ArrayList; @@ -36,13 +35,10 @@ public class ExternalShareActivity extends FragmentStackActivity{ openComposeFragment(sessions.get(0).getID()); }else{ getWindow().setBackgroundDrawable(new ColorDrawable(0xff000000)); - new M3AlertDialogBuilder(this) - .setItems(sessions.stream().map(as->"@"+as.self.username+"@"+as.domain).toArray(String[]::new), (dialog, which)->{ - openComposeFragment(sessions.get(which).getID()); - }) - .setTitle(R.string.choose_account) - .setOnCancelListener(dialog -> finish()) - .show(); + UiUtils.pickAccount(this, null, R.string.choose_account, 0, + session -> openComposeFragment(session.getID()), + b -> b.setOnCancelListener(d -> finish()) + ); } } } 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..84dd040d2 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/PushSubscriptionManager.java @@ -372,7 +372,7 @@ public class PushSubscriptionManager{ for(AccountSession session:AccountSessionManager.getInstance().getLoggedInAccounts()){ if(session.pushSubscription==null || forceReRegister) session.getPushSubscriptionManager().registerAccountForPush(session.pushSubscription); - else if(session.needUpdatePushSettings) + else session.getPushSubscriptionManager().updatePushSettings(session.pushSubscription); } } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java index c3eaf1ff4..38b4d9ae6 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java @@ -44,7 +44,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc private FrameLayout[] tabViews; private TabLayoutMediator tabLayoutMediator; - private NotificationsListFragment allNotificationsFragment, mentionsFragment, postsFragment; + private NotificationsListFragment allNotificationsFragment, mentionsFragment; private String accountID; @@ -104,13 +104,12 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc pager=view.findViewById(R.id.pager); UiUtils.reduceSwipeSensitivity(pager); - tabViews=new FrameLayout[3]; + tabViews=new FrameLayout[2]; for(int i=0;i R.id.notifications_all; case 1 -> R.id.notifications_mentions; - case 2 -> R.id.notifications_posts; default -> throw new IllegalStateException("Unexpected value: "+i); }); tabView.setVisibility(View.GONE); @@ -162,15 +161,9 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc mentionsFragment=new NotificationsListFragment(); mentionsFragment.setArguments(args); - args=new Bundle(args); - args.putBoolean("onlyPosts", true); - postsFragment=new NotificationsListFragment(); - postsFragment.setArguments(args); - getChildFragmentManager().beginTransaction() .add(R.id.notifications_all, allNotificationsFragment) .add(R.id.notifications_mentions, mentionsFragment) - .add(R.id.notifications_posts, postsFragment) .commit(); } @@ -180,7 +173,6 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc tab.setText(switch(position){ case 0 -> R.string.all_notifications; case 1 -> R.string.mentions; - case 2 -> R.string.posts; default -> throw new IllegalStateException("Unexpected value: "+position); }); tab.view.textView.setAllCaps(true); @@ -231,7 +223,6 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc return switch(page){ case 0 -> allNotificationsFragment; case 1 -> mentionsFragment; - case 2 -> postsFragment; default -> throw new IllegalStateException("Unexpected value: "+page); }; } @@ -252,7 +243,7 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc @Override public int getItemCount(){ - return 3; + return 2; } @Override diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java index cfc647e5e..c89c5c0b1 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java @@ -15,6 +15,7 @@ import android.widget.TextView; import org.joinmastodon.android.R; import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships; import org.joinmastodon.android.api.requests.accounts.GetFollowSuggestions; +import org.joinmastodon.android.fragments.IsOnTop; import org.joinmastodon.android.fragments.ProfileFragment; import org.joinmastodon.android.fragments.ScrollableToTop; import org.joinmastodon.android.model.Account; @@ -48,7 +49,7 @@ import me.grishka.appkit.utils.BindableViewHolder; import me.grishka.appkit.utils.V; import me.grishka.appkit.views.UsableRecyclerView; -public class DiscoverAccountsFragment extends BaseRecyclerFragment implements ScrollableToTop{ +public class DiscoverAccountsFragment extends BaseRecyclerFragment implements ScrollableToTop, IsOnTop { private String accountID; private Map relationships=Collections.emptyMap(); private GetAccountRelationships relationshipsRequest; @@ -139,6 +140,11 @@ public class DiscoverAccountsFragment extends BaseRecyclerFragment implements ImageLoaderRecyclerAdapter{ public AccountsAdapter(){ diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java index 78b7e69e1..10a3a77dd 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java @@ -10,6 +10,7 @@ import android.widget.TextView; import org.joinmastodon.android.R; import org.joinmastodon.android.api.requests.trends.GetTrendingLinks; +import org.joinmastodon.android.fragments.IsOnTop; import org.joinmastodon.android.fragments.ScrollableToTop; import org.joinmastodon.android.model.Card; import org.joinmastodon.android.ui.DividerItemDecoration; @@ -34,7 +35,7 @@ import me.grishka.appkit.utils.BindableViewHolder; import me.grishka.appkit.utils.V; import me.grishka.appkit.views.UsableRecyclerView; -public class DiscoverNewsFragment extends BaseRecyclerFragment implements ScrollableToTop{ +public class DiscoverNewsFragment extends BaseRecyclerFragment implements ScrollableToTop, IsOnTop { private String accountID; private List imageRequests=Collections.emptyList(); private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_LINKS); @@ -82,6 +83,11 @@ public class DiscoverNewsFragment extends BaseRecyclerFragment implements smoothScrollRecyclerViewToTop(list); } + @Override + public boolean isOnTop() { + return isRecyclerViewOnTop(list); + } + private class LinksAdapter extends UsableRecyclerView.Adapter implements ImageLoaderRecyclerAdapter{ public LinksAdapter(){ super(imgLoader); 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 f06874a60..8bfb49ce0 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 @@ -4,6 +4,7 @@ import android.os.Bundle; import android.view.View; import org.joinmastodon.android.api.requests.trends.GetTrendingStatuses; +import org.joinmastodon.android.fragments.IsOnTop; import org.joinmastodon.android.fragments.StatusListFragment; import org.joinmastodon.android.model.Status; import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper; @@ -12,7 +13,7 @@ import java.util.List; import me.grishka.appkit.api.SimpleCallback; -public class DiscoverPostsFragment extends StatusListFragment{ +public class DiscoverPostsFragment extends StatusListFragment implements IsOnTop { private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_POSTS); @Override @@ -32,4 +33,9 @@ public class DiscoverPostsFragment extends StatusListFragment{ super.onViewCreated(view, savedInstanceState); bannerHelper.maybeAddBanner(contentWrap); } + + @Override + public boolean isOnTop() { + return isRecyclerViewOnTop(list); + } } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java index 4d2d019e3..01c98c615 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java @@ -7,6 +7,7 @@ import android.widget.TextView; import org.joinmastodon.android.R; import org.joinmastodon.android.api.requests.trends.GetTrendingHashtags; +import org.joinmastodon.android.fragments.IsOnTop; import org.joinmastodon.android.fragments.ScrollableToTop; import org.joinmastodon.android.model.Hashtag; import org.joinmastodon.android.ui.DividerItemDecoration; @@ -23,7 +24,7 @@ import me.grishka.appkit.fragments.BaseRecyclerFragment; import me.grishka.appkit.utils.BindableViewHolder; import me.grishka.appkit.views.UsableRecyclerView; -public class TrendingHashtagsFragment extends BaseRecyclerFragment implements ScrollableToTop{ +public class TrendingHashtagsFragment extends BaseRecyclerFragment implements ScrollableToTop, IsOnTop { private String accountID; private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_HASHTAGS); @@ -67,6 +68,11 @@ public class TrendingHashtagsFragment extends BaseRecyclerFragment impl smoothScrollRecyclerViewToTop(list); } + @Override + public boolean isOnTop() { + return isRecyclerViewOnTop(list); + } + private class HashtagsAdapter extends RecyclerView.Adapter{ @NonNull @Override diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java index d42f435eb..0e888c798 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportCommentFragment.java @@ -9,6 +9,7 @@ import android.view.ViewGroup; import android.view.WindowInsets; import android.widget.Button; import android.widget.EditText; +import android.widget.Switch; import android.widget.TextView; import com.squareup.otto.Subscribe; @@ -28,15 +29,17 @@ import java.util.ArrayList; import me.grishka.appkit.Nav; import me.grishka.appkit.api.Callback; import me.grishka.appkit.api.ErrorResponse; -import me.grishka.appkit.fragments.ToolbarFragment; import me.grishka.appkit.utils.V; public class ReportCommentFragment extends MastodonToolbarFragment{ private String accountID; private Account reportAccount; private Button btn; - private View buttonBar; + private View buttonBar, forwardReportItem; + private TextView forwardReportText; + private Switch forwardReportSwitch; private EditText commentEdit; + private boolean forwardReport; @Override public void onCreate(Bundle savedInstanceState){ @@ -77,7 +80,17 @@ public class ReportCommentFragment extends MastodonToolbarFragment{ view.findViewById(R.id.btn_back).setOnClickListener(this::onButtonClick); buttonBar=view.findViewById(R.id.button_bar); commentEdit=view.findViewById(R.id.text); - + forwardReportSwitch = view.findViewById(R.id.forward_report_switch); + forwardReportItem = view.findViewById(R.id.forward_report); + forwardReportText = view.findViewById(R.id.forward_report_text); + String domain = reportAccount.getDomain(); + if (domain == null) { + forwardReportItem.setVisibility(View.GONE); + } else { + forwardReportItem.setOnClickListener(this::onForwardReportClick); + forwardReportText.setText(getActivity().getString(R.string.sk_forward_report_to, domain)); + forwardReportSwitch.setChecked(forwardReport = true); + } return view; } @@ -102,7 +115,7 @@ public class ReportCommentFragment extends MastodonToolbarFragment{ ReportReason reason=ReportReason.valueOf(getArguments().getString("reason")); ArrayList statusIDs=getArguments().getStringArrayList("statusIDs"); ArrayList ruleIDs=getArguments().getStringArrayList("ruleIDs"); - new SendReport(reportAccount.id, reason, statusIDs, ruleIDs, v.getId()==R.id.btn_back ? null : commentEdit.getText().toString(), true) + new SendReport(reportAccount.id, reason, statusIDs, ruleIDs, v.getId()==R.id.btn_back ? null : commentEdit.getText().toString(), forwardReport) .setCallback(new Callback<>(){ @Override public void onSuccess(Object result){ @@ -123,6 +136,11 @@ public class ReportCommentFragment extends MastodonToolbarFragment{ .exec(accountID); } + private void onForwardReportClick(View v) { + forwardReport = !forwardReport; + forwardReportSwitch.setChecked(forwardReport); + } + @Subscribe public void onFinishReportFragments(FinishReportFragmentsEvent ev){ if(ev.reportAccountID.equals(reportAccount.id)) diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java b/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java index 71f61736c..2e6001832 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java @@ -111,7 +111,7 @@ public class HtmlParser{ @Override public void head(@NonNull Node node, int depth){ if(node instanceof TextNode textNode){ - ssb.append(textNode.text()); + ssb.append(textNode.getWholeText()); }else if(node instanceof Element el){ switch(el.nodeName()){ case "a" -> { diff --git a/mastodon/src/main/java/org/joinmastodon/android/updater/GithubSelfUpdater.java b/mastodon/src/main/java/org/joinmastodon/android/updater/GithubSelfUpdater.java index 90a20e815..098770ce2 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/updater/GithubSelfUpdater.java +++ b/mastodon/src/main/java/org/joinmastodon/android/updater/GithubSelfUpdater.java @@ -52,6 +52,7 @@ public abstract class GithubSelfUpdater{ public static class UpdateInfo{ public String changelog; public String version; + public String changelog; public long size; } } diff --git a/mastodon/src/main/res/color/button_bg_primary_dark_on_light.xml b/mastodon/src/main/res/color/button_bg_primary_dark_on_light.xml index a7b7babb4..c1fc97e0c 100644 --- a/mastodon/src/main/res/color/button_bg_primary_dark_on_light.xml +++ b/mastodon/src/main/res/color/button_bg_primary_dark_on_light.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/mastodon/src/main/res/color/button_bg_primary_light_on_dark.xml b/mastodon/src/main/res/color/button_bg_primary_light_on_dark.xml index df4f68ca9..f61fab9d4 100644 --- a/mastodon/src/main/res/color/button_bg_primary_light_on_dark.xml +++ b/mastodon/src/main/res/color/button_bg_primary_light_on_dark.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/mastodon/src/main/res/color/button_bg_secondary_light_on_dark.xml b/mastodon/src/main/res/color/button_bg_secondary_light_on_dark.xml index 57093c355..8fb77f290 100644 --- a/mastodon/src/main/res/color/button_bg_secondary_light_on_dark.xml +++ b/mastodon/src/main/res/color/button_bg_secondary_light_on_dark.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/mastodon/src/main/res/color/button_text_primary_dark_on_light.xml b/mastodon/src/main/res/color/button_text_primary_dark_on_light.xml index 373da7995..0773dde12 100644 --- a/mastodon/src/main/res/color/button_text_primary_dark_on_light.xml +++ b/mastodon/src/main/res/color/button_text_primary_dark_on_light.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/mastodon/src/main/res/color/button_text_secondary_dark_on_light.xml b/mastodon/src/main/res/color/button_text_secondary_dark_on_light.xml index 131384b06..a8cbd7677 100644 --- a/mastodon/src/main/res/color/button_text_secondary_dark_on_light.xml +++ b/mastodon/src/main/res/color/button_text_secondary_dark_on_light.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/mastodon/src/main/res/drawable/ic_fluent_delete_20_filled.xml b/mastodon/src/main/res/drawable/ic_fluent_delete_20_filled.xml new file mode 100644 index 000000000..ffad611d7 --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_delete_20_filled.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_eye_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_eye_28_regular.xml new file mode 100644 index 000000000..16db3874e --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_eye_28_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_eye_off_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_eye_off_24_regular.xml new file mode 100644 index 000000000..f9fbcb35b --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_eye_off_24_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_mention_20_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_mention_20_regular.xml new file mode 100644 index 000000000..77a55c495 --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_mention_20_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_open_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_open_24_regular.xml new file mode 100644 index 000000000..e18fe0aed --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_open_24_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_sign_out_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_sign_out_24_regular.xml new file mode 100644 index 000000000..d20ea1330 --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_sign_out_24_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_speaker_0_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_speaker_0_24_regular.xml new file mode 100644 index 000000000..8a35ff41e --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_speaker_0_24_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_speaker_0_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_speaker_0_28_regular.xml new file mode 100644 index 000000000..53c6f5b6a --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_speaker_0_28_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_speaker_off_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_speaker_off_24_regular.xml new file mode 100644 index 000000000..e1b6ba1c9 --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_speaker_off_24_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_speaker_off_28_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_speaker_off_28_regular.xml new file mode 100644 index 000000000..05defaa38 --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_speaker_off_28_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/drawable/ic_fluent_task_list_ltr_24_regular.xml b/mastodon/src/main/res/drawable/ic_fluent_task_list_ltr_24_regular.xml new file mode 100644 index 000000000..d000a4700 --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_fluent_task_list_ltr_24_regular.xml @@ -0,0 +1,3 @@ + + + diff --git a/mastodon/src/main/res/layout/item_settings_color_picker.xml b/mastodon/src/main/res/layout/item_settings_color_picker.xml deleted file mode 100644 index ac72b544c..000000000 --- a/mastodon/src/main/res/layout/item_settings_color_picker.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - -