Skip to content
This repository was archived by the owner on Dec 17, 2023. It is now read-only.

Commit 6d28149

Browse files
magicskmagicsk
committed
upgraded to v2 embeding
1 parent ef62f72 commit 6d28149

File tree

9 files changed

+47
-61
lines changed

9 files changed

+47
-61
lines changed

‎.flutter-plugins-dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity-2.0.2/","dependencies":[]},{"name":"flutter_keyboard_visibility","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_keyboard_visibility-4.0.6/","dependencies":[]},{"name":"flutter_webview_plugin","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_webview_plugin-0.3.11/","dependencies":[]},{"name":"geolocator","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/geolocator-6.2.1/","dependencies":[]},{"name":"path_provider","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.28/","dependencies":[]},{"name":"permission_handler","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-5.1.0+2/","dependencies":[]},{"name":"shared_preferences","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]},{"name":"url_launcher","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.7.10/","dependencies":[]},{"name":"webview_flutter","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-1.0.7/","dependencies":[]}],"android":[{"name":"connectivity","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity-2.0.2/","dependencies":[]},{"name":"flutter_keyboard_visibility","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_keyboard_visibility-4.0.6/","dependencies":[]},{"name":"flutter_webview_plugin","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_webview_plugin-0.3.11/","dependencies":[]},{"name":"geolocator","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/geolocator-6.2.1/","dependencies":[]},{"name":"path_provider","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.28/","dependencies":[]},{"name":"permission_handler","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-5.1.0+2/","dependencies":[]},{"name":"shared_preferences","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]},{"name":"url_launcher","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.7.10/","dependencies":[]},{"name":"webview_flutter","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-1.0.7/","dependencies":[]}],"macos":[{"name":"connectivity_macos","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_macos-0.1.0+7/","dependencies":[]},{"name":"path_provider_macos","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+8/","dependencies":[]},{"name":"shared_preferences_macos","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+11/","dependencies":[]},{"name":"url_launcher_macos","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_macos-0.0.1+9/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]},{"name":"shared_preferences_linux","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+4/","dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_linux-0.0.1+4/","dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.5/","dependencies":[]},{"name":"shared_preferences_windows","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-0.0.2+3/","dependencies":["path_provider_windows"]},{"name":"url_launcher_windows","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_windows-0.0.1+3/","dependencies":[]}],"web":[{"name":"connectivity_for_web","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_for_web-0.3.1+4/","dependencies":[]},{"name":"flutter_keyboard_visibility_web","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_keyboard_visibility_web-1.0.1/","dependencies":[]},{"name":"geolocator_web","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/geolocator_web-1.0.1/","dependencies":[]},{"name":"shared_preferences_web","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]},{"name":"url_launcher_web","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_web-0.1.5+3/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity","dependencies":["connectivity_macos","connectivity_for_web"]},{"name":"connectivity_for_web","dependencies":[]},{"name":"connectivity_macos","dependencies":[]},{"name":"flutter_keyboard_visibility","dependencies":["flutter_keyboard_visibility_web"]},{"name":"flutter_keyboard_visibility_web","dependencies":[]},{"name":"flutter_webview_plugin","dependencies":[]},{"name":"geolocator","dependencies":["geolocator_web"]},{"name":"geolocator_web","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux","path_provider_windows"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_linux","url_launcher_macos","url_launcher_windows"]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2021-06-05 21:58:56.615700","version":"2.2.1"}
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity-2.0.2/","dependencies":[]},{"name":"flutter_keyboard_visibility","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_keyboard_visibility-4.0.6/","dependencies":[]},{"name":"flutter_webview_plugin","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_webview_plugin-0.3.11/","dependencies":[]},{"name":"geolocator","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/geolocator-6.2.1/","dependencies":[]},{"name":"path_provider","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.28/","dependencies":[]},{"name":"permission_handler","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-5.1.0+2/","dependencies":[]},{"name":"shared_preferences","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]},{"name":"url_launcher","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.7.10/","dependencies":[]},{"name":"webview_flutter","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-1.0.7/","dependencies":[]}],"android":[{"name":"connectivity","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity-2.0.2/","dependencies":[]},{"name":"flutter_keyboard_visibility","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_keyboard_visibility-4.0.6/","dependencies":[]},{"name":"flutter_webview_plugin","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_webview_plugin-0.3.11/","dependencies":[]},{"name":"geolocator","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/geolocator-6.2.1/","dependencies":[]},{"name":"path_provider","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.28/","dependencies":[]},{"name":"permission_handler","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/permission_handler-5.1.0+2/","dependencies":[]},{"name":"shared_preferences","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]},{"name":"url_launcher","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.7.10/","dependencies":[]},{"name":"webview_flutter","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-1.0.7/","dependencies":[]}],"macos":[{"name":"connectivity_macos","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_macos-0.1.0+7/","dependencies":[]},{"name":"path_provider_macos","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+8/","dependencies":[]},{"name":"shared_preferences_macos","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+11/","dependencies":[]},{"name":"url_launcher_macos","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_macos-0.0.1+9/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]},{"name":"shared_preferences_linux","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+4/","dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_linux-0.0.1+4/","dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.5/","dependencies":[]},{"name":"shared_preferences_windows","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-0.0.2+3/","dependencies":["path_provider_windows"]},{"name":"url_launcher_windows","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_windows-0.0.1+3/","dependencies":[]}],"web":[{"name":"connectivity_for_web","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_for_web-0.3.1+4/","dependencies":[]},{"name":"flutter_keyboard_visibility_web","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_keyboard_visibility_web-1.0.1/","dependencies":[]},{"name":"geolocator_web","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/geolocator_web-1.0.1/","dependencies":[]},{"name":"shared_preferences_web","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]},{"name":"url_launcher_web","path":"/home/magic_sk/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher_web-0.1.5+3/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity","dependencies":["connectivity_macos","connectivity_for_web"]},{"name":"connectivity_for_web","dependencies":[]},{"name":"connectivity_macos","dependencies":[]},{"name":"flutter_keyboard_visibility","dependencies":["flutter_keyboard_visibility_web"]},{"name":"flutter_keyboard_visibility_web","dependencies":[]},{"name":"flutter_webview_plugin","dependencies":[]},{"name":"geolocator","dependencies":["geolocator_web"]},{"name":"geolocator_web","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux","path_provider_windows"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_linux","url_launcher_macos","url_launcher_windows"]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2021-06-06 01:44:24.205327","version":"2.2.1"}

‎android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
2525
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2626

2727
android {
28-
compileSdkVersion 28
28+
compileSdkVersion 30
2929

3030
lintOptions {
3131
disable 'InvalidPackage'
@@ -34,8 +34,8 @@ android {
3434
defaultConfig {
3535
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3636
applicationId "eu.magicsk.mhd_virtual_table"
37-
minSdkVersion 16
38-
targetSdkVersion 28
37+
minSdkVersion 24
38+
targetSdkVersion 30
3939
versionCode flutterVersionCode.toInteger()
4040
versionName flutterVersionName
4141
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

‎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.example.mhd_virtual_table">
2+
package="eu.magicsk.mhd_virtual_table">
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: 22 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,23 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.mhd_virtual_table">
3-
<uses-permission android:name="android.permission.INTERNET"/>
4-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
5-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
6-
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
7-
calls FlutterMain.startInitialization(this); in its onCreate method.
8-
In most cases you can leave this as-is, but you if you want to provide
9-
additional functionality it is fine to subclass or reimplement
10-
FlutterApplication and put your custom class here. -->
11-
<application
12-
android:name="io.flutter.app.FlutterApplication"
13-
android:label="MHD Virtual Table"
14-
android:icon="@mipmap/ic_launcher">
15-
<activity
16-
android:name=".MainActivity"
17-
android:launchMode="singleTop"
18-
android:theme="@style/LaunchTheme"
19-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
20-
android:hardwareAccelerated="true"
21-
android:windowSoftInputMode="adjustResize">
22-
<!-- This keeps the window background of the activity showing
23-
until Flutter renders its first frame. It can be removed if
24-
there is no splash screen (such as the default splash screen
25-
defined in @style/LaunchTheme). -->
26-
<meta-data
27-
android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
28-
android:value="true" />
29-
<intent-filter>
30-
<action android:name="android.intent.action.MAIN"/>
31-
<category android:name="android.intent.category.LAUNCHER"/>
32-
</intent-filter>
33-
</activity>
34-
</application>
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.magicsk.mhd_virtual_table">
2+
<uses-permission android:name="android.permission.INTERNET" />
3+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
4+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
5+
<application android:label="MHD Virtual Table" android:icon="@mipmap/ic_launcher">
6+
<activity android:name=".MainActivity" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
7+
<!--
8+
This keeps the window background of the activity showing
9+
until Flutter renders its first frame. It can be removed if
10+
there is no splash screen (such as the default splash screen
11+
defined in @style/LaunchTheme).
12+
-->
13+
<meta-data android:name="io.flutter.app.android.SplashScreenUntilFirstFrame" android:value="true" />
14+
<meta-data android:name="io.flutter.embedding.android.SplashScreenDrawable" android:resource="@drawable/launch_background" />
15+
<meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme" />
16+
<meta-data android:name="flutterEmbedding" android:value="2" />
17+
<intent-filter>
18+
<action android:name="android.intent.action.MAIN" />
19+
<category android:name="android.intent.category.LAUNCHER" />
20+
</intent-filter>
21+
</activity>
22+
</application>
3523
</manifest>

‎android/app/src/main/java/com/example/mhd_virtual_table/MainActivity.java

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

‎android/app/src/main/java/eu/magicsk/mhd_virtual_table/MainActivity.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package eu.magicsk.mhd_virtual_table;
2+
3+
import io.flutter.embedding.android.FlutterActivity;
4+
5+
public class MainActivity extends FlutterActivity {
6+
}

0 commit comments

Comments
 (0)