Merge pull request #8 from OpenShock/dev/update_animation_speed

Updating Animation Speed and other minor bugs
OpenShock · Oct 5, 2024 · f7ebd03 · f7ebd03
2 parents 90186fd + 4d27a10
commit f7ebd03
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 48 deletions.
diff --git a/lib/component/BottomNavbarWidget.dart b/lib/component/BottomNavbarWidget.dart
@@ -11,7 +11,7 @@ class BottomNavbarWidget extends StatelessWidget {
     this.backgroundColor,
     this.itemCornerRadius = 50,
     this.containerHeight = 56,
-    this.animationDuration = const Duration(milliseconds: 270),
+    this.animationDuration = const Duration(milliseconds: 150),
     this.mainAxisAlignment = MainAxisAlignment.spaceAround,
     required this.items,
     required this.onItemSelected,

diff --git a/lib/fragments/HomeFragment.dart b/lib/fragments/HomeFragment.dart
@@ -62,7 +62,8 @@ class HomeFragmentState extends State<HomeFragment> {
                     ).cornerRadiusWithClipRRectOnly(bottomLeft: 20).onTap(
                       () {
                         SettingScreen().launch(context,
-                            pageRouteAnimation: PageRouteAnimation.Scale);
+                            pageRouteAnimation: PageRouteAnimation.Scale,
+                            duration: Duration(milliseconds: 150));
                       },
                     ),
                   ),

diff --git a/lib/fragments/SharedUsersFragment.dart b/lib/fragments/SharedUsersFragment.dart
@@ -123,6 +123,7 @@ class SharedUsersFragmentState extends State<SharedUsersFragment> {
               code = value;
             },
             decoration: InputDecoration(hintText: "Enter code"),
+            style: TextStyle(color: white),
           ),
           actions: [
             TextButton(

diff --git a/lib/main.dart b/lib/main.dart
@@ -13,7 +13,7 @@ AppStore appStore = AppStore();
 late Openshockapi clientApi; // Declare your global API client object
 
 late SelfUser user; // Declare global user objec
-final appVersion = '1.0.0-BETA';
+final appVersion = '1.0.3';
 
 final storage = new FlutterSecureStorage();
 const isDarkModeOnPref = 'isDarkModeOnPref';
@@ -56,6 +56,7 @@ class MyApp extends StatelessWidget {
             : AppThemeData.darkTheme,
         navigatorKey: navigatorKey,
         scrollBehavior: SBehavior(),
+        themeAnimationDuration: Duration(milliseconds: 150),
         supportedLocales: LanguageDataModel.languageLocales(),
         localeResolutionCallback: (locale, supportedLocales) => locale,
       ),

diff --git a/lib/model/shockobjs/OwnShocker.dart b/lib/model/shockobjs/OwnShocker.dart
@@ -25,14 +25,14 @@ class OwnShocker {
   }
 
   Future<bool> shock(Openshockapi api, int int, int dur) async {
-    return api.sendControlSignal(this.id, int, dur, "SHOCK");
+    return api.sendControlSignal(this.id, int, dur, "Shock");
   }
 
   Future<bool> beep(Openshockapi api, int int, int dur) async {
-    return api.sendControlSignal(this.id, int, dur, "BEEP");
+    return api.sendControlSignal(this.id, int, dur, "Sound");
   }
 
   Future<bool> vibrate(Openshockapi api, int int, int dur) async {
-    return api.sendControlSignal(this.id, int, dur, "VIBRATE");
+    return api.sendControlSignal(this.id, int, dur, "Vibrate");
   }
 }
diff --git a/lib/model/shockobjs/SharedUserShocker.dart b/lib/model/shockobjs/SharedUserShocker.dart
@@ -32,14 +32,14 @@ class SharedUserShocker {
   }
 
   Future<bool> shock(Openshockapi api, int int, int dur) async {
-    return api.sendControlSignal(this.id, int, dur, "SHOCK");
+    return api.sendControlSignal(this.id, int, dur, "Shock");
   }
 
   Future<bool> beep(Openshockapi api, int int, int dur) async {
-    return api.sendControlSignal(this.id, int, dur, "BEEP");
+    return api.sendControlSignal(this.id, int, dur, "Sound");
   }
 
   Future<bool> vibrate(Openshockapi api, int int, int dur) async {
-    return api.sendControlSignal(this.id, int, dur, "VIBRATE");
+    return api.sendControlSignal(this.id, int, dur, "Vibrate");
   }
 }
diff --git a/lib/screens/EditProfileScreen.dart b/lib/screens/EditProfileScreen.dart
@@ -23,7 +23,8 @@ class EditProfileScreenState extends State<EditProfileScreen> {
   }
 
   void init() async {
-    //
+    emailController.text = user.email;
+    fNameController.text = user.name;
   }
 
   @override
@@ -32,8 +33,6 @@ class EditProfileScreenState extends State<EditProfileScreen> {
   }
 
   void setValue() {
-    emailController.text = user.email;
-    fNameController.text = user.name;
     setState(() {});
   }
 
@@ -46,7 +45,11 @@ class EditProfileScreenState extends State<EditProfileScreen> {
         width: context.width(),
         text: 'Update',
         onTap: () {
-          setValue();
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+                content: Text(
+                    "This feature is not yet available, please update your details on the website.")),
+          );
         },
       ).paddingSymmetric(horizontal: 16, vertical: 24),
       appBar: appBarWidget(

diff --git a/lib/screens/SettingScreen.dart b/lib/screens/SettingScreen.dart
@@ -51,25 +51,21 @@ class SettingScreenState extends State<SettingScreen> {
                     title: 'Edit Profile',
                     textColor: white,
                     onTap: () {
-                      EditProfileScreen().launch(
-                        context,
-                        pageRouteAnimation: PageRouteAnimation.SlideBottomTop,
-                      );
+                      EditProfileScreen().launch(context,
+                          pageRouteAnimation: PageRouteAnimation.SlideBottomTop,
+                          duration: Duration(milliseconds: 150));
                     },
                   ),
-                  settIngContainer(
-                    icon: Icons.person,
-                    title: 'Member',
-                    textColor: white,
-                    onTap: () {},
-                  ),
-                  settIngContainer(
-                      icon: Icons.settings, title: 'Setting', textColor: white),
-                  16.height,
-                  64.height,
-                  64.height,
-                  16.height,
-                  16.height,
+                  // settIngContainer(
+                  //   icon: Icons.person,
+                  //   title: 'Member',
+                  //   textColor: white,
+                  //   onTap: () {},
+                  // ),
+                  // settIngContainer(
+                  //     icon: Icons.settings, title: 'Setting', textColor: white),
+
+                  256.height,
 
                   // settIngContainer(
                   //     icon: Icons.chat,

diff --git a/pubspec.lock b/pubspec.lock
@@ -930,22 +930,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
-  syncfusion_flutter_core:
-    dependency: transitive
-    description:
-      name: syncfusion_flutter_core
-      sha256: "6e67726b85812afc7105725a23620b876ab7f6b04b8410e211330ffb8c2cdbe8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "26.2.14"
-  syncfusion_flutter_gauges:
-    dependency: "direct main"
-    description:
-      name: syncfusion_flutter_gauges
-      sha256: "1962f55f6424484f6701b5bfc00733fa84f320d4228f3a9c059cc077e5efb02c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "26.2.14"
   synchronized:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: A flutter project.
 
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 1.0.2+5
+version: 1.0.3+6
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
@@ -23,7 +23,6 @@ dependencies:
   flutter_mobx: ^2.2.1+1
 
   # Smart Home
-  syncfusion_flutter_gauges: ^26.2.13
   cached_network_image: ^3.4.1
   dashed_circle: ^0.0.2
   dotted_line: ^3.2.2