Skip to content

Commit

Permalink
v1.0.1 completed
Browse files Browse the repository at this point in the history
  • Loading branch information
ErfanRht committed Sep 8, 2021
1 parent c0fc276 commit 8ce9735
Show file tree
Hide file tree
Showing 18 changed files with 89 additions and 63 deletions.
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ android {

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.todo"
applicationId "com.tasker.todolist.app"
minSdkVersion 16
targetSdkVersion 30
versionCode flutterVersionCode.toInteger()
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.todo">
package="com.tasker.todolist.app">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.todo">
package="com.tasker.todolist.app">
<uses-permission android:name="android.permission.INTERNET" />
<queries>
<intent>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.todo
package com.tasker.todolist.app

import io.flutter.embedding.android.FlutterActivity

Expand Down
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.todo">
package="com.tasker.todolist.app">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
2 changes: 1 addition & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'package:todo/constants/colors.dart';
import 'package:todo/constants/routes.dart';
import 'package:todo/controllers/main-controller.dart';
import 'package:todo/screens/home/home.dart';
import 'package:todo/screens/home/new-task/new-task.dart';
import 'package:todo/screens/new-task/new-task.dart';
import 'package:todo/screens/loading/loading.dart';
import 'package:todo/screens/welcome/welcome.dart';

Expand Down
8 changes: 8 additions & 0 deletions lib/screens/home/animations.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class HomeAnimationsController extends GetxController {
EdgeInsets titlePadding = EdgeInsets.only(top: 20, left: 25);
// tasks:
double tasksTitleOpacity = 0;
double notFoundOpacity = 0;
// floating button:
double floatingButtonOpacity = 0;

Expand All @@ -18,6 +19,7 @@ class HomeAnimationsController extends GetxController {
double newNavbarOpacity2,
double newTitleOpacity,
double newTasksTitleOpacity,
double newNotFoundOpacity,
double newFloatingButtonOpacity,
EdgeInsets newTitlePadding}) {
navbarOpacity1 =
Expand All @@ -27,6 +29,8 @@ class HomeAnimationsController extends GetxController {
titleOpacity = newTitleOpacity != null ? newTitleOpacity : titleOpacity;
tasksTitleOpacity =
newTasksTitleOpacity != null ? newTasksTitleOpacity : tasksTitleOpacity;
notFoundOpacity =
newNotFoundOpacity != null ? newNotFoundOpacity : notFoundOpacity;
floatingButtonOpacity = newFloatingButtonOpacity != null
? newFloatingButtonOpacity
: floatingButtonOpacity;
Expand Down Expand Up @@ -54,6 +58,10 @@ startHomeAnimations() async {
newTasksTitleOpacity: 1,
);
await Future.delayed(Duration(milliseconds: 500));
Get.find<HomeAnimationsController>().updateHomeAnimations(
newNotFoundOpacity: 1,
);
await Future.delayed(Duration(milliseconds: 500));
Get.find<HomeAnimationsController>().updateHomeAnimations(
newFloatingButtonOpacity: 1,
);
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/home/components/drawer/items/edit-profile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class EditProfileDialog extends StatelessWidget {
borderSide:
BorderSide(color: Colors.cyan, width: 2),
),
hintText: "Email",
hintText: _.userEmail != "" ? _.userEmail : "Email",
hintStyle: GoogleFonts.ubuntu(
fontSize: 17.5,
fontWeight: FontWeight.w500,
Expand Down
7 changes: 5 additions & 2 deletions lib/screens/home/components/navbar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,11 @@ class HomeNavbar extends StatelessWidget {
),
onPressed: () {
homeController.advancedDrawerController.showDrawer();
setSystemUIOverlayStyle(
systemUIOverlayStyle: SystemUIOverlayStyle.BLUE);
_isDark
? setSystemUIOverlayStyle(
systemUIOverlayStyle: SystemUIOverlayStyle.DARK)
: setSystemUIOverlayStyle(
systemUIOverlayStyle: SystemUIOverlayStyle.BLUE);
},
),
),
Expand Down
113 changes: 60 additions & 53 deletions lib/screens/home/components/tasks/items.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:google_fonts/google_fonts.dart';
import 'package:ms_undraw/ms_undraw.dart';
import 'package:todo/constants/colors.dart';
import 'package:todo/controllers/main-controller.dart';
import 'package:todo/screens/home/animations.dart';
import 'package:todo/screens/home/components/tasks/item.dart';

class HomeTasksItems extends StatefulWidget {
Expand All @@ -20,63 +21,69 @@ class _HomeTasksItemsState extends State<HomeTasksItems> {
final Brightness brightnessValue =
MediaQuery.of(context).platformBrightness;
_isDark = brightnessValue == Brightness.dark;
return GetBuilder<MainController>(
builder: (_) {
return AnimatedSwitcher(
duration: Duration(milliseconds: 0),
child: _.tasks.length != 0
? ListView.builder(
reverse: true,
shrinkWrap: true,
physics: BouncingScrollPhysics(),
itemCount: _.tasks.length,
itemBuilder: (context, index) {
return TasksItem(
index: index,
);
},
)
: Container(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Text(
"You have no task for today!",
style: GoogleFonts.ubuntu(
color: _isDark
? kBackgroundColor.withOpacity(0.8)
: kSecondaryColor,
fontSize: 22.2,
fontWeight: FontWeight.w700),
),
Padding(
padding: EdgeInsets.only(left: 50, right: 50),
child: UnDraw(
height: MediaQuery.of(context).size.width - 100,
color: _isDark
? kBackgroundColor.withOpacity(0.8)
: kSecondaryColor,
illustration: UnDrawIllustration.no_data,
placeholder: Padding(
padding: EdgeInsets.only(top: 100),
child: SpinKitDoubleBounce(
return GetBuilder<HomeAnimationsController>(builder: (__) {
return GetBuilder<MainController>(
builder: (_) {
return AnimatedSwitcher(
duration: Duration(milliseconds: 0),
child: _.tasks.length != 0
? ListView.builder(
reverse: true,
shrinkWrap: true,
physics: BouncingScrollPhysics(),
itemCount: _.tasks.length,
itemBuilder: (context, index) {
return TasksItem(
index: index,
);
},
)
: AnimatedOpacity(
opacity: __.notFoundOpacity,
duration: Duration(milliseconds: 500),
child: Container(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SizedBox(
height: 100,
),
Text(
"You have no task for today!",
style: GoogleFonts.ubuntu(
color: _isDark
? kBackgroundColor.withOpacity(0.8)
: kSecondaryColor,
fontSize: 22.2,
fontWeight: FontWeight.w700),
),
Padding(
padding: EdgeInsets.only(left: 50, right: 50),
child: UnDraw(
height: MediaQuery.of(context).size.width - 100,
color: _isDark
? kBackgroundColor.withOpacity(0.8)
: kSecondaryColor,
size: 75,
illustration: UnDrawIllustration.not_found,
placeholder: Padding(
padding: EdgeInsets.only(top: 100),
child: SpinKitDoubleBounce(
color: _isDark
? kBackgroundColor.withOpacity(0.8)
: kSecondaryColor,
size: 75,
),
),
errorWidget: Icon(Icons.error_outline,
color: Colors.red, size: 50),
),
),
errorWidget: Icon(Icons.error_outline,
color: Colors.red, size: 50),
),
),
],
)),
);
},
);
],
)),
),
);
},
);
});
}
}
2 changes: 1 addition & 1 deletion lib/screens/loading/components/logo.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class LoadingLogo extends StatelessWidget {
opacity: _.textOpacity,
duration: _.animationSpeed,
child: Text(
"ToDo app",
"Tasker",
style: GoogleFonts.ubuntu(
color: isDark ? Colors.white : kSecondaryColor,
fontWeight: FontWeight.w900,
Expand Down
7 changes: 7 additions & 0 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
change_app_package_name:
dependency: "direct main"
description:
name: change_app_package_name
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.0"
characters:
dependency: transitive
description:
Expand Down
1 change: 1 addition & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ dependencies:
circular_check_box: ^1.0.4
ms_undraw: ^3.0.1+1
url_launcher: ^6.0.10
change_app_package_name: ^1.0.0

dev_dependencies:
flutter_test:
Expand Down

0 comments on commit 8ce9735

Please # to comment.