dismmisble text widget

this-kin · Feb 9, 2022 · 7a0b5ac · 7a0b5ac
1 parent 55d375b
commit 7a0b5ac
Show file tree

Hide file tree

Showing 12 changed files with 140 additions and 142 deletions.
diff --git a/README.md b/README.md
@@ -80,6 +80,7 @@ flutter build apk
 - Multi-Language Localization (English, French, Portuguese)
 - Local Notification
 - Follow on Twitter
+- Dismissible Slider 
 
 # Coming Soon
 - Attachment (image, audio, doc/pdf)
@@ -88,7 +89,7 @@ flutter build apk
 - save theme state
 - save language state
 - daily reminder 
-- dismissible delete and update
+- dismissible to update
 - charts for task 
 - create and display image task 
 - create and display audio task 

diff --git a/assets/images/user.png b/assets/images/user.png
diff --git a/lib/controllers/item_controller.dart b/lib/controllers/item_controller.dart
@@ -1,9 +1,11 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:path_provider/path_provider.dart';
 import 'package:todey/core/sqflite_db.dart';
 import 'package:todey/models/todo_model.dart';
 import 'package:todey/utils/helper.dart';
+import 'dart:io' as io;
 
 class EventController extends GetxController {
   var dateNow = DateTime.now();
@@ -87,4 +89,9 @@ class EventController extends GetxController {
   //     print(result.files[0].name);
   //   }
   // }
+
+  void _disposeControllers() {
+    noteController.value.clear();
+    titleController.value.clear();
+  }
 }
diff --git a/lib/controllers/settings_controller.dart b/lib/controllers/settings_controller.dart
@@ -1,7 +1,7 @@
 import 'package:feedback/feedback.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:todey/helpers/sharepreference_helper.dart';
+import 'package:todey/services/sharepreference_helper.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class SettingController extends GetxController {

diff --git a/lib/main.dart b/lib/main.dart
@@ -5,6 +5,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_phoenix/flutter_phoenix.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import 'package:todey/controllers/settings_controller.dart';
 import 'package:todey/core/sqflite_db.dart';
 import 'package:todey/modules/onboard/onboard.dart';
 import 'package:todey/services/auth_service.dart';
@@ -19,7 +20,10 @@ void main() async {
   SystemChrome.setPreferredOrientations([
     DeviceOrientation.portraitUp,
     DeviceOrientation.portraitDown,
-  ]).then((value) => Get.put(AuthService()));
+  ]).then((value) {
+    Get.put(AuthService());
+    Get.put(SettingController());
+  });
   runApp(BetterFeedback(child: MyApp()));
 }
 

diff --git a/lib/modules/create/components/second_compo.dart b/lib/modules/create/components/second_compo.dart
@@ -129,8 +129,6 @@ class _SecondComponentState extends State<SecondComponent> {
                       onPressed: () {
                         //activate recorder
                         print("clicked");
-
-                        //    _con.recordAudio();
                       },
                       iconData: Icons.mic_rounded,
                       color: theme.accentColor,

diff --git a/lib/modules/dashboard/dashboard.dart b/lib/modules/dashboard/dashboard.dart
@@ -1,10 +1,11 @@
 import 'package:date_picker_timeline/date_picker_widget.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:get/get_utils/src/extensions/internacionalization.dart';
 import 'package:todey/controllers/item_controller.dart';
-import 'package:todey/models/language_models.dart';
+import 'package:todey/models/todo_model.dart';
 import 'package:todey/modules/dashboard/widget/text_widget.dart';
 import 'package:todey/services/auth_service.dart';
 import 'package:todey/utils/constant.dart';
@@ -79,30 +80,54 @@ class _DashboardState extends State<Dashboard> {
           Flexible(
             child: Container(
               // margin: EdgeInsets.only(right: 10.w),
-              child: Obx(() => _event.events.isEmpty
-                  ? emptyEvents()
-                  : Container(
-                      child: ListView.builder(
-                        itemCount: _event.events.length,
-                        itemBuilder: (BuildContext context, int index) {
-                          return GetX<EventController>(
-                            builder: (controller) {
+              child: Obx(
+                () => _event.events.isEmpty
+                    ? emptyEvents()
+                    : Container(
+                        child: ListView.builder(
+                          itemCount: _event.events.length,
+                          itemBuilder: (BuildContext context, int index) {
+                            return GetX<EventController>(
+                                // ignore: missing_return
+                                builder: (controller) {
                               //
                               var snapshot = controller.events[index];
-                              return TextWidget(
-                                eventCategory: snapshot.eventCategory,
-                                eventCreatedDate: snapshot.eventCreatedDate,
-                                eventId: snapshot.id,
-                                eventIndex: index,
-                                eventNote: snapshot.eventNote,
-                                eventTitle: snapshot.eventTitle,
-                                eventType: snapshot.eventType,
-                              );
-                            },
-                          );
-                        },
+                              // ignore: invalid_use_of_protected_member, unused_local_variable
+                              for (final EventModel item
+                                  in controller.events.value)
+                                return Dismissible(
+                                  onDismissed: (direction) {
+                                    // delete events
+                                    _event.deleteEvent(
+                                        id: snapshot.id, index: index);
+                                  },
+                                  background: Padding(
+                                    padding: const EdgeInsets.all(8.0),
+                                    child: Container(
+                                      color: kDeletedColor,
+                                      alignment: Alignment.center,
+                                      child: Icon(
+                                        CupertinoIcons.delete,
+                                        color: Colors.white,
+                                      ),
+                                    ),
+                                  ),
+                                  key: ValueKey(index),
+                                  child: TextWidget(
+                                    eventCategory: snapshot.eventCategory,
+                                    eventCreatedDate: snapshot.eventCreatedDate,
+                                    eventId: snapshot.id,
+                                    eventIndex: index,
+                                    eventNote: snapshot.eventNote,
+                                    eventTitle: snapshot.eventTitle,
+                                    eventType: snapshot.eventType,
+                                  ),
+                                );
+                            });
+                          },
+                        ),
                       ),
-                    )),
+              ),
             ),
           ),
         ]),

diff --git a/lib/modules/dashboard/widget/text_widget.dart b/lib/modules/dashboard/widget/text_widget.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:todey/utils/constant.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:todey/utils/constant.dart';
 import 'package:todey/utils/helper.dart';
 
 class TextWidget extends StatefulWidget {
@@ -32,130 +32,94 @@ class TextWidget extends StatefulWidget {
 class _TextWidgetState extends State<TextWidget> {
   bool _isExpanded = false;
 
+  void collapse() {
+    setState(() {
+      _isExpanded = !_isExpanded;
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     var theme = Theme.of(context);
-    return Container(
-      padding: const EdgeInsets.only(left: 10),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-          SizedBox(width: MediaQuery.of(context).size.width * 0.1),
-          Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisAlignment: MainAxisAlignment.center,
+    return InkWell(
+      onTap: () {
+        collapse();
+      },
+      child: Padding(
+        padding: EdgeInsets.only(bottom: 8.0.h),
+        child: AnimatedContainer(
+          height: _isExpanded ? 120.h : 100.h,
+          width: double.infinity,
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(15.sp),
+            color: widget.eventCategory == "Important"
+                ? theme.primaryColor
+                : kAccentColor,
+          ),
+          padding: EdgeInsets.symmetric(horizontal: 10.w),
+          duration: const Duration(milliseconds: 300),
+          curve: Curves.bounceInOut,
+          child: Row(
             children: [
-              CircleAvatar(
-                backgroundColor: avatarColor(widget.eventCategory),
-                backgroundImage: AssetImage(getAvatar(widget.eventType)),
-                radius: 22.sp,
-              ),
-              //event Title
               Container(
-                width: 100.w,
-                height: 20.h,
-                child: Text(
-                  widget.eventTitle,
-                  overflow: TextOverflow.fade,
-                  textScaleFactor: 0.7,
-                  style: TextStyle(
-                      color: kTextColor, fontFamily: "Raleway", fontSize: 18),
+                height: 50.h,
+                width: 50.w,
+                decoration: BoxDecoration(
+                  color: avatarColor(widget.eventType),
+                  shape: BoxShape.circle,
+                ),
+                padding: EdgeInsets.all(5.sp),
+                child: Image.asset(
+                  getAvatar(widget.eventType),
+                  fit: BoxFit.scaleDown,
                 ),
               ),
-              SizedBox(height: MediaQuery.of(context).size.height * 0.01),
-              //Event Notes
+              SizedBox(width: 20.w),
               Container(
-                width: 120.w,
-                height: 20.h,
-                child: Text(
-                  widget.eventNote,
-                  overflow: TextOverflow.ellipsis,
-                  style: TextStyle(
-                      //  color: kSettingColor,
-                      fontFamily: "MADType",
-                      fontWeight: FontWeight.w500,
-                      fontSize: 15),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    SizedBox(
+                      height: _isExpanded ? 30.h : 18.h,
+                      width: 120.w,
+                      child: Text(
+                        widget.eventTitle,
+                        maxLines: _isExpanded ? 2 : 1,
+                        style: theme.textTheme.overline.copyWith(
+                          color: Colors.white,
+                          fontSize: 13.sp,
+                        ),
+                      ),
+                    ),
+                    SizedBox(height: 12.h),
+                    SizedBox(
+                      height: 20.h,
+                      width: 170.w,
+                      child: Text(
+                        widget.eventNote,
+                        overflow: TextOverflow.ellipsis,
+                        style: theme.textTheme.headline5.copyWith(
+                          fontSize: 14.sp,
+                          fontWeight: FontWeight.w400,
+                          color: Colors.white,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              const Spacer(),
+              Text(
+                widget.eventCreatedDate,
+                style: theme.textTheme.button.copyWith(
+                  fontSize: 12.sp,
                 ),
               )
             ],
           ),
-          SizedBox(
-            width: MediaQuery.of(context).size.width * 0.15,
-          ),
-          Text(
-            widget.eventCreatedDate,
-            // style: kItemWidgetStyle,
-          )
-        ],
+        ),
       ),
     );
   }
 }
-
-/* 
-Padding(
-      padding: const EdgeInsets.symmetric(vertical: 5),
-      child: GestureDetector(
-        onTap: () {
-          setState(() {
-            _isExpanded = !_isExpanded;
-          });
-        },
-        child: AnimatedContainer(
-          height: _isExpanded ? 120.h : 90.h,
-          padding: EdgeInsets.symmetric(horizontal: 10.w),
-          decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(15.sp),
-            color: getColor(widget.eventCategory),
-          ),
-          duration: ConstanceData.kDuration,
-          curve: Curves.bounceInOut,
-          child: Row(crossAxisAlignment: CrossAxisAlignment.center, children: [
-            CircleAvatar(
-              backgroundColor: avatarColor(widget.eventCategory),
-              backgroundImage: AssetImage(getAvatar(widget.eventType)),
-              radius: 22.sp,
-            ),
-            SizedBox(width: 20.w),
-            Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  Container(
-                    width: 140.w,
-                    height: 20.h,
-                    child: Text(
-                      widget.eventTitle,
-                      overflow: TextOverflow.ellipsis,
-                      maxLines: _isExpanded ? 3 : 1,
-                      textScaleFactor: 0.7,
-                      style: theme.textTheme.overline,
-                    ),
-                  ),
-                  SizedBox(height: 10.h),
-                  Container(
-                    width: 140.w,
-                    height: _isExpanded ? 40.h : 12.h,
-                    child: Text(
-                      widget.eventNote,
-                      overflow: _isExpanded
-                          ? TextOverflow.visible
-                          : TextOverflow.ellipsis,
-                      maxLines: _isExpanded ? 3 : 2,
-                      style: theme.textTheme.headline5.copyWith(
-                        color: Colors.white,
-                      ),
-                    ),
-                  )
-                ]),
-            SizedBox(
-              width: MediaQuery.of(context).size.width * 0.15,
-            ),
-            Text(
-              widget.eventCreatedDate,
-            )
-          ]),
-        ),
-      ),
-    );
-    */
diff --git a/lib/modules/onboard/onboard.dart b/lib/modules/onboard/onboard.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:todey/helpers/sharepreference_helper.dart';
+import 'package:todey/services/sharepreference_helper.dart';
 import 'package:todey/models/welcome_model.dart';
 import 'package:todey/modules/home/home.dart';
 import 'package:todey/services/auth_service.dart';

diff --git a/lib/services/auth_service.dart b/lib/services/auth_service.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/state_manager.dart';
 import 'package:google_sign_in/google_sign_in.dart';
-import 'package:todey/helpers/sharepreference_helper.dart';
+import 'package:todey/services/sharepreference_helper.dart';
 import 'package:todey/modules/home/home.dart';
 import 'package:get/get.dart';
 import 'package:todey/modules/onboard/onboard.dart';

diff --git a/lib/helpers/sharepreference_helper.dart → lib/services/sharepreference_helper.dart b/lib/helpers/sharepreference_helper.dart → lib/services/sharepreference_helper.dart