add search feature to reader viewmodel

app/src/main/java/org/ireader/infinity/presentation/MainActivity.kt

@@ -5,6 +5,7 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
+import androidx.core.app.NotificationManagerCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
 import dagger.hilt.android.AndroidEntryPoint
@@ -32,5 +33,10 @@ class MainActivity : ComponentActivity() {
 
  }
 
+ override fun onDestroy() {
+ NotificationManagerCompat.from(this).cancelAll()
+ super.onDestroy()
+ }
+
 }
 

core-ui/src/main/java/org/ireader/core_ui/theme/AppPreferences.kt

@@ -31,12 +31,14 @@ class AppPreferences @Inject constructor(
  const val AUTO_SCROLL_MODE_OFFSET = "auto_scroll_mode_offset"
  const val SCROLL_INDICATOR_PADDING = "scroll_indicator_padding"
  const val SCROLL_INDICATOR_WIDTH = "scroll_indicator_width"
+ const val SELECTABLE_TEXT = "selectable_text"
 
 
  const val TEXT_READER_SPEECH_RATE = "text_reader_speech_rate"
  const val TEXT_READER_SPEECH_PITCH = "text_reader_speech_pitch"
  const val TEXT_READER_SPEECH_LANGUAGE = "text_reader_speech_language"
  const val TEXT_READER_SPEECH_VOICE = "text_reader_speech_voice"
+ const val TEXT_READER_AUTO_NEXT = "text_reader_auto_next"
 
  /** Services **/
  const val Last_UPDATE_CHECK = "last_update_check"
@@ -108,6 +110,10 @@ class AppPreferences @Inject constructor(
  return preferenceStore.getBoolean(SCROLL_MODE, true)
  }
 
+ fun selectableText(): Preference<Boolean> {
+ return preferenceStore.getBoolean(SELECTABLE_TEXT, true)
+ }
+
  fun autoScrollInterval(): Preference<Long> {
  return preferenceStore.getLong(AUTO_SCROLL_MODE_INTERVAL, 5000L)
  }
@@ -136,6 +142,10 @@ class AppPreferences @Inject constructor(
  return preferenceStore.getFloat(TEXT_READER_SPEECH_RATE, .8f)
  }
 
+ fun readerAutoNext(): Preference<Boolean> {
+ return preferenceStore.getBoolean(TEXT_READER_AUTO_NEXT, false)
+ }
+
  fun speechPitch(): Preference<Float> {
  return preferenceStore.getFloat(TEXT_READER_SPEECH_PITCH, .8f)
  }

domain/src/main/java/org/ireader/domain/feature_services/notification/DefaultNotificationHelper.kt

@@ -5,10 +5,10 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.media.MediaMetadata
-import android.media.session.PlaybackState
 import android.os.Build
 import android.support.v4.media.MediaMetadataCompat
 import android.support.v4.media.session.MediaSessionCompat
+import android.support.v4.media.session.PlaybackStateCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.net.toUri
@@ -176,19 +176,19 @@ class DefaultNotificationHelper @Inject constructor(
  setMetadata(MediaMetadataCompat.Builder().apply {
  putText(MediaMetadata.METADATA_KEY_TITLE, chapter.title)
  }.build())
- val actions =
- PlaybackState.ACTION_PLAY_PAUSE or PlaybackState.ACTION_STOP or PlaybackState.ACTION_SKIP_TO_NEXT or PlaybackState.ACTION_SKIP_TO_PREVIOUS
+ setPlaybackState(PlaybackStateCompat.Builder().apply {
+ setActions(PlaybackStateCompat.ACTION_PLAY or PlaybackStateCompat.ACTION_STOP or PlaybackStateCompat.ACTION_SKIP_TO_NEXT or PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS)
 
+ }.build())
  }
  return NotificationCompat.Builder(applicationContext,
  Notifications.CHANNEL_TEXT_READER_PROGRESS).apply {
  setContentTitle(chapter.title)
  setContentText("${progress}/${chapter.content.size}")
  setSmallIcon(org.ireader.core.R.drawable.ic_infinity)
  setOnlyAlertOnce(true)
- // setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+ setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
  setLargeIcon(applicationContext, book.cover)
- //setShowWhen(false)
  priority = NotificationCompat.PRIORITY_LOW
 
  addAction(R.drawable.ic_baseline_skip_previous,
@@ -213,7 +213,6 @@ class DefaultNotificationHelper @Inject constructor(
  .setShowActionsInCompactView(1, 2, 3)
  )
  setSubText(book.title)
- color = applicationContext.resources.getColor(R.color.blue_200)
 
  //setColorized(true)
  //setAutoCancel(true)

domain/src/main/java/org/ireader/domain/feature_services/notification/Notifications.kt

@@ -9,7 +9,6 @@ import androidx.core.app.NotificationCompat
 import androidx.core.graphics.drawable.toBitmap
 import coil.ImageLoader
 import coil.request.ImageRequest
-import coil.transform.CircleCropTransformation
 
 data class Channel(
  val name: String,
@@ -41,10 +40,9 @@ fun createChannel(context: Context, channel: Channel) {
  if (data != null) {
  val request = ImageRequest.Builder(context)
  .data(data)
- .transformations(CircleCropTransformation())
  .allowHardware(true)
  .target { setLargeIcon(it.toBitmap()) }
- .size(200)
+ .size(512)
  .build()
  ImageLoader(context).execute(request)
  }

domain/src/main/java/org/ireader/domain/use_cases/preferences/reader_preferences/OrientationUseCase.kt

@@ -123,4 +123,12 @@ class TextReaderPrefUseCase @Inject constructor(
  return appPreferences.speechVoice().get()
  }
 
+ fun saveAutoNext(value: Boolean) {
+ appPreferences.readerAutoNext().set(value)
+ }
+
+ fun readAutoNext(): Boolean {
+ return appPreferences.readerAutoNext().get()
+ }
+
 }

domain/src/main/java/org/ireader/domain/use_cases/preferences/reader_preferences/SelectedFontStateUseCase.kt

@@ -8,16 +8,25 @@ import javax.inject.Inject
 class SelectedFontStateUseCase @Inject constructor(
  private val appPreferences: AppPreferences,
 ) {
- fun save(fontIndex: Int) {
+ fun saveFont(fontIndex: Int) {
  appPreferences.font().set(fontIndex)
  }
 
  /**
  * fontIndex is the index of font which is in fonts list inside the Type package
  */
- fun read(): FontType {
+ fun readFont(): FontType {
  val fontType = appPreferences.font().get()
  return fonts[fontType]
  }
 
+ fun saveSelectableText(value: Boolean) {
+ appPreferences.selectableText().set(value)
+ }
+
+ fun readSelectableText(): Boolean {
+ return appPreferences.selectableText().get()
+ }
+
+
 }

presentation/src/main/java/org/ireader/presentation/feature_reader/presentation/reader/ReaderScreen.kt

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
@@ -63,13 +62,13 @@ fun ReadingScreen(
  val context = LocalContext.current
 
 
- DisposableEffect(key1 = true) {
- onDispose {
- vm.uiFunc.apply {
- vm.restoreSetting(context, scrollState)
- }
- }
- }
+// DisposableEffect(key1 = true) {
+// onDispose {
+// vm.uiFunc.apply {
+// vm.restoreSetting(context, scrollState)
+// }
+// }
+// }
  LaunchedEffect(key1 = scaffoldState.drawerState.targetValue) {
  if (chapter != null && scaffoldState.drawerState.targetValue == DrawerValue.Open && vm.stateChapters.isNotEmpty()) {
  vm.uiFunc.apply {
@@ -195,6 +194,15 @@ fun ReadingScreen(
  vm.showSnackBar(UiText.ExceptionString(e))
  }
  }
+ },
+ vm = vm,
+ state = vm,
+ scrollState = scrollState,
+ onBookMark = {
+ vm.uiFunc.apply {
+ vm.bookmarkChapter()
+
+ }
  }
  )
  },