Added neew launcher icon + background color, missing recipe image icon and proper filtering icon

app/src/main/java/xyz/pixelatedw/recipe/ui/components/MainScreen.kt

@@ -11,7 +11,6 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.OutlinedTextField
@@ -21,12 +20,15 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import xyz.pixelatedw.recipe.MainActivity
+import xyz.pixelatedw.recipe.R
 import xyz.pixelatedw.recipe.data.RecipeWithTags
 import xyz.pixelatedw.recipe.data.RecipesView
 
@@ -102,7 +104,7 @@ fun MainScreen(ctx: MainActivity, padding: PaddingValues, view: RecipesView) {
 						onClick = { openTagFilterDialog.value = true },
 					) {
 						Icon(
-							imageVector = Icons.Default.Edit,
+							imageVector = ImageVector.vectorResource(R.drawable.filter_24),
 							contentDescription = "Toggle tags filtering menu"
 						)
 					}

app/src/main/java/xyz/pixelatedw/recipe/ui/components/RecipeInfo.kt

@@ -1,6 +1,5 @@
 package xyz.pixelatedw.recipe.ui.components
 
-import android.util.DisplayMetrics
 import android.view.WindowManager
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
@@ -13,7 +12,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyHorizontalGrid
 import androidx.compose.foundation.rememberScrollState
@@ -27,7 +25,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asImageBitmap
@@ -50,6 +47,7 @@ fun RecipeInfo(
 ) {
 	val keepScreen = view.keepScreenOn.collectAsState()
 	val openDeletionDialog = remember { mutableStateOf(false) }
+	val picsCounts = remember { active.recipe.pics.size };
 
 	Column(
 		modifier = Modifier
@@ -69,24 +67,25 @@ fun RecipeInfo(
 			)
 		}
 
-		LazyHorizontalGrid(
+		if (picsCounts > 0) {
-			rows = GridCells.Fixed(1),
+			LazyHorizontalGrid(
-			modifier = Modifier
+				rows = GridCells.Fixed(1),
-				.fillMaxWidth()
+				modifier = Modifier
-				.wrapContentHeight()
+					.fillMaxWidth()
-				.height(256.dp)
+					.height(256.dp)
-				.padding(bottom = 16.dp),
+					.padding(bottom = 16.dp),
-			contentPadding = PaddingValues(horizontal = 16.dp)
+				contentPadding = PaddingValues(horizontal = 64.dp)
-		) {
+			) {
-			items(active.recipe.pics.size) { idx ->
+				items(picsCounts) { idx ->
-				val pic = active.recipe.showImage(ctx, idx)
+					val pic = active.recipe.showImage(ctx, idx)
-				if (pic != null) {
+					if (pic != null) {
-					Image(
+						Image(
-						bitmap = pic.asImageBitmap(),
+							bitmap = pic.asImageBitmap(),
-						contentDescription = "Recipe image",
+							contentDescription = "Recipe image",
-						contentScale = ContentScale.Crop,
+							contentScale = ContentScale.Crop,
-						modifier = Modifier.size(256.dp),
+							modifier = Modifier.size(256.dp),
-					)
+						)
+					}
 				}
 			}
 		}

app/src/main/java/xyz/pixelatedw/recipe/ui/components/RecipePreview.kt

@@ -13,12 +13,17 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.imageResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.em
+import xyz.pixelatedw.recipe.R
 import xyz.pixelatedw.recipe.data.Recipe
 import xyz.pixelatedw.recipe.data.RecipeWithTags
 
@@ -36,6 +41,14 @@ fun RecipePreview(entry: RecipeWithTags, previewUri: Bitmap?, onClick: () -> Uni
 					modifier = Modifier.size(256.dp).padding(top = 16.dp, bottom = 8.dp),
 				)
 			}
+			else {
+				Image(
+					bitmap = ImageBitmap.imageResource(R.drawable.missing_image),
+					contentDescription = "Missing recipe image",
+					contentScale = ContentScale.Crop,
+					modifier = Modifier.size(256.dp).padding(top = 16.dp, bottom = 8.dp),
+				)
+			}
 		}
 		Row(horizontalArrangement = Arrangement.Center, modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp)) {
 			Text(

app/src/main/res/drawable/filter_24.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M4.25,5.61C6.27,8.2 10,13 10,13v6c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v-6c0,0 3.72,-4.8 5.74,-7.39C20.25,4.95 19.78,4 18.95,4H5.04C4.21,4 3.74,4.95 4.25,5.61z"/>
+    
+</vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,30 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
-    android:viewportWidth="108"
+    android:viewportWidth="960"
-    android:viewportHeight="108">
+    android:viewportHeight="960">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+  <group android:scaleX="0.51"
-        <aapt:attr name="android:fillColor">
+      android:scaleY="0.51"
-            <gradient
+      android:translateX="235.2"
-                android:endX="85.84757"
+      android:translateY="235.2">
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
     <path
-        android:fillColor="#FFFFFF"
+        android:pathData="M360,560h80v-200h-80v200ZM200,500q-46,-23 -73,-66.5T100,339q0,-75 51.5,-127T278,160q12,0 24.5,2t24.5,5q25,-41 65,-64t88,-23q48,0 88,23t65,64q12,-3 24,-5t25,-2q75,0 126.5,52T860,339q0,51 -27,94.5T760,500v220L200,720v-220ZM520,560h80v-200h-80v200ZM280,640h400v-189l44,-22q26,-13 41,-36.5t15,-52.5q0,-42 -28.5,-71T682,240q-11,0 -20,2t-19,5l-47,13 -31,-52q-14,-23 -36.5,-35.5T480,160q-26,0 -48.5,12.5T395,208l-31,52 -48,-13q-10,-2 -19.5,-4.5T277,240q-41,0 -69,29t-28,71q0,29 15,52.5t41,36.5l44,22v189ZM200,720h80v80h400v-80h80v160L200,880v-160ZM480,640Z"
-        android:fillType="nonZero"
+        android:fillColor="#e3e3e3"/>
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+  </group>
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
 </vector>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
+    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
+    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
-</adaptive-icon>

app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#000000</color>
+</resources>

app/src/main/res/values/themes.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.Recipe" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.Recipe" parent="android:Theme.Material.Light.NoActionBar">
+		<item name="android:windowBackground">#000000</item>
+	</style>
 </resources>