Skip to content

Commit cc0da90

Browse files
traxystraxys
committed
Update the flutter application
1 parent bc59294 commit cc0da90

File tree

25 files changed

+406
-297
lines changed

25 files changed

+406
-297
lines changed

‎flutter/.metadata‎

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

66
version:
7-
revision: 02c026b03cd31dd3f867e5faeb7e104cce174c5f
8-
channel: stable
7+
revision: "nixpkgs000000000000000000000000000000000"
8+
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: nixpkgs000000000000000000000000000000000
17+
base_revision: nixpkgs000000000000000000000000000000000
18+
- platform: android
19+
create_revision: nixpkgs000000000000000000000000000000000
20+
base_revision: nixpkgs000000000000000000000000000000000
21+
22+
# User provided section
23+
24+
# List of Local paths (relative to this file) that should be
25+
# ignored by the migrate tool.
26+
#
27+
# Files that are not part of the templates will be ignored by default.
28+
unmanaged_files:
29+
- 'lib/main.dart'
30+
- 'ios/Runner.xcodeproj/project.pbxproj'

‎flutter/analysis_options.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# This file configures the analyzer, which statically analyzes Dart code to
2+
# check for errors, warnings, and lints.
3+
#
4+
# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
5+
# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
6+
# invoked from the command line by running `flutter analyze`.
7+
8+
# The following line activates a set of recommended lints for Flutter apps,
9+
# packages, and plugins designed to encourage good coding practices.
10+
include: package:flutter_lints/flutter.yaml
11+
12+
linter:
13+
# The lint rules applied to this project can be customized in the
14+
# section below to disable rules from the `package:flutter_lints/flutter.yaml`
15+
# included above or to enable additional rules. A list of all available lints
16+
# and their documentation is published at https://dart.dev/lints.
17+
#
18+
# Instead of disabling a lint rule for the entire project in the
19+
# section below, it can also be suppressed for a single line of code
20+
# or a specific dart file by using the `// ignore: name_of_lint` and
21+
# `// ignore_for_file: name_of_lint` syntax on the line or in the file
22+
# producing the lint.
23+
rules:
24+
# avoid_print: false # Uncomment to disable the `avoid_print` rule
25+
# prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
26+
27+
# Additional information about this file can be found at
28+
# https://dart.dev/guides/language/analysis-options

‎flutter/android/.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,7 @@ gradle-wrapper.jar
77
GeneratedPluginRegistrant.java
88

99
# Remember to never publicly share your keystore.
10-
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
10+
# See https://flutter.dev/to/reference-keystore
1111
key.properties
12+
**/*.keystore
13+
**/*.jks

‎flutter/android/app/build.gradle‎

Lines changed: 24 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,44 @@
1-
def localProperties = new Properties()
2-
def localPropertiesFile = rootProject.file('local.properties')
3-
if (localPropertiesFile.exists()) {
4-
localPropertiesFile.withReader('UTF-8') { reader ->
5-
localProperties.load(reader)
6-
}
7-
}
8-
9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
14-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
15-
if (flutterVersionCode == null) {
16-
flutterVersionCode = '1'
17-
}
18-
19-
def flutterVersionName = localProperties.getProperty('flutter.versionName')
20-
if (flutterVersionName == null) {
21-
flutterVersionName = '1.0'
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
5+
id "dev.flutter.flutter-gradle-plugin"
226
}
237

24-
apply plugin: 'com.android.application'
25-
apply plugin: 'kotlin-android'
26-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
27-
288
android {
29-
compileSdkVersion 31
9+
namespace = "com.traxys.kabalist"
10+
compileSdk = flutter.compileSdkVersion
11+
ndkVersion = flutter.ndkVersion
12+
13+
compileOptions {
14+
sourceCompatibility = JavaVersion.VERSION_1_8
15+
targetCompatibility = JavaVersion.VERSION_1_8
16+
}
3017

31-
sourceSets {
32-
main.java.srcDirs += 'src/main/kotlin'
18+
kotlinOptions {
19+
jvmTarget = JavaVersion.VERSION_1_8
3320
}
3421

3522
defaultConfig {
3623
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
37-
applicationId "com.traxys.kabalist"
38-
minSdkVersion 16
39-
targetSdkVersion 30
40-
versionCode flutterVersionCode.toInteger()
41-
versionName flutterVersionName
24+
applicationId = "com.traxys.kabalist"
25+
// You can update the following values to match your application needs.
26+
// For more information, see: https://flutter.dev/to/review-gradle-config.
27+
minSdk = flutter.minSdkVersion
28+
targetSdk = flutter.targetSdkVersion
29+
versionCode = flutter.versionCode
30+
versionName = flutter.versionName
4231
}
4332

4433
buildTypes {
4534
release {
4635
// TODO: Add your own signing config for the release build.
4736
// Signing with the debug keys for now, so `flutter run --release` works.
48-
signingConfig signingConfigs.debug
37+
signingConfig = signingConfigs.debug
4938
}
5039
}
5140
}
5241

5342
flutter {
54-
source '../..'
55-
}
56-
57-
dependencies {
58-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
43+
source = "../.."
5944
}

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

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

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

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,29 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.traxys.kabalist">
3-
<application
4-
android:label="KabaList"
5-
android:icon="@mipmap/launcher_icon">
6-
<activity
7-
android:name=".MainActivity"
8-
android:launchMode="singleTop"
9-
android:theme="@style/LaunchTheme"
10-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
11-
android:hardwareAccelerated="true"
12-
android:windowSoftInputMode="adjustResize">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
<application android:label="KabaList" android:name="${applicationName}" android:icon="@mipmap/launcher_icon">
3+
<activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:taskAffinity="" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
134
<!-- Specifies an Android theme to apply to this Activity as soon as
145
the Android process has started. This theme is visible to the user
156
while the Flutter UI initializes. After that, this theme continues
167
to determine the Window background behind the Flutter UI. -->
17-
<meta-data
18-
android:name="io.flutter.embedding.android.NormalTheme"
19-
android:resource="@style/NormalTheme"
20-
/>
21-
<!-- Displays an Android View that continues showing the launch screen
22-
Drawable until Flutter paints its first frame, then this splash
23-
screen fades out. A splash screen is useful to avoid any visual
24-
gap between the end of Android's launch screen and the painting of
25-
Flutter's first frame. -->
26-
<meta-data
27-
android:name="io.flutter.embedding.android.SplashScreenDrawable"
28-
android:resource="@drawable/launch_background"
29-
/>
8+
<meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme"/>
309
<intent-filter>
3110
<action android:name="android.intent.action.MAIN"/>
3211
<category android:name="android.intent.category.LAUNCHER"/>
3312
</intent-filter>
3413
</activity>
3514
<!-- Don't delete the meta-data below.
3615
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
37-
<meta-data
38-
android:name="flutterEmbedding"
39-
android:value="2" />
16+
<meta-data android:name="flutterEmbedding" android:value="2"/>
4017
</application>
41-
<uses-permission android:name="android.permission.INTERNET" />
18+
<!-- Required to query activities that can process text, see:
19+
https://developer.android.com/training/package-visibility and
20+
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
21+
22+
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
23+
<queries>
24+
<intent>
25+
<action android:name="android.intent.action.PROCESS_TEXT"/>
26+
<data android:mimeType="text/plain"/>
27+
</intent>
28+
</queries>
4229
</manifest>

‎flutter/android/app/src/main/kotlin/com/traxys/kabalist/MainActivity.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package com.traxys.kabalist
1+
package com.example.kabalist
22

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

5-
class MainActivity: FlutterActivity() {
6-
}
5+
class MainActivity: FlutterActivity()

‎flutter/android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
</adaptive-icon>

‎flutter/android/app/src/main/res/mipmap-hdpi/launcher_icon.png‎

-367 Bytes
Loading

‎flutter/android/app/src/main/res/mipmap-mdpi/launcher_icon.png‎

-159 Bytes
Loading

0 commit comments

Comments
 (0)