Skip to content

Commit dfb202f

Browse files
mitesh77mitesh77
authored
Merge branch 'master' into master
2 parents 60564a2 + 3295e7b commit dfb202f

File tree

11 files changed

+44
-41
lines changed

11 files changed

+44
-41
lines changed

‎best_flutter_ui_templates/android/app/build.gradle

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,28 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29-
compileSdkVersion 31
3029

31-
sourceSets {
32-
main.java.srcDirs += 'src/main/kotlin'
30+
compileSdkVersion flutter.compileSdkVersion
31+
ndkVersion flutter.ndkVersion
32+
33+
compileOptions {
34+
sourceCompatibility JavaVersion.VERSION_1_8
35+
targetCompatibility JavaVersion.VERSION_1_8
3336
}
3437

35-
lintOptions {
36-
disable 'InvalidPackage'
38+
kotlinOptions {
39+
jvmTarget = '1.8'
40+
}
41+
42+
sourceSets {
43+
main.java.srcDirs += 'src/main/kotlin'
3744
}
3845

3946
defaultConfig {
4047
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4148
applicationId "com.example.best_flutter_ui_templates"
42-
minSdkVersion 16
43-
targetSdkVersion 31
49+
minSdkVersion flutter.minSdkVersion
50+
targetSdkVersion flutter.targetSdkVersion
4451
versionCode flutterVersionCode.toInteger()
4552
versionName flutterVersionName
4653
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
additional functionality it is fine to subclass or reimplement
77
FlutterApplication and put your custom class here. -->
88
<application
9+
android:label="Best Flutter UI Templates"
910
android:name="${applicationName}"
10-
android:label="best_flutter_ui_templates"
1111
android:icon="@mipmap/ic_launcher">
1212
<activity
1313
android:name=".MainActivity"
14+
android:exported="true"
1415
android:launchMode="singleTop"
1516
android:theme="@style/LaunchTheme"
1617
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

‎best_flutter_ui_templates/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
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
}

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

Lines changed: 1 addition & 1 deletion
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

‎best_flutter_ui_templates/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>8.0</string>
24+
<string>9.0</string>
2525
</dict>
2626
</plist>

‎best_flutter_ui_templates/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 50;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -135,7 +135,7 @@
135135
97C146E61CF9000F007C117D /* Project object */ = {
136136
isa = PBXProject;
137137
attributes = {
138-
LastUpgradeCheck = 1020;
138+
LastUpgradeCheck = 1300;
139139
ORGANIZATIONNAME = "";
140140
TargetAttributes = {
141141
97C146ED1CF9000F007C117D = {
@@ -280,7 +280,7 @@
280280
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
281281
GCC_WARN_UNUSED_FUNCTION = YES;
282282
GCC_WARN_UNUSED_VARIABLE = YES;
283-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
283+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
284284
MTL_ENABLE_DEBUG_INFO = NO;
285285
SDKROOT = iphoneos;
286286
SUPPORTED_PLATFORMS = iphoneos;
@@ -362,7 +362,7 @@
362362
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
363363
GCC_WARN_UNUSED_FUNCTION = YES;
364364
GCC_WARN_UNUSED_VARIABLE = YES;
365-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
365+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
366366
MTL_ENABLE_DEBUG_INFO = YES;
367367
ONLY_ACTIVE_ARCH = YES;
368368
SDKROOT = iphoneos;
@@ -411,7 +411,7 @@
411411
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
412412
GCC_WARN_UNUSED_FUNCTION = YES;
413413
GCC_WARN_UNUSED_VARIABLE = YES;
414-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
414+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
415415
MTL_ENABLE_DEBUG_INFO = NO;
416416
SDKROOT = iphoneos;
417417
SUPPORTED_PLATFORMS = iphoneos;

‎best_flutter_ui_templates/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎best_flutter_ui_templates/ios/Runner/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,7 @@
4141
</array>
4242
<key>UIViewControllerBasedStatusBarAppearance</key>
4343
<false/>
44+
<key>CADisableMinimumFrameDurationOnPhone</key>
45+
<true/>
4446
</dict>
4547
</plist>

‎best_flutter_ui_templates/lib/custom_drawer/drawer_user_controller.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class _DrawerUserControllerState extends State<DrawerUserController>
8080
curve: Curves.fastOutSlowIn);
8181
}
8282
});
83-
WidgetsBinding.instance?.addPostFrameCallback((_) => getInitState());
83+
WidgetsBinding.instance.addPostFrameCallback((_) => getInitState());
8484
super.initState();
8585
}
8686

‎best_flutter_ui_templates/pubspec.lock

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ packages:
77
name: animations
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "2.0.0"
10+
version: "2.0.3"
1111
async:
1212
dependency: transitive
1313
description:
@@ -49,7 +49,7 @@ packages:
4949
name: collection
5050
url: "https://pub.dartlang.org"
5151
source: hosted
52-
version: "1.15.0"
52+
version: "1.16.0"
5353
cupertino_icons:
5454
dependency: "direct main"
5555
description:
@@ -63,7 +63,7 @@ packages:
6363
name: fake_async
6464
url: "https://pub.dartlang.org"
6565
source: hosted
66-
version: "1.2.0"
66+
version: "1.3.0"
6767
flutter:
6868
dependency: "direct main"
6969
description: flutter
@@ -75,7 +75,7 @@ packages:
7575
name: flutter_rating_bar
7676
url: "https://pub.dartlang.org"
7777
source: hosted
78-
version: "4.0.0"
78+
version: "4.0.1"
7979
flutter_test:
8080
dependency: "direct dev"
8181
description: flutter
@@ -87,7 +87,7 @@ packages:
8787
name: font_awesome_flutter
8888
url: "https://pub.dartlang.org"
8989
source: hosted
90-
version: "9.0.0"
90+
version: "10.1.0"
9191
intl:
9292
dependency: "direct main"
9393
description:
@@ -108,7 +108,7 @@ packages:
108108
name: material_color_utilities
109109
url: "https://pub.dartlang.org"
110110
source: hosted
111-
version: "0.1.3"
111+
version: "0.1.4"
112112
meta:
113113
dependency: transitive
114114
description:
@@ -122,7 +122,7 @@ packages:
122122
name: path
123123
url: "https://pub.dartlang.org"
124124
source: hosted
125-
version: "1.8.0"
125+
version: "1.8.1"
126126
sky_engine:
127127
dependency: transitive
128128
description: flutter
@@ -134,7 +134,7 @@ packages:
134134
name: source_span
135135
url: "https://pub.dartlang.org"
136136
source: hosted
137-
version: "1.8.1"
137+
version: "1.8.2"
138138
stack_trace:
139139
dependency: transitive
140140
description:
@@ -169,21 +169,14 @@ packages:
169169
name: test_api
170170
url: "https://pub.dartlang.org"
171171
source: hosted
172-
version: "0.4.8"
173-
typed_data:
174-
dependency: transitive
175-
description:
176-
name: typed_data
177-
url: "https://pub.dartlang.org"
178-
source: hosted
179-
version: "1.3.0"
172+
version: "0.4.9"
180173
vector_math:
181174
dependency: transitive
182175
description:
183176
name: vector_math
184177
url: "https://pub.dartlang.org"
185178
source: hosted
186-
version: "2.1.1"
179+
version: "2.1.2"
187180
sdks:
188-
dart: ">=2.14.0 <3.0.0"
189-
flutter: ">=1.12.13+hotfix.5"
181+
dart: ">=2.17.5 <3.0.0"
182+
flutter: ">=3.0.0"

0 commit comments

Comments
 (0)