Merge branch 'dev' of https://github.com/efoxTeam/flutter-ui into dev

# Conflicts:
#	lib/page/component/tabs.dart

Author: wanwusangzhi

android/app/build.gradle

@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     lintOptions {
         disable 'InvalidPackage'
@@ -42,10 +42,10 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.flutter.beer"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     signingConfigs {
@@ -79,8 +79,8 @@ flutter {
 
 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'
+    androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
     //firebase
     implementation 'com.google.firebase:firebase-core:16.0.8'
     //Crashlytics SDK

android/gradle.properties

@@ -1 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
+android.enableJetifier=true

lib/page/component/tabs.dart

@@ -5,6 +5,7 @@ import 'package:efox_flutter/config/theme.dart' show AppTheme;
 import 'package:efox_flutter/widget/index.dart' as WidgetRoot;
 import 'package:efox_flutter/router/index.dart' show FluroRouter;
 import 'package:efox_flutter/lang/index.dart' show AppLocalizations;
+import 'package:efox_flutter/components/headerComp.dart' as Header;
 
 class Index extends StatefulWidget {
   final MainStateModel model;
@@ -69,11 +70,12 @@ class _IndexState extends State<Index>
 
   Widget _TabBar() {
     return TabBar(
+        indicatorColor: Color(AppTheme.secondColor),
         controller: _tabController,
         isScrollable: true,
         tabs: _mapList.map((v) {
           return new Tab(
-            text: v.typeName,
+            text: AppLocalizations.$t(v.typeName),
             /* icon: Icon(
               IconData(
                 v.code,

lib/widget/navigator/index.dart

@@ -37,7 +37,7 @@ List widgets = [
   ),
   ItemInfo(
     widget: drawer.Index(),
-    code: 58928, // airline_seat_flat 
+    code: 58928, // airline_seat_flat
     title: drawer.Index.title,
   ),
   ItemInfo(
@@ -62,7 +62,7 @@ List widgets = [
   ),
   ItemInfo(
     widget: popupmenubutton.Index(),
-    code: 57440, // art_track 
+    code: 57440, // art_track
     title: popupmenubutton.Index.title,
   ),
   ItemInfo(
@@ -81,7 +81,7 @@ List widgetMap = [
   ItemListInfo(
     nameSpaces: nameSpaces,
     widgetList: widgets,
-    typeName: 'navigator',
+    typeName: 'Navigator',
     code: 58717,
   )
 ];

locale/en.json

@@ -6,7 +6,7 @@
     "widgetType": {
         "regularLayout": "common layout"
     },
-    "common" : {
+    "common": {
         "changeLanguage": "显示中文",
         "changeVersion": "checkVersion",
         "compProgress": "Components Progress"
@@ -23,5 +23,14 @@
         "loadNetwork": "Load Network Document Resources",
         "loadLocal": "Load Local Document Resources"
     },
-    "loading": "Loading"
+    "loading": "Loading",
+    "ScrollComponents": "ScrollComponents",
+    "Common": "Common",
+    "Form": "Form",
+    "Regular": "Regular",
+    "Navigator": "Navigator",
+    "BulletBox": "BulletBox",
+    "Animate": "Animate",
+    "Gestures": "Gestures",
+    "Vision": "Vision"
 }

locale/zh.json

@@ -6,7 +6,7 @@
     "widgetType": {
         "regularLayout": "常规布局"
     },
-    "common" : {
+    "common": {
         "changeLanguage": "Switch to English",
         "changeVersion": "更新版本",
         "compProgress": "组件进度"
@@ -23,5 +23,14 @@
         "loadNetwork": "网络优良,可选择加载线上文档资源",
         "loadLocal": "网络较差时,可选择加载本地文档资源"
     },
-    "loading": "加载中"
+    "loading": "加载中",
+    "ScrollComponents": "滚动",
+    "Common": "通用",
+    "Form": "表单",
+    "Regular": "布局",
+    "Navigator": "导航",
+    "BulletBox": "窗口",
+    "Animate": "动画",
+    "Gestures": "手势",
+    "Vision": "视觉"
 }

pubspec.yaml

@@ -7,7 +7,7 @@ description: A new Flutter project.
 # Both the version and the builder number may be overridden in flutter
 # build by specifying --build-name and --build-number, respectively.
 # Read more about versioning at semver.org.
-version: 1.0.0+1
+version: 1.0.1+1
 
 environment:
   sdk: ">=2.1.0 <3.0.0"