Merge pull request #19 from efoxTeam/dev-ken

Dev ken

Author: ckken

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

android/app/build.gradle

@@ -24,6 +24,13 @@ if (flutterVersionName == null) {
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
     compileSdkVersion 27
 
@@ -41,11 +48,27 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
+        debug {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
+    }
+
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
+            minifyEnabled true
+            useProguard false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }

android/app/key.jks

@@ -0,0 +1,7 @@
+#Flutter Wrapper
+-keep class io.flutter.app.** { *; }
+-keep class io.flutter.plugin.**  { *; }
+-keep class io.flutter.util.**  { *; }
+-keep class io.flutter.view.**  { *; }
+-keep class io.flutter.**  { *; }
+-keep class io.flutter.plugins.**  { *; }

android/app/proguard-rules.pro

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Efox Flutter</string>
+    <string name="app_name">flutter ui</string>
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->

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

@@ -0,0 +1,4 @@
+storePassword=666666
+keyPassword=666666
+keyAlias=key
+storeFile=key.jks

android/key.properties

@@ -1,12 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_markdown/flutter_markdown.dart' as md;
+import 'package:efox_flutter/utils/syntaxHighlighter.dart'
+    show DartSyntaxHighlighter;
 
 class Index extends StatelessWidget {
   final String data;
   Index(this.data);
 
   @override
-  Widget build(BuildContext build ) {
-    return md.MarkdownBody(data: this.data);
+  Widget build(BuildContext build) {
+    return md.MarkdownBody(
+        data: this.data, syntaxHighlighter: DartSyntaxHighlighter());
   }
-}
+}

lib/components/markdownComp.dart

@@ -104,10 +104,9 @@ class _IndexState extends State<Index> {
                     ),
                     Text(
                       '${_tmpWidgetList[index].title}',
-                      overflow: TextOverflow.ellipsis,
-                      style: TextStyle(
-                        fontSize: 16,
-                      ),
+                      //overflow: TextOverflow.ellipsis,
+                      style:
+                          TextStyle(fontSize: 14, fontWeight: FontWeight.w300),
                     )
                   ],
                 ),

lib/page/component/index.dart

@@ -48,7 +48,7 @@ class _IndexState extends State<Index> {
       case 3:
         FluroRouter.router.navigateTo(
           context,
-          '/webview?url=${Uri.encodeComponent(widget.model.config.state.env.githubWeb)}',
+          '/webview?url=${Uri.encodeComponent(widget.model.config.state.env.githubWeb)}&title=${AppLocalizations.$t('common.compProgress')}',
         );
         break;
     }
@@ -71,7 +71,7 @@ class _IndexState extends State<Index> {
                   flexibleSpace: FlexibleSpaceBar(
                     collapseMode: CollapseMode.pin,
                     title: Text(
-                      'Welcome to Flutter',
+                      'Flutter UI',
                     ),
                   ),
                 ),