1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-09-10 02:39:43 +02:00

Added reports navdrawer entry and divided visibility options into subcategories as suggested by gsantner

Merge PR #110 from DfA/divide-visibility-options

Reports Navdrawer Item reworked
set context of webview in onAttach method of BrowserFragment

Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android
This commit is contained in:
vanitasvitae 2016-11-06 20:36:43 +01:00
parent e6f16fce50
commit 8e324d8f2b
10 changed files with 130 additions and 51 deletions

View file

@ -45,6 +45,7 @@
<string name="pref_key__visibility_nav__followed_tags" translatable="false">pref_key__visibility_nav__followed_tags</string>
<string name="pref_key__visibility_nav__profile" translatable="false">pref_key__visibility_nav__profile</string>
<string name="pref_key__visibility_nav__contacts" translatable="false">pref_key__visibility_nav__contacts</string>
<string name="pref_key__visibility_nav__reports" translatable="false">pref_key__visibility_nav__reports</string>
<!-- PodProfile -->
<string name="pref_key__podprofile_avatar_url" translatable="false">podUserProfile_avatar</string>
@ -74,6 +75,9 @@
<string name="pref_title__sub_nav_slider">Navigation Slider</string>
<string name="pref_desc__sub_nav_slider">Control visibility of entries in the navigation drawer</string>
<string name="pref_cat__visibility_nav_items">Item visibility</string>
<string name="pref_cat__visibility_nav_items__user">User</string>
<string name="pref_cat__visibility_nav_items__general">General</string>
<string name="pref_cat__visibility_nav_items__admin">Admin</string>
<!-- Themes -->
<string name="pref_title__themes">Theme and Colors</string>