fix details after commit

peng8350 · Jan 13, 2020 · 915f15c · 915f15c
1 parent d2361b0
commit 915f15c
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 33 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -55,7 +55,13 @@ class MyApp extends StatelessWidget {
         supportedLocales: [
           const Locale('en'),
           const Locale('zh'),
+          const Locale('ja'),
+          const Locale('uk'),
+          const Locale('it'),
+          const Locale('ru'),
+          const Locale('fr'),
         ],
+        locale: const Locale('ja'),
         localeResolutionCallback:
             (Locale locale, Iterable<Locale> supportedLocales) {
           //print("change language");

diff --git a/example/lib/other/refresh_glowindicator.dart b/example/lib/other/refresh_glowindicator.dart
@@ -21,25 +21,26 @@ class RefreshScrollBehavior extends ScrollBehavior {
         return child;
       case TargetPlatform.macOS:
       case TargetPlatform.android:
-      case TargetPlatform.fuchsia:
-        return GlowingOverscrollIndicator(
-          child: child,
-          // this will disable top Bouncing OverScroll Indicator showing in Android
-          showLeading: true, //顶部水波纹是否展示
-          showTrailing: true, //底部水波纹是否展示
-          axisDirection: axisDirection,
-          notificationPredicate: (notification) {
-            if (notification.depth == 0) {
-              // 越界了拖动触发overScroll的话就没必要展示水波纹
-              if (notification.metrics.outOfRange) {
-                return false;
-              }
-              return true;
+      return GlowingOverscrollIndicator(
+        child: child,
+        // this will disable top Bouncing OverScroll Indicator showing in Android
+        showLeading: true, //顶部水波纹是否展示
+        showTrailing: true, //底部水波纹是否展示
+        axisDirection: axisDirection,
+        notificationPredicate: (notification) {
+          if (notification.depth == 0) {
+            // 越界了拖动触发overScroll的话就没必要展示水波纹
+            if (notification.metrics.outOfRange) {
+              return false;
             }
-            return false;
-          },
-          color: Theme.of(context).primaryColor,
-        );
+            return true;
+          }
+          return false;
+        },
+        color: Theme.of(context).primaryColor,
+      );
+      case TargetPlatform.fuchsia:
+
     }
     return null;
   }

diff --git a/example/lib/ui/example/useStage/basic.dart b/example/lib/ui/example/useStage/basic.dart
@@ -137,7 +137,6 @@ class _OnlyListViewState extends State<OnlyListView> {
 
   Widget buildCtn() {
     return ListView.separated(
-      reverse: false,
       padding: EdgeInsets.only(left: 5, right: 5),
       itemBuilder: (c, i) => Item(
         title: data[i],
@@ -160,7 +159,7 @@ class _OnlyListViewState extends State<OnlyListView> {
       enablePullUp: true,
       child: buildCtn(),
       footer: ClassicFooter(
-        loadStyle: LoadStyle.ShowAlways,
+        loadStyle: LoadStyle.ShowWhenLoading,
         completeDuration: Duration(milliseconds: 500),
       ),
       header: WaterDropHeader(),

diff --git a/example/lib/ui/example/useStage/qq_chat_list.dart b/example/lib/ui/example/useStage/qq_chat_list.dart
@@ -119,7 +119,7 @@ class _QQChatListState extends State<QQChatList> {
                       _refreshController.loadComplete();
                     },
                     footer: CustomFooter(
-                      loadStyle: LoadStyle.HideAlways,
+                      loadStyle: LoadStyle.ShowAlways,
                       builder: (context, mode) {
                         if (mode == LoadStatus.loading) {
                           return Container(

diff --git a/lib/src/internals/refresh_localizations.dart b/lib/src/internals/refresh_localizations.dart
@@ -97,7 +97,7 @@ class RefreshLocalizationsDelegate
 
   @override
   bool isSupported(Locale locale) {
-    return ['en', 'zh', 'fr', 'ru', 'uk', 'ja'].contains(locale.languageCode);
+    return ['en', 'zh', 'fr', 'ru', 'uk', 'ja','it'].contains(locale.languageCode);
   }
 
   @override
@@ -169,7 +169,7 @@ class ChRefreshString implements RefreshString {
   String loadFailedText = "加载失败";
 
   @override
-  String loadingText = "加载中...";
+  String loadingText = "加载中…";
 
   @override
   String noMoreText = "没有更多数据了";
@@ -181,7 +181,7 @@ class ChRefreshString implements RefreshString {
   String refreshFailedText = "刷新失败";
 
   @override
-  String refreshingText = "刷新中...";
+  String refreshingText = "刷新中…";
 }
 
 /// English
@@ -205,7 +205,7 @@ class EnRefreshString implements RefreshString {
   String loadFailedText = "Load Failed";
 
   @override
-  String loadingText = "Loading...";
+  String loadingText = "Loading…";
 
   @override
   String noMoreText = "No more data";
@@ -217,7 +217,7 @@ class EnRefreshString implements RefreshString {
   String refreshFailedText = "Refresh failed";
 
   @override
-  String refreshingText = "Refreshing...";
+  String refreshingText = "Refreshing…";
 }
 
 /// French
@@ -277,7 +277,7 @@ class RuRefreshString implements RefreshString {
   String loadFailedText = "Ошибка загрузки";
 
   @override
-  String loadingText = "Загрузка...";
+  String loadingText = "Загрузка…";
 
   @override
   String noMoreText = "Больше данных нет";
@@ -289,7 +289,7 @@ class RuRefreshString implements RefreshString {
   String refreshFailedText = "Не удалось обновить";
 
   @override
-  String refreshingText = "Обновление...";
+  String refreshingText = "Обновление…";
 }
 
 // Ukrainian
@@ -313,7 +313,7 @@ class UkRefreshString implements RefreshString {
   String loadFailedText = "Помилка завантаження";
 
   @override
-  String loadingText = "Завантаження...";
+  String loadingText = "Завантаження…";
 
   @override
   String noMoreText = "Більше даних немає";
@@ -325,7 +325,7 @@ class UkRefreshString implements RefreshString {
   String refreshFailedText = "Не вдалося оновити";
 
   @override
-  String refreshingText = "Оновлення...";
+  String refreshingText = "Оновлення…";
 }
 
 /// Italian
@@ -385,7 +385,7 @@ class JpRefreshString implements RefreshString {
   String loadFailedText = "読み込みが失敗しました";
 
   @override
-  String loadingText = "読み込み中";
+  String loadingText = "読み込み中…";
 
   @override
   String noMoreText = "データはありません";
@@ -397,6 +397,6 @@ class JpRefreshString implements RefreshString {
   String refreshFailedText = "更新が失敗しました";
 
   @override
-  String refreshingText = "更新中";
+  String refreshingText = "更新中…";
 }
 
diff --git a/lib/src/internals/refresh_physics.dart b/lib/src/internals/refresh_physics.dart
@@ -219,7 +219,7 @@ class RefreshPhysics extends ScrollPhysics {
     }
     if (enablePullUp) {
       final RenderSliverLoading sliverFooter = viewportRender.lastChild;
-      bottomExtra =
+      bottomExtra = (!notFull && sliverFooter.geometry.scrollExtent!=0)||
               (notFull &&
                   controller.footerStatus == LoadStatus.noMore &&
                   !RefreshConfiguration.of(