prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devel' into feature/shikimori

Browse Source
This commit is contained in:
Koitharu
2022-07-02 14:36:00 +03:00
parent fc2d5fe00e ce97c8f7d9
commit e6e37aec47
97 changed files with 1358 additions and 1336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/xml/network_security_config.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config xmlns:tools="http://schemas.android.com/tools">
<network-security-config
xmlns:tools="http://schemas.android.com/tools">
<!-- Need to allow cleartext traffic for some sources -->
<base-config
cleartextTrafficPermitted="true"
@@ -8,7 +9,7 @@
<!-- Trust preinstalled CAs -->
<certificates src="system" />
<!-- Additionally trust user added CAs -->
<!-- Additionally, trust user added CAs -->
<certificates
src="user"
tools:ignore="AcceptsUserCertificates" />

13
app/src/main/res/xml/widget_recent.xml
View File

@@ -1,12 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<appwidget-provider
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:description="@string/appwidget_recent_description"
android:initialLayout="@layout/widget_recent"
android:minWidth="110dp"
android:minHeight="110dp"
android:minResizeWidth="40dp"
android:minWidth="120dp"
android:minHeight="40dp"
android:minResizeWidth="120dp"
android:minResizeHeight="40dp"
android:previewImage="@drawable/ic_appwidget_recent"
android:resizeMode="horizontal|vertical"
android:targetCellWidth="2"
android:targetCellHeight="2"
android:updatePeriodMillis="0"
android:widgetCategory="home_screen" />
android:widgetCategory="home_screen"
tools:ignore="UnusedAttribute" />

14
app/src/main/res/xml/widget_shelf.xml
View File

@@ -1,13 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<appwidget-provider
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:configure="org.koitharu.kotatsu.widget.shelf.ShelfConfigActivity"
android:description="@string/appwidget_shelf_description"
android:initialLayout="@layout/widget_shelf"
android:minWidth="110dp"
android:minHeight="110dp"
android:minResizeWidth="40dp"
android:minWidth="160dp"
android:minHeight="120dp"
android:minResizeWidth="120dp"
android:minResizeHeight="40dp"
android:previewImage="@drawable/ic_appwidget_shelf"
android:resizeMode="horizontal|vertical"
android:targetCellWidth="3"
android:targetCellHeight="2"
android:updatePeriodMillis="0"
android:widgetCategory="home_screen" />
android:widgetCategory="home_screen"
android:widgetFeatures="reconfigurable"
tools:ignore="UnusedAttribute" />