vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-09-13 20:29:42 +02:00
Code Issues Releases Wiki Activity

Use searchable dialog for tag and aspect/contact list

Browse source 
* Remove seperate fragments for both cases
* Make use of opoc/SearchOrCustomTextDialog
* Basically also removes all fragment swaps
  * Only two fragments are stream and podselection
  * Pod logout restarts app
  * Thus long known Android Supportlib bug can't occur

* Fixes #198
This commit is contained in:
Gregor Santner 2018-07-25 01:59:25 +02:00
parent 918adcf358
commit dbbd3cef35
13 changed files with 358 additions and 457 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/res/menu/main__navdrawer.xml
View file

@ -17,7 +17,7 @@
<item
android:id="@+id/nav_followed_tags"
android:icon="@drawable/ic_local_offer_black_48px"
android:title="@string/nav_followed_tags" />
android:title="@string/tags" />
<item
android:id="@+id/nav_aspects"
android:icon="@drawable/ic_group_black_48px"
@ -54,9 +54,9 @@
android:title="@string/nav_public_activities" />
<item
android:id="@+id/nav_dandelion"
android:id="@+id/nav_product_support"
android:icon="@drawable/ic_person_black_24px"
android:title="@string/dandelion" />
android:title="@string/gsantner" />
<item
android:id="@+id/nav_statistics"

4
app/src/main/res/values/strings-not_translatable.xml
View file

@ -9,6 +9,7 @@
*via [dandelion*](/people?q=dandelion00%40diasp.org) client [(Source)](https://github.com/gsantner/dandelion)*</string>
<string name="tags" translatable="false">Tags</string>
<string name="tor" translatable="false">Tor</string>
<string name="HTTP" translatable="false">HTTP</string>
@ -116,7 +117,7 @@
<string name="pref_key__visibility_nav__reports" translatable="false">pref_key__visibility_nav__reports</string>
<string name="pref_key__visibility_nav__statistics" translatable="false">pref_key__visibility_nav__statistics</string>
<string name="pref_key__visibility_nav__toggle_mobile_desktop" translatable="false">pref_key__visibility_nav__toggle_mobile_desktop</string>
<string name="pref_key__visibility_nav__dandelion_account" translatable="false">pref_key__visibility_nav__dandelion_account</string>
<string name="pref_key__visibility_nav__gsantner_account" translatable="false">pref_key__visibility_nav__gsantner_account</string>
<string name="pref_key__podprofile_avatar_url" translatable="false">pref_key__podprofile_avatar_url</string>
<string name="pref_key__podprofile_name" translatable="false">pref_key__podprofile_name</string>
<string name="pref_key__podprofile_id" translatable="false">pref_key__podprofile_id</string>
@ -146,4 +147,5 @@
<string name="pref_key__recreate_main_activity" translatable="false">pref_key__recreate_main_activity</string>
<string name="pref_key__show_title" translatable="false">pref_key__show_title</string>
<string name="pdf" translatable="false">PDF</string>
<string name="gsantner" translatable="false">gsantner</string>
</resources>

20
app/src/main/res/xml-v25/shortcuts.xml
View file

@ -35,14 +35,14 @@
</shortcut>
<shortcut
android:shortcutId="sc_aspects"
android:shortcutId="sc_contacts"
android:enabled="true"
android:icon="@drawable/sc_aspect"
android:shortcutShortLabel="@string/aspects"
android:shortcutLongLabel="@string/aspects"
android:shortcutDisabledMessage="@string/aspects">
android:shortcutShortLabel="@string/contacts"
android:shortcutLongLabel="@string/contacts"
android:shortcutDisabledMessage="@string/contacts">
<intent
android:action="sc_aspects"
android:action="sc_contacts"
android:targetPackage="com.github.dfa.diaspora_android"
android:targetClass="com.github.dfa.diaspora_android.activity.MainActivity" />
<!-- If your shortcut is associated with multiple intents, include them
@ -52,14 +52,14 @@
</shortcut>
<shortcut
android:shortcutId="sc_nav_followed_tags"
android:shortcutId="sc_tags"
android:enabled="true"
android:icon="@drawable/sc_tags"
android:shortcutShortLabel="@string/nav_followed_tags"
android:shortcutLongLabel="@string/nav_followed_tags"
android:shortcutDisabledMessage="@string/nav_followed_tags">
android:shortcutShortLabel="@string/tags"
android:shortcutLongLabel="@string/tags"
android:shortcutDisabledMessage="@string/tags">
<intent
android:action="sc_nav_followed_tags"
android:action="sc_tags"
android:targetPackage="com.github.dfa.diaspora_android"
android:targetClass="com.github.dfa.diaspora_android.activity.MainActivity" />
<!-- If your shortcut is associated with multiple intents, include them

4
app/src/main/res/xml/preferences__sub_navslider_vis.xml
View file

@ -42,8 +42,8 @@
android:title="@string/nav_public_activities"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__dandelion_account"
android:title="@string/dandelion"/>
android:key="@string/pref_key__visibility_nav__gsantner_account"
android:title="@string/gsantner"/>
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>