🍱 New app icon

README.md

@@ -1,6 +1,6 @@
 <div align="center">
 
-<img src="fed-icon.png" width="100px">
+<img src="app/src/main/res/drawable/fed_icon.png" width="100px">
 
 # Food Expiration Dates
 

app/src/main/java/com/lorenzovainigli/foodexpirationdates/model/worker/CheckExpirationsWorker.kt

@@ -84,7 +84,7 @@ class CheckExpirationsWorker @Inject constructor(
  val notification = NotificationCompat.Builder(applicationContext, "channel_reminders")
  .setContentText(message)
  .setContentTitle(title)
- .setSmallIcon(R.drawable.fed_icon)
+ .setSmallIcon(R.drawable.fed_icon_notification)
  .setAutoCancel(true)
  .setContentIntent(pendingIntent)
  .build()

app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/AppIcon.kt

@@ -0,0 +1,84 @@
+package com.lorenzovainigli.foodexpirationdates.view.composable
+
+import android.graphics.ColorMatrixColorFilter
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asComposeColorFilter
+import androidx.compose.ui.graphics.drawscope.scale
+import androidx.compose.ui.res.imageResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.times
+import com.lorenzovainigli.foodexpirationdates.R
+import com.lorenzovainigli.foodexpirationdates.ui.theme.FoodExpirationDatesTheme
+
+@Composable
+fun AppIcon(
+ size: Dp,
+ color: Color = MaterialTheme.colorScheme.primary
+) {
+ val aspectRatio: Float = 1f / 48f * 44f
+ val resizeRatio: Float = size / 48.dp // 1 : x = 48 : size
+ val scaleRatio: Float = 0.28f * size / 48.dp // 0.28 : x = 48 : size
+ val width: Dp = size
+ val height: Dp = size * aspectRatio
+ // Rows 1-4: RGBA channels of the output color
+ // Columns 1-4: RGBA channels of the input color
+ val matrix = floatArrayOf(
+ color.red, 0f, 0f, 0f, 0f,
+ color.green, 0f, 0f, 0f, 0f,
+ color.blue, 0f, 0f, 0f, 0f,
+ 1f, 0f, 0f, 0f, 0f
+ )
+ val imageBitmap =
+ ImageBitmap.imageResource(id = R.drawable.fed_icon)
+ Canvas(
+ modifier = Modifier
+ .padding(horizontal = 7.dp)
+ .width(width)
+ .height(height)
+ .clip(RoundedCornerShape(12.dp * resizeRatio))
+ ) {
+ scale(
+ scaleX = scaleRatio,
+ scaleY = scaleRatio,
+ pivot = Offset(0f, 0f)
+ ) {
+ drawImage(
+ image = imageBitmap,
+ topLeft = Offset(
+ x = -24f * resizeRatio,
+ y = -20f * resizeRatio
+ ),
+ colorFilter = ColorMatrixColorFilter(matrix).asComposeColorFilter()
+ )
+ }
+ }
+}
+
+@Preview
+@Composable
+fun AppIconPreview() {
+ FoodExpirationDatesTheme {
+ Surface(
+ color = MaterialTheme.colorScheme.background
+ ) {
+ Column {
+ AppIcon(size = 48.dp)
+ }
+ }
+ }
+}

app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/InfoActivityLayout.kt

@@ -3,12 +3,14 @@ package com.lorenzovainigli.foodexpirationdates.view.composable.activity
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
@@ -116,10 +118,17 @@ fun InfoActivityLayout(
  .padding(10.dp),
  verticalArrangement = Arrangement.spacedBy(16.dp)
  ) {
+ Image(
+ modifier = Modifier.fillMaxWidth()
+ .height(128.dp)
+ .padding(top = 16.dp),
+ painter = painterResource(id = R.drawable.fed_icon),
+ alignment = Alignment.Center,
+ contentDescription = null
+ )
  Text(
  modifier = Modifier
- .align(Alignment.CenterHorizontally)
- .padding(top = 16.dp),
+ .align(Alignment.CenterHorizontally),
  text = stringResource(id = R.string.app_name),
  style = MaterialTheme.typography.headlineMedium,
  textAlign = TextAlign.Center

app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/composable/activity/MainActivityLayout.kt

@@ -2,10 +2,8 @@ package com.lorenzovainigli.foodexpirationdates.view.composable.activity
 
 import android.content.Context
 import android.content.Intent
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
@@ -42,13 +40,9 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
-import androidx.compose.ui.graphics.BlendMode
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
@@ -64,6 +58,7 @@ import com.lorenzovainigli.foodexpirationdates.ui.theme.TonalElevation
 import com.lorenzovainigli.foodexpirationdates.view.activity.InfoActivity
 import com.lorenzovainigli.foodexpirationdates.view.activity.InsertActivity
 import com.lorenzovainigli.foodexpirationdates.view.activity.SettingsActivity
+import com.lorenzovainigli.foodexpirationdates.view.composable.AppIcon
 import com.lorenzovainigli.foodexpirationdates.view.composable.FoodCard
 import com.lorenzovainigli.foodexpirationdates.view.composable.MyTopAppBar
 import com.lorenzovainigli.foodexpirationdates.view.preview.DevicePreviews
@@ -111,20 +106,7 @@ fun MainActivityLayout(
  MyTopAppBar(
  title = stringResource(id = R.string.app_name),
  navigationIcon = {
- Box {
- Image(
- modifier = Modifier
- .padding(horizontal = 7.dp)
- .size(48.dp),
- painter = painterResource(id = R.drawable.fed_icon),
- contentDescription = null,
- contentScale = ContentScale.Crop,
- colorFilter = ColorFilter.tint(
- color = MaterialTheme.colorScheme.primary,
- blendMode = BlendMode.SrcAtop
- )
- )
- }
+ AppIcon(size = 48.dp)
  },
  scrollBehavior = scrollBehavior,
  prefsViewModel = prefsViewModel

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
  <item
- android:height="100dp"
- android:width="100dp"
+ android:height="90dp"
+ android:width="90dp"
  android:drawable="@drawable/fed_icon"
  android:gravity="center"
  />

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

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