Skip to content

Commit 2dd382c

Browse files
agordn52agordn52
committed
v2.2.0 changes
1 parent 7a930b1 commit 2dd382c

29 files changed

+171
-142
lines changed

‎LabelStoreMax/android/.gitignore‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
gradle-wrapper.jar
2+
/.gradle
3+
/captures/
4+
/gradlew
5+
/gradlew.bat
6+
/local.properties
7+
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

‎LabelStoreMax/android/app/build.gradle‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
3232
}
3333

3434
android {
35-
compileSdkVersion 28
35+
compileSdkVersion 29
3636

3737
sourceSets {
3838
main.java.srcDirs += 'src/main/kotlin'
@@ -43,13 +43,13 @@ android {
4343
}
4444

4545
defaultConfig {
46-
applicationId "com.woosignal.label_storemax"
47-
minSdkVersion 28
48-
targetSdkVersion 28
46+
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
47+
applicationId "com.woosignal.android"
48+
minSdkVersion 19
49+
targetSdkVersion 29
4950
versionCode flutterVersionCode.toInteger()
5051
versionName flutterVersionName
51-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
52-
multiDexEnabled = true
52+
multiDexEnabled true
5353
}
5454

5555
signingConfigs {
@@ -60,20 +60,23 @@ android {
6060
storePassword keystoreProperties['storePassword']
6161
}
6262
}
63+
6364
buildTypes {
6465
release {
66+
// TODO: Add your own signing config for the release build.
67+
// Signing with the debug keys for now, so `flutter run --release` works.
68+
6569
// Uncomment "signingConfig signingConfigs.release"
6670
// Remove "signingConfig signingConfigs.debug"
6771
// When you're ready to build for release
6872
// Also check out https://flutter.dev/docs/deployment/android
6973
// Set the key.properties when building apk or appbundle
7074

71-
// signingConfig signingConfigs.release
75+
// signingConfig signingConfigs.release
7276

7377
signingConfig signingConfigs.debug
7478
}
7579
}
76-
7780
}
7881

7982
flutter {
@@ -82,7 +85,5 @@ flutter {
8285

8386
dependencies {
8487
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
85-
testImplementation 'junit:junit:4.12'
86-
androidTestImplementation 'androidx.test:runner:1.1.1'
87-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
88-
}
88+
implementation 'com.android.support:multidex:1.0.3'
89+
}

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

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.woosignal.label_storemax"
3-
xmlns:tools="http://schemas.android.com/tools">
4-
2+
package="com.woosignal.label_storemax">
53
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
64
calls FlutterMain.startInitialization(this); in its onCreate method.
75
In most cases you can leave this as-is, but you if you want to provide
@@ -13,24 +11,33 @@
1311

1412
<application
1513
android:name="io.flutter.app.FlutterApplication"
16-
android:label="label_storemax"
17-
tools:replace="android:label"
14+
android:label="Label StoreMax"
1815
android:icon="@mipmap/launcher_icon">
1916
<activity
2017
android:name=".MainActivity"
2118
android:launchMode="singleTop"
2219
android:theme="@style/LaunchTheme"
2320
android:screenOrientation="portrait"
24-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
21+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
2522
android:hardwareAccelerated="true"
2623
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). -->
24+
<!-- Specifies an Android theme to apply to this Activity as soon as
25+
the Android process has started. This theme is visible to the user
26+
while the Flutter UI initializes. After that, this theme continues
27+
to determine the Window background behind the Flutter UI. -->
28+
<meta-data
29+
android:name="io.flutter.embedding.android.NormalTheme"
30+
android:resource="@style/NormalTheme"
31+
/>
32+
<!-- Displays an Android View that continues showing the launch screen
33+
Drawable until Flutter paints its first frame, then this splash
34+
screen fades out. A splash screen is useful to avoid any visual
35+
gap between the end of Android's launch screen and the painting of
36+
Flutter's first frame. -->
3137
<meta-data
32-
android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
33-
android:value="true" />
38+
android:name="io.flutter.embedding.android.SplashScreenDrawable"
39+
android:resource="@drawable/launch_background"
40+
/>
3441
<intent-filter>
3542
<action android:name="android.intent.action.MAIN"/>
3643
<category android:name="android.intent.category.LAUNCHER"/>
@@ -44,5 +51,10 @@
4451
android:host="3ds.stripesdk.io" />
4552
</intent-filter>
4653
</activity>
54+
<!-- Don't delete the meta-data below.
55+
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
56+
<meta-data
57+
android:name="flutterEmbedding"
58+
android:value="2" />
4759
</application>
4860
</manifest>

‎LabelStoreMax/android/app/src/main/kotlin/com/woosignal/label_storemax/MainActivity.kt‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
package com.woosignal.label_storemax
22

3-
import android.os.Bundle
4-
5-
import io.flutter.app.FlutterActivity
6-
import io.flutter.plugins.GeneratedPluginRegistrant
3+
import io.flutter.embedding.android.FlutterActivity
74

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

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3+
<!-- Theme applied to the Android Window while the process is starting -->
34
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
45
<!-- Show a splash screen on the activity. Automatically removed when
56
Flutter draws its first frame -->
67
<item name="android:windowBackground">@drawable/launch_background</item>
78
</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:color/white</item>
17+
</style>
818
</resources>

‎LabelStoreMax/android/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
buildscript {
2-
ext.kotlin_version = '1.3.10'
2+
ext.kotlin_version = '1.3.50'
33
repositories {
44
google()
55
jcenter()
6+
maven {
7+
url "https://maven.google.com"
8+
}
69
}
710

811
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.5.1'
12+
classpath 'com.android.tools.build:gradle:3.5.0'
1013
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1114
}
1215
}
@@ -15,9 +18,6 @@ allprojects {
1518
repositories {
1619
google()
1720
jcenter()
18-
maven {
19-
url "https://maven.google.com"
20-
}
2121
}
2222
}
2323

‎LabelStoreMax/android/gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
org.gradle.jvmargs=-Xmx1536M
2-
32
android.useAndroidX=true
43
android.enableJetifier=true
54
android.enableR8=true

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Oct 28 17:45:00 GMT 2019
1+
#Fri Jun 23 08:50:38 CEST 2017
22
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-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip

‎LabelStoreMax/android/key.properties‎

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

‎LabelStoreMax/android/settings.gradle‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
include ':app'
22

3-
def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
3+
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4+
def properties = new Properties()
45

5-
def plugins = new Properties()
6-
def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
7-
if (pluginsFile.exists()) {
8-
pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
9-
}
6+
assert localPropertiesFile.exists()
7+
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
108

11-
plugins.each { name, path ->
12-
def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
13-
include ":$name"
14-
project(":$name").projectDir = pluginDirectory
15-
}
9+
def flutterSdkPath = properties.getProperty("flutter.sdk")
10+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
11+
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"

0 commit comments

Comments
 (0)