Compare commits

...

8 Commits

Author SHA1 Message Date
Roshan Varughese
a1912747dc Merge branch 'main' of https://github.com/Animeboynz/mihon 2024-07-25 07:55:24 +12:00
Roshan Varughese
d59d7afcd1 Update SettingsLibraryScreen.kt
No idea how this works.

Co-authored-by: Foolbar <118464521+Foolbar@users.noreply.github.com>
2024-07-25 07:55:10 +12:00
Roshan Varughese
6b8fda8b49 Merge branch 'mihonapp:main' into main 2024-07-25 07:40:23 +12:00
renovate[bot]
602b58f364 fix(deps): update dependency androidx.annotation:annotation to v1.8.1 (#1043)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-25 01:15:21 +06:00
renovate[bot]
e48dbdbf23 fix(deps): update dependency androidx.activity:activity-compose to v1.9.1 (#1042)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-25 01:14:44 +06:00
renovate[bot]
6ace423e18 chore(deps): update softprops/action-gh-release action to v2.0.8 (#1024)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-24 19:09:53 +06:00
FooIbar
51b68cd25f Remove obsolete workaround (#1021) 2024-07-24 19:09:29 +06:00
renovate[bot]
ca784cbe32 fix(deps): update dependency io.coil-kt.coil3:coil-bom to v3.0.0-alpha09 (#1039)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-24 18:53:11 +06:00
6 changed files with 4 additions and 19 deletions

View File

@@ -95,7 +95,7 @@ jobs:
- name: Create Release
if: startsWith(github.ref, 'refs/tags/') && github.repository == 'mihonapp/mihon'
uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0 # v2.0.6
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
with:
tag_name: ${{ env.VERSION_TAG }}
name: Mihon ${{ env.VERSION_TAG }}

View File

@@ -71,15 +71,11 @@ object SettingsLibraryScreen : SearchableSettings {
val scope = rememberCoroutineScope()
val userCategoriesCount = allCategories.filterNot(Category::isSystemCategory).size
val defaultCategory by libraryPreferences.defaultCategory().collectAsState()
val selectedCategory = allCategories.find { it.id == defaultCategory.toLong() }
// For default category
val ids = listOf(libraryPreferences.defaultCategory().defaultValue()) +
allCategories.fastMap { it.id.toInt() }
val labels = listOf(stringResource(MR.strings.default_category_summary)) +
allCategories.fastMap { it.visualName }
val selectedCategoryName = selectedCategory?.visualName?.replace("%", "%%")
return Preference.PreferenceGroup(
title = stringResource(MR.strings.categories),
@@ -96,7 +92,6 @@ object SettingsLibraryScreen : SearchableSettings {
Preference.PreferenceItem.ListPreference(
pref = libraryPreferences.defaultCategory(),
title = stringResource(MR.strings.default_category),
subtitle = selectedCategoryName ?: stringResource(MR.strings.default_category_summary),
entries = ids.zip(labels).toMap().toImmutableMap(),
),
Preference.PreferenceItem.SwitchPreference(

View File

@@ -7,7 +7,7 @@ interpolator_version = "1.0.0"
[libraries]
gradle = { module = "com.android.tools.build:gradle", version.ref = "agp_version" }
annotation = "androidx.annotation:annotation:1.8.0"
annotation = "androidx.annotation:annotation:1.8.1"
appcompat = "androidx.appcompat:appcompat:1.7.0"
biometricktx = "androidx.biometric:biometric-ktx:1.2.0-alpha05"
constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"

View File

@@ -3,7 +3,7 @@ compose-bom = "2024.07.00-alpha01"
accompanist = "0.35.1-alpha"
[libraries]
activity = "androidx.activity:activity-compose:1.9.0"
activity = "androidx.activity:activity-compose:1.9.1"
bom = { group = "dev.chrisbanes.compose", name = "compose-bom", version.ref = "compose-bom" }
foundation = { module = "androidx.compose.foundation:foundation" }
animation = { module = "androidx.compose.animation:animation" }

View File

@@ -42,7 +42,7 @@ preferencektx = "androidx.preference:preference-ktx:1.2.1"
injekt-core = "com.github.inorichi.injekt:injekt-core:65b0440"
coil-bom = { module = "io.coil-kt.coil3:coil-bom", version = "3.0.0-alpha08" }
coil-bom = { module = "io.coil-kt.coil3:coil-bom", version = "3.0.0-alpha09" }
coil-core = { module = "io.coil-kt.coil3:coil" }
coil-gif = { module = "io.coil-kt.coil3:coil-gif" }
coil-compose = { module = "io.coil-kt.coil3:coil-compose" }

View File

@@ -13,16 +13,6 @@ pluginManagement {
mavenCentral()
maven(url = "https://www.jitpack.io")
}
// https://issuetracker.google.com/344363457
// TODO: Remove when AGP's bundled R8 is updated
buildscript {
repositories {
maven("https://storage.googleapis.com/r8-releases/raw")
}
dependencies {
classpath("com.android.tools:r8:8.5.21")
}
}
}
dependencyResolutionManagement {