From 38a1983d83d6fcbd9de666fd57518f0655a6f902 Mon Sep 17 00:00:00 2001 From: Luca Fluri Date: Thu, 16 Jul 2020 02:55:16 +0200 Subject: [PATCH] feat: android splashcreen - implemented android splashscreen and notification icon - adjusted pricetile coloring when available again --- android/app/src/main/AndroidManifest.xml | 7 +++++++ android/app/src/main/res/drawable/app_icon.png | Bin 5285 -> 682 bytes .../app/src/main/res/drawable/app_icon_og.png | Bin 0 -> 1912 bytes .../main/res/drawable/launch_background.xml | 8 ++++---- android/app/src/main/res/values/styles.xml | 3 ++- assets/notifications_icon/app_icon.png | Bin 5285 -> 682 bytes .../home/components/product_list_tile.dart | 12 +++--------- 7 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 android/app/src/main/res/drawable/app_icon_og.png diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 171b1b1..aab5f10 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -55,6 +55,13 @@ + + + + + + + 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 ac$dc}uHbk2vUtvq$42^QdL?I_N&gARFpf+B diff --git a/android/app/src/main/res/drawable/app_icon_og.png b/android/app/src/main/res/drawable/app_icon_og.png new file mode 100644 index 0000000000000000000000000000000000000000..c4cc798d7408b624d2be0ae7a5276c50aa9ee25b GIT binary patch literal 1912 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 ba&_LNsHUcTP+UHw`VMLCzHW8oaPhwYY>_fz literal 0 HcmV?d00001 diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml index 8403758..6e313e5 100644 --- a/android/app/src/main/res/drawable/launch_background.xml +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -1,12 +1,12 @@ - + - + android:src="@drawable/ic_launcher_foreground" /> + diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index a554de4..cf9034d 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -1,5 +1,6 @@ + #FF5B9DC1 diff --git a/assets/notifications_icon/app_icon.png b/assets/notifications_icon/app_icon.png index 92f43f75c098db3ad71cc6b5d3524ae2ddf2d328..bff4d7a03efc9bac35289b12a141164c730a81f5 100644 GIT binary patch delta 646 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 ac$dc}uHbk2vUtvq$42^QdL?I_N&gARFpf+B diff --git a/lib/screens/home/components/product_list_tile.dart b/lib/screens/home/components/product_list_tile.dart index 992429f..29c6156 100644 --- a/lib/screens/home/components/product_list_tile.dart +++ b/lib/screens/home/components/product_list_tile.dart @@ -17,16 +17,10 @@ class ProductListTile extends StatelessWidget { @override Widget build(BuildContext context) { //Price Difference since last day => used for coloring - double _priceDifference = (product.prices.length > 1 && - product.prices[product.prices.length - 1] >= 0) - ? product.prices[product.prices.length - 1] - - product.prices[product.prices.length - 2] - : 0.0; + double _priceDifference = product.priceDifferenceToYesterday(); + bool _underTarget = product.underTarget(); - bool _underTarget = product.prices[product.prices.length - 1] >= 0 && - product.prices[product.prices.length - 1] <= product.targetPrice; - - Color _chosenColor = _priceDifference == 0 + Color _chosenColor = _priceDifference == 0 || product.availableAgain() ? Colors.transparent : _priceDifference < 0 ? Colors.green[800] : Colors.red[900];