Skip to content

Commit 4995dc9

Browse files
committed
updated at all
1 parent 30c3d33 commit 4995dc9

File tree

78 files changed

+1004
-926
lines changed

Some content is hidden

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

78 files changed

+1004
-926
lines changed

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/Gemfile

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

android/Gemfile.lock

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

android/app/build.gradle

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,46 +24,37 @@ if (flutterVersionName == null) {
2424
apply plugin: 'com.android.application'
2525
apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
27-
apply plugin: 'com.google.gms.google-services'
28-
29-
def keystoreProperties = new Properties()
30-
def keystorePropertiesFile = rootProject.file('key.properties')
31-
if (keystorePropertiesFile.exists()) {
32-
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
33-
}
3427

3528
android {
36-
compileSdkVersion 28
29+
compileSdkVersion 30
3730

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

42-
lintOptions {
43-
disable 'InvalidPackage'
40+
sourceSets {
41+
main.java.srcDirs += 'src/main/kotlin'
4442
}
4543

4644
defaultConfig {
4745
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
48-
applicationId "com.hwa.fluttermvvmtemplate"
49-
minSdkVersion 19
50-
targetSdkVersion 29
46+
applicationId "com.example.sample"
47+
minSdkVersion 16
48+
targetSdkVersion 30
5149
versionCode flutterVersionCode.toInteger()
5250
versionName flutterVersionName
5351
}
5452

55-
signingConfigs {
56-
release {
57-
keyAlias keystoreProperties['keyAlias']
58-
keyPassword keystoreProperties['keyPassword']
59-
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
60-
storePassword keystoreProperties['storePassword']
61-
}
62-
}
63-
6453
buildTypes {
6554
release {
66-
signingConfig signingConfigs.release
55+
// TODO: Add your own signing config for the release build.
56+
// Signing with the debug keys for now, so `flutter run --release` works.
57+
signingConfig signingConfigs.debug
6758
}
6859
}
6960
}
@@ -74,6 +65,4 @@ flutter {
7465

7566
dependencies {
7667
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
77-
implementation platform('com.google.firebase:firebase-bom:29.0.3')
78-
implementation 'com.google.firebase:firebase-analytics'
7968
}

android/app/src/debug/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.hwa.fluttermvvmtemplate">
2+
package="com.example.sample">
33
<!-- Flutter needs it to communicate with the running application
44
to allow setting breakpoints, to provide hot reload, etc.
55
-->

android/app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.hwa.fluttermvvmtemplate">
3-
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
4-
calls FlutterMain.startInitialization(this); in its onCreate method.
5-
In most cases you can leave this as-is, but you if you want to provide
6-
additional functionality it is fine to subclass or reimplement
7-
FlutterApplication and put your custom class here. -->
8-
<application
9-
android:name="io.flutter.app.FlutterApplication"
10-
android:label="fluttermvvmtemplate"
2+
package="com.example.sample">
3+
<application
4+
android:label="sample"
115
android:icon="@mipmap/ic_launcher">
126
<activity
13-
android:name="com.hwa.fluttermvvmtemplate.MainActivity"
7+
android:name=".MainActivity"
148
android:launchMode="singleTop"
159
android:theme="@style/LaunchTheme"
1610
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

android/app/src/main/kotlin/com/hwa/fluttermvvmtemplate/MainActivity.kt renamed to android/app/src/main/kotlin/com/example/sample/MainActivity.kt

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

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

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>
-28.5 KB
Binary file not shown.
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Modify this file to customize your launch splash screen -->
33
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
4-
<item android:drawable="@color/fuchsia" />
5-
<item>
4+
<item android:drawable="@android:color/white" />
5+
6+
<!-- You can insert your own image assets here -->
7+
<!-- <item>
68
<bitmap
79
android:gravity="center"
8-
android:src="@drawable/circle_hwa" />
9-
</item>
10+
android:src="@mipmap/launch_image" />
11+
</item> -->
1012
</layer-list>
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+
Flutter 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/color.xml

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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
66
Flutter draws its first frame -->
77
<item name="android:windowBackground">@drawable/launch_background</item>
@@ -12,7 +12,7 @@
1212
running.
1313
1414
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:color/white</item>
15+
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
16+
<item name="android:windowBackground">?android:colorBackground</item>
1717
</style>
1818
</resources>

android/app/src/profile/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.hwa.fluttermvvmtemplate">
2+
package="com.example.sample">
33
<!-- Flutter needs it to communicate with the running application
44
to allow setting breakpoints, to provide hot reload, etc.
55
-->

0 commit comments

Comments
 (0)