diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 9f978a4..4eceac1 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -40,7 +40,7 @@
-
+
@@ -138,7 +138,7 @@
-
+
@@ -173,7 +173,7 @@
-
+
@@ -222,7 +222,7 @@
-
+
@@ -250,7 +250,7 @@
-
+
@@ -404,14 +404,14 @@
-
+
-
+
@@ -467,14 +467,14 @@
-
+
-
+
@@ -684,14 +684,14 @@
-
+
-
+
@@ -761,14 +761,14 @@
-
+
-
+
@@ -810,7 +810,7 @@
-
+
@@ -1020,7 +1020,7 @@
-
+
@@ -1034,7 +1034,7 @@
-
+
@@ -1048,23 +1048,23 @@
-
+
-
+
-
+
-
+
@@ -1082,8 +1082,8 @@
-
-
+
+
@@ -1091,8 +1091,8 @@
-
-
+
+
@@ -1121,8 +1121,8 @@
-
-
+
+
@@ -1132,13 +1132,13 @@
-
-
+
+
-
+
@@ -1168,7 +1168,7 @@
-
+
diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml
index 52f4a21..8a3ee45 100644
--- a/.idea/libraries/Flutter_Plugins.xml
+++ b/.idea/libraries/Flutter_Plugins.xml
@@ -20,8 +20,8 @@
-
+
diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
index 7fef957..8e3cd5a 100644
--- a/android/.idea/gradle.xml
+++ b/android/.idea/gradle.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/android/.idea/workspace.xml b/android/.idea/workspace.xml
new file mode 100644
index 0000000..4cc43c7
--- /dev/null
+++ b/android/.idea/workspace.xml
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1683231228875
+
+
+ 1683231228875
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/lib/app.dart b/lib/app.dart
index f549f9f..64c3fae 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -9,7 +9,6 @@ import 'package:provider/provider.dart';
import 'screen/pages/files/files.dart';
import 'screen/pages/more/overhang.dart';
import 'screen/pages/talk/chatList.dart';
-import 'screen/settings/settings.dart';
import 'package:badges/badges.dart' as badges;
@@ -46,9 +45,9 @@ class _AppState extends State {
return PersistentTabView(
context,
controller: tabController,
- navBarStyle: NavBarStyle.style3,
+ navBarStyle: NavBarStyle.style6,
decoration: const NavBarDecoration(
- border: Border.symmetric(vertical: BorderSide.none, horizontal: BorderSide(color: Colors.grey, width: 2))
+ border: Border.symmetric(vertical: BorderSide.none, horizontal: BorderSide(color: Colors.grey, width: 1))
),
screenTransitionAnimation: const ScreenTransitionAnimation(animateTabTransition: true, curve: Curves.ease, duration: Duration(milliseconds: 200)),
screens: [
@@ -69,19 +68,20 @@ class _AppState extends State {
inactiveColorPrimary: Theme.of(context).disabledColor,
icon: Consumer(
builder: (context, value, child) {
- if(value.primaryLoading()) return const SizedBox.shrink();
+ if(value.primaryLoading()) return const Icon(Icons.chat);
int messages = value.getRoomsResponse.data.map((e) => e.unreadMessages).reduce((a, b) => a+b);
return badges.Badge(
showBadge: messages > 0,
- badgeStyle: const badges.BadgeStyle(
- badgeColor: Colors.white
+ position: badges.BadgePosition.bottomEnd(),
+ badgeStyle: badges.BadgeStyle(
+ badgeColor: Theme.of(context).primaryColor,
),
- badgeContent: Text("$messages", style: const TextStyle(color: Colors.black)),
+ badgeContent: Text("$messages", style: const TextStyle(color: Colors.white)),
child: const Icon(Icons.chat),
);
},
),
- title: "Talk"
+ title: "Talk",
),
PersistentBottomNavBarItem(
activeColorPrimary: Theme.of(context).primaryColor,
diff --git a/pubspec.yaml b/pubspec.yaml
index dd633ea..5347ddf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
-version: 1.0.0+1
+version: 1.0.0+2
environment:
sdk: '>=2.18.4 <3.0.0'