Fix long book names getting cut after 2 lines (#90)

Also move book detail screen and viewmodel to separate package -------------------------------------------------------------- Signed-off-by: starry-shivam <[email protected]>
Pool-Of-Tears · Oct 18, 2023 · f730166 · f730166
1 parent 6fca390
commit f730166
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/app/src/main/java/com/starry/myne/ui/navigation/NavGraph.kt b/app/src/main/java/com/starry/myne/ui/navigation/NavGraph.kt
@@ -39,7 +39,7 @@ import com.google.accompanist.navigation.animation.composable
 import com.starry.myne.others.NetworkObserver
 import com.starry.myne.ui.screens.categories.composables.CategoriesScreen
 import com.starry.myne.ui.screens.categories.composables.CategoryDetailScreen
-import com.starry.myne.ui.screens.home.composables.BookDetailScreen
+import com.starry.myne.ui.screens.detail.composables.BookDetailScreen
 import com.starry.myne.ui.screens.home.composables.HomeScreen
 import com.starry.myne.ui.screens.library.composables.LibraryScreen
 import com.starry.myne.ui.screens.reader.composables.ReaderDetailScreen

diff --git a/...eens/home/composables/BookDetailScreen.kt → ...ns/detail/composables/BookDetailScreen.kt b/...eens/home/composables/BookDetailScreen.kt → ...ns/detail/composables/BookDetailScreen.kt
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.starry.myne.ui.screens.home.composables
+package com.starry.myne.ui.screens.detail.composables
 
 import android.app.DownloadManager
 import android.content.Intent
@@ -58,6 +58,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -96,7 +97,7 @@ import com.airbnb.lottie.compose.rememberLottieComposition
 import com.starry.myne.MainActivity
 import com.starry.myne.R
 import com.starry.myne.ui.common.ProgressDots
-import com.starry.myne.ui.screens.home.viewmodels.BookDetailViewModel
+import com.starry.myne.ui.screens.detail.viewmodels.BookDetailViewModel
 import com.starry.myne.ui.screens.other.NetworkError
 import com.starry.myne.ui.screens.settings.viewmodels.ThemeMode
 import com.starry.myne.ui.theme.figeronaFont
@@ -260,8 +261,6 @@ fun BookDetailScreen(
                                         fontSize = 24.sp,
                                         fontFamily = figeronaFont,
                                         fontWeight = FontWeight.Bold,
-                                        maxLines = 2,
-                                        overflow = TextOverflow.Ellipsis,
                                         color = MaterialTheme.colorScheme.onBackground,
                                     )
 
@@ -300,7 +299,7 @@ fun BookDetailScreen(
                             }
 
                         var buttonText by remember { mutableStateOf(buttonTextValue) }
-                        var progressState by remember { mutableStateOf(0f) }
+                        var progressState by remember { mutableFloatStateOf(0f) }
                         var showProgressBar by remember { mutableStateOf(false) }
 
                         // Callable which updates book details screen button.
@@ -469,7 +468,10 @@ fun MiddleBar(
     showProgressBar: Boolean,
     onButtonClick: () -> Unit
 ) {
-    val progress by animateFloatAsState(targetValue = progressValue)
+    val progress by animateFloatAsState(
+        targetValue = progressValue,
+        label = "download progress bar"
+    )
     Column(modifier = Modifier.fillMaxWidth()) {
         AnimatedVisibility(visible = showProgressBar) {
             if (progressValue > 0f) {

diff --git a/...ns/home/viewmodels/BookDetailViewModel.kt → .../detail/viewmodels/BookDetailViewModel.kt b/...ns/home/viewmodels/BookDetailViewModel.kt → .../detail/viewmodels/BookDetailViewModel.kt
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package com.starry.myne.ui.screens.home.viewmodels
+package com.starry.myne.ui.screens.detail.viewmodels
 
 import android.annotation.SuppressLint
 import androidx.compose.material.ExperimentalMaterialApi