From 5d123e225f8e653f48390687e5692fe32912adbf Mon Sep 17 00:00:00 2001 From: marekmutch Date: Fri, 29 Sep 2023 14:57:14 -0400 Subject: [PATCH] #111 Default thumbnail mode to square instead of rectangular. Swap order of thumbnail mode preference list to have the default option (square) listed first. Formatting to appease ktlint. --- .../chronicle/data/local/SharedPreferencesPrefsRepo.kt | 4 ++-- .../currentlyplaying/CurrentlyPlayingViewModel.kt | 10 ++++++---- .../chronicle/features/settings/SettingsViewModel.kt | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/io/github/mattpvaughn/chronicle/data/local/SharedPreferencesPrefsRepo.kt b/app/src/main/java/io/github/mattpvaughn/chronicle/data/local/SharedPreferencesPrefsRepo.kt index 1e203d9..2d643db 100644 --- a/app/src/main/java/io/github/mattpvaughn/chronicle/data/local/SharedPreferencesPrefsRepo.kt +++ b/app/src/main/java/io/github/mattpvaughn/chronicle/data/local/SharedPreferencesPrefsRepo.kt @@ -155,8 +155,8 @@ interface PrefsRepo { VIEW_STYLE_TEXT_LIST ) - const val BOOK_COVER_STYLE_RECT = "Rectangular" const val BOOK_COVER_STYLE_SQUARE = "Square" + const val BOOK_COVER_STYLE_RECT = "Rectangular" } } @@ -186,7 +186,7 @@ class SharedPreferencesPrefsRepo @Inject constructor(private val sharedPreferenc value.absolutePath ).apply() - private val defaultBookCoverStyle = "Rectangular" + private val defaultBookCoverStyle = "Square" override var bookCoverStyle: String get() = getString(KEY_BOOK_COVER_STYLE, defaultBookCoverStyle) set(value) = sharedPreferences.edit().putString(KEY_BOOK_COVER_STYLE, value).apply() diff --git a/app/src/main/java/io/github/mattpvaughn/chronicle/features/currentlyplaying/CurrentlyPlayingViewModel.kt b/app/src/main/java/io/github/mattpvaughn/chronicle/features/currentlyplaying/CurrentlyPlayingViewModel.kt index 4966551..ca8dcba 100644 --- a/app/src/main/java/io/github/mattpvaughn/chronicle/features/currentlyplaying/CurrentlyPlayingViewModel.kt +++ b/app/src/main/java/io/github/mattpvaughn/chronicle/features/currentlyplaying/CurrentlyPlayingViewModel.kt @@ -599,10 +599,12 @@ class CurrentlyPlayingViewModel( } R.string.sleep_timer_duration_end_of_chapter -> { val duration = ( - ((chapterDuration.value ?: 0L) - ( - chapterProgress.value - ?: 0L - )) / prefsRepo.playbackSpeed + ( + (chapterDuration.value ?: 0L) - ( + chapterProgress.value + ?: 0L + ) + ) / prefsRepo.playbackSpeed ).toLong() BEGIN to duration } diff --git a/app/src/main/java/io/github/mattpvaughn/chronicle/features/settings/SettingsViewModel.kt b/app/src/main/java/io/github/mattpvaughn/chronicle/features/settings/SettingsViewModel.kt index ea9eefd..6eefae3 100644 --- a/app/src/main/java/io/github/mattpvaughn/chronicle/features/settings/SettingsViewModel.kt +++ b/app/src/main/java/io/github/mattpvaughn/chronicle/features/settings/SettingsViewModel.kt @@ -191,8 +191,8 @@ class SettingsViewModel( override fun onClick() { showOptionsMenu( options = listOf( - FormattableString.from(R.string.settings_book_cover_type_rect), - FormattableString.from(R.string.settings_book_cover_type_square) + FormattableString.from(R.string.settings_book_cover_type_square), + FormattableString.from(R.string.settings_book_cover_type_rect) ), title = FormattableString.from(R.string.settings_book_cover_type_label), listener = object : BottomChooserItemListener() {