Merge pull request #162 from virskor/hotfix/review

更新ui

mobile/.packages

@@ -1,4 +1,4 @@
-# Generated by pub on 2021-01-03 15:47:21.908883.
+# Generated by pub on 2021-01-16 11:55:17.200790.
 archive:file:///Users/virs/.fvm/versions/1.22.5-stable/.pub-cache/hosted/pub.flutter-io.cn/archive-2.0.13/lib/
 args:file:///Users/virs/.fvm/versions/1.22.5-stable/.pub-cache/hosted/pub.flutter-io.cn/args-1.6.0/lib/
 assets_audio_player:../packages/flutter_assetsAudioPlayer/lib/
@@ -126,7 +126,7 @@ video_player:file:///Users/virs/.fvm/versions/1.22.5-stable/.pub-cache/hosted/pu
 video_player_platform_interface:file:///Users/virs/.fvm/versions/1.22.5-stable/.pub-cache/hosted/pub.flutter-io.cn/video_player_platform_interface-2.2.0/lib/
 video_player_web:file:///Users/virs/.fvm/versions/1.22.5-stable/.pub-cache/hosted/pub.flutter-io.cn/video_player_web-0.1.4+1/lib/
 wakelock:file:///Users/virs/.fvm/versions/1.22.5-stable/.pub-cache/hosted/pub.flutter-io.cn/wakelock-0.1.4+2/lib/
-webview_flutter:file:///Users/virs/.fvm/versions/1.22.5-stable/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-1.0.3/lib/
+webview_flutter:file:///Users/virs/.fvm/versions/1.22.5-stable/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-1.0.7/lib/
 win32:file:///Users/virs/.fvm/versions/1.22.5-stable/.pub-cache/hosted/pub.flutter-io.cn/win32-1.7.4/lib/
 xdg_directories:file:///Users/virs/.fvm/versions/1.22.5-stable/.pub-cache/hosted/pub.flutter-io.cn/xdg_directories-0.1.2/lib/
 xml:file:///Users/virs/.fvm/versions/1.22.5-stable/.pub-cache/hosted/pub.flutter-io.cn/xml-4.5.1/lib/

mobile/android/app/src/main/AndroidManifest.xml

@@ -27,7 +27,7 @@
     <application
         tools:replace="icon, label"
         android:name="io.flutter.app.FlutterApplication"
-        android:label="DiscuzQ"
+        android:label="Discuz!Q"
         android:usesCleartextTraffic="true"
         android:icon="@mipmap/ic_launcher">
         <!--头像剪裁-->

mobile/build.yaml

@@ -15,10 +15,14 @@ development:
   # You are not gonna get a health application when you add a domain like https://google.com redirected into https://www.google.com
   #
   # YOUR DOMAIN SHOULD NEVER ENDED WITH PATH SEPARATOR LIKE : https://www.example.com/
-  domain: https://discuz.chat
-  appname: DiscuzQ
+  domain: https://m.clodra.com
+  appname: ClodraAPP
+  # 帮助中心链接
+  helpCenter: https://app.clodra.com/helpcenter/
+  # 技术支持链接
+  technicalSupport: https://app.clodra.com
   # Allow to show checked mode banner
-  debugShowCheckedModeBanner: true
+  debugShowCheckedModeBanner: false
   # Allow and show performance overlay setting
   enablePerformanceOverlay: true
   # HTTP2
@@ -37,7 +41,7 @@ development:
   #
   # Financial fatures
   # Set this item into FALSE, wallet and financial amount will be displayed
-  financial: true 
+  financial: false 
   # Bugly
   bugly: 
     IOS: de3ab42b91
@@ -47,8 +51,12 @@ development:
 # 构建生产环境的APP时加载的信息
 # Parameters for building prodution package
 production:
-  domain: https://discuz.chat
-  appname: DiscuzQ
+  domain: https://m.clodra.com
+  appname: ClodraAPP
+  ## 帮助中心链接
+  helpCenter: https://app.clodra.com/helpcenter/
+  # 技术支持链接
+  technicalSupport: https://app.clodra.com
   ## DO NOT ENABLE THIS ITEM WHEN YOU ARE BUILD AN APPLICATION FOR YOUR USERS
   enablePerformanceOverlay: false
   ## DO NOT ENABLE THIS ITEM WHEN YOU ARE BUILD AN APPLICATION FOR YOUR USERS
@@ -57,7 +65,7 @@ production:
   enableHttp2: false
   onBadCertificate: true 
   http2idleTimeout: 15000
-  financial: true 
+  financial: false 
   # Bugly
   bugly: 
     IOS: de3ab42b91

mobile/ios/Flutter/.last_build_id

@@ -1 +1 @@
-cbcc2527cf03f6794e5fbef48ae5d5fd
+a06c9e6ee74aebe4aa13e3e9300a5b89

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -374,7 +374,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CURRENT_PROJECT_VERSION = 78;
 				DEVELOPMENT_TEAM = T92T456454;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -511,7 +511,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CURRENT_PROJECT_VERSION = 78;
 				DEVELOPMENT_TEAM = T92T456454;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -542,7 +542,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CURRENT_PROJECT_VERSION = 78;
 				DEVELOPMENT_TEAM = T92T456454;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

mobile/lib/core.dart

@@ -18,6 +18,7 @@ import 'package:discuzq/providers/forumProvider.dart';
 import 'package:discuzq/providers/categoriesProvider.dart';
 import 'package:discuzq/providers/editorProvider.dart';
 import 'package:discuzq/widgets/update/upgrader.dart';
+import 'package:discuzq/widgets/settings/privacyConfirm.dart';
 
 ///
 /// 执行
@@ -80,11 +81,30 @@ class DiscuzQ extends StatelessWidget {
 
     /// 加载本地的用户信息
     await AuthHelper.getUserFromLocal(context: context);
+
+    await _userPrivaciesNotice(context);
   }
 
   /// 加载本地的配置
   Future<bool> _initAppSettings() async =>
       await AppConfigurations().initAppSetting();
+
+
+  /// 弹出用户隐私提示
+  void _userPrivaciesNotice(BuildContext context) {
+    final dynamic appConf = context.read<AppConfigProvider>().appConf;
+    if (appConf['confrimedPrivacy'] != null &&
+        appConf['confrimedPrivacy'] == false) {
+      showModalBottomSheet(
+          context: context,
+          isDismissible: false,
+          enableDrag: false,
+          backgroundColor: Colors.transparent,
+          builder: (BuildContext context) {
+            return const PrivacyConfirm();
+          });
+    }
+  }
 }
 
 ///
@@ -99,4 +119,6 @@ class _DiscuzAppIndicator extends StatelessWidget {
           brightness: Brightness.dark,
         ),
       );
+
+
 }

mobile/lib/discuz.dart

@@ -18,7 +18,6 @@ import 'package:discuzq/api/forum.dart';
 import 'package:discuzq/router/routers.dart';
 import 'package:discuzq/views/exploreDelagate.dart';
 import 'package:discuzq/providers/appConfigProvider.dart';
-import 'package:discuzq/widgets/settings/privacyConfirm.dart';
 
 import 'widgets/ui/ui.dart';
 
@@ -166,6 +165,8 @@ class _DiscuzAppDelegate extends StatefulWidget {
 class __DiscuzAppDelegateState extends State<_DiscuzAppDelegate> {
   final CancelToken _cancelToken = CancelToken();
 
+  final PageController _pageController = PageController();
+
   /// 页面集合
   static const List<Widget> _views = [
     const ForumDelegate(),
@@ -179,19 +180,16 @@ class __DiscuzAppDelegateState extends State<_DiscuzAppDelegate> {
 
   /// 底部按钮菜单
   final List<NavigatorItem> _items = [
-    const NavigatorItem(icon: 0xe63e, title: "首页"),
-    const NavigatorItem(icon: 0xe605, title: "发现", shouldLogin: true),
+    const NavigatorItem(icon: 0xe7f3, title: "首页"),
+    const NavigatorItem(icon: 0xe788, title: "发现", shouldLogin: true),
     const NavigatorItem(isPublishButton: true),
-    const NavigatorItem(icon: 0xe677, title: "消息", shouldLogin: true),
-    const NavigatorItem(icon: 0xe7c7, title: "我的", size: 23, shouldLogin: true)
+    const NavigatorItem(icon: 0xe7c0, title: "消息", shouldLogin: true),
+    const NavigatorItem(icon: 0xe6f2, title: "我的", shouldLogin: true)
   ];
 
   /// 使用global key
   final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
 
-  /// states
-  int _selected = 0;
-
   /// _loaded means user forum api already requested! not means success or fail to load data
   bool _loaded = false;
 
@@ -211,6 +209,7 @@ class __DiscuzAppDelegateState extends State<_DiscuzAppDelegate> {
 
   @override
   void dispose() {
+    _pageController.dispose();
     super.dispose();
   }
 
@@ -231,17 +230,17 @@ class __DiscuzAppDelegateState extends State<_DiscuzAppDelegate> {
               canvasColor: DiscuzApp.themeOf(context).scaffoldBackgroundColor),
           child: Scaffold(
             key: _scaffoldKey,
-            //body: _views.elementAt(_selected),
-            body: IndexedStack(
+            body: PageView(
+              controller: _pageController,
               children: _views,
-              index: _selected,
+              physics: const NeverScrollableScrollPhysics(),
             ),
             resizeToAvoidBottomPadding: false,
             bottomNavigationBar: DiscuzBottomNavigator(
               items: _items,
-              onItemSelected: (index) => setState(() {
-                _selected = index;
-              }),
+              onItemSelected: (index) {
+                _pageController.jumpToPage(index);
+              },
             ),
           ),
         );
@@ -262,23 +261,5 @@ class __DiscuzAppDelegateState extends State<_DiscuzAppDelegate> {
     setState(() {
       _loaded = true;
     });
-
-    this._userPrivaciesNotice();
-  }
-
-  /// 弹出用户隐私提示
-  void _userPrivaciesNotice() {
-    final dynamic appConf = context.read<AppConfigProvider>().appConf;
-    if (appConf['confrimedPrivacy'] != null &&
-        appConf['confrimedPrivacy'] == false) {
-      showModalBottomSheet(
-          context: context,
-          isDismissible: false,
-          enableDrag: false,
-          backgroundColor: Colors.transparent,
-          builder: (BuildContext context) {
-            return const PrivacyConfirm();
-          });
-    }
   }
 }

mobile/lib/models/buildInfoModel.dart

@@ -40,8 +40,14 @@ class BuildInfoModel {
   /// bugly配置
   final dynamic bugly;
 
+  final String helpCenter;
+
+  final String technicalSupport;
+
   const BuildInfoModel(
       {this.domain = 'https://discuz.chat',
+      this.technicalSupport = "",
+      this.helpCenter = "",
       this.appname = 'DiscuzQ',
       this.enableHttp2 = false,
       this.onBadCertificate = true,
@@ -79,6 +85,8 @@ class BuildInfoModel {
         idleTimeout: data['idleTimeout'] ?? 15000,
         financial: data['financial'] ?? false,
         bugly: data['bugly'] ?? null,
+        helpCenter: data['helpCenter'] ?? "",
+        technicalSupport: data['technicalSupport'] ?? "",
         debugShowCheckedModeBanner: data['debugShowCheckedModeBanner'] ?? false,
         enablePerformanceOverlay: data['enablePerformanceOverlay'] ?? false);
   }

mobile/lib/router/routers.dart

@@ -1,3 +1,4 @@
+import 'package:discuzq/views/settings/aboutDelegate.dart';
 import 'package:discuzq/views/topics/appTopicsDelegate.dart';
 import 'package:flutter/material.dart';
 import 'package:fluro/fluro.dart';
@@ -11,6 +12,9 @@ class Routers {
   /// 偏好设置
   static const String preferences = "/preferences";
 
+  /// 关于
+  static const String about = "/about";
+
   /// 话题列表
   static const String topics = "/topics";
 
@@ -26,7 +30,14 @@ class Routers {
       return const AppTopicsDelegate();
     });
 
+    /// 话题
+    final Handler aboutHandler = Handler(
+        handlerFunc: (BuildContext context, Map<String, dynamic> params) {
+      return const AboutDelegate();
+    });
+
     router.define(preferences, handler: preferencesHandler);
+    router.define(about, handler: aboutHandler);
     router.define(topics, handler: topicsHandler);
   }
 }