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

Merge branch 'settings_changes' into 'settings_changes' 

Change the design in settings 2

See merge request tom79/fedilab!758
This commit is contained in:
Thomas 2019-09-22 18:58:21 +02:00
parent 06be4c2a92 36b1a1cc33
commit e53734c265
2 changed files with 265 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2214,18 +2214,18 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
} }
} }
CheckBox nav_news = rootView.findViewById(R.id.nav_news); SwitchCompat nav_news = rootView.findViewById(R.id.nav_news);
CheckBox nav_list = rootView.findViewById(R.id.nav_list); SwitchCompat nav_list = rootView.findViewById(R.id.nav_list);
CheckBox nav_scheduled = rootView.findViewById(R.id.nav_scheduled); SwitchCompat nav_scheduled = rootView.findViewById(R.id.nav_scheduled);
CheckBox nav_archive = rootView.findViewById(R.id.nav_archive); SwitchCompat nav_archive = rootView.findViewById(R.id.nav_archive);
CheckBox nav_archive_notifications = rootView.findViewById(R.id.nav_archive_notifications); SwitchCompat nav_archive_notifications = rootView.findViewById(R.id.nav_archive_notifications);
CheckBox nav_peertube = rootView.findViewById(R.id.nav_peertube); SwitchCompat nav_peertube = rootView.findViewById(R.id.nav_peertube);
CheckBox nav_filters = rootView.findViewById(R.id.nav_filters); SwitchCompat nav_filters = rootView.findViewById(R.id.nav_filters);
CheckBox nav_who_to_follow = rootView.findViewById(R.id.nav_who_to_follow); SwitchCompat nav_who_to_follow = rootView.findViewById(R.id.nav_who_to_follow);
CheckBox nav_blocked = rootView.findViewById(R.id.nav_blocked); SwitchCompat nav_blocked = rootView.findViewById(R.id.nav_blocked);
CheckBox nav_muted = rootView.findViewById(R.id.nav_muted); SwitchCompat nav_muted = rootView.findViewById(R.id.nav_muted);
CheckBox nav_blocked_domains = rootView.findViewById(R.id.nav_blocked_domains); SwitchCompat nav_blocked_domains = rootView.findViewById(R.id.nav_blocked_domains);
CheckBox nav_how_to = rootView.findViewById(R.id.nav_how_to); SwitchCompat nav_how_to = rootView.findViewById(R.id.nav_how_to);
Button validate = rootView.findViewById(R.id.validate); Button validate = rootView.findViewById(R.id.validate);
MainMenuItem mainMenu = new MainMenuDAO(context, db).getMainMenu(); MainMenuItem mainMenu = new MainMenuDAO(context, db).getMainMenu();

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

@ -2650,56 +2650,189 @@
android:background="?colorAccent" /> android:background="?colorAccent" />
</LinearLayout> </LinearLayout>
<CheckBox <LinearLayout
android:id="@+id/nav_news" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/action_news" /> android:layout_marginTop="@dimen/settings_option_margin"
android:layout_marginBottom="@dimen/settings_option_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
<CheckBox <TextView
android:id="@+id/nav_list" android:layout_width="0dp"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:text="@string/action_news"
android:textSize="16sp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/nav_news"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/action_lists" /> 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_lists"
android:textSize="16sp" />
<CheckBox <androidx.appcompat.widget.SwitchCompat
android:id="@+id/nav_scheduled" android:id="@+id/nav_list"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/scheduled_toots" /> 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/scheduled_toots"
android:textSize="16sp" />
<CheckBox <androidx.appcompat.widget.SwitchCompat
android:id="@+id/nav_archive" android:id="@+id/nav_scheduled"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/owner_cached_toots" /> android:layout_marginTop="@dimen/settings_option_margin"
android:layout_marginBottom="@dimen/settings_option_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
<CheckBox <TextView
android:id="@+id/nav_archive_notifications" android:layout_width="0dp"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_weight="1"
android:text="@string/owner_cached_toots"
android:textSize="16sp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/nav_archive"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/owner_cached_notifications" /> 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/owner_cached_notifications"
android:textSize="16sp" />
<CheckBox <androidx.appcompat.widget.SwitchCompat
android:id="@+id/nav_peertube" android:id="@+id/nav_archive_notifications"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/peertube_favorites" /> android:layout_marginTop="@dimen/settings_option_margin"
android:layout_marginBottom="@dimen/settings_option_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
<CheckBox <TextView
android:id="@+id/nav_filters" android:layout_width="0dp"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginEnd="10dp"
android:text="@string/filters" /> android:layout_weight="1"
android:text="@string/peertube_favorites"
android:textSize="16sp" />
<CheckBox <androidx.appcompat.widget.SwitchCompat
android:id="@+id/nav_who_to_follow" android:id="@+id/nav_peertube"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/how_to_follow" /> 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/filters"
android:textSize="16sp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/nav_filters"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</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/how_to_follow"
android:textSize="16sp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/nav_who_to_follow"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout <LinearLayout
@ -2730,24 +2863,75 @@
android:background="?colorAccent" /> android:background="?colorAccent" />
</LinearLayout> </LinearLayout>
<LinearLayout
<CheckBox android:layout_width="match_parent"
android:id="@+id/nav_blocked"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/blocked_menu" /> android:layout_marginTop="@dimen/settings_option_margin"
android:layout_marginBottom="@dimen/settings_option_margin"
android:gravity="center_vertical"
android:orientation="horizontal">
<CheckBox <TextView
android:id="@+id/nav_muted" android:layout_width="0dp"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginEnd="10dp"
android:text="@string/muted_menu" /> android:layout_weight="1"
android:text="@string/blocked_menu"
android:textSize="16sp" />
<CheckBox <androidx.appcompat.widget.SwitchCompat
android:id="@+id/nav_blocked_domains" android:id="@+id/nav_blocked"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/blocked_domains" /> 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/muted_menu"
android:textSize="16sp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/nav_muted"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</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/blocked_domains"
android:textSize="16sp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/nav_blocked_domains"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -2777,11 +2961,28 @@
android:background="?colorAccent" /> android:background="?colorAccent" />
</LinearLayout> </LinearLayout>
<CheckBox <LinearLayout
android:id="@+id/nav_how_to" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/how_to_videos" /> 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/how_to_videos"
android:textSize="16sp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/nav_how_to"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<Button <Button
@ -2791,6 +2992,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/validate" /> android:text="@string/validate" />
</LinearLayout> </LinearLayout>