8 Commits

Author SHA1 Message Date
marco 81222de7fe Merge pull request 'Added app theming' (#2) from development into main
Flutter APK Build / Build Flutter APK (push) Successful in 5m44s
Reviewed-on: #2
2026-06-19 01:37:42 +02:00
marco 6dc7161b41 added title 2026-06-19 01:36:22 +02:00
marco f1756b30d1 added padding to views 2026-06-19 01:35:46 +02:00
marco 77a524f3ec added basic app theme 2026-06-19 01:25:56 +02:00
marco 392ec22dcd Merge pull request 'Feature: dismissible tasks' (#1) from development into main
Flutter APK Build / Build Flutter APK (push) Successful in 5m43s
Reviewed-on: #1
2026-06-19 00:36:43 +02:00
marco 064c014f8b removed unused import 2026-06-19 00:35:38 +02:00
marco 410a7eb843 made tasks dismissible 2026-06-19 00:35:20 +02:00
marco 20b017b066 added alarmkey and locationkey to allowlist 2026-06-19 00:21:34 +02:00
7 changed files with 124 additions and 23 deletions
+37
View File
@@ -0,0 +1,37 @@
import 'package:flutter/material.dart';
class AppTheme {
AppTheme._();
static ThemeData get lightTheme => _baseTheme(
colorScheme: ColorScheme.fromSeed(
seedColor: Colors.indigo,
brightness: Brightness.light,
),
);
static ThemeData get darkTheme => _baseTheme(
colorScheme: ColorScheme.fromSeed(
seedColor: Colors.indigo,
brightness: Brightness.dark,
),
);
static ThemeData _baseTheme({required ColorScheme colorScheme}) {
final theme = ThemeData(useMaterial3: true, colorScheme: colorScheme);
final universalBorderRadius = BorderRadius.circular(12);
return theme.copyWith(
inputDecorationTheme: InputDecorationTheme(
border: OutlineInputBorder(borderRadius: universalBorderRadius),
),
listTileTheme: ListTileThemeData(
shape: RoundedRectangleBorder(
borderRadius: universalBorderRadius,
side: BorderSide(color: colorScheme.secondaryContainer, width: 2),
),
),
);
}
}
+3
View File
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'app_theme.dart';
import 'model/repositories/local_repository.dart';
import 'pages/task_edit_page.dart';
import 'pages/task_overview_page.dart';
@@ -33,6 +34,8 @@ class MainApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
return MaterialApp(
theme: AppTheme.lightTheme,
darkTheme: AppTheme.darkTheme,
routes: {
TaskOverviewPage.routeName: (context) => TaskOverviewPage(),
TaskEditPage.routeName: (context) => TaskEditPage(),
@@ -1,4 +1,3 @@
import '../location.dart';
import '../task.dart';
class CreateTaskRequest {
+6 -1
View File
@@ -22,7 +22,12 @@ class LocalRepository
if (_prefs == null) {
await SharedPreferencesWithCache.create(
cacheOptions: const SharedPreferencesWithCacheOptions(
allowList: <String>{_tasksKey, _taskOrderKey},
allowList: <String>{
_tasksKey,
_taskOrderKey,
_alarmsKey,
_locationsKey,
},
),
).then((value) => _prefs = value);
}
+2
View File
@@ -80,7 +80,9 @@ class _TaskEditPageState extends State<TaskEditPage> {
horizontal: MediaQuery.of(context).size.width * 0.05,
),
child: Column(
spacing: 12,
children: [
SizedBox(height: 6),
TextFormField(
autofocus: true,
controller: titleController,
+17 -3
View File
@@ -5,6 +5,7 @@ import '../model/extensions/controller_context.dart';
import '../model/task.dart';
import '../service/controllers/task_controller.dart';
import '../service/tools.dart';
import '../widgets/task_dismissible.dart';
import 'task_edit_page.dart';
class TaskOverviewPage extends StatefulWidget {
@@ -21,12 +22,17 @@ class _TaskOverviewPageState extends State<TaskOverviewPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(),
body: ReorderableListView.builder(
appBar: AppBar(title: Text('Hallo Yannick')),
body: Padding(
padding: EdgeInsetsGeometry.symmetric(
horizontal: MediaQuery.of(context).size.width * 0.05,
),
child: ReorderableListView.builder(
itemBuilder: itemBuilder,
itemCount: tasks.length,
onReorderItem: context.controller<TaskController>().reorderTask,
),
),
floatingActionButton: FloatingActionButton(
onPressed: onCreateTaskTapped,
child: Icon(Icons.add),
@@ -37,8 +43,14 @@ class _TaskOverviewPageState extends State<TaskOverviewPage> {
Widget itemBuilder(BuildContext context, int index) {
final task = tasks.elementAt(index);
return ListTile(
return Padding(
key: Key(task.id),
padding: const EdgeInsets.only(bottom: 12),
child: TaskDismissible(
key: Key(task.id),
onDismissedRight: () =>
context.controller<TaskController>().deleteTask(task),
child: ListTile(
title: Text(task.title),
subtitle: task.description.isNotEmpty ? Text(task.description) : null,
trailing: Checkbox(
@@ -55,6 +67,8 @@ class _TaskOverviewPageState extends State<TaskOverviewPage> {
);
}
},
),
),
);
}
+41
View File
@@ -0,0 +1,41 @@
import 'package:flutter/material.dart';
class TaskDismissible extends StatelessWidget {
const TaskDismissible({
required super.key,
this.onDismissedRight,
required this.child,
});
final VoidCallback? onDismissedRight;
final Widget child;
@override
Widget build(BuildContext context) {
return Dismissible(
key: key!,
direction: DismissDirection.startToEnd,
background: Container(
color: Theme.of(context).colorScheme.error,
child: Align(
alignment: AlignmentGeometry.centerLeft,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 12),
child: Icon(
Icons.delete,
color: Theme.of(context).colorScheme.onError,
),
),
),
),
onDismissed: onDismissed,
child: child,
);
}
void onDismissed(DismissDirection direction) {
if (direction == DismissDirection.startToEnd && onDismissedRight != null) {
onDismissedRight!();
}
}
}