mirror of
https://github.com/gsantner/dandelion
synced 2025-12-16 01:01:11 +01:00
Moved WebView in own fragments. There is still a bug, where the webview cannot be returned for some reason.
This commit is contained in:
parent
52d6947d3e
commit
b2337b1955
18 changed files with 764 additions and 530 deletions
|
|
@ -8,42 +8,31 @@
|
|||
android:id="@+id/action_search"
|
||||
android:icon="@drawable/ic_search_white_48px"
|
||||
app:showAsAction="always"
|
||||
android:orderInCategory="100"
|
||||
android:title="@string/action_search_by_tags_or_persons" />
|
||||
|
||||
|
||||
<item
|
||||
android:id="@+id/action_compose"
|
||||
android:icon="@drawable/ic_mode_edit_white_48px"
|
||||
app:showAsAction="always"
|
||||
android:orderInCategory="200"
|
||||
android:title="@string/action_compose_new_post" />
|
||||
|
||||
<item
|
||||
android:icon="@drawable/ic_share_white_48px"
|
||||
android:title="@string/action_share_dotdotdot"
|
||||
app:showAsAction="always" >
|
||||
<menu>
|
||||
<item android:id="@+id/action_share_screenshot" android:title="@string/share__share_screenshot"/>
|
||||
<item android:id="@+id/action_take_screenshot" android:title="@string/share__take_screenshot"/>
|
||||
<item android:id="@+id/action_share_link" android:title="@string/share__share_link_as_text"/>
|
||||
</menu>
|
||||
</item>
|
||||
|
||||
<!-- Keep right most -->
|
||||
<item
|
||||
android:id="@+id/action_go_to_top"
|
||||
android:icon="@drawable/ic_arrow_upward_white_48px"
|
||||
android:title="@string/action_go_to_top"
|
||||
app:showAsAction="always"/>
|
||||
app:showAsAction="always"
|
||||
android:orderInCategory="400"
|
||||
android:title="@string/action_go_to_top" />
|
||||
|
||||
<!-- overflow menu -->
|
||||
<item
|
||||
android:id="@+id/action_toggle_desktop_page"
|
||||
android:icon="@drawable/ic_sync_white_48px"
|
||||
android:title="@string/action_toggle_desktop_page" />
|
||||
|
||||
<item
|
||||
android:id="@+id/action_exit"
|
||||
app:showAsAction="never"
|
||||
android:orderInCategory="600"
|
||||
android:title="@string/action_exit_app"
|
||||
app:showAsAction="never" />
|
||||
/>
|
||||
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -6,19 +6,16 @@
|
|||
<item
|
||||
android:id="@+id/action_notifications"
|
||||
android:icon="@drawable/ic_notifications_white_48px__layer"
|
||||
app:showAsAction="always"
|
||||
android:orderInCategory="100"
|
||||
android:title="@string/notifications"
|
||||
app:showAsAction="always" />
|
||||
/>
|
||||
|
||||
<item
|
||||
android:id="@+id/action_conversations"
|
||||
android:icon="@drawable/ic_mail_white_48px__layer"
|
||||
android:title="@string/conversations"
|
||||
app:showAsAction="always" />
|
||||
|
||||
<item
|
||||
android:id="@+id/action_reload"
|
||||
android:icon="@drawable/ic_refresh_white_48px"
|
||||
android:title="@string/reload"
|
||||
app:showAsAction="always"/>
|
||||
app:showAsAction="always"
|
||||
android:orderInCategory="200"
|
||||
android:title="@string/conversations" />
|
||||
|
||||
</menu>
|
||||
|
|
|
|||
23
app/src/main/res/menu/stream__menu_bottom.xml
Normal file
23
app/src/main/res/menu/stream__menu_bottom.xml
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item
|
||||
android:icon="@drawable/ic_share_white_48px"
|
||||
app:showAsAction="always"
|
||||
android:orderInCategory="300"
|
||||
android:title="@string/action_share_dotdotdot">
|
||||
<menu>
|
||||
<item android:id="@+id/action_share_screenshot" android:title="@string/share__share_screenshot"/>
|
||||
<item android:id="@+id/action_take_screenshot" android:title="@string/share__take_screenshot"/>
|
||||
<item android:id="@+id/action_share_link" android:title="@string/share__share_link_as_text"/>
|
||||
</menu>
|
||||
</item>
|
||||
|
||||
<item
|
||||
android:id="@+id/action_toggle_desktop_page"
|
||||
android:icon="@drawable/ic_sync_white_48px"
|
||||
android:orderInCategory="700"
|
||||
android:title="@string/action_toggle_desktop_page" />
|
||||
|
||||
</menu>
|
||||
12
app/src/main/res/menu/stream__menu_top.xml
Normal file
12
app/src/main/res/menu/stream__menu_top.xml
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item
|
||||
android:id="@+id/action_reload"
|
||||
android:icon="@drawable/ic_refresh_white_48px"
|
||||
app:showAsAction="always"
|
||||
android:orderInCategory="1000"
|
||||
android:title="@string/reload"/>
|
||||
|
||||
</menu>
|
||||
Loading…
Add table
Add a link
Reference in a new issue