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

Some fixes

This commit is contained in:
tom79 2019-08-28 16:54:03 +02:00
parent 410e81b0d2
commit 24479cbc71
4 changed files with 1 additions and 47 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

@ -25,7 +25,6 @@ public class MainMenuItem {
nav_peertube = true,
nav_filters = true,
nav_how_to_follow = true,
nav_administration = true,
nav_blocked = true,
nav_muted = true,
nav_blocked_domains = true,
@ -95,14 +94,6 @@ public class MainMenuItem {
this.nav_how_to_follow = nav_how_to_follow;
}
public boolean isNav_administration() {
return nav_administration;
}
public void setNav_administration(boolean nav_administration) {
this.nav_administration = nav_administration;
}
public boolean isNav_blocked() {
return nav_blocked;
}

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

@ -1568,9 +1568,6 @@ public class Helper {
if( !mainMenuItem.isNav_list()){
menu.findItem(R.id.nav_list).setVisible(false);
}
if( !mainMenuItem.isNav_administration()){
menu.findItem(R.id.nav_administration).setVisible(false);
}
if( !mainMenuItem.isNav_archive()){
menu.findItem(R.id.nav_archive).setVisible(false);
}

5
app/src/main/java/app/fedilab/android/sqlite/MainMenuDAO.java
View File

@ -62,7 +62,6 @@ public class MainMenuDAO {
values.put(Sqlite.COL_NAV_PEERTUBE, mainMenuItem.isNav_peertube()?1:0);
values.put(Sqlite.COL_NAV_FILTERS, mainMenuItem.isNav_filters()?1:0);
values.put(Sqlite.COL_NAV_HOW_TO_FOLLOW, mainMenuItem.isNav_how_to_follow()?1:0);
values.put(Sqlite.COL_NAV_ADMINISTRATION, mainMenuItem.isNav_administration()?1:0);
values.put(Sqlite.COL_NAV_BLOCKED, mainMenuItem.isNav_blocked()?1:0);
values.put(Sqlite.COL_NAV_MUTED, mainMenuItem.isNav_muted()?1:0);
values.put(Sqlite.COL_NAV_BLOCKED_DOMAINS, mainMenuItem.isNav_blocked()?1:0);
@ -94,7 +93,6 @@ public class MainMenuDAO {
values.put(Sqlite.COL_NAV_PEERTUBE, mainMenuItem.isNav_peertube()?1:0);
values.put(Sqlite.COL_NAV_FILTERS, mainMenuItem.isNav_filters()?1:0);
values.put(Sqlite.COL_NAV_HOW_TO_FOLLOW, mainMenuItem.isNav_how_to_follow()?1:0);
values.put(Sqlite.COL_NAV_ADMINISTRATION, mainMenuItem.isNav_administration()?1:0);
values.put(Sqlite.COL_NAV_BLOCKED, mainMenuItem.isNav_blocked()?1:0);
values.put(Sqlite.COL_NAV_MUTED, mainMenuItem.isNav_muted()?1:0);
values.put(Sqlite.COL_NAV_BLOCKED_DOMAINS, mainMenuItem.isNav_blocked()?1:0);
@ -125,7 +123,6 @@ public class MainMenuDAO {
values.put(Sqlite.COL_NAV_PEERTUBE, mainMenuItem.isNav_peertube()?1:0);
values.put(Sqlite.COL_NAV_FILTERS, mainMenuItem.isNav_filters()?1:0);
values.put(Sqlite.COL_NAV_HOW_TO_FOLLOW, mainMenuItem.isNav_how_to_follow()?1:0);
values.put(Sqlite.COL_NAV_ADMINISTRATION, mainMenuItem.isNav_administration()?1:0);
values.put(Sqlite.COL_NAV_BLOCKED, mainMenuItem.isNav_blocked()?1:0);
values.put(Sqlite.COL_NAV_MUTED, mainMenuItem.isNav_muted()?1:0);
values.put(Sqlite.COL_NAV_BLOCKED_DOMAINS, mainMenuItem.isNav_blocked()?1:0);
@ -157,7 +154,6 @@ public class MainMenuDAO {
values.put(Sqlite.COL_NAV_PEERTUBE, mainMenuItem.isNav_peertube()?1:0);
values.put(Sqlite.COL_NAV_FILTERS, mainMenuItem.isNav_filters()?1:0);
values.put(Sqlite.COL_NAV_HOW_TO_FOLLOW, mainMenuItem.isNav_how_to_follow()?1:0);
values.put(Sqlite.COL_NAV_ADMINISTRATION, mainMenuItem.isNav_administration()?1:0);
values.put(Sqlite.COL_NAV_BLOCKED, mainMenuItem.isNav_blocked()?1:0);
values.put(Sqlite.COL_NAV_MUTED, mainMenuItem.isNav_muted()?1:0);
values.put(Sqlite.COL_NAV_BLOCKED_DOMAINS, mainMenuItem.isNav_blocked()?1:0);
@ -221,7 +217,6 @@ public class MainMenuDAO {
return null;
}
c.moveToFirst();
mainMenuItem.setNav_administration(c.getInt(c.getColumnIndex(Sqlite.COL_NAV_ADMINISTRATION)) == 1);
mainMenuItem.setNav_archive(c.getInt(c.getColumnIndex(Sqlite.COL_NAV_ARCHIVE)) == 1);
mainMenuItem.setNav_archive_notifications(c.getInt(c.getColumnIndex(Sqlite.COL_NAV_ARCHIVE_NOTIFICATIONS)) == 1);
mainMenuItem.setNav_blocked(c.getInt(c.getColumnIndex(Sqlite.COL_NAV_BLOCKED)) == 1);

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

@ -915,36 +915,7 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_checkbox_margin"
android:layout_marginBottom="@dimen/settings_checkbox_margin"
android:orientation="horizontal">
<CheckBox
android:id="@+id/set_display_news"
android:layout_width="wrap_content"
android:textSize="16sp"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/set_display_news_text"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:textSize="16sp"
android:text="@string/set_display_news_from_fedilab"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:textColor="@color/mastodonC2"
android:text="@string/set_display_news_from_fedilab_indication"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
<TextView
android:text="@string/set_backup"