Skip to content

Commit b8654a0

Browse files
nb312nb312
authored
Merge pull request #32 from saadii00/master
Now running on android all the problems are resolved
2 parents 9a0edeb + 5c01f24 commit b8654a0

14 files changed

+151
-124
lines changed

‎.flutter-plugins-dependencies

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"google_places_picker","path":"D:\\\\program_app\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_places_picker-2.1.0+3\\\\","dependencies":[]},{"name":"image_picker","path":"D:\\\\program_app\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.6.7+22\\\\","dependencies":[]}],"android":[{"name":"flutter_plugin_android_lifecycle","path":"D:\\\\program_app\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-1.0.11\\\\","dependencies":[]},{"name":"google_places_picker","path":"D:\\\\program_app\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_places_picker-2.1.0+3\\\\","dependencies":[]},{"name":"image_picker","path":"D:\\\\program_app\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.6.7+22\\\\","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":"2022-01-14 00:13:07.508169","version":"2.8.1"}
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"}

‎README.md

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
# flutter-ui-nice
2+
23
### :heart: Star :heart: the repo to support the project or :smile:[Follow Me](https://github.com/nb312).Thanks!
3-
Facebook Page | Twitter | Medium | QQ Group
4-
--- | --- | --- | ---
5-
[Flutter Open ](https://www.facebook.com/flutteropen) | [NieBin](https://twitter.com/niebin_gg) | [Flutter Open](https://medium.com/flutteropen) | 963828159
4+
5+
| Facebook Page | Twitter | Medium | QQ Group |
6+
| ----------------------------------------------------- | --------------------------------------- | ---------------------------------------------- | --------- |
7+
| [Flutter Open ](https://www.facebook.com/flutteropen) | [NieBin](https://twitter.com/niebin_gg) | [Flutter Open](https://medium.com/flutteropen) | 963828159 |
68

79
# Contributors
8-
~ | ~ | ~ | ~ | ~
9-
--- | --- | --- | --- | ---
10-
[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)
11-
| [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)
10+
11+
| ~ | ~ | ~ | ~ | ~ |
12+
| ---------------------------------------------- | ---------------------------------------- | ---------------------------------------------- | ----------------------------------------- | --------------------------------------------------------- | -------------------------------------------------------- |
13+
| [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) |
14+
| [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) |
1215

1316
# Contents
17+
1418
<img src="doc/01-signup-no.jpg"/>
1519

1620
<img src="doc/02-walk_through-no.jpg"/>
@@ -32,6 +36,7 @@ Facebook Page | Twitter | Medium | QQ Group
3236
<img src="doc/10-camera-no.jpg"/>
3337

3438
# License
39+
3540
Copyright 2019 @NieBin
3641

3742
Licensed under the Apache License, Version 2.0 (the "License");

‎android/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29-
compileSdkVersion 29
29+
compileSdkVersion 31
3030

3131
sourceSets {
3232
main.java.srcDirs += 'src/main/kotlin'

‎android/app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
additional functionality it is fine to subclass or reimplement
1616
FlutterApplication and put your custom class here. -->
1717
<application
18-
android:name="io.flutter.app.FlutterApplication"
18+
android:name="${applicationName}"
1919
android:label="flutter_ui_shopping"
2020
android:icon="@mipmap/ic_launcher">
2121
<activity

‎android/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
2-
ext.kotlin_version = '1.3.50'
2+
ext.kotlin_version = '1.7.20'
33
repositories {
44
google()
55
jcenter()
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.0'
9+
classpath 'com.android.tools.build:gradle:7.1.2'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}

‎android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

‎ios/Flutter/flutter_export_environment.sh

100644100755
+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/bin/sh
22
# This is a generated file; do not edit or check into version control.
3-
export "FLUTTER_ROOT=D:\program_app\flutter"
4-
export "FLUTTER_APPLICATION_PATH=D:\program_data\flutter\flutter-ui-nice"
3+
export "FLUTTER_ROOT=/Users/muhammadsaadullahshahid/developer/flutter"
4+
export "FLUTTER_APPLICATION_PATH=/Users/muhammadsaadullahshahid/flutter-ui-nice"
55
export "COCOAPODS_PARALLEL_CODE_SIGN=true"
6-
export "FLUTTER_TARGET=lib\main.dart"
6+
export "FLUTTER_TARGET=lib/main.dart"
77
export "FLUTTER_BUILD_DIR=build"
88
export "FLUTTER_BUILD_NAME=1.0.0"
99
export "FLUTTER_BUILD_NUMBER=1"
1010
export "DART_OBFUSCATION=false"
11-
export "TRACK_WIDGET_CREATION=false"
11+
export "TRACK_WIDGET_CREATION=true"
1212
export "TREE_SHAKE_ICONS=false"
13-
export "PACKAGE_CONFIG=.packages"
13+
export "PACKAGE_CONFIG=.dart_tool/package_config.json"

‎lib/page/navigation/common/pages/home_page.dart

+26-23
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,33 @@ import 'package:flutter/material.dart';
22
import 'package:flutter_ui_nice/const/color_const.dart';
33

44
class HomePage extends StatelessWidget {
5-
HomePage(this.onMenuPressed);
6-
final VoidCallback onMenuPressed;
5+
HomePage(this.onMenuPressed);
6+
final VoidCallback onMenuPressed;
77

8-
@override
8+
@override
99
Widget build(BuildContext context) {
1010
return Container(
11-
decoration: BoxDecoration(
12-
borderRadius: BorderRadius.circular(10.0),
13-
gradient: LinearGradient(
14-
begin: Alignment.topLeft,
15-
end: Alignment.bottomRight,
16-
colors: [YELLOW, GREEN, BLUE],
17-
),
18-
boxShadow: <BoxShadow>[
19-
BoxShadow(
20-
color: Colors.black26,
21-
offset: Offset(2.0, 1.0),
22-
blurRadius: 10.0,
23-
)
24-
],
25-
),
26-
child: Center(
27-
child: RaisedButton(onPressed: onMenuPressed, child: Text("Open Menu"),),
28-
),
29-
);
11+
decoration: BoxDecoration(
12+
borderRadius: BorderRadius.circular(10.0),
13+
gradient: LinearGradient(
14+
begin: Alignment.topLeft,
15+
end: Alignment.bottomRight,
16+
colors: [YELLOW, GREEN, BLUE],
17+
),
18+
boxShadow: <BoxShadow>[
19+
BoxShadow(
20+
color: Colors.black26,
21+
offset: Offset(2.0, 1.0),
22+
blurRadius: 10.0,
23+
)
24+
],
25+
),
26+
child: Center(
27+
child: ElevatedButton(
28+
onPressed: onMenuPressed,
29+
child: Text("Open Menu"),
30+
),
31+
),
32+
);
3033
}
31-
}
34+
}

‎lib/page/navigation/navigation1/widgets/button.dart

+69-58
Original file line numberDiff line numberDiff line change
@@ -2,67 +2,78 @@ import 'package:flutter/material.dart';
22
import 'package:flutter_ui_nice/const/color_const.dart';
33

44
class Button {
5+
static Widget home(VoidCallback onPressed) =>
6+
_buildButton(onPressed, "HOME", Icons.home);
57

6-
static Widget home(VoidCallback onPressed) => _buildButton(onPressed, "HOME", Icons.home);
8+
static Widget chat(VoidCallback onPressed, {int notification}) =>
9+
_buildButton(onPressed, "CHAT", Icons.chat, notification: notification);
710

8-
static Widget chat(VoidCallback onPressed, {int notification}) => _buildButton(onPressed, "CHAT", Icons.chat, notification:
9-
notification);
11+
static Widget feed(VoidCallback onPressed) =>
12+
_buildButton(onPressed, "FEED", Icons.rss_feed);
1013

11-
static Widget feed(VoidCallback onPressed) => _buildButton(onPressed, "FEED", Icons.rss_feed);
14+
static Widget profile(VoidCallback onPressed) =>
15+
_buildButton(onPressed, "PROFILE", Icons.person);
1216

13-
static Widget profile(VoidCallback onPressed) => _buildButton(onPressed, "PROFILE", Icons.person);
17+
static Widget settings(VoidCallback onPressed) =>
18+
_buildButton(onPressed, "SETTINGS", Icons.settings);
1419

15-
static Widget settings(VoidCallback onPressed) => _buildButton(onPressed, "SETTINGS", Icons.settings);
20+
static Widget _buildButton(
21+
VoidCallback onPressed, String title, IconData icon,
22+
{int notification}) {
23+
if (notification != null) {
24+
return Container(
25+
child: Stack(
26+
children: <Widget>[
27+
_button(onPressed, title, icon),
28+
Positioned(
29+
top: 0.0,
30+
right: 0.0,
31+
child: Container(
32+
decoration: BoxDecoration(
33+
shape: BoxShape.circle, color: Colors.redAccent),
34+
child: Padding(
35+
padding: const EdgeInsets.all(6.0),
36+
child: Text(
37+
"$notification",
38+
style: TextStyle(color: Colors.white),
39+
),
40+
),
41+
),
42+
),
43+
],
44+
),
45+
);
46+
} else {
47+
return _button(onPressed, title, icon);
48+
}
49+
}
1650

17-
static Widget _buildButton(VoidCallback onPressed, String title, IconData icon, {int notification}) {
18-
if (notification != null) {
19-
return Container(
20-
child: Stack(
21-
children: <Widget>[
22-
_button(onPressed, title, icon),
23-
Positioned(
24-
top: 0.0,
25-
right: 0.0,
26-
child: Container(
27-
decoration: BoxDecoration(
28-
shape: BoxShape.circle,
29-
color: Colors.redAccent
30-
),
31-
child: Padding(
32-
padding: const EdgeInsets.all(6.0),
33-
child: Text("$notification", style: TextStyle(color: Colors.white),),
34-
),
35-
),
36-
),
37-
],
38-
),
39-
);
40-
} else {
41-
return _button(onPressed, title, icon);
42-
}
43-
}
44-
45-
static Widget _button(VoidCallback onPressed, String title, IconData icon) => RaisedButton(
46-
color: GREEN,
47-
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20.0)),
48-
onPressed: onPressed,
49-
child: Padding(
50-
padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 10.0),
51-
child: Row(
52-
mainAxisAlignment: MainAxisAlignment.spaceBetween,
53-
children: <Widget>[
54-
Text(
55-
title,
56-
style: TextStyle(
57-
fontSize: 18.0,
58-
color: TEXT_BLACK,
59-
),
60-
),
61-
SizedBox(width: 5.0,),
62-
Icon(icon)
63-
],
64-
),
65-
),
66-
);
67-
68-
}
51+
static Widget _button(VoidCallback onPressed, String title, IconData icon) =>
52+
ElevatedButton(
53+
style: ElevatedButton.styleFrom(
54+
backgroundColor: GREEN,
55+
shape:
56+
RoundedRectangleBorder(borderRadius: BorderRadius.circular(20.0)),
57+
),
58+
onPressed: onPressed,
59+
child: Padding(
60+
padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 10.0),
61+
child: Row(
62+
mainAxisAlignment: MainAxisAlignment.spaceBetween,
63+
children: <Widget>[
64+
Text(
65+
title,
66+
style: TextStyle(
67+
fontSize: 18.0,
68+
color: TEXT_BLACK,
69+
),
70+
),
71+
SizedBox(
72+
width: 5.0,
73+
),
74+
Icon(icon)
75+
],
76+
),
77+
),
78+
);
79+
}

‎lib/page/shopping/ShopPageEighteen.dart

+18-13
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,13 @@ class _ShopEighteenState extends State<ShopPageEighteen> {
4747
margin: EdgeInsets.only(top: topmargin, left: 10, right: 10),
4848
child: new Theme(
4949
data: new ThemeData(
50-
primaryColor: Colors.black,
51-
primaryColorDark: Colors.blue,
52-
highlightColor: Colors.green,
53-
textSelectionColor: Colors.blue[100] // text selection color
54-
),
50+
primaryColor: Colors.black,
51+
primaryColorDark: Colors.blue,
52+
highlightColor: Colors.green,
53+
textSelectionTheme:
54+
TextSelectionThemeData(selectionColor: Colors.blue[100]),
55+
// text selection color
56+
),
5557
child: new TextField(
5658
decoration: new InputDecoration(
5759
prefixStyle: TextStyle(color: RED),
@@ -61,7 +63,8 @@ class _ShopEighteenState extends State<ShopPageEighteen> {
6163
hintStyle: TextStyle(color: Colors.white),
6264
// helperText: 'Keep it short, this is just a demo.',
6365
labelText: name,
64-
labelStyle: TextStyle(color: Colors.black), floatingLabelBehavior: FloatingLabelBehavior.never,
66+
labelStyle: TextStyle(color: Colors.black),
67+
floatingLabelBehavior: FloatingLabelBehavior.never,
6568
// prefixText: 'Email ',
6669
// suffixText: 'USD',
6770
// suffixStyle: const TextStyle(color: Colors.green)
@@ -164,14 +167,16 @@ class _ShopEighteenState extends State<ShopPageEighteen> {
164167
Container(
165168
alignment: FractionalOffset.topCenter,
166169
height: 80,
167-
child: FlatButton(
168-
color: Color.fromRGBO(7, 7, 7, 1),
169-
textColor: Color.fromRGBO(198, 193, 124, 1),
170+
child: TextButton(
171+
style: TextButton.styleFrom(
172+
backgroundColor: Color.fromRGBO(7, 7, 7, 1),
173+
foregroundColor: Color.fromRGBO(198, 193, 124, 1),
174+
padding: EdgeInsets.only(
175+
left: 20, right: 20, top: 8, bottom: 8),
176+
shape: RoundedRectangleBorder(
177+
borderRadius: BorderRadius.circular(20)),
178+
),
170179
onPressed: () {},
171-
padding: EdgeInsets.only(
172-
left: 20, right: 20, top: 8, bottom: 8),
173-
shape: RoundedRectangleBorder(
174-
borderRadius: BorderRadius.circular(20)),
175180
child: Text("Next",
176181
style: TextStyle(
177182
fontSize: 20,

‎lib/page/shopping/ShopPageNineteen.dart

+11-8
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ class _ShopNineteenState extends State<ShopPageNineteen> {
3939
Widget textfield(String hint) {
4040
return TextField(
4141
decoration: InputDecoration(
42-
labelText: hint, floatingLabelBehavior: FloatingLabelBehavior.never,
42+
labelText: hint,
43+
floatingLabelBehavior: FloatingLabelBehavior.never,
4344
),
4445
);
4546
}
@@ -223,14 +224,16 @@ class _ShopNineteenState extends State<ShopPageNineteen> {
223224
child: Container(
224225
alignment: FractionalOffset.center,
225226
height: 80,
226-
child: FlatButton(
227-
color: Color.fromRGBO(7, 7, 7, 1),
228-
textColor: Color.fromRGBO(198, 193, 124, 1),
227+
child: TextButton(
228+
style: TextButton.styleFrom(
229+
backgroundColor: Color.fromRGBO(7, 7, 7, 1),
230+
foregroundColor: Color.fromRGBO(198, 193, 124, 1),
231+
padding: EdgeInsets.only(
232+
left: 20, right: 20, top: 8, bottom: 8),
233+
shape: RoundedRectangleBorder(
234+
borderRadius: BorderRadius.circular(20)),
235+
),
229236
onPressed: () {},
230-
padding: EdgeInsets.only(
231-
left: 20, right: 20, top: 8, bottom: 8),
232-
shape: RoundedRectangleBorder(
233-
borderRadius: BorderRadius.circular(20)),
234237
child: Text("Pay",
235238
style: TextStyle(
236239
fontSize: 20,

‎lib/page/signup/SignPageEleven.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ class _SignPageElevenState extends State<SignPageEleven> {
340340
flex: 2,
341341
child: Wrap(
342342
children: <Widget>[
343-
FlatButton(
343+
TextButton(
344344
child: Text(
345345
data,
346346
style: TextStyle(

‎lib/page/signup/SignPageOne.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Widget signupWidget() {
4646
'Don\'t have an account?',
4747
style: TextStyle(fontFamily: 'Montserrat'),
4848
),
49-
FlatButton(
49+
TextButton(
5050
onPressed: () {
5151
print('Sign Up button pressed');
5252
},

0 commit comments

Comments
 (0)