diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies new file mode 100644 index 0000000..8214b12 --- /dev/null +++ b/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"google_places_picker","path":"/Users/muhammadsaadullahshahid/developer/flutter/.pub-cache/hosted/pub.dartlang.org/google_places_picker-2.1.0+3/","native_build":true,"dependencies":[]},{"name":"image_picker","path":"/Users/muhammadsaadullahshahid/developer/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.6.7+22/","native_build":true,"dependencies":[]}],"android":[{"name":"flutter_plugin_android_lifecycle","path":"/Users/muhammadsaadullahshahid/developer/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_plugin_android_lifecycle-1.0.11/","native_build":true,"dependencies":[]},{"name":"google_places_picker","path":"/Users/muhammadsaadullahshahid/developer/flutter/.pub-cache/hosted/pub.dartlang.org/google_places_picker-2.1.0+3/","native_build":true,"dependencies":[]},{"name":"image_picker","path":"/Users/muhammadsaadullahshahid/developer/flutter/.pub-cache/hosted/pub.dartlang.org/image_picker-0.6.7+22/","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"google_places_picker","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]}],"date_created":"2023-03-27 01:50:50.103075","version":"3.3.8"} \ No newline at end of file diff --git a/README.md b/README.md index 02c70cd..c3fc4fb 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,20 @@ # flutter-ui-nice + ### :heart: Star :heart: the repo to support the project or :smile:[Follow Me](https://github.com/nb312).Thanks! -Facebook Page | Twitter | Medium | QQ Group ---- | --- | --- | --- -[Flutter Open ](https://www.facebook.com/flutteropen) | [NieBin](https://twitter.com/niebin_gg) | [Flutter Open](https://medium.com/flutteropen) | 963828159 + +| Facebook Page | Twitter | Medium | QQ Group | +| ----------------------------------------------------- | --------------------------------------- | ---------------------------------------------- | --------- | +| [Flutter Open ](https://www.facebook.com/flutteropen) | [NieBin](https://twitter.com/niebin_gg) | [Flutter Open](https://medium.com/flutteropen) | 963828159 | # Contributors -~ | ~ | ~ | ~ | ~ ---- | --- | --- | --- | --- -[NieBin](https://github.com/nb312)| [Echonox](https://github.com/echonox) | [Mahesh Jamdade](https://github.com/maheshmnj) |[edgartrem](https://github.com/edgartrem) | [srikanthbollojula](https://github.com/srikanthbollojula) - | [Yasin ilhan](https://github.com/kalismeras61) | [Çağrı Akgül](https://github.com/saturu) | [dndoanh](https://github.com/dndoanh) | [Waffulz](https://github.com/Waffulz) | [Santosh Prasad Sah](https://github.com/SahSantoshh) + +| ~ | ~ | ~ | ~ | ~ | +| ---------------------------------------------- | ---------------------------------------- | ---------------------------------------------- | ----------------------------------------- | --------------------------------------------------------- | -------------------------------------------------------- | +| [NieBin](https://github.com/nb312) | [Echonox](https://github.com/echonox) | [Mahesh Jamdade](https://github.com/maheshmnj) | [edgartrem](https://github.com/edgartrem) | [srikanthbollojula](https://github.com/srikanthbollojula) | +| [Yasin ilhan](https://github.com/kalismeras61) | [Çağrı Akgül](https://github.com/saturu) | [dndoanh](https://github.com/dndoanh) | [Waffulz](https://github.com/Waffulz) | [Santosh Prasad Sah](https://github.com/SahSantoshh) | [Muhammad Saadullah Shahid](https://github.com/saadii00) | # Contents + @@ -32,6 +36,7 @@ Facebook Page | Twitter | Medium | QQ Group # License + Copyright 2019 @NieBin Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/android/app/build.gradle b/android/app/build.gradle index f8d97c1..3aaeda9 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 27 + compileSdkVersion 31 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -40,7 +40,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.nb.flutteruishopping" minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 29 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 212794a..7b1f491 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -15,7 +15,7 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> + diff --git a/android/app/src/main/kotlin/com/nb/flutteruishopping/MainActivity.kt b/android/app/src/main/kotlin/com/nb/flutteruishopping/MainActivity.kt index 20b82af..e713d58 100644 --- a/android/app/src/main/kotlin/com/nb/flutteruishopping/MainActivity.kt +++ b/android/app/src/main/kotlin/com/nb/flutteruishopping/MainActivity.kt @@ -2,12 +2,8 @@ package com.nb.flutteruishopping import android.os.Bundle -import io.flutter.app.FlutterActivity -import io.flutter.plugins.GeneratedPluginRegistrant +import io.flutter.embedding.android.FlutterActivity + class MainActivity: FlutterActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - GeneratedPluginRegistrant.registerWith(this) - } } diff --git a/android/build.gradle b/android/build.gradle index cee685d..da2dc14 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.2.71' + ext.kotlin_version = '1.7.20' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:7.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/android/gradle.properties b/android/gradle.properties index 8bd86f6..a673820 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1 +1,4 @@ org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true +android.enableR8=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 2819f02..cc5527d 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh new file mode 100755 index 0000000..cf2a8d5 --- /dev/null +++ b/ios/Flutter/flutter_export_environment.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=/Users/muhammadsaadullahshahid/developer/flutter" +export "FLUTTER_APPLICATION_PATH=/Users/muhammadsaadullahshahid/flutter-ui-nice" +export "COCOAPODS_PARALLEL_CODE_SIGN=true" +export "FLUTTER_TARGET=lib/main.dart" +export "FLUTTER_BUILD_DIR=build" +export "FLUTTER_BUILD_NAME=1.0.0" +export "FLUTTER_BUILD_NUMBER=1" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=true" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.dart_tool/package_config.json" diff --git a/lib/page/feed/FeedPageOne.dart b/lib/page/feed/FeedPageOne.dart index 56bfa44..de18b50 100644 --- a/lib/page/feed/FeedPageOne.dart +++ b/lib/page/feed/FeedPageOne.dart @@ -99,7 +99,7 @@ class _FeedState extends State { child: Text('+33', style: Theme.of(context) .textTheme - .title + .headline6 .copyWith(color: Colors.white)), ), )), diff --git a/lib/page/navigation/common/pages/home_page.dart b/lib/page/navigation/common/pages/home_page.dart index 00ae207..144f692 100644 --- a/lib/page/navigation/common/pages/home_page.dart +++ b/lib/page/navigation/common/pages/home_page.dart @@ -2,30 +2,33 @@ import 'package:flutter/material.dart'; import 'package:flutter_ui_nice/const/color_const.dart'; class HomePage extends StatelessWidget { - HomePage(this.onMenuPressed); - final VoidCallback onMenuPressed; + HomePage(this.onMenuPressed); + final VoidCallback onMenuPressed; - @override + @override Widget build(BuildContext context) { return Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(10.0), - gradient: LinearGradient( - begin: Alignment.topLeft, - end: Alignment.bottomRight, - colors: [YELLOW, GREEN, BLUE], - ), - boxShadow: [ - BoxShadow( - color: Colors.black26, - offset: Offset(2.0, 1.0), - blurRadius: 10.0, - ) - ], - ), - child: Center( - child: RaisedButton(onPressed: onMenuPressed, child: Text("Open Menu"),), - ), - ); + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10.0), + gradient: LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [YELLOW, GREEN, BLUE], + ), + boxShadow: [ + BoxShadow( + color: Colors.black26, + offset: Offset(2.0, 1.0), + blurRadius: 10.0, + ) + ], + ), + child: Center( + child: ElevatedButton( + onPressed: onMenuPressed, + child: Text("Open Menu"), + ), + ), + ); } -} \ No newline at end of file +} diff --git a/lib/page/navigation/navigation1/widgets/button.dart b/lib/page/navigation/navigation1/widgets/button.dart index 27eea91..9a2154e 100644 --- a/lib/page/navigation/navigation1/widgets/button.dart +++ b/lib/page/navigation/navigation1/widgets/button.dart @@ -2,67 +2,78 @@ import 'package:flutter/material.dart'; import 'package:flutter_ui_nice/const/color_const.dart'; class Button { + static Widget home(VoidCallback onPressed) => + _buildButton(onPressed, "HOME", Icons.home); - static Widget home(VoidCallback onPressed) => _buildButton(onPressed, "HOME", Icons.home); + static Widget chat(VoidCallback onPressed, {int notification}) => + _buildButton(onPressed, "CHAT", Icons.chat, notification: notification); - static Widget chat(VoidCallback onPressed, {int notification}) => _buildButton(onPressed, "CHAT", Icons.chat, notification: - notification); + static Widget feed(VoidCallback onPressed) => + _buildButton(onPressed, "FEED", Icons.rss_feed); - static Widget feed(VoidCallback onPressed) => _buildButton(onPressed, "FEED", Icons.rss_feed); + static Widget profile(VoidCallback onPressed) => + _buildButton(onPressed, "PROFILE", Icons.person); - static Widget profile(VoidCallback onPressed) => _buildButton(onPressed, "PROFILE", Icons.person); + static Widget settings(VoidCallback onPressed) => + _buildButton(onPressed, "SETTINGS", Icons.settings); - static Widget settings(VoidCallback onPressed) => _buildButton(onPressed, "SETTINGS", Icons.settings); + static Widget _buildButton( + VoidCallback onPressed, String title, IconData icon, + {int notification}) { + if (notification != null) { + return Container( + child: Stack( + children: [ + _button(onPressed, title, icon), + Positioned( + top: 0.0, + right: 0.0, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.circle, color: Colors.redAccent), + child: Padding( + padding: const EdgeInsets.all(6.0), + child: Text( + "$notification", + style: TextStyle(color: Colors.white), + ), + ), + ), + ), + ], + ), + ); + } else { + return _button(onPressed, title, icon); + } + } - static Widget _buildButton(VoidCallback onPressed, String title, IconData icon, {int notification}) { - if (notification != null) { - return Container( - child: Stack( - children: [ - _button(onPressed, title, icon), - Positioned( - top: 0.0, - right: 0.0, - child: Container( - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.redAccent - ), - child: Padding( - padding: const EdgeInsets.all(6.0), - child: Text("$notification", style: TextStyle(color: Colors.white),), - ), - ), - ), - ], - ), - ); - } else { - return _button(onPressed, title, icon); - } - } - - static Widget _button(VoidCallback onPressed, String title, IconData icon) => RaisedButton( - color: GREEN, - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20.0)), - onPressed: onPressed, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 10.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - title, - style: TextStyle( - fontSize: 18.0, - color: TEXT_BLACK, - ), - ), - SizedBox(width: 5.0,), - Icon(icon) - ], - ), - ), - ); - -} \ No newline at end of file + static Widget _button(VoidCallback onPressed, String title, IconData icon) => + ElevatedButton( + style: ElevatedButton.styleFrom( + backgroundColor: GREEN, + shape: + RoundedRectangleBorder(borderRadius: BorderRadius.circular(20.0)), + ), + onPressed: onPressed, + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 10.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + title, + style: TextStyle( + fontSize: 18.0, + color: TEXT_BLACK, + ), + ), + SizedBox( + width: 5.0, + ), + Icon(icon) + ], + ), + ), + ); +} diff --git a/lib/page/shopping/ShopPageEighteen.dart b/lib/page/shopping/ShopPageEighteen.dart index 28579b3..e1672f3 100644 --- a/lib/page/shopping/ShopPageEighteen.dart +++ b/lib/page/shopping/ShopPageEighteen.dart @@ -47,22 +47,24 @@ class _ShopEighteenState extends State { margin: EdgeInsets.only(top: topmargin, left: 10, right: 10), child: new Theme( data: new ThemeData( - primaryColor: Colors.black, - primaryColorDark: Colors.blue, - highlightColor: Colors.green, - textSelectionColor: Colors.blue[100] // text selection color - ), + primaryColor: Colors.black, + primaryColorDark: Colors.blue, + highlightColor: Colors.green, + textSelectionTheme: + TextSelectionThemeData(selectionColor: Colors.blue[100]), + // text selection color + ), child: new TextField( decoration: new InputDecoration( prefixStyle: TextStyle(color: RED), prefix: Text( name + " ", ), - hasFloatingPlaceholder: false, hintStyle: TextStyle(color: Colors.white), // helperText: 'Keep it short, this is just a demo.', labelText: name, labelStyle: TextStyle(color: Colors.black), + floatingLabelBehavior: FloatingLabelBehavior.never, // prefixText: 'Email ', // suffixText: 'USD', // suffixStyle: const TextStyle(color: Colors.green) @@ -165,14 +167,16 @@ class _ShopEighteenState extends State { Container( alignment: FractionalOffset.topCenter, height: 80, - child: FlatButton( - color: Color.fromRGBO(7, 7, 7, 1), - textColor: Color.fromRGBO(198, 193, 124, 1), + child: TextButton( + style: TextButton.styleFrom( + backgroundColor: Color.fromRGBO(7, 7, 7, 1), + foregroundColor: Color.fromRGBO(198, 193, 124, 1), + padding: EdgeInsets.only( + left: 20, right: 20, top: 8, bottom: 8), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(20)), + ), onPressed: () {}, - padding: EdgeInsets.only( - left: 20, right: 20, top: 8, bottom: 8), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(20)), child: Text("Next", style: TextStyle( fontSize: 20, diff --git a/lib/page/shopping/ShopPageNineteen.dart b/lib/page/shopping/ShopPageNineteen.dart index 622a7d0..37fa879 100644 --- a/lib/page/shopping/ShopPageNineteen.dart +++ b/lib/page/shopping/ShopPageNineteen.dart @@ -39,8 +39,8 @@ class _ShopNineteenState extends State { Widget textfield(String hint) { return TextField( decoration: InputDecoration( - hasFloatingPlaceholder: false, labelText: hint, + floatingLabelBehavior: FloatingLabelBehavior.never, ), ); } @@ -224,14 +224,16 @@ class _ShopNineteenState extends State { child: Container( alignment: FractionalOffset.center, height: 80, - child: FlatButton( - color: Color.fromRGBO(7, 7, 7, 1), - textColor: Color.fromRGBO(198, 193, 124, 1), + child: TextButton( + style: TextButton.styleFrom( + backgroundColor: Color.fromRGBO(7, 7, 7, 1), + foregroundColor: Color.fromRGBO(198, 193, 124, 1), + padding: EdgeInsets.only( + left: 20, right: 20, top: 8, bottom: 8), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(20)), + ), onPressed: () {}, - padding: EdgeInsets.only( - left: 20, right: 20, top: 8, bottom: 8), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(20)), child: Text("Pay", style: TextStyle( fontSize: 20, diff --git a/lib/page/signup/SignPageEleven.dart b/lib/page/signup/SignPageEleven.dart index dd60c14..3ec0edb 100644 --- a/lib/page/signup/SignPageEleven.dart +++ b/lib/page/signup/SignPageEleven.dart @@ -340,7 +340,7 @@ class _SignPageElevenState extends State { flex: 2, child: Wrap( children: [ - FlatButton( + TextButton( child: Text( data, style: TextStyle( diff --git a/lib/page/signup/SignPageOne.dart b/lib/page/signup/SignPageOne.dart index 796edac..ca71cba 100644 --- a/lib/page/signup/SignPageOne.dart +++ b/lib/page/signup/SignPageOne.dart @@ -46,7 +46,7 @@ Widget signupWidget() { 'Don\'t have an account?', style: TextStyle(fontFamily: 'Montserrat'), ), - FlatButton( + TextButton( onPressed: () { print('Sign Up button pressed'); }, diff --git a/lib/page/signup/SignPageSeven.dart b/lib/page/signup/SignPageSeven.dart index fe43a2a..56e4af7 100644 --- a/lib/page/signup/SignPageSeven.dart +++ b/lib/page/signup/SignPageSeven.dart @@ -62,7 +62,7 @@ class _SignPageSevenState extends State { Future _selectPlace(BuildContext context) async { try { - Place _picker = await PluginGooglePlacePicker.showPlacePicker(); + Place _picker = await PluginGooglePlacePicker.showAutocomplete(); setState(() { _place = _picker; }); diff --git a/lib/page/signup/SignPageSix.dart b/lib/page/signup/SignPageSix.dart index 7961cb8..50a1a35 100644 --- a/lib/page/signup/SignPageSix.dart +++ b/lib/page/signup/SignPageSix.dart @@ -243,16 +243,16 @@ class _SignPageSixState extends State ]; return Scaffold( - resizeToAvoidBottomPadding: false, + resizeToAvoidBottomInset: false, body: Stack( - overflow: Overflow.visible, + clipBehavior: Clip.none, fit: StackFit.expand, children: [ buildBackgroundImage(), SingleChildScrollView( physics: BouncingScrollPhysics(), child: Stack( - overflow: Overflow.visible, + clipBehavior: Clip.none, fit: StackFit.loose, children: stackChildren, ), diff --git a/lib/page/signup/SingPageTen.dart b/lib/page/signup/SingPageTen.dart index 0c56127..e65254c 100644 --- a/lib/page/signup/SingPageTen.dart +++ b/lib/page/signup/SingPageTen.dart @@ -37,7 +37,7 @@ class _SignPageTeenState extends State ]; return Scaffold( - resizeToAvoidBottomPadding: false, + resizeToAvoidBottomInset: false, appBar: SignupApbar( title: "CREATE ACCOUNT", ), diff --git a/lib/page/signup/widgets/location_picker.dart b/lib/page/signup/widgets/location_picker.dart index 9109de9..b7d4d21 100644 --- a/lib/page/signup/widgets/location_picker.dart +++ b/lib/page/signup/widgets/location_picker.dart @@ -12,7 +12,7 @@ class _LocationPickerState extends State { Future _selectPlace(BuildContext context) async { try { - Place _picker = await PluginGooglePlacePicker.showPlacePicker(); + Place _picker = await PluginGooglePlacePicker.showAutocomplete(); setState(() { _place = _picker; }); diff --git a/pubspec.yaml b/pubspec.yaml index f27951e..ee05eb8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,10 +18,10 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^0.1.2 - image_picker: ^0.4.10 - intl: ^0.15.7 - google_places_picker: ^0.0.9 + cupertino_icons: ^0.1.3 + image_picker: ^0.6.7+2 + intl: ^0.16.1 + google_places_picker: ^2.1.0+2 dev_dependencies: flutter_test: