diff --git a/android/app/src/main/res/drawable/app_icon.png b/android/app/src/main/res/drawable/app_icon.png index 59cbfda..e15958a 100644 Binary files a/android/app/src/main/res/drawable/app_icon.png and b/android/app/src/main/res/drawable/app_icon.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 117e881..98bf978 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 7b8c7ba..19c9c28 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index c55eb96..f79c133 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 598ae71..ad74c87 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 59cbfda..ea2ac20 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/assets/images/2.png b/assets/images/2.png new file mode 100644 index 0000000..7567e84 Binary files /dev/null and b/assets/images/2.png differ diff --git a/assets/images/logo.png b/assets/images/logo.png index 7567e84..fbbd26f 100644 Binary files a/assets/images/logo.png and b/assets/images/logo.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png index e4c82f1..a880be9 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/100.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/102.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/102.png new file mode 100644 index 0000000..490fae4 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/102.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png index 1ef26e8..d8144c2 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png index e37eb3d..c630b99 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png index ed8aebe..0fcb92b 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/128.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/128.png index ca3ccd6..416f0a1 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/128.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/128.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png index 598ae71..ad74c87 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/144.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png index 6628b8c..8128554 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/152.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/16.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/16.png index adaab95..651818f 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/16.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/16.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png index d1f950f..d77d363 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/167.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/172.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/172.png new file mode 100644 index 0000000..cb8b6f7 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/172.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png index 8dd69c7..bc09970 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/196.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/196.png new file mode 100644 index 0000000..e969d0c Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/196.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png index d6bbebe..c3bb20b 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/20.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/216.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/216.png new file mode 100644 index 0000000..b3f4042 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/216.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/256.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/256.png index e110dc8..886df6f 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/256.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/256.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png index faecf42..f2df582 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/32.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/32.png index 373995f..ec1126c 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/32.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/32.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png index 3c5b828..2714ef7 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/48.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/48.png new file mode 100644 index 0000000..19c9c28 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/48.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png index baa9e00..91e5965 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/50.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/512.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/512.png index 4ebc18a..e15958a 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/512.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/512.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/55.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/55.png new file mode 100644 index 0000000..23252ab Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/55.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png index 52b971b..90ba37c 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png index 03cc194..a196ac1 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png index e624789..beb801e 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/64.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/64.png index 2544d61..e9e2fff 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/64.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/64.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/66.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/66.png new file mode 100644 index 0000000..793f49c Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/66.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png index 117e881..98bf978 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/72.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png index 21c2b38..0294ee6 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/76.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png index f136054..436acb6 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png index 04bfa8a..b666e4c 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/88.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/88.png new file mode 100644 index 0000000..05a94ba Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/88.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/92.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/92.png new file mode 100644 index 0000000..9eb7342 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/92.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index 5c82812..ffab254 100644 --- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1 +1 @@ -{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"128x128","expected-size":"128","filename":"128.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"256x256","expected-size":"256","filename":"256.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"128x128","expected-size":"256","filename":"256.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"256x256","expected-size":"512","filename":"512.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"32","filename":"32.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"512x512","expected-size":"512","filename":"512.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"16","filename":"16.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"32","filename":"32.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"64","filename":"64.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"512x512","expected-size":"1024","filename":"1024.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"}]} \ No newline at end of file +{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"idiom":"watch","filename":"172.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"38mm","scale":"2x","size":"86x86","expected-size":"172","role":"quickLook"},{"idiom":"watch","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"38mm","scale":"2x","size":"40x40","expected-size":"80","role":"appLauncher"},{"idiom":"watch","filename":"88.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"40mm","scale":"2x","size":"44x44","expected-size":"88","role":"appLauncher"},{"idiom":"watch","filename":"102.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"41mm","scale":"2x","size":"45x45","expected-size":"102","role":"appLauncher"},{"idiom":"watch","filename":"92.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"41mm","scale":"2x","size":"46x46","expected-size":"92","role":"appLauncher"},{"idiom":"watch","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"44mm","scale":"2x","size":"50x50","expected-size":"100","role":"appLauncher"},{"idiom":"watch","filename":"196.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"42mm","scale":"2x","size":"98x98","expected-size":"196","role":"quickLook"},{"idiom":"watch","filename":"216.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"44mm","scale":"2x","size":"108x108","expected-size":"216","role":"quickLook"},{"idiom":"watch","filename":"48.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"38mm","scale":"2x","size":"24x24","expected-size":"48","role":"notificationCenter"},{"idiom":"watch","filename":"55.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"42mm","scale":"2x","size":"27.5x27.5","expected-size":"55","role":"notificationCenter"},{"idiom":"watch","filename":"66.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"45mm","scale":"2x","size":"33x33","expected-size":"66","role":"notificationCenter"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"watch","role":"companionSettings","scale":"3x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"watch","role":"companionSettings","scale":"2x"},{"size":"1024x1024","expected-size":"1024","filename":"1024.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"watch-marketing","scale":"1x"},{"size":"128x128","expected-size":"128","filename":"128.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"256x256","expected-size":"256","filename":"256.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"128x128","expected-size":"256","filename":"256.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"256x256","expected-size":"512","filename":"512.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"32","filename":"32.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"512x512","expected-size":"512","filename":"512.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"16","filename":"16.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"32","filename":"32.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"64","filename":"64.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"512x512","expected-size":"1024","filename":"1024.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"}]} \ No newline at end of file diff --git a/lib/constant/links.dart b/lib/constant/links.dart index 0275c40..19993ac 100644 --- a/lib/constant/links.dart +++ b/lib/constant/links.dart @@ -24,8 +24,8 @@ class AppLink { static const String deletePassengersPromo = "$promo/delete.php"; static const String updatePassengersPromo = "$promo/update.php"; - ////=======================ride=================== - static const String ride = '$server/ride/'; + ////=======================cancelRide=================== + static const String ride = '$server/ride'; static const String addCancelRide = "$server/ride/cancelRide/add.php"; static const String cancelRide = "$server/ride/cancelRide/get.php"; //-----------------ridessss------------------ @@ -34,6 +34,12 @@ class AppLink { static const String updateRides = "$ride/rides/update.php"; static const String deleteRides = "$ride/rides/delete.php"; +//-----------------DriverOrder------------------ + static const String addDriverOrder = "$ride/driver_order/add.php"; + static const String getDriverOrder = "$ride/driver_order/get.php"; + static const String updateDriverOrder = "$ride/driver_order/update.php"; + static const String deleteDriverOrder = "$ride/driver_order/delete.php"; + static const String pathImage = "$server/upload/types/"; static const String uploadImage = "$server/uploadImage.php"; static const String uploadImageType = "$server/uploadImageType.php"; diff --git a/lib/controller/firebase/firbase_messge.dart b/lib/controller/firebase/firbase_messge.dart index 28b7b63..b9cfb43 100644 --- a/lib/controller/firebase/firbase_messge.dart +++ b/lib/controller/firebase/firbase_messge.dart @@ -6,7 +6,9 @@ import 'package:get/get.dart'; import 'package:http/http.dart' as http; import 'package:ride/constant/colors.dart'; import 'package:ride/constant/style.dart'; +import 'package:ride/controller/functions/crud.dart'; import 'package:ride/controller/functions/launch.dart'; +import 'package:ride/controller/functions/toast.dart'; import 'package:ride/views/widgets/elevated_btn.dart'; import '../../constant/box_name.dart'; @@ -136,14 +138,16 @@ class FirebasMessagesController extends GetxController { Padding( padding: const EdgeInsets.all(8.0), child: Text( - 'Distance is '.tr + myList[4].toString() + ' Minutes'.tr, + 'Distance is '.tr + myList[5].toString() + ' KM'.tr, style: AppStyle.title, ), ), Padding( padding: const EdgeInsets.all(8.0), child: Text( - 'Duration of Trip is '.tr + myList[5].toString(), + 'Duration of Trip is '.tr + + myList[4].toString() + + ' Minutes'.tr, style: AppStyle.title, ), ), @@ -154,14 +158,30 @@ class FirebasMessagesController extends GetxController { children: [ MyElevatedButton( title: 'Apply Order'.tr, - onPressed: () { - //TODO save and request to passenger + onPressed: () async { + await CRUD().postFromDialogue( + link: AppLink.addDriverOrder, + payload: { + 'driver_id': myList[6].toString(), + // box.read(BoxName.driverID).toString(), + 'order_id': + message.notification!.body.toString(), + 'status': 'Apply' + }); }, ), MyElevatedButton( title: 'Refuse Order'.tr, - onPressed: () { - //TODO save and request to passenger and driver log upto 3 per 1 day + onPressed: () async { + await CRUD().postFromDialogue( + link: AppLink.addDriverOrder, + payload: { + 'driver_id': myList[6].toString(), + // box.read(BoxName.driverID).toString(), + 'order_id': + message.notification!.body.toString(), + 'status': 'Refused' + }); }, kolor: AppColor.redColor, ), @@ -170,6 +190,8 @@ class FirebasMessagesController extends GetxController { ) ], )); + } else if (message.notification!.title!.contains('Promo')) { + // Get.to(page) } } }); @@ -285,7 +307,7 @@ class FirebasMessagesController extends GetxController { // } void sendNotificationDriverId(String title, body, Strin1, Strin2, Strin3, - Strin4, Strin5, Strin6, token) async { + Strin4, Strin5, Strin6, String7, token) async { http .post(Uri.parse('https://fcm.googleapis.com/fcm/send'), headers: { @@ -300,7 +322,7 @@ class FirebasMessagesController extends GetxController { }, 'data': { 'myList': jsonEncode( - [Strin1, Strin2, Strin3, Strin4, Strin5, Strin6]), + [Strin1, Strin2, Strin3, Strin4, Strin5, Strin6, String7]), }, 'priority': 'high', 'to': token, diff --git a/lib/controller/functions/crud.dart b/lib/controller/functions/crud.dart index 59b8993..261cd07 100644 --- a/lib/controller/functions/crud.dart +++ b/lib/controller/functions/crud.dart @@ -26,7 +26,7 @@ class CRUD { if (response.statusCode == 200) { var jsonData = jsonDecode(response.body); if (jsonData['status'] == 'success') { - print(jsonData); + // print(jsonData); return response.body; } return jsonData['status']; @@ -65,6 +65,39 @@ class CRUD { return (jsonData['status']); } + Future postFromDialogue({ + required String link, + Map? payload, + }) async { + var url = Uri.parse( + link, + ); + var response = await http.post( + url, + body: payload, + headers: { + "Content-Type": "application/x-www-form-urlencoded", + 'Authorization': + 'Basic ${base64Encode(utf8.encode(AppCredintials.basicAuthCredentials))}', + }, + ); + print(response.request); + + var jsonData = jsonDecode(response.body); + if (response.statusCode == 200) { + if (jsonData['status'] == 'success') { + Get.back(); + Get.snackbar( + jsonData['status'], + jsonData['message'], + ); + + return response.body; + } + } + return (jsonData['status']); + } + Future getGoogleApi({ required String link, Map? payload, diff --git a/lib/controller/home/map_page_controller.dart b/lib/controller/home/map_page_controller.dart index db3f34a..730f8f1 100644 --- a/lib/controller/home/map_page_controller.dart +++ b/lib/controller/home/map_page_controller.dart @@ -1,20 +1,17 @@ import 'dart:async'; import 'dart:convert'; -import 'dart:math' show sqrt, pi, cos, sin; +import 'dart:math' show cos; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_polyline_algorithm/google_polyline_algorithm.dart'; import 'package:location/location.dart'; -import 'package:path/path.dart'; import 'package:ride/constant/box_name.dart'; -import 'package:ride/constant/colors.dart'; import 'package:ride/constant/credential.dart'; import 'package:ride/constant/links.dart'; import 'package:ride/controller/firebase/firbase_messge.dart'; import 'package:ride/controller/functions/crud.dart'; import 'package:ride/controller/functions/secure_storage.dart'; -import 'package:ride/controller/functions/toast.dart'; import 'package:ride/views/widgets/elevated_btn.dart'; import '../../main.dart'; import '../../models/model/locations.dart'; @@ -46,6 +43,7 @@ class MapController extends GetxController { bool isPickerShown = false; bool isButtomSheetShown = false; bool mapType = false; + bool mapTraficON = false; bool isCancelRidePageShown = false; bool isCashConfirmPageShown = false; bool isPaymentMethodPageShown = false; @@ -53,6 +51,7 @@ class MapController extends GetxController { bool isMainBottomMenuMap = true; double heightButtomSheetShown = 0; double cashConfirmPageShown = 250; + double widthMapTypeAndTrafic = 50; double paymentPageShown = Get.height * .6; late LatLng southwest; late LatLng northeast; @@ -92,6 +91,11 @@ class MapController extends GetxController { update(); } + void changeMapTraffic() { + mapTraficON = !mapTraficON; + update(); + } + void changeCancelRidePageShow() { // rideConfirm == true // ? @@ -102,6 +106,7 @@ class MapController extends GetxController { void getDrawerMenu() { heightMenuBool = !heightMenuBool; + widthMapTypeAndTrafic = heightMenuBool == true ? 0 : 50; heightMenu = heightMenuBool == true ? 100 : 0; widthMenu = heightMenuBool == true ? 110 : 0; update(); @@ -140,7 +145,7 @@ class MapController extends GetxController { "price_for_passenger": totaME.toString(), "distance": distance.toString() }).then((value) { - print(value); + // print(jsonDecode(value)['message']); List body = [ '${data[0]["start_location"]['lat']},${data[0]["start_location"]['lng']}', '${data[0]["end_location"]['lat']},${data[0]["end_location"]['lng']}', @@ -148,16 +153,19 @@ class MapController extends GetxController { totalDriver.toString(), duration.toString(), distance.toString(), + dataCarsLocationByPassenger['message'][0]['id'].toString() ]; FirebasMessagesController().sendNotificationDriverId( 'Order', - 'body', + jsonDecode(value)['message'].toString(), body[0], body[1], body[2], body[3], body[4], body[5], + body[6], + box.read(BoxName.tokenFCM).toString(), //TODO change to Driver ); }); diff --git a/lib/controller/home/profile/order_history_controller.dart b/lib/controller/home/profile/order_history_controller.dart new file mode 100644 index 0000000..7c98a3a --- /dev/null +++ b/lib/controller/home/profile/order_history_controller.dart @@ -0,0 +1,36 @@ +import 'dart:convert'; + +import 'package:get/get.dart'; +import 'package:ride/constant/box_name.dart'; +import 'package:ride/constant/links.dart'; +import 'package:ride/controller/functions/crud.dart'; +import 'package:ride/main.dart'; + +class OrderHistoryController extends GetxController { + List orderHistoryListPassenger = []; + bool isloading = true; + + @override + void onInit() { + getOrderHistoryByPassenger(); + super.onInit(); + } + + Future getOrderHistoryByPassenger() async { + var res = await CRUD().get(link: AppLink.getRides, payload: { + 'passenger_id': box.read(BoxName.pasengerID).toString(), + }); + if (res.toString() == 'failure') { + Get.snackbar('failure', 'message'); + isloading = false; + update(); + } else { + var jsonDecoded = jsonDecode(res); + + orderHistoryListPassenger = jsonDecoded['data']; + print(orderHistoryListPassenger); + isloading = false; + update(); + } + } +} diff --git a/lib/controller/payment/payment_controller.dart b/lib/controller/payment/payment_controller.dart index 55d6889..27b2475 100644 --- a/lib/controller/payment/payment_controller.dart +++ b/lib/controller/payment/payment_controller.dart @@ -11,7 +11,7 @@ import '../functions/crud.dart'; class PaymentController extends GetxController { bool isloading = false; - bool isWalletCheced = false; + bool isWalletCheced = true; bool isCashCheced = false; bool isWalletFound = false; final formKey = GlobalKey(); @@ -23,23 +23,20 @@ class PaymentController extends GetxController { getPassengerWallet() async { isloading = true; update(); - box.write(BoxName.passengerWalletFound, isWalletFound); + // box.write(BoxName.passengerWalletFound, isWalletFound); // totalPassengerWalletDetails = box.read(BoxName.passengerWalletDetails); - if (totalPassengerWalletDetails.isEmpty) { - await CRUD().get(link: AppLink.getWalletByPassenger, payload: { - 'passenger_id': box.read(BoxName.pasengerID) - }).then((value) { - print(value); - totalPassengerWalletDetails = jsonDecode(value)['message']; - passengerTotalWalletAmount = totalPassengerWalletDetails[0]['total']; - box.write(BoxName.passengerWalletDetails, totalPassengerWalletDetails); - }); - } + // if (box.read(BoxName.passengerWalletTotal).toString().isEmpty) { + await CRUD().get( + link: AppLink.getWalletByPassenger, + payload: {'passenger_id': box.read(BoxName.pasengerID)}).then((value) { + box.write(BoxName.passengerWalletTotal, + jsonDecode(value)['message'][0]['total'].toString()); + }); + // } isloading = false; update(); - print(totalPassengerWalletDetails); } void onChangedPymentethodWallet(bool? value) { diff --git a/lib/views/home/map_page.dart b/lib/views/home/map_page.dart index 9bb190b..26ca2b4 100644 --- a/lib/views/home/map_page.dart +++ b/lib/views/home/map_page.dart @@ -4,10 +4,8 @@ import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:ride/constant/colors.dart'; import 'package:ride/controller/home/map_page_controller.dart'; import 'package:ride/views/home/map_widget.dart/cancel_raide_page.dart'; -import 'package:ride/views/widgets/circle_container.dart'; import 'package:ride/views/widgets/mycircular.dart'; -import '../../controller/functions/toast.dart'; import '../../controller/home/menu_controller.dart'; import 'map_widget.dart/buttom_sheet_map_show.dart'; import 'map_widget.dart/cash_confirm_bottom_page.dart'; @@ -15,7 +13,8 @@ import 'map_widget.dart/main_bottom_Menu_map.dart'; import 'map_widget.dart/map_menu_widget.dart'; import 'map_widget.dart/menu_map_page.dart'; import 'map_widget.dart/payment_method.page.dart'; -import 'map_widget.dart/picker_animation_container.dart'; +import 'my_wallet/passenger_wallet.dart'; +import 'profile/order_history.dart'; class MapPage extends StatelessWidget { const MapPage({super.key}); @@ -25,6 +24,35 @@ class MapPage extends StatelessWidget { Get.put(MapController()); Get.put(MyMenuController()); return Scaffold( + // appBar: AppBar(), + // drawer: Drawer( + // child: ListView( + // padding: EdgeInsets.zero, + // children: [ + // ListTile( + // onTap: () { + // Get.to(() => const PassengerWallet()); + // }, + // leading: Icon(Icons.wallet), + // title: Text('My Wallet'), + // ), + // ListTile( + // onTap: () async { + // // await OrderHistoryController().getOrderHistoryByPassenger(); + // Get.to(() => const OrderHistory()); + // }, + // leading: Icon(Icons.history), + // title: Text('Order History'), + // ), + // ListTile( + // onTap: () {}, + // leading: Icon(Icons.money), + // title: Text('Tariff'), + // ), + // ], + // ), + // ), + body: Stack( children: [ GetBuilder( @@ -135,8 +163,10 @@ class MapPage extends StatelessWidget { mapType: controller.mapType ? MapType.satellite : MapType.normal, myLocationButtonEnabled: true, - indoorViewEnabled: true, - trafficEnabled: false, + // liteModeEnabled: true, tiltGesturesEnabled: false, + + // indoorViewEnabled: true, + trafficEnabled: controller.mapTraficON, buildingsEnabled: true, mapToolbarEnabled: true, onCameraMove: (position) { @@ -150,17 +180,50 @@ class MapPage extends StatelessWidget { ), GetBuilder( builder: (controller) => Positioned( - top: 80, + top: 85, left: 6, - child: IconButton( - onPressed: () { - controller.changeMapType(); - // Toast.show(context, 'This is a toast message!'); - }, - icon: const Icon( - Icons.satellite_alt, - size: 35, - ), + child: Column( + children: [ + AnimatedContainer( + duration: const Duration(microseconds: 200), + width: controller.widthMapTypeAndTrafic, + decoration: BoxDecoration( + border: Border.all(), + color: AppColor.secondaryColor, + borderRadius: BorderRadius.circular(15)), + child: IconButton( + onPressed: () { + controller.changeMapType(); + // Toast.show(context, 'This is a toast message!'); + }, + icon: const Icon( + Icons.satellite_alt, + size: 29, + ), + ), + ), + const SizedBox( + height: 5, + ), + AnimatedContainer( + duration: const Duration(microseconds: 200), + width: controller.widthMapTypeAndTrafic, + decoration: BoxDecoration( + color: AppColor.secondaryColor, + border: Border.all(), + borderRadius: BorderRadius.circular(15)), + child: IconButton( + onPressed: () { + controller.changeMapTraffic(); + // Toast.show(context, 'This is a toast message!'); + }, + icon: const Icon( + Icons.streetview_sharp, + size: 29, + ), + ), + ), + ], )), ), const PickerIconOnMap(), diff --git a/lib/views/home/map_widget.dart/buttom_sheet_map_show.dart b/lib/views/home/map_widget.dart/buttom_sheet_map_show.dart index 299a2d5..f9cacd8 100644 --- a/lib/views/home/map_widget.dart/buttom_sheet_map_show.dart +++ b/lib/views/home/map_widget.dart/buttom_sheet_map_show.dart @@ -7,7 +7,6 @@ import 'package:ride/views/widgets/elevated_btn.dart'; import '../../../constant/colors.dart'; import '../../../constant/style.dart'; -import '../../../controller/functions/toast.dart'; import '../../../controller/home/map_page_controller.dart'; GetBuilder buttomSheetMapPage() { diff --git a/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart b/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart index 65f9a80..21661ab 100644 --- a/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart +++ b/lib/views/home/map_widget.dart/cash_confirm_bottom_page.dart @@ -49,7 +49,7 @@ class CashConfirmPageShown extends StatelessWidget { ], ), GetBuilder( - builder: (controller) => Row( + builder: (paymentController) => Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ const Icon( @@ -69,16 +69,17 @@ class CashConfirmPageShown extends StatelessWidget { ), Text( // '${'Your Wallet balance is '.tr}JD ', - '${'Your Wallet balance is '.tr}JD ${controller.passengerTotalWalletAmount.toString()}', + '${'Your Wallet balance is '.tr} ${box.read(BoxName.passengerWalletTotal).toString()} JD', style: AppStyle.subtitle, ), ], ), const Spacer(), Checkbox.adaptive( - value: controller.isWalletCheced, + value: paymentController.isWalletCheced, onChanged: (value) { - controller.onChangedPymentethodWallet(value); + paymentController + .onChangedPymentethodWallet(value); }, ) ], diff --git a/lib/views/home/map_widget.dart/map_menu_widget.dart b/lib/views/home/map_widget.dart/map_menu_widget.dart index 4f668de..b3abae8 100644 --- a/lib/views/home/map_widget.dart/map_menu_widget.dart +++ b/lib/views/home/map_widget.dart/map_menu_widget.dart @@ -2,7 +2,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:get/get_rx/src/rx_typedefs/rx_typedefs.dart'; import 'package:ride/constant/style.dart'; +import 'package:ride/controller/home/profile/order_history_controller.dart'; import 'package:ride/views/home/my_wallet/passenger_wallet.dart'; +import 'package:ride/views/home/profile/order_history.dart'; import '../../../constant/colors.dart'; import '../../../controller/home/map_page_controller.dart'; @@ -127,7 +129,9 @@ class MapMenuWidget extends StatelessWidget { icon: Icons.wallet, ), IconMainPageMap( - onTap: () {}, + onTap: () async { + Get.to(() => const OrderHistory()); + }, title: 'Order History', icon: Icons.history, ), diff --git a/lib/views/home/my_wallet/passenger_wallet.dart b/lib/views/home/my_wallet/passenger_wallet.dart index 4c3840d..0fc2226 100644 --- a/lib/views/home/my_wallet/passenger_wallet.dart +++ b/lib/views/home/my_wallet/passenger_wallet.dart @@ -4,7 +4,9 @@ import 'package:ride/constant/style.dart'; import 'package:ride/controller/payment/payment_controller.dart'; import 'package:ride/views/widgets/my_scafold.dart'; +import '../../../constant/box_name.dart'; import '../../../constant/colors.dart'; +import '../../../main.dart'; class PassengerWallet extends StatelessWidget { const PassengerWallet({super.key}); @@ -43,7 +45,7 @@ class PassengerWallet extends StatelessWidget { child: Padding( padding: const EdgeInsets.all(10), child: Text( - 'You Have ${controller.passengerTotalWalletAmount} JD in SEFER Wallet', + 'You Have ${box.read(BoxName.passengerWalletTotal).toString()} JD in SEFER Wallet', style: AppStyle.title, ), ), diff --git a/lib/views/home/profile/order_history.dart b/lib/views/home/profile/order_history.dart new file mode 100644 index 0000000..72fc63f --- /dev/null +++ b/lib/views/home/profile/order_history.dart @@ -0,0 +1,35 @@ +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:ride/views/widgets/my_scafold.dart'; +import 'package:ride/views/widgets/mycircular.dart'; + +import '../../../controller/home/profile/order_history_controller.dart'; + +class OrderHistory extends StatelessWidget { + const OrderHistory({super.key}); + + @override + Widget build(BuildContext context) { + // Instantiate the OrderHistoryController class + Get.put(OrderHistoryController()); + + return MyScafolld( + title: 'Order History'.tr, + isleading: true, + body: [ + GetBuilder( + builder: (orderHistoryController) => orderHistoryController.isloading + ? const MyCircularProgressIndicator() + : ListView.builder( + itemCount: + orderHistoryController.orderHistoryListPassenger.length, + itemBuilder: (BuildContext context, int index) { + return Text(orderHistoryController + .orderHistoryListPassenger[0]['date']); + }, + ), + ) + ], + ); + } +} diff --git a/lib/views/home/profile/passenger_profile_page.dart b/lib/views/home/profile/passenger_profile_page.dart index 1807c20..4833182 100644 --- a/lib/views/home/profile/passenger_profile_page.dart +++ b/lib/views/home/profile/passenger_profile_page.dart @@ -1,7 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; -import 'package:ride/constant/colors.dart'; import 'package:ride/constant/style.dart'; import 'package:ride/controller/profile/profile_controller.dart'; import 'package:ride/views/widgets/elevated_btn.dart';