diff --git a/android/.project b/android/.project
new file mode 100644
index 0000000..3964dd3
--- /dev/null
+++ b/android/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectdescription>
+	<name>android</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildspec>
+		<buildcommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildcommand>
+	</buildspec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectdescription>
diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 0000000..e889521
--- /dev/null
+++ b/android/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=
+eclipse.preferences.version=1
diff --git a/android/app/.classpath b/android/app/.classpath
new file mode 100644
index 0000000..eb19361
--- /dev/null
+++ b/android/app/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>
diff --git a/android/app/.project b/android/app/.project
new file mode 100644
index 0000000..ac485d7
--- /dev/null
+++ b/android/app/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectdescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildspec>
+		<buildcommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildcommand>
+		<buildcommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildcommand>
+	</buildspec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectdescription>
diff --git a/android/app/.settings/org.eclipse.buildship.core.prefs b/android/app/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 0000000..b1886ad
--- /dev/null
+++ b/android/app/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 16e0c1a..27a914c 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -33,7 +33,7 @@ android {
 
 defaultConfig {
 // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId "com.example.efoxflutter"
+ applicationId "com.flutter.beer"
 minSdkVersion 16
 targetSdkVersion 27
 versionCode flutterVersionCode.toInteger()
@@ -58,4 +58,8 @@ dependencies {
 testImplementation 'junit:junit:4.12'
 androidTestImplementation 'com.android.support.test:runner:1.0.2'
 androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+ //firebase
+ implementation 'com.google.firebase:firebase-core:16.0.7'
 }
+//firebase
+apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
diff --git a/android/app/google-services.json b/android/app/google-services.json
new file mode 100644
index 0000000..48216fc
--- /dev/null
+++ b/android/app/google-services.json
@@ -0,0 +1,42 @@
+{
+ "project_info": {
+ "project_number": "27281760426",
+ "firebase_url": "https://efox-flutter.firebaseio.com",
+ "project_id": "efox-flutter",
+ "storage_bucket": "efox-flutter.appspot.com"
+ },
+ "client": [
+ {
+ "client_info": {
+ "mobilesdk_app_id": "1:27281760426:android:51548b1d738060a2",
+ "android_client_info": {
+ "package_name": "com.flutter.beer"
+ }
+ },
+ "oauth_client": [
+ {
+ "client_id": "27281760426-to57nfnn76jt4696hlg63lvr7g2po8u5.apps.googleusercontent.com",
+ "client_type": 3
+ }
+ ],
+ "api_key": [
+ {
+ "current_key": "AIzaSyDdh4EwOeSv9fWPH8CbEsHZz7jJ_Lsn4Bo"
+ }
+ ],
+ "services": {
+ "analytics_service": {
+ "status": 1
+ },
+ "appinvite_service": {
+ "status": 1,
+ "other_platform_oauth_client": []
+ },
+ "ads_service": {
+ "status": 2
+ }
+ }
+ }
+ ],
+ "configuration_version": "1"
+}
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 90db689..2e9846d 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.example.efoxflutter">
+ package="com.flutter.beer">
 
 
 <application android:name="io.flutter.app.FlutterApplication" - android:label="efox_flutter" + android:label="@string/app_name" android:icon="@mipmap/ic_launcher">
 <activity android:name=".MainActivity" diff --git a/android/app/src/main/java/com/example/efoxflutter/MainActivity.java b/android/app/src/main/java/com/flutter/beer/MainActivity.java similarity index 91% rename from android/app/src/main/java/com/example/efoxflutter/MainActivity.java rename to android/app/src/main/java/com/flutter/beer/MainActivity.java index 715f401..57d491f 100644 --- a/android/app/src/main/java/com/example/efoxflutter/MainActivity.java +++ b/android/app/src/main/java/com/flutter/beer/MainActivity.java @@ -1,4 +1,4 @@ -package com.example.efoxflutter; +package com.flutter.beer; import android.os.Bundle; import io.flutter.app.FlutterActivity; diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 00fa441..3bcbc17 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
 <resources>
+ <string name="app_name">Efox Flutter</string>
 <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
 
diff --git a/android/build.gradle b/android/build.gradle
index bb8a303..131b586 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,6 +6,8 @@ buildscript {
 
 dependencies {
 classpath 'com.android.tools.build:gradle:3.2.1'
+ //firebase
+ classpath 'com.google.gms:google-services:4.2.0'
 }
 }
 
diff --git a/lib/components/widgetComp.dart b/lib/components/widgetComp.dart
index 596e20c..91d1cce 100644
--- a/lib/components/widgetComp.dart
+++ b/lib/components/widgetComp.dart
@@ -9,6 +9,7 @@ import 'package:efox_flutter/utils/file.dart' as FileUtils;
 import 'package:efox_flutter/utils/loadAsset.dart' as LoadAssetUtils;
 import 'package:efox_flutter/router/index.dart' show FluroRouter;
 import 'package:efox_flutter/config/theme.dart' show AppTheme;
+import 'package:efox_flutter/utils/share.dart' as AppShare;
 
 class Index extends StatefulWidget {
 final List<widget> demoChild;
@@ -126,6 +127,15 @@ class IndexState extends State<index> {
 this.openPage(context, model, this.mdUrl);
 },
 ),
+ IconButton(
+ icon: Icon(Icons.share),
+ onPressed: () {
+ final String msg = Uri.encodeComponent(
+ model.config.state.env.GithubAssetOrigin +
+ this.mdUrl.replaceAll(RegExp('/index.md'), ''));
+ AppShare.shareText(msg);
+ },
+ ),
 PopupMenuButton(
 offset: Offset(0, 80),
 onSelected: (index) {
diff --git a/lib/main.dart b/lib/main.dart
index 738b618..6e7b12d 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -9,6 +9,8 @@ import 'package:efox_flutter/store/store.dart' show model, Store;
 import 'package:efox_flutter/router/index.dart';
 //主题
 import 'package:efox_flutter/config/theme.dart' show AppTheme;
+//统计
+import 'package:efox_flutter/utils/analytics.dart' as Analytics;
 
 void main() => runApp(MainApp());
 
@@ -61,6 +63,7 @@ class MainAppState extends State<mainapp> {
 title: 'Flutter Demo',
 theme: AppTheme.themData,
 onGenerateRoute: FluroRouter.router.generator,
+ navigatorObservers: <navigatorobserver>[Analytics.observer],
 ),
 );
 }
diff --git a/lib/page/component/index.dart b/lib/page/component/index.dart
index 7bbcc0b..355ae61 100644
--- a/lib/page/component/index.dart
+++ b/lib/page/component/index.dart
@@ -30,70 +30,73 @@ class _IndexState extends State<index> {
 Widget renderExpanel(MainStateModel model, widgetsItem) {
 String nameSpaces = widgetsItem.nameSpaces;
 List _tmpWidgetList = widgetsItem.widgetList;
- return ExpansionTile(
- title: Text(
- widgetsItem.typeName,
- style: TextStyle(
- fontSize: 20,
- fontWeight: FontWeight.bold,
+ return Container(
+ margin: EdgeInsets.only(bottom: 10),
+ child: ExpansionTile(
+ title: Text(
+ widgetsItem.typeName,
+ style: TextStyle(
+ fontSize: 20,
+ fontWeight: FontWeight.bold,
+ ),
 ),
- ),
- leading: Icon(
- IconData(
- widgetsItem.code ?? 58353,
- fontFamily: 'MaterialIcons',
- matchTextDirection: true,
+ leading: Icon(
+ IconData(
+ widgetsItem.code ?? 58353,
+ fontFamily: 'MaterialIcons',
+ matchTextDirection: true,
+ ),
+ // color: Color(AppTheme.mainColor),
 ),
- // color: Color(AppTheme.mainColor),
- ),
- backgroundColor: Colors.white,
- children: [
- GridView.count(
- shrinkWrap: true,
- physics: NeverScrollableScrollPhysics(),
- childAspectRatio: 1,
- crossAxisCount: 3,
- children: List.generate(
- _tmpWidgetList.length,
- (index) {
- return Container(
- decoration: BoxDecoration(
- border: Border(
- bottom: BorderSide(
- width: .1,
+ backgroundColor: Colors.white,
+ children: [
+ GridView.count(
+ shrinkWrap: true,
+ physics: NeverScrollableScrollPhysics(),
+ childAspectRatio: 1,
+ crossAxisCount: 3,
+ children: List.generate(
+ _tmpWidgetList.length,
+ (index) {
+ return Container(
+ decoration: BoxDecoration(
+ border: Border(
+ bottom: BorderSide(
+ width: .1,
+ ),
 ),
 ),
- ),
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- IconButton(
- iconSize: 48,
- icon: Icon(
- IconData(
- _tmpWidgetList[index].code ?? 59101,
- fontFamily: 'MaterialIcons',
- matchTextDirection: true,
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ IconButton(
+ iconSize: 48,
+ icon: Icon(
+ IconData(
+ _tmpWidgetList[index].code ?? 59101,
+ fontFamily: 'MaterialIcons',
+ matchTextDirection: true,
+ ),
+ color: Color(AppTheme.mainColor),
 ),
- color: Color(AppTheme.mainColor),
+ onPressed: () {
+ FluroRouter.router.navigateTo(
+ context,
+ nameSpaces + _tmpWidgetList[index].title,
+ );
+ },
 ),
- onPressed: () {
- FluroRouter.router.navigateTo(
- context,
- nameSpaces + _tmpWidgetList[index].title,
- );
- },
- ),
- Text(
- _tmpWidgetList[index].title,
- ),
- ],
- ),
- );
- },
+ Text(
+ _tmpWidgetList[index].title,
+ ),
+ ],
+ ),
+ );
+ },
+ ),
 ),
- ),
- ],
+ ],
+ ),
 );
 }
 
diff --git a/lib/router/index.dart b/lib/router/index.dart
index 7fa0ff3..27a8afe 100644
--- a/lib/router/index.dart
+++ b/lib/router/index.dart
@@ -4,6 +4,8 @@ import 'package:fluro/fluro.dart';
 import 'package:efox_flutter/page/home.dart' as HomePage;
 import 'package:efox_flutter/widget/index.dart' as WidgetConfig;
 import 'handles.dart';
+//统计
+import 'package:efox_flutter/utils/analytics.dart' show analytics;
 
 class FluroRouter {
 static Router router;
@@ -20,7 +22,7 @@ class FluroRouter {
 );
 
 router.define('/webview', handler: webviewHandler);
- 
+
 // 组件
 WidgetConfig.getAllWidgets().forEach((widgetsItem) {
 print('widgetsItem $widgetsItem');
@@ -29,6 +31,9 @@ class FluroRouter {
 widgetsItem.nameSpaces + itemInfo.title,
 handler: Handler(
 handlerFunc: (BuildContext context, Map<string, List> params) {
+ print('组件路由params=$params widgetsItem=${itemInfo.title}');
+ analytics.logEvent(
+ name: 'component', parameters: {'name': itemInfo.title});
 return itemInfo.widget;
 }),
 );
diff --git a/lib/utils/analytics.dart b/lib/utils/analytics.dart
new file mode 100644
index 0000000..2a7fcf6
--- /dev/null
+++ b/lib/utils/analytics.dart
@@ -0,0 +1,7 @@
+import 'package:firebase_analytics/firebase_analytics.dart';
+import 'package:firebase_analytics/observer.dart';
+
+//统计
+FirebaseAnalytics analytics = FirebaseAnalytics();
+FirebaseAnalyticsObserver observer =
+ FirebaseAnalyticsObserver(analytics: analytics);
diff --git a/lib/utils/share.dart b/lib/utils/share.dart
new file mode 100644
index 0000000..b02eda6
--- /dev/null
+++ b/lib/utils/share.dart
@@ -0,0 +1,5 @@
+import 'package:share/share.dart';
+
+void shareText(text) {
+ Share.share(text);
+}
diff --git a/pubspec.yaml b/pubspec.yaml
index 45088d7..490cd9f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -22,7 +22,7 @@ dependencies:
 # Use with the CupertinoIcons class for iOS style icons.
 cupertino_icons: ^0.1.2
 flutter_spinkit: ^3.0.0 #加载指示器合集
- share: ^0.5.3 #社会化分享
+ share: ^0.6.0+1 #社会化分享
 pull_to_refresh: ^1.1.6 #加载更多
 shared_preferences: ^0.4.2 #简单数据存储
 scoped_model: ^1.0.1
@@ -33,6 +33,7 @@ dependencies:
 flutter_webview_plugin: ^0.3.0+2
 fluro: ^1.4.0
 flutter_screenutil: ^0.5.1
+ firebase_analytics: ^2.0.2+1
 
 dev_dependencies:
 flutter_test:
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://patch-diff.githubusercontent.com/raw/YYFlutter/flutter-ui/pull/16.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://patch-diff.githubusercontent.com/raw/YYFlutter/flutter-ui/pull/16.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>