Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Prepares menu

This commit is contained in:
tom79 2019-11-30 14:35:53 +01:00
parent 3e7b527194
commit d924399d6a
7 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/app/fedilab/android/client/Entities/MainMenuItem.java
View File

@ -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;
}
}

3
app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java
View File

@ -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());

7
app/src/main/java/app/fedilab/android/helper/Helper.java
View File

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

5
app/src/main/res/drawable/ic_trending_tags.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M16,6l2.29,2.29 -4.88,4.88 -4,-4L2,16.59 3.41,18l6,-6 4,4 6.3,-6.29L22,12V6z"/>
</vector>

24
app/src/main/res/layout/fragment_settings_reveal.xml
View File

@ -2794,6 +2794,30 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_option_margin"
android:layout_marginBottom="@dimen/settings_option_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:text="@string/action_trends"
android:textSize="16sp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/nav_trends"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

4
app/src/main/res/menu/activity_main_drawer.xml
View File

@ -17,6 +17,10 @@
android:icon="@drawable/ic_new_releases_black"
android:title="@string/action_news"
app:actionLayout="@layout/item_menu_news" />
<item
android:id="@+id/nav_trends"
android:icon="@drawable/ic_trending_tags"
android:title="@string/action_trends" />
<item
android:id="@+id/nav_list"
android:icon="@drawable/ic_list"

1
app/src/main/res/values/strings.xml
View File

@ -1202,4 +1202,5 @@
<string name="set_user_agent_indication">Allows to customize the user agent used for api calls or with the built-in browser.</string>
<string name="set_utm_parameters">Remove UTM parameters</string>
<string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>
<string name="action_trends">Trends</string>
</resources>