Merge branch 'dev' into dev-settings-search

This commit is contained in:
mpm11011
2020-09-16 14:56:34 -04:00
committed by GitHub
207 changed files with 2415 additions and 1427 deletions

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/set_as_default"
android:title="@string/set_chapter_settings_as_default" />
</menu>

View File

@@ -2,6 +2,13 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_share"
android:icon="@drawable/ic_share_24dp"
android:title="@string/action_share"
app:iconTint="?attr/colorOnPrimary"
app:showAsAction="ifRoom" />
<item
android:id="@+id/download_group"
android:icon="@drawable/ic_get_app_24dp"