diff --git a/trackeroo/android/app/src/main/ic_launcher-playstore.png b/trackeroo/android/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000000000000000000000000000000000000..d36fa1b3ce944f7de95ede70d626f9f2bea07add
Binary files /dev/null and b/trackeroo/android/app/src/main/ic_launcher-playstore.png differ
diff --git a/trackeroo/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/trackeroo/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index db77bb4b7b0906d62b1847e87f15cdcacf6a4f29..881d2894faabfd2a73c5a2ee6cefdf817760ec3b 100644
Binary files a/trackeroo/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/trackeroo/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/trackeroo/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/trackeroo/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 17987b79bb8a35cc66c3c1fd44f5a5526c1b78be..b20a97d11c8bbd7161a1320a5a55ed5de2daf41e 100644
Binary files a/trackeroo/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/trackeroo/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/trackeroo/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/trackeroo/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 09d4391482be68e9e4a07fab769b5de337d16eb1..a9d8a59a0a490860dd04a94554d9c159d06e828a 100644
Binary files a/trackeroo/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/trackeroo/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/trackeroo/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/trackeroo/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index d5f1c8d34e7a88e3f88bea192c3a370d44689c3c..1ddfdf019f31f95f290e690b865d1dde26657253 100644
Binary files a/trackeroo/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/trackeroo/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/trackeroo/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/trackeroo/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 4d6372eebdb28e45604e46eeda8dd24651419bc0..ad25b99e239ac5a448a2e15a6aa25e71fcdee06a 100644
Binary files a/trackeroo/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/trackeroo/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/trackeroo/assets/icon/kangaroo-circle.png b/trackeroo/assets/icon/kangaroo-circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..54ce714f15c2fd16efd5e27499c8301927bc73a4
Binary files /dev/null and b/trackeroo/assets/icon/kangaroo-circle.png differ
diff --git a/trackeroo/assets/icon/kangaroo-square.png b/trackeroo/assets/icon/kangaroo-square.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cbdfcc48e2bbabde64218ba31f769d3b17943ce
Binary files /dev/null and b/trackeroo/assets/icon/kangaroo-square.png differ
diff --git a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
index d36b1fab2d9dea668a4f83df94d525897d9e68dd..eabd8512d0ab34eede7452ce59aeccffeaa4686e 100644
--- a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,122 +1,122 @@
{
- "images" : [
+ "images": [
{
- "size" : "20x20",
- "idiom" : "iphone",
- "filename" : "Icon-App-20x20@2x.png",
- "scale" : "2x"
+ "filename": "Icon-App-20x20@2x.png",
+ "idiom": "iphone",
+ "scale": "2x",
+ "size": "20x20"
},
{
- "size" : "20x20",
- "idiom" : "iphone",
- "filename" : "Icon-App-20x20@3x.png",
- "scale" : "3x"
+ "filename": "Icon-App-20x20@3x.png",
+ "idiom": "iphone",
+ "scale": "3x",
+ "size": "20x20"
},
{
- "size" : "29x29",
- "idiom" : "iphone",
- "filename" : "Icon-App-29x29@1x.png",
- "scale" : "1x"
+ "filename": "Icon-App-29x29@1x.png",
+ "idiom": "iphone",
+ "scale": "1x",
+ "size": "29x29"
},
{
- "size" : "29x29",
- "idiom" : "iphone",
- "filename" : "Icon-App-29x29@2x.png",
- "scale" : "2x"
+ "filename": "Icon-App-29x29@2x.png",
+ "idiom": "iphone",
+ "scale": "2x",
+ "size": "29x29"
},
{
- "size" : "29x29",
- "idiom" : "iphone",
- "filename" : "Icon-App-29x29@3x.png",
- "scale" : "3x"
+ "filename": "Icon-App-29x29@3x.png",
+ "idiom": "iphone",
+ "scale": "3x",
+ "size": "29x29"
},
{
- "size" : "40x40",
- "idiom" : "iphone",
- "filename" : "Icon-App-40x40@2x.png",
- "scale" : "2x"
+ "filename": "Icon-App-40x40@2x.png",
+ "idiom": "iphone",
+ "scale": "2x",
+ "size": "40x40"
},
{
- "size" : "40x40",
- "idiom" : "iphone",
- "filename" : "Icon-App-40x40@3x.png",
- "scale" : "3x"
+ "filename": "Icon-App-40x40@3x.png",
+ "idiom": "iphone",
+ "scale": "3x",
+ "size": "40x40"
},
{
- "size" : "60x60",
- "idiom" : "iphone",
- "filename" : "Icon-App-60x60@2x.png",
- "scale" : "2x"
+ "filename": "Icon-App-60x60@2x.png",
+ "idiom": "iphone",
+ "scale": "2x",
+ "size": "60x60"
},
{
- "size" : "60x60",
- "idiom" : "iphone",
- "filename" : "Icon-App-60x60@3x.png",
- "scale" : "3x"
+ "filename": "Icon-App-60x60@3x.png",
+ "idiom": "iphone",
+ "scale": "3x",
+ "size": "60x60"
},
{
- "size" : "20x20",
- "idiom" : "ipad",
- "filename" : "Icon-App-20x20@1x.png",
- "scale" : "1x"
+ "filename": "Icon-App-20x20@1x.png",
+ "idiom": "ipad",
+ "scale": "1x",
+ "size": "20x20"
},
{
- "size" : "20x20",
- "idiom" : "ipad",
- "filename" : "Icon-App-20x20@2x.png",
- "scale" : "2x"
+ "filename": "Icon-App-20x20@2x.png",
+ "idiom": "ipad",
+ "scale": "2x",
+ "size": "20x20"
},
{
- "size" : "29x29",
- "idiom" : "ipad",
- "filename" : "Icon-App-29x29@1x.png",
- "scale" : "1x"
+ "filename": "Icon-App-29x29@1x.png",
+ "idiom": "ipad",
+ "scale": "1x",
+ "size": "29x29"
},
{
- "size" : "29x29",
- "idiom" : "ipad",
- "filename" : "Icon-App-29x29@2x.png",
- "scale" : "2x"
+ "filename": "Icon-App-29x29@2x.png",
+ "idiom": "ipad",
+ "scale": "2x",
+ "size": "29x29"
},
{
- "size" : "40x40",
- "idiom" : "ipad",
- "filename" : "Icon-App-40x40@1x.png",
- "scale" : "1x"
+ "filename": "Icon-App-40x40@1x.png",
+ "idiom": "ipad",
+ "scale": "1x",
+ "size": "40x40"
},
{
- "size" : "40x40",
- "idiom" : "ipad",
- "filename" : "Icon-App-40x40@2x.png",
- "scale" : "2x"
+ "filename": "Icon-App-40x40@2x.png",
+ "idiom": "ipad",
+ "scale": "2x",
+ "size": "40x40"
},
{
- "size" : "76x76",
- "idiom" : "ipad",
- "filename" : "Icon-App-76x76@1x.png",
- "scale" : "1x"
+ "filename": "Icon-App-76x76@1x.png",
+ "idiom": "ipad",
+ "scale": "1x",
+ "size": "76x76"
},
{
- "size" : "76x76",
- "idiom" : "ipad",
- "filename" : "Icon-App-76x76@2x.png",
- "scale" : "2x"
+ "filename": "Icon-App-76x76@2x.png",
+ "idiom": "ipad",
+ "scale": "2x",
+ "size": "76x76"
},
{
- "size" : "83.5x83.5",
- "idiom" : "ipad",
- "filename" : "Icon-App-83.5x83.5@2x.png",
- "scale" : "2x"
+ "filename": "Icon-App-83.5x83.5@2x.png",
+ "idiom": "ipad",
+ "scale": "2x",
+ "size": "83.5x83.5"
},
{
- "size" : "1024x1024",
- "idiom" : "ios-marketing",
- "filename" : "Icon-App-1024x1024@1x.png",
- "scale" : "1x"
+ "filename": "Icon-App-1024x1024@1x.png",
+ "idiom": "ios-marketing",
+ "scale": "1x",
+ "size": "1024x1024"
}
],
- "info" : {
- "version" : 1,
- "author" : "xcode"
+ "info": {
+ "author": "icons_launcher",
+ "version": 1
}
-}
+}
\ No newline at end of file
diff --git a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
index dc9ada4725e9b0ddb1deab583e5b5102493aa332..817918221a7ac150c6c1d05d3b5e02bb1388bd7e 100644
Binary files a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
index 7353c41ecf9ca08017312dc233d9830079b50717..14d4cf94c7e12ddb5498def75e9b39ae294b4c22 100644
Binary files a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
index 797d452e458972bab9d994556c8305db4c827017..01263fd7f08244fd8aa6fcfeeb60406a237503ce 100644
Binary files a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
index 6ed2d933e1120817fe9182483a228007b18ab6ae..b52277b2f6e0e3baea2df05e8872fe59439b305c 100644
Binary files a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
index 4cd7b0099ca80c806f8fe495613e8d6c69460d76..c34beb05abba89dd9fd75dbad3ae10167e402e43 100644
Binary files a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
index fe730945a01f64a61e2235dbe3f45b08f7729182..27297bb44376a28fe669f4244bcc3d5843d04dfb 100644
Binary files a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
index 321773cd857a8a0f0c9c7d3dc3f5ff4fb298dc10..53471ef833ba217a586b28dcf19e434c7647b021 100644
Binary files a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
index 797d452e458972bab9d994556c8305db4c827017..01263fd7f08244fd8aa6fcfeeb60406a237503ce 100644
Binary files a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
index 502f463a9bc882b461c96aadf492d1729e49e725..c7132f77997a817766d7da981b4cba8be04950ed 100644
Binary files a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
index 0ec303439225b78712f49115768196d8d76f6790..6c5e9e39ac3dbab1eb43b1bea953192c001e9c5e 100644
Binary files a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
index 0ec303439225b78712f49115768196d8d76f6790..6c5e9e39ac3dbab1eb43b1bea953192c001e9c5e 100644
Binary files a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
index e9f5fea27c705180eb716271f41b582e76dcbd90..91c98d31ce194ba8493d6edff0f800bf34a82826 100644
Binary files a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
index 84ac32ae7d989f82d5e46a60405adcc8279e8001..fbbd58e38599e9a878e2b7fda05b208f275fe45c 100644
Binary files a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index 8953cba09064923c5daf2d37e7c3c836ccdd794b..dd99c2fdefd328e802ecdba0e3df1d7de6d7e777 100644
Binary files a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index 0467bf12aa4d28f374bb26596605a46dcbb3e7c8..668c6637dbf34c7e835c5fdc166c313d8cc34587 100644
Binary files a/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/trackeroo/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/trackeroo/lib/frontend/utils/onboarding/ob_categories.dart b/trackeroo/lib/frontend/utils/onboarding/ob_categories.dart
index 037f64484448ff43de75968d51ba8186a9d49dc9..9b95c578eac86fce45e17a3b257ace41e660ef6a 100644
--- a/trackeroo/lib/frontend/utils/onboarding/ob_categories.dart
+++ b/trackeroo/lib/frontend/utils/onboarding/ob_categories.dart
@@ -13,7 +13,7 @@ class OnboardingCategories extends StatelessWidget {
children: [
Row(
children: [
- Icon(Icons.category_rounded, size: 40.0),
+ Icon(Icons.arrow_forward_ios_rounded, size: 30.0),
SizedBox(width: 20.0),
Text(
'Categories',
@@ -31,6 +31,15 @@ class OnboardingCategories extends StatelessWidget {
fontSize: 16.0
),
),
+ Expanded(
+ child: Center(
+ child: Icon(
+ Icons.category_rounded,
+ size: 200.0,
+ )
+ )
+ ),
+ SizedBox(height: 100.0)
]
),
),
diff --git a/trackeroo/lib/frontend/utils/onboarding/ob_details.dart b/trackeroo/lib/frontend/utils/onboarding/ob_details.dart
index 070d4dea01b89fd3d5a8cdb228f3c7aefa358e37..824bdd6fcc4e7ab81d9c25e1452590f1205e999a 100644
--- a/trackeroo/lib/frontend/utils/onboarding/ob_details.dart
+++ b/trackeroo/lib/frontend/utils/onboarding/ob_details.dart
@@ -13,7 +13,7 @@ class OnboardingDetails extends StatelessWidget {
children: [
Row(
children: [
- Icon(Icons.bar_chart, size: 40.0),
+ Icon(Icons.arrow_forward_ios_rounded, size: 30.0),
SizedBox(width: 20.0),
Text(
'Details',
@@ -31,6 +31,15 @@ class OnboardingDetails extends StatelessWidget {
fontSize: 16.0
),
),
+ Expanded(
+ child: Center(
+ child: Icon(
+ Icons.bar_chart,
+ size: 200.0,
+ )
+ )
+ ),
+ SizedBox(height: 100.0)
]
),
),
diff --git a/trackeroo/lib/frontend/utils/onboarding/ob_home.dart b/trackeroo/lib/frontend/utils/onboarding/ob_home.dart
index 913d50166ad70d88c2f3d65ba5f85399a47e6014..eb046e7d35468aae317d7297128df4434359e28a 100644
--- a/trackeroo/lib/frontend/utils/onboarding/ob_home.dart
+++ b/trackeroo/lib/frontend/utils/onboarding/ob_home.dart
@@ -13,7 +13,7 @@ class OnboardingHome extends StatelessWidget {
children: [
Row(
children: [
- Icon(Icons.home_rounded, size: 40.0),
+ Icon(Icons.arrow_forward_ios_rounded, size: 30.0),
SizedBox(width: 20.0),
Text(
'Home',
@@ -31,6 +31,15 @@ class OnboardingHome extends StatelessWidget {
fontSize: 16.0
),
),
+ Expanded(
+ child: Center(
+ child: Icon(
+ Icons.home_rounded,
+ size: 200.0,
+ )
+ )
+ ),
+ SizedBox(height: 100.0)
]
),
),
diff --git a/trackeroo/lib/frontend/utils/onboarding/ob_welcome.dart b/trackeroo/lib/frontend/utils/onboarding/ob_welcome.dart
index 49c36fecf8a60d6a66aa31f32306a8c08ab79bd0..00c6372128ad98ef5a2ea4c4feea0ae8634efb2d 100644
--- a/trackeroo/lib/frontend/utils/onboarding/ob_welcome.dart
+++ b/trackeroo/lib/frontend/utils/onboarding/ob_welcome.dart
@@ -5,36 +5,39 @@ class OnboardingWelcome extends StatelessWidget {
@override
Widget build(BuildContext context) {
- return const SafeArea(
+ return SafeArea(
child: Padding(
- padding: EdgeInsets.all(20.0),
+ padding: const EdgeInsets.all(20.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- Text(
+ const Text(
'Welcome',
style: TextStyle(
fontSize: 40.0,
fontWeight: FontWeight.w300
),
),
- Text(
+ const Text(
'to Trackeroo',
style: TextStyle(
fontSize: 16.0
),
),
- SizedBox(height: 30.0),
- Text('This is a University Project.'),
- SizedBox(height: 5.0),
- Text('It collects no data and does not require Internet connection.'),
+ const SizedBox(height: 30.0),
+ const Text('This is a University Project.'),
+ const SizedBox(height: 5.0),
+ const Text('It collects no data and does not require Internet connection.'),
Expanded(
child: Center(
- child: Text('App Icon\nPlaceholder', textAlign: TextAlign.center)
+ child: Image.asset(
+ 'assets/icon/kangaroo-circle.png',
+ width: 250.0,
+ )
)
),
- Text('Created by Florian Schindler, Hannes Raschke, Michelle Kehl und Celine Schmitt'),
- SizedBox(height: 90.0)
+ const Text('Created by Florian Schindler, Hannes Raschke, Michelle Kehl und Celine Schmitt'),
+ const SizedBox(height: 90.0)
]
),
),
diff --git a/trackeroo/lib/frontend/views/details_view.dart b/trackeroo/lib/frontend/views/details_view.dart
index ceb94ee9ad896614a31820b49a29e61693fb992c..0f3250b3aad073c9dca1f4d471ded844a8a6f17a 100644
--- a/trackeroo/lib/frontend/views/details_view.dart
+++ b/trackeroo/lib/frontend/views/details_view.dart
@@ -196,8 +196,8 @@ class _DetailsViewState extends State<DetailsView> {
onPressed: () => {
showDateRangePicker(
context: context,
- firstDate: transactionsController.transactionsList.isNotEmpty ? transactionsController.transactionsList.first.createdAt : DateTime.now(),
- lastDate: transactionsController.transactionsList.isNotEmpty ? transactionsController.transactionsList.last.createdAt : DateTime.now(),
+ firstDate: filteredTransList.isNotEmpty ? filteredTransList.last.createdAt : DateTime.now(),
+ lastDate: filteredTransList.isNotEmpty ? filteredTransList.first.createdAt : DateTime.now(),
helpText: 'Choose timespan',
saveText: 'Done'
),
diff --git a/trackeroo/pubspec.lock b/trackeroo/pubspec.lock
index 1acc7c931447d4a35ee562c5bc5a6e16dbb1082b..f3723e6a159683c147bf84e44e7653b3b546c7b8 100644
--- a/trackeroo/pubspec.lock
+++ b/trackeroo/pubspec.lock
@@ -17,6 +17,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "5.13.0"
+ archive:
+ dependency: transitive
+ description:
+ name: archive
+ sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.3.7"
args:
dependency: transitive
description:
@@ -328,6 +336,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.2"
+ icons_launcher:
+ dependency: "direct main"
+ description:
+ name: icons_launcher
+ sha256: "71cf6baae0f0d1752e3c26035f9e6ea07bd297af72d389e907fb0119e9d56ba1"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.1.2"
+ image:
+ dependency: transitive
+ description:
+ name: image
+ sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf
+ url: "https://pub.dev"
+ source: hosted
+ version: "4.0.17"
io:
dependency: transitive
description:
@@ -464,6 +488,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.7"
+ petitparser:
+ dependency: transitive
+ description:
+ name: petitparser
+ sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
+ url: "https://pub.dev"
+ source: hosted
+ version: "5.4.0"
platform:
dependency: transitive
description:
@@ -480,6 +512,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
+ pointycastle:
+ dependency: transitive
+ description:
+ name: pointycastle
+ sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.7.3"
pool:
dependency: transitive
description:
@@ -637,6 +677,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.3.2"
+ universal_io:
+ dependency: transitive
+ description:
+ name: universal_io
+ sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad"
+ url: "https://pub.dev"
+ source: hosted
+ version: "2.2.2"
vector_math:
dependency: transitive
description:
@@ -677,6 +725,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.0.0"
+ xml:
+ dependency: transitive
+ description:
+ name: xml
+ sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
+ url: "https://pub.dev"
+ source: hosted
+ version: "6.3.0"
yaml:
dependency: transitive
description:
diff --git a/trackeroo/pubspec.yaml b/trackeroo/pubspec.yaml
index eef35bacfa519f091ed46f2411588ab7e2bdadb9..5c1ec75ac070f6e9fdb2bbec99220e74d62a71c7 100644
--- a/trackeroo/pubspec.yaml
+++ b/trackeroo/pubspec.yaml
@@ -38,6 +38,7 @@ dependencies:
get_it: ^7.6.0
flutter_colorpicker: ^1.0.3
rive: ^0.11.3
+ icons_launcher: ^2.1.2
dev_dependencies:
flutter_test:
@@ -66,6 +67,7 @@ flutter:
assets:
- assets/rive/
- assets/data/
+ - assets/icon/
# An image asset can refer to one or more resolution-specific "variants", see
# https://flutter.dev/assets-and-images/#resolution-aware
@@ -92,3 +94,11 @@ flutter:
#
# For details regarding fonts from package dependencies,
# see https://flutter.dev/custom-fonts/#from-packages
+
+icons_launcher:
+ image_path: "assets/icon/kangaroo-circle.png"
+ platforms:
+ android:
+ enable: true
+ ios:
+ enable: true