Skip to content

Commit 613e774

Browse files
committed
Updates for latest flutter stable (#240)
* Recreate android and ios Update to Android embedding v2 Deletes png assets by using Android's adaptive launcher icon system Recreates ios/ Bumps up pubspec versions * Gradle bump
1 parent 7b849b4 commit 613e774

Some content is hidden

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

50 files changed

+323
-499
lines changed

mdc_100_series/.gitignore

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,46 @@
1+
# Miscellaneous
2+
*.class
3+
*.log
4+
*.pyc
5+
*.swp
16
.DS_Store
7+
.atom/
8+
.buildlog/
9+
.history
10+
.svn/
11+
12+
# IntelliJ related
13+
*.iml
14+
*.ipr
15+
*.iws
16+
.idea/
17+
18+
# The .vscode folder contains launch configuration and tasks you configure in
19+
# VS Code which you may wish to be included in version control, so this line
20+
# is commented out by default.
21+
#.vscode/
22+
23+
# Flutter/Dart/Pub related
24+
**/doc/api/
25+
**/ios/Flutter/.last_build_id
226
.dart_tool/
27+
.flutter-plugins
28+
.flutter-plugins-dependencies
329
.packages
30+
.pub-cache/
431
.pub/
5-
.idea
6-
.atom
7-
.vscode
8-
.flutter-plugins
9-
build/
10-
*.iml
32+
/build/
33+
34+
# Web related
35+
lib/generated_plugin_registrant.dart
36+
37+
# Symbolication related
38+
app.*.symbols
39+
40+
# Obfuscation related
41+
app.*.map.json
42+
43+
# Android Studio will place build artifacts here
44+
/android/app/debug
45+
/android/app/profile
46+
/android/app/release

mdc_100_series/.metadata

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: 7ffcd3d22d7bc1222d53d6d3bb83f59891aac2c2
8-
channel: dev
7+
revision: 1d9032c7e1d867f071f2277eb1673e8f9b0274e3
8+
channel: stable
9+
10+
project_type: app

mdc_100_series/android/.gitignore

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
*.iml
2-
*.class
3-
.gradle
1+
gradle-wrapper.jar
2+
/.gradle
3+
/captures/
4+
/gradlew
5+
/gradlew.bat
46
/local.properties
5-
/.idea/workspace.xml
6-
/.idea/libraries
7-
.DS_Store
8-
/build
9-
/captures
107
GeneratedPluginRegistrant.java
8+
9+
# Remember to never publicly share your keystore.
10+
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
11+
key.properties

mdc_100_series/android/app/build.gradle

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

2828
android {
29-
compileSdkVersion 28
29+
compileSdkVersion 30
3030

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

35-
lintOptions {
36-
disable 'InvalidPackage'
37-
}
38-
3935
defaultConfig {
4036
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
41-
applicationId "com.example.mdc_101_flutter"
37+
applicationId "com.example.mdc_100_series"
4238
minSdkVersion 16
43-
targetSdkVersion 28
39+
targetSdkVersion 30
4440
versionCode flutterVersionCode.toInteger()
4541
versionName flutterVersionName
46-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4742
}
4843

4944
buildTypes {
@@ -61,7 +56,4 @@ flutter {
6156

6257
dependencies {
6358
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
64-
testImplementation 'junit:junit:4.12'
65-
androidTestImplementation 'androidx.test:runner:1.1.1'
66-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
6759
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="com.example.mdc_100_series">
3+
<!-- Flutter needs it to communicate with the running application
4+
to allow setting breakpoints, to provide hot reload, etc.
5+
-->
6+
<uses-permission android:name="android.permission.INTERNET"/>
7+
</manifest>
Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,42 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.mdc100series">
3-
4-
<!-- The INTERNET permission is required for development. Specifically,
5-
flutter needs it to communicate with the running application
6-
to allow setting breakpoints, to provide hot reload, etc.
7-
-->
8-
<uses-permission android:name="android.permission.INTERNET"/>
9-
10-
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
11-
calls FlutterMain.startInitialization(this); in its onCreate method.
12-
In most cases you can leave this as-is, but you if you want to provide
13-
additional functionality it is fine to subclass or reimplement
14-
FlutterApplication and put your custom class here. -->
15-
<application
16-
android:name="io.flutter.app.FlutterApplication"
2+
package="com.example.mdc_100_series">
3+
<application
174
android:label="@string/shr_app_name"
185
android:icon="@mipmap/ic_launcher"
196
android:roundIcon="@mipmap/ic_launcher_round">
207
<activity
218
android:name=".MainActivity"
229
android:launchMode="singleTop"
2310
android:theme="@style/LaunchTheme"
24-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
11+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
2512
android:hardwareAccelerated="true"
2613
android:windowSoftInputMode="adjustResize">
27-
<!-- This keeps the window background of the activity showing
28-
until Flutter renders its first frame. It can be removed if
29-
there is no splash screen (such as the default splash screen
30-
defined in @style/LaunchTheme). -->
14+
<!-- Specifies an Android theme to apply to this Activity as soon as
15+
the Android process has started. This theme is visible to the user
16+
while the Flutter UI initializes. After that, this theme continues
17+
to determine the Window background behind the Flutter UI. -->
3118
<meta-data
32-
android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
33-
android:value="true" />
19+
android:name="io.flutter.embedding.android.NormalTheme"
20+
android:resource="@style/NormalTheme"
21+
/>
22+
<!-- Displays an Android View that continues showing the launch screen
23+
Drawable until Flutter paints its first frame, then this splash
24+
screen fades out. A splash screen is useful to avoid any visual
25+
gap between the end of Android's launch screen and the painting of
26+
Flutter's first frame. -->
27+
<meta-data
28+
android:name="io.flutter.embedding.android.SplashScreenDrawable"
29+
android:resource="@drawable/launch_background"
30+
/>
3431
<intent-filter>
3532
<action android:name="android.intent.action.MAIN"/>
3633
<category android:name="android.intent.category.LAUNCHER"/>
3734
</intent-filter>
3835
</activity>
36+
<!-- Don't delete the meta-data below.
37+
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
38+
<meta-data
39+
android:name="flutterEmbedding"
40+
android:value="2" />
3941
</application>
4042
</manifest>

mdc_100_series/android/app/src/main/java/com/example/mdc100series/MainActivity.java

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.example.mdc_100_series
2+
3+
import io.flutter.embedding.android.FlutterActivity
4+
5+
class MainActivity: FlutterActivity() {
6+
}

mdc_100_series/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
22
xmlns:aapt="http://schemas.android.com/aapt"
3-
android:width="24dp"
4-
android:height="24dp"
3+
android:width="108dp"
4+
android:height="108dp"
55
android:viewportWidth="108"
66
android:viewportHeight="108">
77
<path

mdc_100_series/android/app/src/main/res/drawable/ic_launcher_background.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)