Merge branch 'feature/suggestions_v2' into devel
This commit is contained in:
17
app/src/main/res/drawable-anydpi-v24/ic_stat_suggestion.xml
Normal file
17
app/src/main/res/drawable-anydpi-v24/ic_stat_suggestion.xml
Normal file
@@ -0,0 +1,17 @@
|
||||
<vector
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="#FFFFFF"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<group
|
||||
android:scaleX="1.0036364"
|
||||
android:scaleY="1.0036364"
|
||||
android:translateX="-0.043636363"
|
||||
android:translateY="-0.043636363">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M8.6,1.535L6.711,4.715L3.1,5.525L3.439,9.207L1,11.994L3.439,14.773L3.1,18.465L6.711,19.283L8.6,22.465L12,20.994L15.4,22.457L17.289,19.273L20.9,18.457L20.561,14.773L23,11.994L20.561,9.217L20.9,5.535L17.289,4.715L15.4,1.535L12,2.996L8.6,1.535zM10.068,8.521L13.932,8.521C14.357,8.521 14.705,8.866 14.705,9.295L14.705,15.479L12,14.318L9.295,15.479L9.295,9.295A0.773,0.773 0,0 1,10.068 8.521z" />
|
||||
</group>
|
||||
</vector>
|
||||
BIN
app/src/main/res/drawable-hdpi/ic_stat_suggestion.png
Normal file
BIN
app/src/main/res/drawable-hdpi/ic_stat_suggestion.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 542 B |
BIN
app/src/main/res/drawable-mdpi/ic_stat_suggestion.png
Normal file
BIN
app/src/main/res/drawable-mdpi/ic_stat_suggestion.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 362 B |
BIN
app/src/main/res/drawable-xhdpi/ic_stat_suggestion.png
Normal file
BIN
app/src/main/res/drawable-xhdpi/ic_stat_suggestion.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 719 B |
BIN
app/src/main/res/drawable-xxhdpi/ic_stat_suggestion.png
Normal file
BIN
app/src/main/res/drawable-xxhdpi/ic_stat_suggestion.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 967 B |
@@ -448,6 +448,9 @@
|
||||
<string name="cancel_all">Cancel all</string>
|
||||
<string name="downloads_wifi_only">Download only via Wi-Fi</string>
|
||||
<string name="downloads_wifi_only_summary">Stop downloading when switching to a mobile network</string>
|
||||
<string name="suggestion_manga">Suggestion: %s</string>
|
||||
<string name="suggestions_notifications_summary">Sometimes show notifications with suggested manga</string>
|
||||
<string name="more">More</string>
|
||||
<string name="enable">Enable</string>
|
||||
<string name="no_thanks">No thanks</string>
|
||||
<string name="cancel_all_downloads_confirm">All active downloads will be cancelled, partially downloaded data will be lost</string>
|
||||
@@ -457,4 +460,5 @@
|
||||
<string name="downloads_paused">Downloads have been paused</string>
|
||||
<string name="downloads_removed">Downloads have been removed</string>
|
||||
<string name="downloads_cancelled">Downloads have been cancelled</string>
|
||||
<string name="suggestions_enable_prompt">Do you want to receive personalized manga suggestions?</string>
|
||||
</resources>
|
||||
|
||||
@@ -9,13 +9,22 @@
|
||||
android:layout="@layout/preference_toggle_header"
|
||||
android:title="@string/suggestions_enable" />
|
||||
|
||||
<SwitchPreferenceCompat
|
||||
android:defaultValue="true"
|
||||
android:dependency="suggestions"
|
||||
android:key="suggestions_notifications"
|
||||
android:summary="@string/suggestions_notifications_summary"
|
||||
android:title="@string/notifications_enable" />
|
||||
|
||||
<org.koitharu.kotatsu.settings.utils.MultiAutoCompleteTextViewPreference
|
||||
android:dependency="suggestions"
|
||||
android:key="suggestions_exclude_tags"
|
||||
android:summary="@string/suggestions_excluded_genres_summary"
|
||||
android:title="@string/suggestions_excluded_genres" />
|
||||
android:title="@string/suggestions_excluded_genres"
|
||||
app:allowDividerAbove="true" />
|
||||
|
||||
<SwitchPreferenceCompat
|
||||
android:defaultValue="false"
|
||||
android:dependency="suggestions"
|
||||
android:key="suggestions_exclude_nsfw"
|
||||
android:title="@string/exclude_nsfw_from_suggestions" />
|
||||
@@ -28,4 +37,4 @@
|
||||
android:summary="@string/suggestions_info"
|
||||
app:allowDividerAbove="true" />
|
||||
|
||||
</PreferenceScreen>
|
||||
</PreferenceScreen>
|
||||
|
||||
Reference in New Issue
Block a user