Skip to content

Commit 9a0edeb

Browse files
nb312nb312
authored
Merge pull request #31 from gaowanliang/master
Modify to fit Android X
2 parents dd4accc + bf7a6d0 commit 9a0edeb

13 files changed

+22
-24
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:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_places_picker-2.1.0+2\\\\","dependencies":[]},{"name":"image_picker","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.6.7+2\\\\","dependencies":[]}],"android":[{"name":"flutter_plugin_android_lifecycle","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-1.0.8\\\\","dependencies":[]},{"name":"google_places_picker","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_places_picker-2.1.0+2\\\\","dependencies":[]},{"name":"image_picker","path":"D:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.6.7+2\\\\","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":"2020-06-26 22:39:06.633075","version":"1.20.0-1.0.pre"}
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"}

‎android/app/build.gradle

+2-2
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 27
29+
compileSdkVersion 29
3030

3131
sourceSets {
3232
main.java.srcDirs += 'src/main/kotlin'
@@ -40,7 +40,7 @@ android {
4040
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4141
applicationId "com.nb.flutteruishopping"
4242
minSdkVersion 16
43-
targetSdkVersion 27
43+
targetSdkVersion 29
4444
versionCode flutterVersionCode.toInteger()
4545
versionName flutterVersionName
4646
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

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

+3
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,8 @@
4141
<meta-data
4242
android:name="com.google.android.geo.API_KEY"
4343
android:value="YOUR_API_KEY"/>
44+
<meta-data
45+
android:name="flutterEmbedding"
46+
android:value="2" />
4447
</application>
4548
</manifest>

‎android/app/src/main/kotlin/com/nb/flutteruishopping/MainActivity.kt

+2-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@ package com.nb.flutteruishopping
22

33
import android.os.Bundle
44

5-
import io.flutter.app.FlutterActivity
6-
import io.flutter.plugins.GeneratedPluginRegistrant
5+
import io.flutter.embedding.android.FlutterActivity
6+
77

88
class MainActivity: FlutterActivity() {
9-
override fun onCreate(savedInstanceState: Bundle?) {
10-
super.onCreate(savedInstanceState)
11-
GeneratedPluginRegistrant.registerWith(this)
12-
}
139
}

‎android/build.gradle

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

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

‎android/gradle.properties

+2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
org.gradle.jvmargs=-Xmx1536M
2+
android.useAndroidX=true
3+
android.enableJetifier=true
24
android.enableR8=true

‎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-4.10.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

‎ios/Flutter/flutter_export_environment.sh

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
#!/bin/sh
22
# This is a generated file; do not edit or check into version control.
3-
export "FLUTTER_ROOT=D:\flutter"
4-
export "FLUTTER_APPLICATION_PATH=D:\flutter-ui-nice"
3+
export "FLUTTER_ROOT=D:\program_app\flutter"
4+
export "FLUTTER_APPLICATION_PATH=D:\program_data\flutter\flutter-ui-nice"
5+
export "COCOAPODS_PARALLEL_CODE_SIGN=true"
56
export "FLUTTER_TARGET=lib\main.dart"
67
export "FLUTTER_BUILD_DIR=build"
7-
export "SYMROOT=${SOURCE_ROOT}/../build\ios"
8-
export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
9-
export "FLUTTER_FRAMEWORK_DIR=D:\flutter\bin\cache\artifacts\engine\ios"
108
export "FLUTTER_BUILD_NAME=1.0.0"
119
export "FLUTTER_BUILD_NUMBER=1"
1210
export "DART_OBFUSCATION=false"
1311
export "TRACK_WIDGET_CREATION=false"
1412
export "TREE_SHAKE_ICONS=false"
13+
export "PACKAGE_CONFIG=.packages"

‎lib/page/feed/FeedPageOne.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class _FeedState extends State<FeedPageOne> {
9999
child: Text('+33',
100100
style: Theme.of(context)
101101
.textTheme
102-
.title
102+
.headline6
103103
.copyWith(color: Colors.white)),
104104
),
105105
)),

‎lib/page/shopping/ShopPageEighteen.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,10 @@ class _ShopEighteenState extends State<ShopPageEighteen> {
5858
prefix: Text(
5959
name + " ",
6060
),
61-
hasFloatingPlaceholder: false,
6261
hintStyle: TextStyle(color: Colors.white),
6362
// helperText: 'Keep it short, this is just a demo.',
6463
labelText: name,
65-
labelStyle: TextStyle(color: Colors.black),
64+
labelStyle: TextStyle(color: Colors.black), floatingLabelBehavior: FloatingLabelBehavior.never,
6665
// prefixText: 'Email ',
6766
// suffixText: 'USD',
6867
// suffixStyle: const TextStyle(color: Colors.green)

‎lib/page/shopping/ShopPageNineteen.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ class _ShopNineteenState extends State<ShopPageNineteen> {
3939
Widget textfield(String hint) {
4040
return TextField(
4141
decoration: InputDecoration(
42-
hasFloatingPlaceholder: false,
43-
labelText: hint,
42+
labelText: hint, floatingLabelBehavior: FloatingLabelBehavior.never,
4443
),
4544
);
4645
}

‎lib/page/signup/SignPageSix.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ class _SignPageSixState extends State<SignPageSix>
243243
];
244244

245245
return Scaffold(
246-
resizeToAvoidBottomPadding: false,
246+
resizeToAvoidBottomInset: false,
247247
body: Stack(
248248
overflow: Overflow.visible,
249249
fit: StackFit.expand,

‎lib/page/signup/SingPageTen.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class _SignPageTeenState extends State<SignPageTeen>
3737
];
3838

3939
return Scaffold(
40-
resizeToAvoidBottomPadding: false,
40+
resizeToAvoidBottomInset: false,
4141
appBar: SignupApbar(
4242
title: "CREATE ACCOUNT",
4343
),

0 commit comments

Comments
 (0)