diff --git a/app/src/main/java/io/legado/app/di/appModule.kt b/app/src/main/java/io/legado/app/di/appModule.kt index 47f656e01..38ad5656e 100644 --- a/app/src/main/java/io/legado/app/di/appModule.kt +++ b/app/src/main/java/io/legado/app/di/appModule.kt @@ -66,6 +66,7 @@ import io.legado.app.ui.book.import.remote.RemoteBookViewModel import io.legado.app.ui.book.import.remote.ServerConfigViewModel import io.legado.app.ui.book.import.remote.ServersViewModel import io.legado.app.ui.book.info.BookInfoViewModel +import io.legado.app.ui.book.read.ReadBookViewModel import io.legado.app.ui.book.readRecord.ReadRecordViewModel import io.legado.app.ui.book.search.SearchViewModel import io.legado.app.ui.book.searchContent.SearchContentViewModel @@ -181,6 +182,7 @@ val appModule = module { viewModelOf(::ServerConfigViewModel) viewModelOf(::ServersViewModel) viewModelOf(::BookInfoViewModel) + viewModelOf(::ReadBookViewModel) viewModelOf(::ChangeCoverViewModel) viewModelOf(::ChangeBookSourceComposeViewModel) viewModelOf(::ChangeBookSourceViewModel) diff --git a/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt index cb0280d48..d61365160 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt @@ -8,7 +8,6 @@ import android.view.KeyEvent import android.view.View import android.view.WindowInsets import android.view.WindowManager -import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.core.view.WindowInsetsCompat import androidx.core.view.doOnDetach @@ -52,6 +51,7 @@ import io.legado.app.utils.setOnApplyWindowInsetsListenerCompat import io.legado.app.utils.showDialogFragment import io.legado.app.utils.themeColor import io.legado.app.utils.viewbindingdelegate.viewBinding +import org.koin.androidx.viewmodel.ext.android.viewModel import java.time.Instant import java.time.LocalDate import java.time.ZoneId @@ -64,7 +64,7 @@ abstract class BaseReadBookActivity : VMBaseActivity(imageBg = false) { override val binding by viewBinding(ActivityBookReadBinding::inflate) - override val viewModel by viewModels() + override val viewModel by viewModel() protected val menuLayoutIsVisible get() = bottomDialog > 0 || binding.readMenu.isVisible || binding.searchMenu.bottomMenuVisible @@ -425,4 +425,4 @@ abstract class BaseReadBookActivity : val nextKeysStr = getPrefString(PreferKey.nextKeys) return nextKeysStr?.split(",")?.contains(keyCode.toString()) ?: false } -} \ No newline at end of file +} diff --git a/app/src/main/java/io/legado/app/ui/config/coverConfig/CoverManageSheet.kt b/app/src/main/java/io/legado/app/ui/config/coverConfig/CoverManageSheet.kt index 276592f42..f9cee8f4c 100644 --- a/app/src/main/java/io/legado/app/ui/config/coverConfig/CoverManageSheet.kt +++ b/app/src/main/java/io/legado/app/ui/config/coverConfig/CoverManageSheet.kt @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.aspectRatio +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size @@ -67,24 +68,19 @@ fun CoverManageSheet( AppModalBottomSheet( show = show, - onDismissRequest = onDismissRequest + onDismissRequest = onDismissRequest, + title = stringResource(R.string.default_cover) ) { Column( modifier = Modifier .fillMaxWidth() .padding(bottom = 24.dp) ) { - AppText( - text = stringResource(R.string.default_cover), - style = LegadoTheme.typography.titleMedium, - modifier = Modifier.padding(16.dp) - ) LazyVerticalGrid( columns = GridCells.Fixed(3), - contentPadding = PaddingValues(16.dp), - horizontalArrangement = Arrangement.spacedBy(12.dp), - verticalArrangement = Arrangement.spacedBy(12.dp), + horizontalArrangement = Arrangement.spacedBy(8.dp), + verticalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth() ) { items(coverList) { path -> @@ -131,11 +127,14 @@ fun CoverManageSheet( .fillMaxWidth() .aspectRatio(0.7f) ) { - Box(contentAlignment = Alignment.Center) { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center + ) { AppIcon( + modifier = Modifier.size(32.dp), imageVector = Icons.Default.Add, contentDescription = "Add", - modifier = Modifier.size(32.dp), tint = MaterialTheme.colorScheme.primary ) }