Added notification icon + bugfix

Author: Mr-Pine

app/.gitignore

@@ -1 +1,2 @@
-/build
+/build
+/release/

app/src/main/AndroidManifest.xml

@@ -22,6 +22,10 @@
             android:name="com.google.firebase.messaging.default_notification_channel_id"
             android:value="@string/new_comic_channel_id" />
 
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/notification_thick"
+            />
 
         <activity
             android:name="de.mr_pine.xkcdfeed.MainActivity"

app/src/main/java/de/mr_pine/xkcdfeed/SingleComicViewModel.kt

@@ -14,6 +14,10 @@ class SingleComicViewModel: ViewModel() {
     var currentNumber by mutableStateOf(-1)
     var imageLoaded by mutableStateOf(true)
 
+    fun getNumber(): Int {
+        return currentComic?.id ?: -1
+    }
+
     fun setComic(number: Int, context: Context){
         currentNumber = number
 

app/src/main/java/de/mr_pine/xkcdfeed/composables/single/Single.kt

@@ -71,6 +71,7 @@ fun SingleViewContent(
     setFavorite: (XKCDComic) -> Unit,
     removeFavorite: (XKCDComic) -> Unit,
     colorMatrix: ColorMatrix,
+    getNumber: () -> Int,
     navigateHome: () -> Unit,
     startActivity: (Intent) -> Unit
 ) {
@@ -93,7 +94,9 @@ fun SingleViewContent(
             scaffoldState.bottomSheetState.expand()
     })
 
-    fun getId() = comic.id
+    fun getId(): Int {
+        return comic.id
+    }
     var currentNumberString by remember(comic.id) { mutableStateOf(comic.id.toString()) }
 
     var parentSize by remember { mutableStateOf(IntSize(0, 0)) }
@@ -195,10 +198,10 @@ fun SingleViewContent(
                     coroutineScope = scope,
                     zoomableState = zoomableState,
                     onSwipeLeft = {
-                        if (getId() < maxNumber) setNumber(getId() + 1)
+                        if (getNumber() < maxNumber) setNumber(getNumber() + 1)
                                   },
                     onSwipeRight = {
-                        if (getId() > 0) setNumber(getId() - 1)
+                        if (getNumber() > 0) setNumber(getNumber() - 1)
                                    },
                 ) {
                     Image(
@@ -478,10 +481,10 @@ fun bottomSheetContent(
                             verticalAlignment = Alignment.Bottom
                         ) {
                             Text(
-                                text = comic.title ?: "I am a title :)",
+                                text = comic.title ?: "",
                                 fontWeight = FontWeight.Bold,
                                 fontSize = 24.sp,
-                                modifier = Modifier.placeholder(comic.title == null)
+                                modifier = Modifier.widthIn(min = if(comic.title == null) 200.dp else 0.dp).placeholder(comic.title == null)
                             )
                             Text(
                                 text = "(${comic.id})",
@@ -595,6 +598,7 @@ fun SingleViewContentStateful(
             setNumber = { singleViewModel.currentComic = mainViewModel.loadComic(it) },
             maxNumber = mainViewModel.latestComicNumber,
             colorMatrix = ColorMatrix(mainViewModel.matrix.toColorMatrix()),
+            getNumber = singleViewModel::getNumber,
             startActivity = { mainViewModel.startActivity(it) },
             navigateHome = navigateHome
         )