Skip to content

Commit 6647f79

Browse files
ArizArmeidiArizArmeidi
committed
Update to Flutter 3.0 & some UI updates
1 parent ea045b7 commit 6647f79

File tree

99 files changed

+3612
-754
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+3612
-754
lines changed

‎.metadata‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,45 @@
11
# This file tracks properties of this Flutter project.
22
# Used by Flutter tool to assess capabilities and perform upgrades etc.
33
#
4-
# This file should be version controlled and should not be manually edited.
4+
# This file should be version controlled.
55

66
version:
7-
revision: 9b2d32b605630f28625709ebd9d78ab3016b2bf6
7+
revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
88
channel: stable
99

1010
project_type: app
11+
12+
# Tracks metadata for the flutter migrate command
13+
migration:
14+
platforms:
15+
- platform: root
16+
create_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
17+
base_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
18+
- platform: android
19+
create_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
20+
base_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
21+
- platform: ios
22+
create_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
23+
base_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
24+
- platform: linux
25+
create_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
26+
base_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
27+
- platform: macos
28+
create_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
29+
base_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
30+
- platform: web
31+
create_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
32+
base_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
33+
- platform: windows
34+
create_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
35+
base_revision: 6928314d505d2bb4777be05e45d7808a5aa91d2a
36+
37+
# User provided section
38+
39+
# List of Local paths (relative to this file) that should be
40+
# ignored by the migrate tool.
41+
#
42+
# Files that are not part of the templates will be ignored by default.
43+
unmanaged_files:
44+
- 'lib/main.dart'
45+
- 'ios/Runner.xcodeproj/project.pbxproj'

‎android/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ GeneratedPluginRegistrant.java
99
# Remember to never publicly share your keystore.
1010
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
1111
key.properties
12+
**/*.keystore
13+
**/*.jks

‎android/app/build.gradle‎

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

2828
android {
29-
compileSdkVersion 29
29+
compileSdkVersion flutter.compileSdkVersion
30+
ndkVersion flutter.ndkVersion
3031

31-
sourceSets {
32-
main.java.srcDirs += 'src/main/kotlin'
32+
compileOptions {
33+
sourceCompatibility JavaVersion.VERSION_1_8
34+
targetCompatibility JavaVersion.VERSION_1_8
35+
}
36+
37+
kotlinOptions {
38+
jvmTarget = '1.8'
3339
}
3440

35-
lintOptions {
36-
disable 'InvalidPackage'
41+
sourceSets {
42+
main.java.srcDirs += 'src/main/kotlin'
3743
}
3844

3945
defaultConfig {
4046
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
41-
applicationId "com.example.FlutterWeather"
42-
minSdkVersion 16
43-
targetSdkVersion 29
47+
applicationId "com.example.flutter_weather"
48+
// You can update the following values to match your application needs.
49+
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
50+
minSdkVersion flutter.minSdkVersion
51+
targetSdkVersion flutter.targetSdkVersion
4452
versionCode flutterVersionCode.toInteger()
4553
versionName flutterVersionName
4654
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.FlutterWeather">
3-
<!-- Flutter needs it to communicate with the running application
2+
package="com.example.flutter_weather">
3+
<!-- The INTERNET permission is required for development. Specifically,
4+
the Flutter tool needs it to communicate with the running application
45
to allow setting breakpoints, to provide hot reload, etc.
56
-->
67
<uses-permission android:name="android.permission.INTERNET"/>

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

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.FlutterWeather">
3-
<uses-permission android:name="android.permission.INTERNET"/>
4-
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
5-
calls FlutterMain.startInitialization(this); in its onCreate method.
6-
In most cases you can leave this as-is, but you if you want to provide
7-
additional functionality it is fine to subclass or reimplement
8-
FlutterApplication and put your custom class here. -->
9-
<application
10-
android:name="io.flutter.app.FlutterApplication"
11-
android:label="FlutterWeather"
2+
package="com.example.flutter_weather">
3+
<application
4+
android:label="flutter_weather"
5+
android:name="${applicationName}"
126
android:icon="@mipmap/ic_launcher">
137
<activity
148
android:name=".MainActivity"
9+
android:exported="true"
1510
android:launchMode="singleTop"
1611
android:theme="@style/LaunchTheme"
1712
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
@@ -25,15 +20,6 @@
2520
android:name="io.flutter.embedding.android.NormalTheme"
2621
android:resource="@style/NormalTheme"
2722
/>
28-
<!-- Displays an Android View that continues showing the launch screen
29-
Drawable until Flutter paints its first frame, then this splash
30-
screen fades out. A splash screen is useful to avoid any visual
31-
gap between the end of Android's launch screen and the painting of
32-
Flutter's first frame. -->
33-
<meta-data
34-
android:name="io.flutter.embedding.android.SplashScreenDrawable"
35-
android:resource="@drawable/launch_background"
36-
/>
3723
<intent-filter>
3824
<action android:name="android.intent.action.MAIN"/>
3925
<category android:name="android.intent.category.LAUNCHER"/>
@@ -45,5 +31,4 @@
4531
android:name="flutterEmbedding"
4632
android:value="2" />
4733
</application>
48-
4934
</manifest>

android/app/src/main/kotlin/com/example/FlutterWeather/MainActivity.kt renamed to android/app/src/main/kotlin/com/example/flutter_weather/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.FlutterWeather
1+
package com.example.flutter_weather
22

33
import io.flutter.embedding.android.FlutterActivity
44

‎android/app/src/main/res/drawable-v21/launch_background.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Modify this file to customize your launch splash screen -->
3+
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
4+
<item android:drawable="?android:colorBackground" />
5+
6+
<!-- You can insert your own image assets here -->
7+
<!-- <item>
8+
<bitmap
9+
android:gravity="center"
10+
android:src="@mipmap/launch_image" />
11+
</item> -->
12+
</layer-list>

‎android/app/src/main/res/values-night/styles.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
4+
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
5+
<!-- Show a splash screen on the activity. Automatically removed when
6+
the Flutter engine draws its first frame -->
7+
<item name="android:windowBackground">@drawable/launch_background</item>
8+
</style>
9+
<!-- Theme applied to the Android Window as soon as the process has started.
10+
This theme determines the color of the Android Window while your
11+
Flutter UI initializes, as well as behind your Flutter UI while its
12+
running.
13+
14+
This Theme is only used starting with V2 of Flutter's Android embedding. -->
15+
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
16+
<item name="android:windowBackground">?android:colorBackground</item>
17+
</style>
18+
</resources>

‎android/app/src/main/res/values/styles.xml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<!-- Theme applied to the Android Window while the process is starting -->
4-
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
3+
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
4+
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
55
<!-- Show a splash screen on the activity. Automatically removed when
6-
Flutter draws its first frame -->
6+
the Flutter engine draws its first frame -->
77
<item name="android:windowBackground">@drawable/launch_background</item>
8-
<item name="android:defaultFocusHighlightEnabled">false</item>
98
</style>
109
<!-- Theme applied to the Android Window as soon as the process has started.
1110
This theme determines the color of the Android Window while your
1211
Flutter UI initializes, as well as behind your Flutter UI while its
1312
running.
14-
13+
1514
This Theme is only used starting with V2 of Flutter's Android embedding. -->
16-
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
17-
<item name="android:windowBackground">@android:color/white</item>
18-
<item name="android:defaultFocusHighlightEnabled">false</item>
15+
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
16+
<item name="android:windowBackground">?android:colorBackground</item>
1917
</style>
20-
2118
</resources>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.FlutterWeather">
3-
<!-- Flutter needs it to communicate with the running application
2+
package="com.example.flutter_weather">
3+
<!-- The INTERNET permission is required for development. Specifically,
4+
the Flutter tool needs it to communicate with the running application
45
to allow setting breakpoints, to provide hot reload, etc.
56
-->
67
<uses-permission android:name="android.permission.INTERNET"/>

0 commit comments

Comments
 (0)