Skip to content

Commit 2cf8cec

Browse files
pauldemarcopauldemarco
committed
Updated plugin to latest plugin structure [Dart] [Android].
1 parent ab3c7f1 commit 2cf8cec

26 files changed

+484
-591
lines changed

‎.gitignore

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
.DS_Store
2-
.atom/
3-
.idea
2+
.dart_tool/
3+
44
.packages
55
.pub/
6-
build/
7-
ios/.generated/
8-
packages
96
pubspec.lock
7+
8+
build/

‎android/.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,3 @@
66
.DS_Store
77
/build
88
/captures
9-
10-
/gradle
11-
/gradlew
12-
/gradlew.bat

‎android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.1.3'
12-
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
11+
classpath 'com.android.tools.build:gradle:3.2.1'
12+
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.7'
1313
}
1414
}
1515

‎example/.gitignore

Lines changed: 66 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,71 @@
1+
# Miscellaneous
2+
*.class
3+
*.lock
4+
*.log
5+
*.pyc
6+
*.swp
17
.DS_Store
28
.atom/
3-
.idea
9+
.buildlog/
10+
.history
11+
.svn/
12+
13+
# IntelliJ related
14+
*.iml
15+
*.ipr
16+
*.iws
17+
.idea/
18+
19+
# Visual Studio Code related
20+
.vscode/
21+
22+
# Flutter/Dart/Pub related
23+
**/doc/api/
24+
.dart_tool/
25+
.flutter-plugins
426
.packages
27+
.pub-cache/
528
.pub/
629
build/
7-
ios/.generated/
8-
packages
9-
pubspec.lock
10-
.flutter-plugins
30+
31+
# Android related
32+
**/android/**/gradle-wrapper.jar
33+
**/android/.gradle
34+
**/android/captures/
35+
**/android/gradlew
36+
**/android/gradlew.bat
37+
**/android/local.properties
38+
**/android/**/GeneratedPluginRegistrant.java
39+
40+
# iOS/XCode related
41+
**/ios/**/*.mode1v3
42+
**/ios/**/*.mode2v3
43+
**/ios/**/*.moved-aside
44+
**/ios/**/*.pbxuser
45+
**/ios/**/*.perspectivev3
46+
**/ios/**/*sync/
47+
**/ios/**/.sconsign.dblite
48+
**/ios/**/.tags*
49+
**/ios/**/.vagrant/
50+
**/ios/**/DerivedData/
51+
**/ios/**/Icon?
52+
**/ios/**/Pods/
53+
**/ios/**/.symlinks/
54+
**/ios/**/profile
55+
**/ios/**/xcuserdata
56+
**/ios/.generated/
57+
**/ios/Flutter/App.framework
58+
**/ios/Flutter/Flutter.framework
59+
**/ios/Flutter/Generated.xcconfig
60+
**/ios/Flutter/app.flx
61+
**/ios/Flutter/app.zip
62+
**/ios/Flutter/flutter_assets/
63+
**/ios/ServiceDefinitions.json
64+
**/ios/Runner/GeneratedPluginRegistrant.*
65+
66+
# Exceptions to above rules.
67+
!**/ios/**/default.mode1v3
68+
!**/ios/**/default.mode2v3
69+
!**/ios/**/default.pbxuser
70+
!**/ios/**/default.perspectivev3
71+
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

‎example/android/.gitignore

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

‎example/android/app/build.gradle

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
def localProperties = new Properties()
22
def localPropertiesFile = rootProject.file('local.properties')
33
if (localPropertiesFile.exists()) {
4-
localPropertiesFile.withInputStream { stream ->
5-
localProperties.load(stream)
4+
localPropertiesFile.withReader('UTF-8') { reader ->
5+
localProperties.load(reader)
66
}
77
}
88

@@ -11,6 +11,16 @@ if (flutterRoot == null) {
1111
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
1212
}
1313

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'
22+
}
23+
1424
apply plugin: 'com.android.application'
1525
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
1626

@@ -26,15 +36,12 @@ android {
2636
applicationId "com.pauldemarco.flutterblueexample"
2737
minSdkVersion 19
2838
targetSdkVersion 27
29-
versionCode 1
30-
versionName "1.0"
39+
versionCode flutterVersionCode.toInteger()
40+
versionName flutterVersionName
3141
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3242
}
3343

3444
buildTypes {
35-
profile {
36-
matchingFallbacks = ['debug', 'release']
37-
}
3845
release {
3946
// TODO: Add your own signing config for the release build.
4047
// Signing with the debug keys for now, so `flutter run --release` works.
@@ -49,6 +56,6 @@ flutter {
4956

5057
dependencies {
5158
testImplementation 'junit:junit:4.12'
52-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
53-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
59+
androidTestImplementation 'com.android.support.test:runner:1.0.2'
60+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
5461
}

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

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:tools="http://schemas.android.com/tools"
32
package="com.pauldemarco.flutterblueexample">
43

54
<!-- The INTERNET permission is required for development. Specifically,
@@ -13,13 +12,24 @@
1312
In most cases you can leave this as-is, but you if you want to provide
1413
additional functionality it is fine to subclass or reimplement
1514
FlutterApplication and put your custom class here. -->
16-
<application android:name="io.flutter.app.FlutterApplication" android:label="flutter_blue_example" tools:replace="android:label" android:icon="@mipmap/ic_launcher">
17-
<activity android:name=".MainActivity"
18-
android:launchMode="singleTop"
19-
android:theme="@android:style/Theme.Black.NoTitleBar"
20-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection"
21-
android:hardwareAccelerated="true"
22-
android:windowSoftInputMode="adjustResize">
15+
<application
16+
android:name="io.flutter.app.FlutterApplication"
17+
android:label="flutter_blue_example"
18+
android:icon="@mipmap/ic_launcher">
19+
<activity
20+
android:name=".MainActivity"
21+
android:launchMode="singleTop"
22+
android:theme="@style/LaunchTheme"
23+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"
24+
android:hardwareAccelerated="true"
25+
android:windowSoftInputMode="adjustResize">
26+
<!-- This keeps the window background of the activity showing
27+
until Flutter renders its first frame. It can be removed if
28+
there is no splash screen (such as the default splash screen
29+
defined in @style/LaunchTheme). -->
30+
<meta-data
31+
android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
32+
android:value="true" />
2333
<intent-filter>
2434
<action android:name="android.intent.action.MAIN"/>
2535
<category android:name="android.intent.category.LAUNCHER"/>

‎example/android/app/src/main/res/drawable/launch_background.xml

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:color/white" />
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>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
4+
<!-- Show a splash screen on the activity. Automatically removed when
5+
Flutter draws its first frame -->
6+
<item name="android:windowBackground">@drawable/launch_background</item>
7+
</style>
8+
</resources>

‎example/android/build.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.0.1'
8+
classpath 'com.android.tools.build:gradle:3.2.1'
99
}
1010
}
1111

@@ -27,7 +27,3 @@ subprojects {
2727
task clean(type: Delete) {
2828
delete rootProject.buildDir
2929
}
30-
31-
task wrapper(type: Wrapper) {
32-
gradleVersion = '2.14.1'
33-
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Fri Jun 23 08:50:38 CEST 2017
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

‎example/android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
55
def plugins = new Properties()
66
def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
77
if (pluginsFile.exists()) {
8-
pluginsFile.withInputStream { stream -> plugins.load(stream) }
8+
pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
99
}
1010

1111
plugins.each { name, path ->

‎example/flutter_blue_example.iml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module type="FLUTTER_MODULE_TYPE" version="4">
2+
<module type="JAVA_MODULE" version="4">
33
<component name="NewModuleRootManager" inherit-compiler-output="true">
44
<exclude-output />
55
<content url="file://$MODULE_DIR$">
6+
<sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
7+
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
8+
<excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
69
<excludeFolder url="file://$MODULE_DIR$/.idea" />
710
<excludeFolder url="file://$MODULE_DIR$/.pub" />
811
<excludeFolder url="file://$MODULE_DIR$/build" />
9-
<excludeFolder url="file://$MODULE_DIR$/packages" />
1012
</content>
1113
<orderEntry type="sourceFolder" forTests="false" />
12-
<orderEntry type="library" name="Dart Packages" level="project" />
1314
<orderEntry type="library" name="Dart SDK" level="project" />
15+
<orderEntry type="library" name="Flutter Plugins" level="project" />
16+
<orderEntry type="library" name="Dart Packages" level="project" />
1417
</component>
1518
</module>

‎example/flutter_blue_example_android.iml

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

‎example/pubspec.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
name: flutter_blue_example
22
description: Demonstrates how to use the flutter_blue plugin.
3+
publish_to: 'none'
4+
5+
environment:
6+
sdk: ">=2.0.0-dev.68.0 <3.0.0"
37

48
dependencies:
59
flutter:
610
sdk: flutter
11+
12+
dev_dependencies:
13+
flutter_test:
14+
sdk: flutter
15+
716
flutter_blue:
817
path: ../
918

‎example/test/widget_test.dart

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// This is a basic Flutter widget test.
2+
//
3+
// To perform an interaction with a widget in your test, use the WidgetTester
4+
// utility that Flutter provides. For example, you can send tap and scroll
5+
// gestures. You can also use WidgetTester to find child widgets in the widget
6+
// tree, read text, and verify that the values of widget properties are correct.
7+
8+
import 'package:flutter_test/flutter_test.dart';
9+
10+
void main() {
11+
testWidgets('First test', (WidgetTester tester) async {
12+
// TODO: Add tests
13+
});
14+
}

‎flutter_blue.iml

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module type="FLUTTER_MODULE_TYPE" version="4">
2+
<module type="JAVA_MODULE" version="4">
33
<component name="NewModuleRootManager" inherit-compiler-output="true">
44
<exclude-output />
55
<content url="file://$MODULE_DIR$">
6+
<sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
7+
<excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
68
<excludeFolder url="file://$MODULE_DIR$/.idea" />
79
<excludeFolder url="file://$MODULE_DIR$/.pub" />
810
<excludeFolder url="file://$MODULE_DIR$/build" />
9-
<excludeFolder url="file://$MODULE_DIR$/example/.idea/libraries/packages" />
10-
<excludeFolder url="file://$MODULE_DIR$/example/.idea/packages" />
11-
<excludeFolder url="file://$MODULE_DIR$/example/.idea/runConfigurations/packages" />
1211
<excludeFolder url="file://$MODULE_DIR$/example/.pub" />
13-
<excludeFolder url="file://$MODULE_DIR$/example/android/app/packages" />
14-
<excludeFolder url="file://$MODULE_DIR$/example/android/app/src/main/java/com/packages" />
15-
<excludeFolder url="file://$MODULE_DIR$/example/android/app/src/main/java/com/pauldemarco/flutterblueexample/packages" />
16-
<excludeFolder url="file://$MODULE_DIR$/example/android/app/src/main/java/com/pauldemarco/packages" />
17-
<excludeFolder url="file://$MODULE_DIR$/example/android/app/src/main/java/io/flutter/packages" />
18-
<excludeFolder url="file://$MODULE_DIR$/example/android/app/src/main/java/io/flutter/plugins/packages" />
19-
<excludeFolder url="file://$MODULE_DIR$/example/android/app/src/main/java/io/packages" />
20-
<excludeFolder url="file://$MODULE_DIR$/example/android/app/src/main/java/packages" />
21-
<excludeFolder url="file://$MODULE_DIR$/example/android/app/src/main/packages" />
22-
<excludeFolder url="file://$MODULE_DIR$/example/android/app/src/main/res/mipmap-hdpi/packages" />
23-
<excludeFolder url="file://$MODULE_DIR$/example/android/app/src/main/res/mipmap-mdpi/packages" />
24-
<excludeFolder url="file://$MODULE_DIR$/example/android/app/src/main/res/mipmap-xhdpi/packages" />
25-
<excludeFolder url="file://$MODULE_DIR$/example/android/app/src/main/res/mipmap-xxhdpi/packages" />
26-
<excludeFolder url="file://$MODULE_DIR$/example/android/app/src/main/res/mipmap-xxxhdpi/packages" />
27-
<excludeFolder url="file://$MODULE_DIR$/example/android/app/src/main/res/packages" />
28-
<excludeFolder url="file://$MODULE_DIR$/example/android/app/src/packages" />
29-
<excludeFolder url="file://$MODULE_DIR$/example/android/packages" />
3012
<excludeFolder url="file://$MODULE_DIR$/example/build" />
31-
<excludeFolder url="file://$MODULE_DIR$/example/ios/Flutter/packages" />
32-
<excludeFolder url="file://$MODULE_DIR$/example/ios/Runner.xcodeproj/packages" />
33-
<excludeFolder url="file://$MODULE_DIR$/example/ios/Runner.xcodeproj/project.xcworkspace/packages" />
34-
<excludeFolder url="file://$MODULE_DIR$/example/ios/Runner.xcodeproj/xcshareddata/packages" />
35-
<excludeFolder url="file://$MODULE_DIR$/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/packages" />
36-
<excludeFolder url="file://$MODULE_DIR$/example/ios/Runner.xcworkspace/packages" />
37-
<excludeFolder url="file://$MODULE_DIR$/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/packages" />
38-
<excludeFolder url="file://$MODULE_DIR$/example/ios/Runner/Assets.xcassets/packages" />
39-
<excludeFolder url="file://$MODULE_DIR$/example/ios/Runner/Base.lproj/packages" />
40-
<excludeFolder url="file://$MODULE_DIR$/example/ios/Runner/packages" />
41-
<excludeFolder url="file://$MODULE_DIR$/example/ios/packages" />
42-
<excludeFolder url="file://$MODULE_DIR$/example/lib/packages" />
43-
<excludeFolder url="file://$MODULE_DIR$/example/packages" />
44-
<excludeFolder url="file://$MODULE_DIR$/packages" />
45-
<excludeFolder url="file://$MODULE_DIR$/test/packages" />
4613
</content>
4714
<orderEntry type="sourceFolder" forTests="false" />
4815
<orderEntry type="library" name="Dart Packages" level="project" />
4916
<orderEntry type="library" name="Dart SDK" level="project" />
17+
<orderEntry type="library" name="Flutter Plugins" level="project" />
5018
</component>
5119
</module>

0 commit comments

Comments
 (0)