diff --git a/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index db77bb4..0b1393a 100644 Binary files a/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/circle_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 17987b7..74ada4c 100644 Binary files a/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/circle_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 09d4391..bae471a 100644 Binary files a/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/circle_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index d5f1c8d..75d4218 100644 Binary files a/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/circle_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 4d6372e..123da0f 100644 Binary files a/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/circle_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index d36b1fa..728e6c3 100644 --- a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,122 +1,122 @@ { - "images" : [ - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@3x.png", - "scale" : "3x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@3x.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", - "scale" : "3x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@1x.png", - "scale" : "1x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", - "scale" : "1x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", - "scale" : "1x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", - "scale" : "2x" - }, - { - "size" : "83.5x83.5", - "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "Icon-App-1024x1024@1x.png", - "scale" : "1x" + "images": [ + { + "size": "20x20", + "idiom": "iphone", + "filename": "icon-20@2x.png", + "scale": "2x" + }, + { + "size": "20x20", + "idiom": "iphone", + "filename": "icon-20@3x.png", + "scale": "3x" + }, + { + "size": "29x29", + "idiom": "iphone", + "filename": "icon-29.png", + "scale": "1x" + }, + { + "size": "29x29", + "idiom": "iphone", + "filename": "icon-29@2x.png", + "scale": "2x" + }, + { + "size": "29x29", + "idiom": "iphone", + "filename": "icon-29@3x.png", + "scale": "3x" + }, + { + "size": "40x40", + "idiom": "iphone", + "filename": "icon-40@2x.png", + "scale": "2x" + }, + { + "size": "40x40", + "idiom": "iphone", + "filename": "icon-40@3x.png", + "scale": "3x" + }, + { + "size": "60x60", + "idiom": "iphone", + "filename": "icon-60@2x.png", + "scale": "2x" + }, + { + "size": "60x60", + "idiom": "iphone", + "filename": "icon-60@3x.png", + "scale": "3x" + }, + { + "size": "20x20", + "idiom": "ipad", + "filename": "icon-20-ipad.png", + "scale": "1x" + }, + { + "size": "20x20", + "idiom": "ipad", + "filename": "icon-20@2x-ipad.png", + "scale": "2x" + }, + { + "size": "29x29", + "idiom": "ipad", + "filename": "icon-29-ipad.png", + "scale": "1x" + }, + { + "size": "29x29", + "idiom": "ipad", + "filename": "icon-29@2x-ipad.png", + "scale": "2x" + }, + { + "size": "40x40", + "idiom": "ipad", + "filename": "icon-40.png", + "scale": "1x" + }, + { + "size": "40x40", + "idiom": "ipad", + "filename": "icon-40@2x.png", + "scale": "2x" + }, + { + "size": "76x76", + "idiom": "ipad", + "filename": "icon-76.png", + "scale": "1x" + }, + { + "size": "76x76", + "idiom": "ipad", + "filename": "icon-76@2x.png", + "scale": "2x" + }, + { + "size": "83.5x83.5", + "idiom": "ipad", + "filename": "icon-83.5@2x.png", + "scale": "2x" + }, + { + "size": "1024x1024", + "idiom": "ios-marketing", + "filename": "icon-1024.png", + "scale": "1x" + } + ], + "info": { + "version": 1, + "author": "icon.wuruihong.com" } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} +} \ No newline at end of file diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png deleted file mode 100644 index dc9ada4..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png deleted file mode 100644 index 7353c41..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png deleted file mode 100644 index 797d452..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png deleted file mode 100644 index 6ed2d93..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png deleted file mode 100644 index 4cd7b00..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png deleted file mode 100644 index fe73094..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png deleted file mode 100644 index 321773c..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png deleted file mode 100644 index 797d452..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png deleted file mode 100644 index 502f463..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png deleted file mode 100644 index 0ec3034..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png deleted file mode 100644 index 0ec3034..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png deleted file mode 100644 index e9f5fea..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png deleted file mode 100644 index 84ac32a..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png deleted file mode 100644 index 8953cba..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png deleted file mode 100644 index 0467bf1..0000000 Binary files a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-1024.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-1024.png new file mode 100644 index 0000000..05beef9 Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-1024.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png new file mode 100644 index 0000000..6b1372d Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png new file mode 100644 index 0000000..10cbc0c Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png new file mode 100644 index 0000000..10cbc0c Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png new file mode 100644 index 0000000..5b8e703 Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29-ipad.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29-ipad.png new file mode 100644 index 0000000..7bc25d8 Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29-ipad.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29.png new file mode 100644 index 0000000..7bc25d8 Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png new file mode 100644 index 0000000..eea8b84 Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png new file mode 100644 index 0000000..eea8b84 Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png new file mode 100644 index 0000000..830eda1 Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40.png new file mode 100644 index 0000000..10cbc0c Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png new file mode 100644 index 0000000..fac3cf2 Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png new file mode 100644 index 0000000..e328109 Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png new file mode 100644 index 0000000..e328109 Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png new file mode 100644 index 0000000..21c6322 Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76.png new file mode 100644 index 0000000..d9f1e3a Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png new file mode 100644 index 0000000..e0a98c2 Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png differ diff --git a/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png new file mode 100644 index 0000000..23bfd03 Binary files /dev/null and b/circle_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png differ diff --git a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart index 00fc3e4..d72c12d 100644 --- a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart +++ b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart @@ -619,7 +619,6 @@ class _TIMTextFieldLayoutNarrowState Container( height: 40.sp, width: Get.width, - // color: Colors.red, child: Row( mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ diff --git a/circle_app/lib/app/circle/view.dart b/circle_app/lib/app/circle/view.dart index 8ebbf61..f90c41c 100644 --- a/circle_app/lib/app/circle/view.dart +++ b/circle_app/lib/app/circle/view.dart @@ -379,17 +379,7 @@ class CirclePage extends StatelessWidget { getCircleImage('circle_line'), width: Get.width, )), - Positioned( - bottom: 56.sp, - right: 0.sp, - child: GestureDetector( - onTap: () { - Get.toNamed(AppRoutes.Call_out); - }, - child: Image.asset( - getCircleImage('send_msg'), - width: 60.sp, - ))) + ], ))); } diff --git a/circle_app/lib/app/home/view.dart b/circle_app/lib/app/home/view.dart index dc2aa1c..62ff055 100644 --- a/circle_app/lib/app/home/view.dart +++ b/circle_app/lib/app/home/view.dart @@ -53,8 +53,8 @@ class HomePage extends StatelessWidget { body: controller.tabs[controller.currentIndex], ), Positioned( - bottom: 56.sp, - right: 0.sp, + bottom: Get.bottomBarHeight + 36.sp, + right: 10.sp, child: GestureDetector( onTap: () { Get.toNamed(AppRoutes.Call_out); diff --git a/circle_app/lib/network/dio_manager.dart b/circle_app/lib/network/dio_manager.dart index 3f3c08f..fbab001 100644 --- a/circle_app/lib/network/dio_manager.dart +++ b/circle_app/lib/network/dio_manager.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'dart:io'; +import 'package:circle_app/util/util.dart'; import 'package:dio/dio.dart'; import '../util/device.dart'; @@ -171,6 +172,9 @@ class DioManager { // json转model String jsonStr = json.encode(response.data); Map responseMap = json.decode(jsonStr); + if (responseMap["code"] == 5003) { + pushLoginPage(); + } return responseMap; } on DioException catch (e) { // // DioError是指返回值不为200的情况 diff --git a/circle_app/lib/util/util.dart b/circle_app/lib/util/util.dart index b429010..d8a4d52 100644 --- a/circle_app/lib/util/util.dart +++ b/circle_app/lib/util/util.dart @@ -1,9 +1,12 @@ import 'dart:ui'; import 'package:circle_app/common/values/values.dart'; +import 'package:circle_app/router/app_routers.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:fluttertoast/fluttertoast.dart'; +import 'package:get/get.dart'; +import 'package:get/get_state_manager/get_state_manager.dart'; class Util { @@ -97,3 +100,6 @@ String convertToTenThousand(int number) { return number.toString(); } } +pushLoginPage() { + Get.offAllNamed(AppRoutes.Login); +}