diff --git a/app/src/main/java/app/fedilab/android/client/Entities/MainMenuItem.java b/app/src/main/java/app/fedilab/android/client/Entities/MainMenuItem.java index 6fcad20fc..65f8a292c 100644 --- a/app/src/main/java/app/fedilab/android/client/Entities/MainMenuItem.java +++ b/app/src/main/java/app/fedilab/android/client/Entities/MainMenuItem.java @@ -18,6 +18,7 @@ public class MainMenuItem { private boolean nav_news = true, + nav_trends = true, nav_list = true, nav_scheduled = true, nav_archive = true, @@ -125,4 +126,12 @@ public class MainMenuItem { public void setNav_howto(boolean nav_howto) { this.nav_howto = nav_howto; } + + public boolean isNav_trends() { + return nav_trends; + } + + public void setNav_trends(boolean nav_trends) { + this.nav_trends = nav_trends; + } } diff --git a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java index d630cb42d..5fb6d41d6 100644 --- a/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java @@ -2348,6 +2348,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot } SwitchCompat nav_news = rootView.findViewById(R.id.nav_news); + SwitchCompat nav_trends = rootView.findViewById(R.id.nav_trends); SwitchCompat nav_list = rootView.findViewById(R.id.nav_list); SwitchCompat nav_scheduled = rootView.findViewById(R.id.nav_scheduled); SwitchCompat nav_archive = rootView.findViewById(R.id.nav_archive); @@ -2366,6 +2367,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot mainMenu = new MainMenuItem(); } nav_news.setChecked(mainMenu.isNav_news()); + nav_trends.setChecked(mainMenu.isNav_trends()); nav_list.setChecked(mainMenu.isNav_list()); nav_scheduled.setChecked(mainMenu.isNav_scheduled()); nav_archive.setChecked(mainMenu.isNav_archive()); @@ -2382,6 +2384,7 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot validate.setOnClickListener(view -> { MainMenuItem mainMenuItem = new MainMenuItem(); mainMenuItem.setNav_news(nav_news.isChecked()); + mainMenuItem.setNav_trends(nav_trends.isChecked()); mainMenuItem.setNav_list(nav_list.isChecked()); mainMenuItem.setNav_scheduled(nav_scheduled.isChecked()); mainMenuItem.setNav_archive(nav_archive.isChecked()); diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java index 79afa2e73..e10d0a61e 100644 --- a/app/src/main/java/app/fedilab/android/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/helper/Helper.java @@ -238,6 +238,7 @@ import static app.fedilab.android.activities.BaseMainActivity.mutedAccount; import static app.fedilab.android.activities.BaseMainActivity.regex_home; import static app.fedilab.android.activities.BaseMainActivity.regex_local; import static app.fedilab.android.activities.BaseMainActivity.regex_public; +import static app.fedilab.android.activities.BaseMainActivity.social; import static app.fedilab.android.helper.Helper.NotifType.MENTION; import static app.fedilab.android.sqlite.StatusCacheDAO.ARCHIVE_CACHE; import static app.fedilab.android.sqlite.StatusCacheDAO.BOOKMARK_CACHE; @@ -1674,6 +1675,9 @@ public class Helper { MenuItem nav_list = menu.findItem(R.id.nav_list); if (nav_list != null) nav_list.setVisible(false); + MenuItem nav_trends = menu.findItem(R.id.nav_trends); + if (nav_trends != null) + nav_trends.setVisible(false); MenuItem nav_peertube = menu.findItem(R.id.nav_peertube); if (nav_peertube != null) nav_peertube.setVisible(false); @@ -1743,6 +1747,9 @@ public class Helper { if (!mainMenuItem.isNav_scheduled()) { menu.findItem(R.id.nav_scheduled).setVisible(false); } + if (!mainMenuItem.isNav_trends() || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) { + menu.findItem(R.id.nav_trends).setVisible(false); + } if (!mainMenuItem.isNav_scheduled()) { menu.findItem(R.id.nav_scheduled).setVisible(false); } diff --git a/app/src/main/res/drawable/ic_trending_tags.xml b/app/src/main/res/drawable/ic_trending_tags.xml new file mode 100644 index 000000000..4d3859d53 --- /dev/null +++ b/app/src/main/res/drawable/ic_trending_tags.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/fragment_settings_reveal.xml b/app/src/main/res/layout/fragment_settings_reveal.xml index f282018be..6279dbb11 100644 --- a/app/src/main/res/layout/fragment_settings_reveal.xml +++ b/app/src/main/res/layout/fragment_settings_reveal.xml @@ -2794,6 +2794,30 @@ + + + + + + + + + + Allows to customize the user agent used for api calls or with the built-in browser. Remove UTM parameters The app will automatically remove UTM parameters from URLs before visiting a link. + Trends \ No newline at end of file