mirror of
https://github.com/mihonapp/mihon.git
synced 2025-08-26 16:11:31 +02:00
Compare commits
8 Commits
0dbfe8653d
...
7bf7acb124
Author | SHA1 | Date | |
---|---|---|---|
|
7bf7acb124 | ||
|
aa1714b2ac | ||
|
f696f209c6 | ||
|
9fa22f0b37 | ||
|
6d8cfd5f30 | ||
|
af57e124f2 | ||
|
8e8ee69bba | ||
|
e9d69a83fe |
4
.github/workflows/build_pull_request.yml
vendored
4
.github/workflows/build_pull_request.yml
vendored
@@ -20,10 +20,10 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Clone repo
|
||||
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
|
||||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
|
||||
- name: Validate Gradle Wrapper
|
||||
uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
|
||||
uses: gradle/actions/wrapper-validation@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
|
||||
|
||||
- name: Dependency Review
|
||||
uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # v4.3.3
|
||||
|
4
.github/workflows/build_push.yml
vendored
4
.github/workflows/build_push.yml
vendored
@@ -17,10 +17,10 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Clone repo
|
||||
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
|
||||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||
|
||||
- name: Validate Gradle Wrapper
|
||||
uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
|
||||
uses: gradle/actions/wrapper-validation@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
|
||||
|
||||
- name: Setup Android SDK
|
||||
run: |
|
||||
|
@@ -3,7 +3,6 @@ package eu.kanade.tachiyomi.data.backup
|
||||
import android.content.Context
|
||||
import android.net.Uri
|
||||
import eu.kanade.tachiyomi.data.backup.models.Backup
|
||||
import eu.kanade.tachiyomi.data.backup.models.BackupSerializer
|
||||
import kotlinx.serialization.protobuf.ProtoBuf
|
||||
import okio.buffer
|
||||
import okio.gzip
|
||||
@@ -33,7 +32,7 @@ class BackupDecoder(
|
||||
source
|
||||
}.use { it.readByteArray() }
|
||||
|
||||
parser.decodeFromByteArray(BackupSerializer, backupString)
|
||||
parser.decodeFromByteArray(Backup.serializer(), backupString)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -13,7 +13,6 @@ import eu.kanade.tachiyomi.data.backup.models.Backup
|
||||
import eu.kanade.tachiyomi.data.backup.models.BackupCategory
|
||||
import eu.kanade.tachiyomi.data.backup.models.BackupManga
|
||||
import eu.kanade.tachiyomi.data.backup.models.BackupPreference
|
||||
import eu.kanade.tachiyomi.data.backup.models.BackupSerializer
|
||||
import eu.kanade.tachiyomi.data.backup.models.BackupSource
|
||||
import eu.kanade.tachiyomi.data.backup.models.BackupSourcePreferences
|
||||
import kotlinx.serialization.protobuf.ProtoBuf
|
||||
@@ -84,7 +83,7 @@ class BackupCreator(
|
||||
backupSourcePreferences = backupSourcePreferences(options),
|
||||
)
|
||||
|
||||
val byteArray = parser.encodeToByteArray(BackupSerializer, backup)
|
||||
val byteArray = parser.encodeToByteArray(Backup.serializer(), backup)
|
||||
if (byteArray.isEmpty()) {
|
||||
throw IllegalStateException(context.stringResource(MR.strings.empty_backup_error))
|
||||
}
|
||||
|
@@ -1,12 +1,8 @@
|
||||
package eu.kanade.tachiyomi.data.backup.models
|
||||
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.Serializer
|
||||
import kotlinx.serialization.protobuf.ProtoNumber
|
||||
|
||||
@Serializer(forClass = Backup::class)
|
||||
object BackupSerializer
|
||||
|
||||
@Serializable
|
||||
data class Backup(
|
||||
@ProtoNumber(1) val backupManga: List<BackupManga>,
|
||||
|
@@ -1,6 +1,6 @@
|
||||
[versions]
|
||||
agp_version = "8.4.1"
|
||||
lifecycle_version = "2.8.1"
|
||||
agp_version = "8.4.2"
|
||||
lifecycle_version = "2.8.2"
|
||||
paging_version = "3.3.0"
|
||||
|
||||
[libraries]
|
||||
|
@@ -15,6 +15,6 @@ ui-util = { module = "androidx.compose.ui:ui-util" }
|
||||
material3-core = { module = "androidx.compose.material3:material3" }
|
||||
material-icons = { module = "androidx.compose.material:material-icons-extended" }
|
||||
|
||||
glance = "androidx.glance:glance-appwidget:1.0.0"
|
||||
glance = "androidx.glance:glance-appwidget:1.1.0"
|
||||
|
||||
accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
|
||||
|
@@ -809,4 +809,5 @@
|
||||
<string name="action_replace_repo_title">Digitalni otisak prsta za potpisivanje već postoji</string>
|
||||
<string name="action_replace_repo_message">Repozitorij %1$s ima isti digitalni otisak ključa za potpisivanje kao %2$s.
|
||||
\nAko se to očekuje, %2$s će se zamijeniti, u suprotnom se obrati svom održavatelju repozitorija.</string>
|
||||
<string name="file_picker_uri_permission_unsupported">Neuspjelo dobivanje trajnog pristupa mapi. Aplikacija se može ponašati neočekivano.</string>
|
||||
</resources>
|
@@ -61,7 +61,7 @@
|
||||
<item quantity="other">%1$d പുതിയ അധ്യായങ്ങൾ</item>
|
||||
</plurals>
|
||||
<plurals name="notification_chapters_multiple_and_more">
|
||||
<item quantity="one">അധ്യായങ്ങൾ %1$s-ഉം 1-ഉം</item>
|
||||
<item quantity="one">അധ്യായങ്ങൾ %1$s-ഉം പിന്നെ 1-ഉം</item>
|
||||
<item quantity="other">%1$s-ഉം %2$d-ഉം അധ്യായങ്ങൾ</item>
|
||||
</plurals>
|
||||
<plurals name="num_repos">
|
||||
|
@@ -99,4 +99,25 @@
|
||||
<string name="action_open_in_web_view">വെബ്വ്യൂവിൽ തുറക്കുക</string>
|
||||
<string name="action_migrate">മൈഗ്രേറ്റ് ചെയ്യുക</string>
|
||||
<string name="action_display_mode">ഡിസ്പ്ലേ മോഡ്</string>
|
||||
<string name="action_oldest">ഏറ്റവും പഴയത്</string>
|
||||
<string name="action_cancel">റദ്ദാക്കുക</string>
|
||||
<string name="action_display_show_continue_reading_button">വായന തുടരുക ബട്ടൺ</string>
|
||||
<string name="action_display_language_badge">ഭാഷ</string>
|
||||
<string name="action_cancel_all">എല്ലാം റദ്ദാക്കുക</string>
|
||||
<string name="action_ok">ശരി</string>
|
||||
<string name="cancel_all_for_series">ഈ സീരീസിനായി എല്ലാം റദ്ദാക്കുക</string>
|
||||
<string name="action_move_to_top">മുകളിലേക്ക് നീങ്ങുക</string>
|
||||
<string name="action_order_by_chapter_number">അധ്യായ നമ്പർ പ്രകാരം</string>
|
||||
<string name="action_newest">ഏറ്റവും പുതിയത്</string>
|
||||
<string name="action_show_manga">എൻട്രി കാണിക്കുക</string>
|
||||
<string name="action_display_grid">കോംപാക്റ്റ് ഗ്രിഡ്</string>
|
||||
<string name="action_display_comfortable_grid">സുഖപ്രദമായ ഗ്രിഡ്</string>
|
||||
<string name="action_display_download_badge">ഡൌൺലോഡ് ചെയ്ത അധ്യായങ്ങൾ</string>
|
||||
<string name="action_display_local_badge">ലോക്കൽ സോഴ്സ്</string>
|
||||
<string name="action_disable">ഡിസേബിൾ</string>
|
||||
<string name="action_pin">പിൻ ചെയ്യുക</string>
|
||||
<string name="action_apply">അപ്ലൈ</string>
|
||||
<string name="action_sort">സോർട്</string>
|
||||
<string name="action_display_list">ലിസ്റ്റ്</string>
|
||||
<string name="action_display_cover_only_grid">ചിത്രം മാത്രമുള്ള ഗ്രിഡ്</string>
|
||||
</resources>
|
@@ -809,4 +809,5 @@
|
||||
<string name="upcoming_calendar_prev">上個月</string>
|
||||
<string name="label_upcoming">預告</string>
|
||||
<string name="action_view_upcoming">檢視新刊預告</string>
|
||||
<string name="file_picker_uri_permission_unsupported">無法取得永久性資料夾存取權,應用程式可能會表現異常。</string>
|
||||
</resources>
|
Reference in New Issue
Block a user