chore: ready for publishing

Get dependencies from the pub server and specify versions rather than
depend on "any"

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.22.2"
+  "flutter": "3.22.1"
 }

.github/workflows/melos-component-ci.yml

@@ -10,3 +10,5 @@ jobs:
     uses: Iconica-Development/.github/.github/workflows/melos-ci.yml@master
     secrets: inherit
     permissions: write-all
+    with:
+      flutter_version: 3.19.6

CHANGELOG.md

@@ -1,12 +1,5 @@
-## 5.1.1
+## 4.1.1
-
+- Update Firebase dependencies to their latest versions
-- Be honest about which Dart and Flutter versions we support
-- Relax our Firebase version constraint, we also support the current newest versions
-
-## 5.1.0
-
-* Added `routeToPostDetail` to the `TimelineUserStory` to allow for navigation to the post detail screen.
-* Fixed design issues.
 
 ## 4.1.0
 - Migrate to flutter 3.22 which deprecates the background and onBackground properties in the ThemeData and also removes MaterialStatePropertyAll

README.md

@@ -35,7 +35,45 @@ And import this package:   import 'package:intl/date_symbol_data_local.dart';
 ```
 
 ## How to use
-To use the userstory add the following code somewhere in your widget tree:
+To use the module within your Flutter-application with predefined `Go_router` routes you should add the following:
+
+Add go_router as dependency to your project.
+Add the following configuration to your flutter_application:
+
+```
+List<GoRoute> getTimelineStoryRoutes() => 
+  getTimelineStoryRoutes(
+    TimelineUserStoryConfiguration(
+      service: TimelineService(
+        postService: LocalTimelinePostService(),
+      ),
+      optionsBuilder: (context) {
+        return const TimelineOptions();
+      },
+    ),
+  );
+```
+
+Add the `getTimelineStoryRoutes()` to your go_router routes like so:
+
+```
+final GoRouter _router = GoRouter(
+  routes: <RouteBase>[
+    GoRoute(
+      path: '/',
+      builder: (BuildContext context, GoRouterState state) {
+        return const MyHomePage(
+          title: "home",
+        );
+      },
+    ),
+    ...getTimelineStoryRoutes(configuration: configuration);
+  ],
+);
+```
+
+The user story can also be used without go router:
+Add the following code somewhere in your widget tree:
 
 ````
 timeLineNavigatorUserStory(TimelineUserStoryConfiguration, context),

packages/flutter_timeline/example/lib/apps/go_router/app.dart

@@ -0,0 +1,41 @@
+import 'package:example/config/config.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_timeline/flutter_timeline.dart';
+import 'package:go_router/go_router.dart';
+
+List<GoRoute> getTimelineRoutes() => getTimelineStoryRoutes(
+      configuration: getConfig(TimelineService(
+        postService: LocalTimelinePostService(),
+      )),
+    );
+
+final _router = GoRouter(
+  initialLocation: '/timeline',
+  routes: [
+    ...getTimelineRoutes(),
+  ],
+);
+
+class GoRouterApp extends StatelessWidget {
+  const GoRouterApp({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp.router(
+      routerConfig: _router,
+      title: 'Flutter Timeline',
+      theme: ThemeData(
+        textTheme: const TextTheme(
+            titleLarge: TextStyle(
+                color: Color(0xffb71c6d), fontFamily: 'Playfair Display')),
+        colorScheme: ColorScheme.fromSeed(
+          seedColor: const Color(0xFFB8E2E8),
+          primary: const Color(0xffb71c6d),
+        ).copyWith(
+          surface: const Color(0XFFFAF9F6),
+        ),
+        useMaterial3: true,
+      ),
+    );
+  }
+}

packages/flutter_timeline/example/lib/config/config.dart

@@ -16,6 +16,25 @@ var options = TimelineOptions(
   paddings: TimelinePaddingOptions(
     mainPadding: const EdgeInsets.all(20).copyWith(top: 28),
   ),
+  categoriesOptions: CategoriesOptions(
+    categoriesBuilder: (context) => [
+      const TimelineCategory(
+        key: null,
+        title: 'All',
+        icon: SizedBox.shrink(),
+      ),
+      const TimelineCategory(
+        key: 'category1',
+        title: 'Category 1',
+        icon: SizedBox.shrink(),
+      ),
+      const TimelineCategory(
+        key: 'category2',
+        title: 'Category 2',
+        icon: SizedBox.shrink(),
+      ),
+    ],
+  ),
 );
 
 void navigateToOverview(

packages/flutter_timeline/example/lib/main.dart

@@ -1,9 +1,15 @@
-import 'package:example/apps/navigator/app.dart';
+// import 'package:example/apps/go_router/app.dart';
+// import 'package:example/apps/navigator/app.dart';
+import 'package:example/apps/go_router/app.dart';
 import 'package:flutter/material.dart';
 import 'package:intl/date_symbol_data_local.dart';
 
 void main() {
   initializeDateFormatting();
 
-  runApp(const NavigatorApp());
+  // Uncomment any, but only one, of these lines to run the example with specific navigation.
+
+  // runApp(const WidgetApp());
+  // runApp(const NavigatorApp());
+  runApp(const GoRouterApp());
 }

packages/flutter_timeline/example/pubspec.yaml

@@ -38,6 +38,7 @@ dependencies:
   flutter_timeline:
     path: ../
   intl: ^0.19.0
+  go_router: ^13.0.1
 
 dev_dependencies:
   flutter_test:

packages/flutter_timeline/lib/flutter_timeline.dart

@@ -5,6 +5,7 @@
 /// Flutter Timeline library
 library flutter_timeline;
 
+export 'package:flutter_timeline/src/flutter_timeline_gorouter_userstory.dart';
 export 'package:flutter_timeline/src/flutter_timeline_navigator_userstory.dart';
 export 'package:flutter_timeline/src/models/timeline_configuration.dart';
 export 'package:flutter_timeline/src/routes.dart';

packages/flutter_timeline/lib/src/flutter_timeline_gorouter_userstory.dart

@@ -0,0 +1,311 @@
+// SPDX-FileCopyrightText: 2023 Iconica
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+import 'package:collection/collection.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_timeline/flutter_timeline.dart';
+import 'package:flutter_timeline/src/go_router.dart';
+import 'package:go_router/go_router.dart';
+
+/// Retrieves a list of GoRouter routes for timeline stories.
+///
+/// This function retrieves a list of GoRouter routes for displaying timeline
+/// stories. It takes an optional [TimelineUserStoryConfiguration] as parameter.
+/// If no configuration is provided, default values will be used.
+List<GoRoute> getTimelineStoryRoutes({
+  TimelineUserStoryConfiguration? configuration,
+}) {
+  var config = configuration ??
+      TimelineUserStoryConfiguration(
+        userId: 'test_user',
+        service: TimelineService(
+          postService: LocalTimelinePostService(),
+        ),
+        optionsBuilder: (context) => const TimelineOptions(),
+      );
+
+  return <GoRoute>[
+    GoRoute(
+      path: TimelineUserStoryRoutes.timelineHome,
+      pageBuilder: (context, state) {
+        var service = config.serviceBuilder?.call(context) ?? config.service;
+        var timelineScreen = TimelineScreen(
+          userId: config.getUserId?.call(context) ?? config.userId,
+          onUserTap: (user) => config.onUserTap?.call(context, user),
+          allowAllDeletion: config.canDeleteAllPosts?.call(context) ?? false,
+          onRefresh: config.onRefresh,
+          service: service,
+          options: config.optionsBuilder(context),
+          onPostTap: (post) async =>
+              config.onPostTap?.call(context, post) ??
+              await context.push(
+                TimelineUserStoryRoutes.timelineViewPath(post.id),
+              ),
+          filterEnabled: config.filterEnabled,
+          postWidgetBuilder: config.postWidgetBuilder,
+        );
+
+        var button = FloatingActionButton(
+          backgroundColor: config
+                  .optionsBuilder(context)
+                  .theme
+                  .postCreationFloatingActionButtonColor ??
+              Theme.of(context).primaryColor,
+          onPressed: () async => context.push(
+            TimelineUserStoryRoutes.timelineCategorySelection,
+          ),
+          shape: const CircleBorder(),
+          child: const Icon(
+            Icons.add,
+            color: Colors.white,
+            size: 30,
+          ),
+        );
+
+        return buildScreenWithoutTransition(
+          context: context,
+          state: state,
+          child: config.homeOpenPageBuilder
+                  ?.call(context, timelineScreen, button) ??
+              Scaffold(
+                appBar: AppBar(
+                  backgroundColor: const Color(0xff212121),
+                  title: Text(
+                    config
+                        .optionsBuilder(context)
+                        .translations
+                        .timeLineScreenTitle,
+                    style: TextStyle(
+                      color: Theme.of(context).primaryColor,
+                      fontSize: 24,
+                      fontWeight: FontWeight.w800,
+                    ),
+                  ),
+                ),
+                body: timelineScreen,
+                floatingActionButton: button,
+              ),
+        );
+      },
+    ),
+    GoRoute(
+      path: TimelineUserStoryRoutes.timelineCategorySelection,
+      pageBuilder: (context, state) {
+        var timelineSelectionScreen = TimelineSelectionScreen(
+          options: config.optionsBuilder(context),
+          categories: config
+                  .optionsBuilder(context)
+                  .categoriesOptions
+                  .categoriesBuilder
+                  ?.call(context) ??
+              [],
+          onCategorySelected: (category) async {
+            await context.push(
+              TimelineUserStoryRoutes.timelinepostCreation(category.key ?? ''),
+            );
+          },
+        );
+
+        var backButton = IconButton(
+          color: Colors.white,
+          icon: const Icon(Icons.arrow_back_ios),
+          onPressed: () => context.go(TimelineUserStoryRoutes.timelineHome),
+        );
+
+        return buildScreenWithoutTransition(
+          context: context,
+          state: state,
+          child: config.categorySelectionOpenPageBuilder
+                  ?.call(context, timelineSelectionScreen) ??
+              Scaffold(
+                appBar: AppBar(
+                  leading: backButton,
+                  backgroundColor: const Color(0xff212121),
+                  title: Text(
+                    config.optionsBuilder(context).translations.postCreation,
+                    style: TextStyle(
+                      color: Theme.of(context).primaryColor,
+                      fontSize: 24,
+                      fontWeight: FontWeight.w800,
+                    ),
+                  ),
+                ),
+                body: timelineSelectionScreen,
+              ),
+        );
+      },
+    ),
+    GoRoute(
+      path: TimelineUserStoryRoutes.timelineView,
+      pageBuilder: (context, state) {
+        var service = config.serviceBuilder?.call(context) ?? config.service;
+        var post = service.postService.getPost(state.pathParameters['post']!);
+        var category = config.optionsBuilder
+            .call(context)
+            .categoriesOptions
+            .categoriesBuilder
+            ?.call(context)
+            .firstWhereOrNull(
+              (element) => element.key == post?.category,
+            );
+
+        var timelinePostWidget = TimelinePostScreen(
+          userId: config.getUserId?.call(context) ?? config.userId,
+          allowAllDeletion: config.canDeleteAllPosts?.call(context) ?? false,
+          options: config.optionsBuilder(context),
+          service: service,
+          post: post!,
+          onPostDelete: () async =>
+              config.onPostDelete?.call(context, post) ??
+              () async {
+                await service.postService.deletePost(post);
+                if (!context.mounted) return;
+                context.go(TimelineUserStoryRoutes.timelineHome);
+              }.call(),
+          onUserTap: (user) => config.onUserTap?.call(context, user),
+        );
+
+        var backButton = IconButton(
+          color: Colors.white,
+          icon: const Icon(Icons.arrow_back_ios),
+          onPressed: () => context.go(TimelineUserStoryRoutes.timelineHome),
+        );
+
+        return buildScreenWithoutTransition(
+          context: context,
+          state: state,
+          child: config.postViewOpenPageBuilder?.call(
+                context,
+                timelinePostWidget,
+                backButton,
+                post,
+                category,
+              ) ??
+              Scaffold(
+                appBar: AppBar(
+                  leading: backButton,
+                  backgroundColor: const Color(0xff212121),
+                  title: Text(
+                    category?.title ?? post.category ?? 'Category',
+                    style: TextStyle(
+                      color: Theme.of(context).primaryColor,
+                      fontSize: 24,
+                      fontWeight: FontWeight.w800,
+                    ),
+                  ),
+                ),
+                body: timelinePostWidget,
+              ),
+        );
+      },
+    ),
+    GoRoute(
+      path: TimelineUserStoryRoutes.timelinePostCreation,
+      pageBuilder: (context, state) {
+        var category = state.pathParameters['category'];
+        var service = config.serviceBuilder?.call(context) ?? config.service;
+        var timelinePostCreationWidget = TimelinePostCreationScreen(
+          userId: config.getUserId?.call(context) ?? config.userId,
+          options: config.optionsBuilder(context),
+          service: service,
+          onPostCreated: (post) async {
+            var newPost = await service.postService.createPost(post);
+            if (!context.mounted) return;
+            if (config.afterPostCreationGoHome) {
+              context.go(TimelineUserStoryRoutes.timelineHome);
+            } else {
+              await context
+                  .push(TimelineUserStoryRoutes.timelineViewPath(newPost.id));
+            }
+          },
+          onPostOverview: (post) async => context.push(
+            TimelineUserStoryRoutes.timelinePostOverview,
+            extra: post,
+          ),
+          enablePostOverviewScreen: config.enablePostOverviewScreen,
+          postCategory: category,
+        );
+
+        var backButton = IconButton(
+          icon: const Icon(
+            Icons.arrow_back_ios,
+            color: Colors.white,
+          ),
+          onPressed: () =>
+              context.go(TimelineUserStoryRoutes.timelineCategorySelection),
+        );
+
+        return buildScreenWithoutTransition(
+          context: context,
+          state: state,
+          child: config.postCreationOpenPageBuilder
+                  ?.call(context, timelinePostCreationWidget, backButton) ??
+              Scaffold(
+                appBar: AppBar(
+                  backgroundColor: const Color(0xff212121),
+                  leading: backButton,
+                  title: Text(
+                    config.optionsBuilder(context).translations.postCreation,
+                    style: TextStyle(
+                      color: Theme.of(context).primaryColor,
+                      fontSize: 24,
+                      fontWeight: FontWeight.w800,
+                    ),
+                  ),
+                ),
+                body: timelinePostCreationWidget,
+              ),
+        );
+      },
+    ),
+    GoRoute(
+      path: TimelineUserStoryRoutes.timelinePostOverview,
+      pageBuilder: (context, state) {
+        var post = state.extra! as TimelinePost;
+        var service = config.serviceBuilder?.call(context) ?? config.service;
+        var timelinePostOverviewWidget = TimelinePostOverviewScreen(
+          options: config.optionsBuilder(context),
+          service: service,
+          timelinePost: post,
+          onPostSubmit: (post) async {
+            await service.postService.createPost(post);
+            if (!context.mounted) return;
+            context.go(TimelineUserStoryRoutes.timelineHome);
+          },
+        );
+        var backButton = IconButton(
+          icon: const Icon(
+            Icons.arrow_back_ios,
+            color: Colors.white,
+          ),
+          onPressed: () async => context.pop(),
+        );
+
+        return buildScreenWithoutTransition(
+          context: context,
+          state: state,
+          child: config.postOverviewOpenPageBuilder?.call(
+                context,
+                timelinePostOverviewWidget,
+              ) ??
+              Scaffold(
+                appBar: AppBar(
+                  leading: backButton,
+                  backgroundColor: const Color(0xff212121),
+                  title: Text(
+                    config.optionsBuilder(context).translations.postOverview,
+                    style: TextStyle(
+                      color: Theme.of(context).primaryColor,
+                      fontSize: 24,
+                      fontWeight: FontWeight.w800,
+                    ),
+                  ),
+                ),
+                body: timelinePostOverviewWidget,
+              ),
+        );
+      },
+    ),
+  ];
+}

packages/flutter_timeline/lib/src/flutter_timeline_navigator_userstory.dart

@@ -10,13 +10,11 @@ import 'package:flutter_timeline/flutter_timeline.dart';
 /// This function creates a navigator for displaying user stories on a timeline.
 /// It takes a [BuildContext] and an optional [TimelineUserStoryConfiguration]
 /// as parameters. If no configuration is provided, default values will be used.
-late TimelineUserStoryConfiguration timelineUserStoryConfiguration;
-
 Widget timeLineNavigatorUserStory({
   required BuildContext context,
   TimelineUserStoryConfiguration? configuration,
 }) {
-  timelineUserStoryConfiguration = configuration ??
+  var config = configuration ??
       TimelineUserStoryConfiguration(
         userId: 'test_user',
         service: TimelineService(
@@ -25,10 +23,7 @@ Widget timeLineNavigatorUserStory({
         optionsBuilder: (context) => const TimelineOptions(),
       );
 
-  return _timelineScreenRoute(
+  return _timelineScreenRoute(configuration: config, context: context);
-    config: timelineUserStoryConfiguration,
-    context: context,
-  );
 }
 
 /// A widget function that creates a timeline screen route.
@@ -38,11 +33,18 @@ Widget timeLineNavigatorUserStory({
 /// parameters. If no configuration is provided, default values will be used.
 Widget _timelineScreenRoute({
   required BuildContext context,
-  required TimelineUserStoryConfiguration config,
+  TimelineUserStoryConfiguration? configuration,
-  String? initalCategory,
 }) {
+  var config = configuration ??
+      TimelineUserStoryConfiguration(
+        userId: 'test_user',
+        service: TimelineService(
+          postService: LocalTimelinePostService(),
+        ),
+        optionsBuilder: (context) => const TimelineOptions(),
+      );
+
   var timelineScreen = TimelineScreen(
-    timelineCategory: initalCategory,
     userId: config.getUserId?.call(context) ?? config.userId,
     allowAllDeletion: config.canDeleteAllPosts?.call(context) ?? false,
     onUserTap: (user) => config.onUserTap?.call(context, user),
@@ -53,7 +55,7 @@ Widget _timelineScreenRoute({
         Navigator.of(context).push(
           MaterialPageRoute(
             builder: (context) => _postDetailScreenRoute(
-              config: config,
+              configuration: config,
               context: context,
               post: post,
             ),
@@ -63,50 +65,40 @@ Widget _timelineScreenRoute({
     filterEnabled: config.filterEnabled,
     postWidgetBuilder: config.postWidgetBuilder,
   );
-  var theme = Theme.of(context);
+
   var button = FloatingActionButton(
     backgroundColor: config
             .optionsBuilder(context)
             .theme
             .postCreationFloatingActionButtonColor ??
-        theme.colorScheme.primary,
+        Theme.of(context).primaryColor,
-    onPressed: () async {
+    onPressed: () async => Navigator.of(context).push(
-      var selectedCategory = config.service.postService.selectedCategory;
-      if (selectedCategory != null && selectedCategory.key != null) {
-        await Navigator.of(context).push(
-          MaterialPageRoute(
-            builder: (context) => _postCreationScreenRoute(
-              config: config,
-              context: context,
-              category: selectedCategory,
-            ),
-          ),
-        );
-      } else {
-        await Navigator.of(context).push(
       MaterialPageRoute(
         builder: (context) => _postCategorySelectionScreen(
-              config: config,
+          configuration: config,
           context: context,
         ),
       ),
-        );
+    ),
-      }
-    },
     shape: const CircleBorder(),
     child: const Icon(
       Icons.add,
       color: Colors.white,
-      size: 24,
+      size: 30,
     ),
   );
 
   return config.homeOpenPageBuilder?.call(context, timelineScreen, button) ??
       Scaffold(
         appBar: AppBar(
+          backgroundColor: const Color(0xff212121),
           title: Text(
             config.optionsBuilder(context).translations.timeLineScreenTitle,
-            style: theme.textTheme.headlineLarge,
+            style: TextStyle(
+              color: Theme.of(context).primaryColor,
+              fontSize: 24,
+              fontWeight: FontWeight.w800,
+            ),
           ),
         ),
         body: timelineScreen,
@@ -123,8 +115,17 @@ Widget _timelineScreenRoute({
 Widget _postDetailScreenRoute({
   required BuildContext context,
   required TimelinePost post,
-  required TimelineUserStoryConfiguration config,
+  TimelineUserStoryConfiguration? configuration,
 }) {
+  var config = configuration ??
+      TimelineUserStoryConfiguration(
+        userId: 'test_user',
+        service: TimelineService(
+          postService: LocalTimelinePostService(),
+        ),
+        optionsBuilder: (context) => const TimelineOptions(),
+      );
+
   var timelinePostScreen = TimelinePostScreen(
     userId: config.getUserId?.call(context) ?? config.userId,
     allowAllDeletion: config.canDeleteAllPosts?.call(context) ?? false,
@@ -142,7 +143,11 @@ Widget _postDetailScreenRoute({
     onUserTap: (user) => config.onUserTap?.call(context, user),
   );
 
-  var category = config.service.postService.categories
+  var category = config
+      .optionsBuilder(context)
+      .categoriesOptions
+      .categoriesBuilder
+      ?.call(context)
       .firstWhere((element) => element.key == post.category);
 
   var backButton = IconButton(
@@ -155,9 +160,10 @@ Widget _postDetailScreenRoute({
           ?.call(context, timelinePostScreen, backButton, post, category) ??
       Scaffold(
         appBar: AppBar(
-          iconTheme: Theme.of(context).appBarTheme.iconTheme,
+          leading: backButton,
+          backgroundColor: const Color(0xff212121),
           title: Text(
-            category.title.toLowerCase(),
+            category?.title ?? post.category ?? 'Category',
             style: TextStyle(
               color: Theme.of(context).primaryColor,
               fontSize: 24,
@@ -177,24 +183,31 @@ Widget _postDetailScreenRoute({
 Widget _postCreationScreenRoute({
   required BuildContext context,
   required TimelineCategory category,
-  required TimelineUserStoryConfiguration config,
+  TimelineUserStoryConfiguration? configuration,
 }) {
+  var config = configuration ??
+      TimelineUserStoryConfiguration(
+        userId: 'test_user',
+        service: TimelineService(
+          postService: LocalTimelinePostService(),
+        ),
+        optionsBuilder: (context) => const TimelineOptions(),
+      );
+
   var timelinePostCreationScreen = TimelinePostCreationScreen(
     userId: config.getUserId?.call(context) ?? config.userId,
     options: config.optionsBuilder(context),
     service: config.service,
     onPostCreated: (post) async {
       var newPost = await config.service.postService.createPost(post);
-
       if (!context.mounted) return;
       if (config.afterPostCreationGoHome) {
         await Navigator.pushReplacement(
           context,
           MaterialPageRoute(
             builder: (context) => _timelineScreenRoute(
-              config: config,
+              configuration: config,
               context: context,
-              initalCategory: category.title,
             ),
           ),
         );
@@ -203,7 +216,7 @@ Widget _postCreationScreenRoute({
           context,
           MaterialPageRoute(
             builder: (context) => _postOverviewScreenRoute(
-              config: config,
+              configuration: config,
               context: context,
               post: newPost,
             ),
@@ -214,7 +227,7 @@ Widget _postCreationScreenRoute({
     onPostOverview: (post) async => Navigator.of(context).push(
       MaterialPageRoute(
         builder: (context) => _postOverviewScreenRoute(
-          config: config,
+          configuration: config,
           context: context,
           post: post,
         ),
@@ -236,7 +249,7 @@ Widget _postCreationScreenRoute({
           ?.call(context, timelinePostCreationScreen, backButton) ??
       Scaffold(
         appBar: AppBar(
-          iconTheme: Theme.of(context).appBarTheme.iconTheme,
+          backgroundColor: const Color(0xff212121),
           leading: backButton,
           title: Text(
             config.optionsBuilder(context).translations.postCreation,
@@ -260,23 +273,28 @@ Widget _postCreationScreenRoute({
 Widget _postOverviewScreenRoute({
   required BuildContext context,
   required TimelinePost post,
-  required TimelineUserStoryConfiguration config,
+  TimelineUserStoryConfiguration? configuration,
 }) {
+  var config = configuration ??
+      TimelineUserStoryConfiguration(
+        userId: 'test_user',
+        service: TimelineService(
+          postService: LocalTimelinePostService(),
+        ),
+        optionsBuilder: (context) => const TimelineOptions(),
+      );
+
   var timelinePostOverviewWidget = TimelinePostOverviewScreen(
     options: config.optionsBuilder(context),
     service: config.service,
     timelinePost: post,
     onPostSubmit: (post) async {
-      var createdPost = await config.service.postService.createPost(post);
+      await config.service.postService.createPost(post);
-      config.onPostCreate?.call(createdPost);
       if (context.mounted) {
         await Navigator.of(context).pushAndRemoveUntil(
           MaterialPageRoute(
-            builder: (context) => _timelineScreenRoute(
+            builder: (context) =>
-              config: config,
+                _timelineScreenRoute(configuration: config, context: context),
-              context: context,
-              initalCategory: post.category,
-            ),
           ),
           (route) => false,
         );
@@ -298,10 +316,10 @@ Widget _postOverviewScreenRoute({
       ) ??
       Scaffold(
         appBar: AppBar(
-          iconTheme: Theme.of(context).appBarTheme.iconTheme,
           leading: backButton,
+          backgroundColor: const Color(0xff212121),
           title: Text(
-            config.optionsBuilder(context).translations.postCreation,
+            config.optionsBuilder(context).translations.postOverview,
             style: TextStyle(
               color: Theme.of(context).primaryColor,
               fontSize: 24,
@@ -315,17 +333,30 @@ Widget _postOverviewScreenRoute({
 
 Widget _postCategorySelectionScreen({
   required BuildContext context,
-  required TimelineUserStoryConfiguration config,
+  TimelineUserStoryConfiguration? configuration,
 }) {
+  var config = configuration ??
+      TimelineUserStoryConfiguration(
+        userId: 'test_user',
+        service: TimelineService(
+          postService: LocalTimelinePostService(),
+        ),
+        optionsBuilder: (context) => const TimelineOptions(),
+      );
+
   var timelineSelectionScreen = TimelineSelectionScreen(
-    postService: config.service.postService,
     options: config.optionsBuilder(context),
-    categories: config.service.postService.categories,
+    categories: config
+            .optionsBuilder(context)
+            .categoriesOptions
+            .categoriesBuilder
+            ?.call(context) ??
+        [],
     onCategorySelected: (category) async {
       await Navigator.of(context).push(
         MaterialPageRoute(
           builder: (context) => _postCreationScreenRoute(
-            config: config,
+            configuration: config,
             context: context,
             category: category,
           ),
@@ -346,8 +377,8 @@ Widget _postCategorySelectionScreen({
           ?.call(context, timelineSelectionScreen) ??
       Scaffold(
         appBar: AppBar(
-          iconTheme: Theme.of(context).appBarTheme.iconTheme,
           leading: backButton,
+          backgroundColor: const Color(0xff212121),
           title: Text(
             config.optionsBuilder(context).translations.postCreation,
             style: TextStyle(
@@ -360,15 +391,3 @@ Widget _postCategorySelectionScreen({
         body: timelineSelectionScreen,
       );
 }
-
-Future<void> routeToPostDetail(BuildContext context, TimelinePost post) async {
-  await Navigator.of(context).push(
-    MaterialPageRoute(
-      builder: (context) => _postDetailScreenRoute(
-        config: timelineUserStoryConfiguration,
-        context: context,
-        post: post,
-      ),
-    ),
-  );
-}

packages/flutter_timeline/lib/src/go_router.dart

@@ -0,0 +1,30 @@
+// SPDX-FileCopyrightText: 2023 Iconica
+//
+// SPDX-License-Identifier: BSD-3-Clause
+
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+
+CustomTransitionPage buildScreenWithFadeTransition<T>({
+  required BuildContext context,
+  required GoRouterState state,
+  required Widget child,
+}) =>
+    CustomTransitionPage<T>(
+      key: state.pageKey,
+      child: child,
+      transitionsBuilder: (context, animation, secondaryAnimation, child) =>
+          FadeTransition(opacity: animation, child: child),
+    );
+
+CustomTransitionPage buildScreenWithoutTransition<T>({
+  required BuildContext context,
+  required GoRouterState state,
+  required Widget child,
+}) =>
+    CustomTransitionPage<T>(
+      key: state.pageKey,
+      child: child,
+      transitionsBuilder: (context, animation, secondaryAnimation, child) =>
+          child,
+    );

packages/flutter_timeline/lib/src/models/timeline_configuration.dart

@@ -65,7 +65,6 @@ class TimelineUserStoryConfiguration {
     this.afterPostCreationGoHome = false,
     this.enablePostOverviewScreen = true,
     this.categorySelectionOpenPageBuilder,
-    this.onPostCreate,
   });
 
   /// The ID of the user associated with this user story configuration.
@@ -160,6 +159,4 @@ class TimelineUserStoryConfiguration {
     BuildContext context,
     Widget child,
   )? categorySelectionOpenPageBuilder;
-
-  final Function(TimelinePost post)? onPostCreate;
 }

packages/flutter_timeline/pubspec.yaml

@@ -3,27 +3,29 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 name: flutter_timeline
 description: Visual elements and interface combined into one package
-version: 5.1.1
+version: 4.1.1
-homepage: https://github.com/Iconica-Development/flutter_timeline
 publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub
 
 environment:
-  sdk: ">=3.4.3 <4.0.0"
+  sdk: ">=3.1.3 <4.0.0"
-  flutter: '>=3.22.2'
 
 dependencies:
   flutter:
     sdk: flutter
+  go_router: ^12.1.3
+
+  collection: ^1.18.0
+
   flutter_timeline_view:
     hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
-    version: ^5.1.1
+    version: ^4.1.1
 
   flutter_timeline_interface:
     hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
-    version: ^5.1.1
+    version: ^4.1.1
-  collection: ^1.18.0
 
 dev_dependencies:
+  flutter_lints: ^2.0.0
   flutter_iconica_analysis:
     git:
       url: https://github.com/Iconica-Development/flutter_iconica_analysis

packages/flutter_timeline_firebase/lib/src/config/firebase_timeline_options.dart

@@ -2,14 +2,15 @@
 //
 // SPDX-License-Identifier: BSD-3-Clause
 
+import 'package:flutter/material.dart';
+
+@immutable
 class FirebaseTimelineOptions {
   const FirebaseTimelineOptions({
     this.usersCollectionName = 'users',
     this.timelineCollectionName = 'timeline',
-    this.timelineCategoryCollectionName = 'timeline_categories',
   });
 
   final String usersCollectionName;
   final String timelineCollectionName;
-  final String timelineCategoryCollectionName;
 }

packages/flutter_timeline_firebase/lib/src/models/firebase_user_document.dart

@@ -2,6 +2,9 @@
 //
 // SPDX-License-Identifier: BSD-3-Clause
 
+import 'package:flutter/material.dart';
+
+@immutable
 class FirebaseUserDocument {
   const FirebaseUserDocument({
     this.firstName,

packages/flutter_timeline_firebase/lib/src/service/firebase_post_service.dart

@@ -5,7 +5,6 @@
 import 'dart:typed_data';
 
 import 'package:cloud_firestore/cloud_firestore.dart';
-import 'package:collection/collection.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_storage/firebase_storage.dart';
 import 'package:flutter/material.dart';
@@ -39,12 +38,6 @@ class FirebaseTimelinePostService
   @override
   List<TimelinePost> posts = [];
 
-  @override
-  List<TimelineCategory> categories = [];
-
-  @override
-  TimelineCategory? selectedCategory;
-
   @override
   Future<TimelinePost> createPost(TimelinePost post) async {
     var postId = const Uuid().v4();
@@ -125,6 +118,7 @@ class FirebaseTimelinePostService
 
   @override
   Future<List<TimelinePost>> fetchPosts(String? category) async {
+    debugPrint('fetching posts from firebase with category: $category');
     var snapshot = (category != null)
         ? await _db
             .collection(_options.timelineCollectionName)
@@ -245,20 +239,10 @@ class FirebaseTimelinePostService
   }
 
   @override
-  Future<TimelinePost?> getPost(String postId) async {
+  TimelinePost? getPost(String postId) =>
-    var post = await _db
+      (posts.any((element) => element.id == postId))
-        .collection(_options.timelineCollectionName)
+          ? posts.firstWhere((element) => element.id == postId)
-        .doc(postId)
+          : null;
-        .withConverter<TimelinePost>(
-          fromFirestore: (snapshot, _) => TimelinePost.fromJson(
-            snapshot.id,
-            snapshot.data()!,
-          ),
-          toFirestore: (user, _) => user.toJson(),
-        )
-        .get();
-    return post.data();
-  }
 
   @override
   List<TimelinePost> getPosts(String? category) => posts
@@ -374,122 +358,4 @@ class FirebaseTimelinePostService
 
     return user;
   }
-
-  @override
-  Future<bool> addCategory(TimelineCategory category) async {
-    var exists = categories.firstWhereOrNull(
-      (element) => element.title.toLowerCase() == category.title.toLowerCase(),
-    );
-    if (exists != null) return false;
-    try {
-      await _db
-          .collection(_options.timelineCategoryCollectionName)
-          .add(category.toJson());
-      categories.add(category);
-      notifyListeners();
-      return true;
-    } on Exception catch (_) {
-      return false;
-    }
-  }
-
-  @override
-  Future<List<TimelineCategory>> fetchCategories() async {
-    categories.clear();
-    categories.add(
-      const TimelineCategory(
-        key: null,
-        title: 'All',
-      ),
-    );
-    var categoriesSnapshot = await _db
-        .collection(_options.timelineCategoryCollectionName)
-        .withConverter(
-          fromFirestore: (snapshot, _) =>
-              TimelineCategory.fromJson(snapshot.data()!),
-          toFirestore: (model, _) => model.toJson(),
-        )
-        .get();
-    categories.addAll(categoriesSnapshot.docs.map((e) => e.data()));
-
-    notifyListeners();
-    return categories;
-  }
-
-  @override
-  Future<TimelinePost> likeReaction(
-    String userId,
-    TimelinePost post,
-    String reactionId,
-  ) async {
-    // update the post with the new like
-    var updatedPost = post.copyWith(
-      reactions: post.reactions?.map(
-        (r) {
-          if (r.id == reactionId) {
-            return r.copyWith(
-              likedBy: (r.likedBy ?? [])..add(userId),
-            );
-          }
-          return r;
-        },
-      ).toList(),
-    );
-    posts = posts
-        .map(
-          (p) => p.id == post.id ? updatedPost : p,
-        )
-        .toList();
-    var postRef = _db.collection(_options.timelineCollectionName).doc(post.id);
-    await postRef.update({
-      'reactions': post.reactions
-          ?.map(
-            (r) =>
-                r.id == reactionId ? r.copyWith(likedBy: r.likedBy ?? []) : r,
-          )
-          .map((e) => e.toJson())
-          .toList(),
-    });
-    notifyListeners();
-    return updatedPost;
-  }
-
-  @override
-  Future<TimelinePost> unlikeReaction(
-    String userId,
-    TimelinePost post,
-    String reactionId,
-  ) async {
-    // update the post with the new like
-    var updatedPost = post.copyWith(
-      reactions: post.reactions?.map(
-        (r) {
-          if (r.id == reactionId) {
-            return r.copyWith(
-              likedBy: r.likedBy?..remove(userId),
-            );
-          }
-          return r;
-        },
-      ).toList(),
-    );
-    posts = posts
-        .map(
-          (p) => p.id == post.id ? updatedPost : p,
-        )
-        .toList();
-    var postRef = _db.collection(_options.timelineCollectionName).doc(post.id);
-    await postRef.update({
-      'reactions': post.reactions
-          ?.map(
-            (r) => r.id == reactionId
-                ? r.copyWith(likedBy: r.likedBy?..remove(userId))
-                : r,
-          )
-          .map((e) => e.toJson())
-          .toList(),
-    });
-    notifyListeners();
-    return updatedPost;
-  }
 }

packages/flutter_timeline_firebase/pubspec.yaml

@@ -4,30 +4,30 @@
 
 name: flutter_timeline_firebase
 description: Implementation of the Flutter Timeline interface for Firebase.
-version: 5.1.1
+version: 4.1.1
-homepage: https://github.com/Iconica-Development/flutter_timeline
 publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub
 
 environment:
-  sdk: ">=3.4.3 <4.0.0"
+  sdk: '>=3.1.3 <4.0.0'
-  flutter: '>=3.22.2'
 
 dependencies:
   flutter:
     sdk: flutter
-  cloud_firestore: '>=4.13.1 <6.0.0'
+  cloud_firestore: ^5.6.6
-  firebase_core: '>=2.22.0 <4.0.0'
+  firebase_core: ^3.13.0
-  firebase_storage: '>=11.5.1 <13.0.0'
+  firebase_storage: ^12.4.5
   uuid: ^4.2.1
-  collection: ^1.18.0
+
   flutter_timeline_interface:
     hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
-    version: ^5.1.1
+    version: ^4.1.1
 
 dev_dependencies:
+  flutter_lints: ^2.0.0
   flutter_iconica_analysis:
     git:
       url: https://github.com/Iconica-Development/flutter_iconica_analysis
       ref: 6.0.0
 
 flutter:
+

packages/flutter_timeline_interface/lib/src/model/timeline_category.dart

@@ -5,44 +5,13 @@ class TimelineCategory {
   const TimelineCategory({
     required this.key,
     required this.title,
-    this.icon,
+    required this.icon,
     this.canCreate = true,
     this.canView = true,
   });
-
-  TimelineCategory.fromJson(Map<String, dynamic> json)
-      : key = json['key'] as String?,
-        title = json['title'] as String,
-        icon = json['icon'] as Widget?,
-        canCreate = json['canCreate'] as bool? ?? true,
-        canView = json['canView'] as bool? ?? true;
-
   final String? key;
   final String title;
-  final Widget? icon;
+  final Widget icon;
   final bool canCreate;
   final bool canView;
-
-  TimelineCategory copyWith({
-    String? key,
-    String? title,
-    Widget? icon,
-    bool? canCreate,
-    bool? canView,
-  }) =>
-      TimelineCategory(
-        key: key ?? this.key,
-        title: title ?? this.title,
-        icon: icon ?? this.icon,
-        canCreate: canCreate ?? this.canCreate,
-        canView: canView ?? this.canView,
-      );
-
-  Map<String, Object?> toJson() => {
-        'key': key,
-        'title': title,
-        'icon': icon,
-        'canCreate': canCreate,
-        'canView': canView,
-      };
 }

packages/flutter_timeline_interface/lib/src/model/timeline_poster.dart

@@ -13,28 +13,11 @@ class TimelinePosterUserModel {
     this.imageUrl,
   });
 
-  factory TimelinePosterUserModel.fromJson(
-    Map<String, dynamic> json,
-    String userId,
-  ) =>
-      TimelinePosterUserModel(
-        userId: userId,
-        firstName: json['first_name'] as String?,
-        lastName: json['last_name'] as String?,
-        imageUrl: json['image_url'] as String?,
-      );
-
   final String userId;
   final String? firstName;
   final String? lastName;
   final String? imageUrl;
 
-  Map<String, dynamic> toJson() => {
-        'first_name': firstName,
-        'last_name': lastName,
-        'image_url': imageUrl,
-      };
-
   String? get fullName {
     var fullName = '';
 

packages/flutter_timeline_interface/lib/src/model/timeline_reaction.dart

@@ -16,7 +16,6 @@ class TimelinePostReaction {
     this.imageUrl,
     this.creator,
     this.createdAtString,
-    this.likedBy,
   });
 
   factory TimelinePostReaction.fromJson(
@@ -32,7 +31,6 @@ class TimelinePostReaction {
         imageUrl: json['image_url'] as String?,
         createdAt: DateTime.parse(json['created_at'] as String),
         createdAtString: json['created_at'] as String,
-        likedBy: (json['liked_by'] as List<dynamic>?)?.cast<String>() ?? [],
       );
 
   /// The unique identifier of the reaction.
@@ -59,8 +57,6 @@ class TimelinePostReaction {
   /// Reaction creation date as String with microseconds.
   final String? createdAtString;
 
-  final List<String>? likedBy;
-
   TimelinePostReaction copyWith({
     String? id,
     String? postId,
@@ -69,7 +65,6 @@ class TimelinePostReaction {
     String? reaction,
     String? imageUrl,
     DateTime? createdAt,
-    List<String>? likedBy,
   }) =>
       TimelinePostReaction(
         id: id ?? this.id,
@@ -79,7 +74,6 @@ class TimelinePostReaction {
         reaction: reaction ?? this.reaction,
         imageUrl: imageUrl ?? this.imageUrl,
         createdAt: createdAt ?? this.createdAt,
-        likedBy: likedBy ?? this.likedBy,
       );
 
   Map<String, dynamic> toJson() => <String, dynamic>{
@@ -88,7 +82,6 @@ class TimelinePostReaction {
           'reaction': reaction,
           'image_url': imageUrl,
           'created_at': createdAt.toIso8601String(),
-          'liked_by': likedBy,
         },
       };
 
@@ -98,7 +91,6 @@ class TimelinePostReaction {
           'reaction': reaction,
           'image_url': imageUrl,
           'created_at': createdAtString,
-          'liked_by': likedBy,
         },
       };
 }

packages/flutter_timeline_interface/lib/src/services/timeline_post_service.dart

@@ -5,12 +5,11 @@
 import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_timeline_interface/flutter_timeline_interface.dart';
+import 'package:flutter_timeline_interface/src/model/timeline_post.dart';
+import 'package:flutter_timeline_interface/src/model/timeline_reaction.dart';
 
 abstract class TimelinePostService with ChangeNotifier {
   List<TimelinePost> posts = [];
-  List<TimelineCategory> categories = [];
-  TimelineCategory? selectedCategory;
 
   Future<void> deletePost(TimelinePost post);
   Future<TimelinePost> deletePostReaction(TimelinePost post, String reactionId);
@@ -18,7 +17,7 @@ abstract class TimelinePostService with ChangeNotifier {
   Future<List<TimelinePost>> fetchPosts(String? category);
   Future<TimelinePost> fetchPost(TimelinePost post);
   Future<List<TimelinePost>> fetchPostsPaginated(String? category, int limit);
-  Future<TimelinePost?> getPost(String postId);
+  TimelinePost? getPost(String postId);
   List<TimelinePost> getPosts(String? category);
   Future<List<TimelinePost>> refreshPosts(String? category);
   Future<TimelinePost> fetchPostDetails(TimelinePost post);
@@ -29,17 +28,4 @@ abstract class TimelinePostService with ChangeNotifier {
   });
   Future<TimelinePost> likePost(String userId, TimelinePost post);
   Future<TimelinePost> unlikePost(String userId, TimelinePost post);
-
-  Future<List<TimelineCategory>> fetchCategories();
-  Future<bool> addCategory(TimelineCategory category);
-  Future<TimelinePost> likeReaction(
-    String userId,
-    TimelinePost post,
-    String reactionId,
-  );
-  Future<TimelinePost> unlikeReaction(
-    String userId,
-    TimelinePost post,
-    String reactionId,
-  );
 }

packages/flutter_timeline_interface/pubspec.yaml

@@ -4,18 +4,18 @@
 
 name: flutter_timeline_interface
 description: Interface for the service of the Flutter Timeline component
-version: 5.1.1
+version: 4.1.1
-homepage: https://github.com/Iconica-Development/flutter_timeline
 publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub
 
 environment:
-  sdk: '>=3.4.3 <4.0.0'
+  sdk: '>=3.1.3 <4.0.0'
 
 dependencies:
   flutter:
     sdk: flutter
 
 dev_dependencies:
+  flutter_lints: ^2.0.0
   flutter_iconica_analysis:
     git:
       url: https://github.com/Iconica-Development/flutter_iconica_analysis

packages/flutter_timeline_view/assets/Comment.svg

@@ -1,3 +0,0 @@
-<svg width="21" height="21" viewBox="0 0 21 21" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.5 3.5C14.3587 3.5 17.5 6.64125 17.5 10.5C17.5 14.3587 14.3587 17.5 10.5 17.5C9.4675 17.5 8.4525 17.2725 7.49875 16.8175C7.2625 16.7037 7.00875 16.6513 6.74625 16.6513C6.58 16.6513 6.41375 16.6775 6.25625 16.7213L3.45625 17.5437L4.27875 14.7438C4.40125 14.3325 4.36625 13.8863 4.1825 13.5013C3.7275 12.5475 3.5 11.5325 3.5 10.5C3.5 6.64125 6.64125 3.5 10.5 3.5ZM10.5 1.75C5.67 1.75 1.75 5.67 1.75 10.5C1.75 11.8475 2.065 13.1075 2.59875 14.2538L0.875 20.125L6.74625 18.4013C7.8925 18.935 9.1525 19.25 10.5 19.25C15.33 19.25 19.25 15.33 19.25 10.5C19.25 5.67 15.33 1.75 10.5 1.75Z" fill="#212121"/>
-</svg>

packages/flutter_timeline_view/assets/send.svg

@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.05813 12.3603L7.52523 16.4769L11.6405 22.944C12.0627 23.6073 12.7875 23.9999 13.5628 23.9999C13.6281 23.9999 13.6921 23.9974 13.7585 23.9913C14.6077 23.9186 15.3399 23.3858 15.6697 22.6006L23.8204 3.1673C24.1809 2.30831 23.989 1.3287 23.3318 0.6703C22.6734 0.0118984 21.6938 -0.181315 20.8348 0.179268L1.39902 8.33114C0.612628 8.66096 0.0797531 9.3932 0.008375 10.2424C-0.0642338 11.0915 0.339422 11.9037 1.05813 12.3603ZM2.1128 10.0331L21.5473 1.8825C21.6113 1.85542 21.6704 1.84435 21.7233 1.84435C21.8735 1.84435 21.9793 1.92926 22.0248 1.97603C22.0876 2.03756 22.2205 2.20862 22.1184 2.45352L13.9677 21.8881C13.8754 22.1084 13.6822 22.1465 13.6022 22.1539C13.5222 22.1588 13.3241 22.1539 13.1973 21.9533L9.36876 15.9378L14.4674 10.8392C14.828 10.4786 14.828 9.89408 14.4674 9.53349C14.1068 9.17291 13.5222 9.17291 13.1616 9.53349L8.06303 14.6321L2.04757 10.8035C1.85436 10.6805 1.83836 10.4971 1.84698 10.3986C1.85436 10.3199 1.89251 10.1254 2.1128 10.0331Z" fill="#212121"/>
-</svg>

packages/flutter_timeline_view/lib/src/config/timeline_options.dart

@@ -16,10 +16,10 @@ class TimelineOptions {
     this.translations = const TimelineTranslations.empty(),
     this.paddings = const TimelinePaddingOptions(),
     this.imagePickerConfig = const ImagePickerConfig(),
-    this.imagePickerTheme,
+    this.imagePickerTheme = const ImagePickerTheme(),
     this.timelinePostHeight,
     this.sortCommentsAscending = true,
-    this.sortPostsAscending = false,
+    this.sortPostsAscending,
     this.doubleTapTolike = false,
     this.iconsWithValues = false,
     this.likeAndDislikeIconsForDoubleTap = const (
@@ -38,7 +38,7 @@ class TimelineOptions {
     this.userAvatarBuilder,
     this.anonymousAvatarBuilder,
     this.nameBuilder,
-    this.iconSize = 24,
+    this.iconSize = 26,
     this.postWidgetHeight,
     this.filterOptions = const FilterOptions(),
     this.categoriesOptions = const CategoriesOptions(),
@@ -93,7 +93,7 @@ class TimelineOptions {
 
   /// ImagePickerTheme can be used to change the UI of the
   /// Image Picker Widget to change the text/icons to your liking.
-  final ImagePickerTheme? imagePickerTheme;
+  final ImagePickerTheme imagePickerTheme;
 
   /// ImagePickerConfig can be used to define the
   /// size and quality for the uploaded image.
@@ -160,7 +160,6 @@ class TimelineOptions {
     BuildContext context,
     Function() onPressed,
     String text,
-    TimelinePost post,
   )? postOverviewButtonBuilder;
 
   /// Optional builder to override the default alertdialog for post deletion
@@ -175,14 +174,53 @@ class TimelineOptions {
   final InputDecoration? contentInputDecoration;
 }
 
+List<TimelineCategory> _getDefaultCategories(context) => [
+      const TimelineCategory(
+        key: null,
+        title: 'All',
+        icon: Padding(
+          padding: EdgeInsets.only(right: 8.0),
+          child: Icon(
+            Icons.apps,
+            color: Colors.black,
+          ),
+        ),
+      ),
+      const TimelineCategory(
+        key: 'Category',
+        title: 'Category',
+        icon: Padding(
+          padding: EdgeInsets.only(right: 8.0),
+          child: Icon(
+            Icons.category,
+            color: Colors.black,
+          ),
+        ),
+      ),
+      const TimelineCategory(
+        key: 'Category with two lines',
+        title: 'Category with two lines',
+        icon: Padding(
+          padding: EdgeInsets.only(right: 8.0),
+          child: Icon(
+            Icons.category,
+            color: Colors.black,
+          ),
+        ),
+      ),
+    ];
+
 class CategoriesOptions {
   const CategoriesOptions({
+    this.categoriesBuilder = _getDefaultCategories,
     this.categoryButtonBuilder,
     this.categorySelectorHorizontalPadding,
   });
 
   /// List of categories that the user can select.
   /// If this is null no categories will be shown.
+  final List<TimelineCategory> Function(BuildContext context)?
+      categoriesBuilder;
 
   /// Abilty to override the standard category selector
   final Widget Function(
@@ -197,11 +235,17 @@ class CategoriesOptions {
   final double? categorySelectorHorizontalPadding;
 
   TimelineCategory? getCategoryByKey(
-    List<TimelineCategory> categories,
     BuildContext context,
     String? key,
-  ) =>
+  ) {
-      categories.firstWhereOrNull((category) => category.key == key);
+    if (categoriesBuilder == null) {
+      return null;
+    }
+
+    return categoriesBuilder!
+        .call(context)
+        .firstWhereOrNull((category) => category.key == key);
+  }
 }
 
 class FilterOptions {

packages/flutter_timeline_view/lib/src/config/timeline_paddings.dart

@@ -4,9 +4,9 @@ import 'package:flutter/material.dart';
 class TimelinePaddingOptions {
   const TimelinePaddingOptions({
     this.mainPadding =
-        const EdgeInsets.only(left: 32, top: 20, right: 32, bottom: 40),
+        const EdgeInsets.only(left: 12.0, top: 24.0, right: 12.0, bottom: 12.0),
     this.postPadding =
-        const EdgeInsets.only(left: 12.0, top: 12, right: 12.0, bottom: 8),
+        const EdgeInsets.symmetric(vertical: 12.0, horizontal: 12.0),
     this.postOverviewButtonBottomPadding = 30.0,
     this.categoryButtonTextPadding,
   });

packages/flutter_timeline_view/lib/src/config/timeline_translations.dart

@@ -28,6 +28,7 @@ class TimelineTranslations {
     required this.allowCommentsDescription,
     required this.commentsTitleOnPost,
     required this.checkPost,
+    required this.postAt,
     required this.deletePost,
     required this.deleteReaction,
     required this.deleteConfirmationMessage,
@@ -35,8 +36,7 @@ class TimelineTranslations {
     required this.deleteCancelButton,
     required this.deleteButton,
     required this.viewPost,
-    required this.oneLikeTitle,
+    required this.likesTitle,
-    required this.multipleLikesTitle,
     required this.commentsTitle,
     required this.firstComment,
     required this.writeComment,
@@ -49,14 +49,6 @@ class TimelineTranslations {
     required this.yes,
     required this.no,
     required this.timeLineScreenTitle,
-    required this.createCategoryPopuptitle,
-    required this.addCategoryTitle,
-    required this.addCategorySubmitButton,
-    required this.addCategoryCancelButtton,
-    required this.addCategoryHintText,
-    required this.addCategoryErrorText,
-    required this.titleErrorText,
-    required this.contentErrorText,
   });
 
   /// Default translations for the timeline component view
@@ -75,7 +67,7 @@ class TimelineTranslations {
     this.allowCommentsDescription =
         'Indicate whether people are allowed to respond',
     this.commentsTitleOnPost = 'Comments',
-    this.checkPost = 'Overview',
+    this.checkPost = 'Check post overview',
     this.deletePost = 'Delete post',
     this.deleteConfirmationTitle = 'Delete Post',
     this.deleteConfirmationMessage =
@@ -84,28 +76,20 @@ class TimelineTranslations {
     this.deleteCancelButton = 'Cancel',
     this.deleteReaction = 'Delete Reaction',
     this.viewPost = 'View post',
-    this.oneLikeTitle = 'like',
+    this.likesTitle = 'Likes',
-    this.multipleLikesTitle = 'likes',
     this.commentsTitle = 'Are people allowed to comment?',
     this.firstComment = 'Be the first to comment',
     this.writeComment = 'Write your comment here...',
+    this.postAt = 'at',
     this.postLoadingError = 'Something went wrong while loading the post',
     this.timelineSelectionDescription = 'Choose a category',
     this.searchHint = 'Search...',
     this.postOverview = 'Post Overview',
-    this.postIn = 'Post',
+    this.postIn = 'Post in',
     this.postCreation = 'add post',
     this.yes = 'Yes',
     this.no = 'No',
     this.timeLineScreenTitle = 'iconinstagram',
-    this.createCategoryPopuptitle = 'Choose a title for the new category',
-    this.addCategoryTitle = 'Add category',
-    this.addCategorySubmitButton = 'Add category',
-    this.addCategoryCancelButtton = 'Cancel',
-    this.addCategoryHintText = 'Category name...',
-    this.addCategoryErrorText = 'Please enter a category name',
-    this.titleErrorText = 'Please enter a title',
-    this.contentErrorText = 'Please enter content',
   });
 
   final String noPosts;
@@ -120,11 +104,10 @@ class TimelineTranslations {
   final String allowComments;
   final String allowCommentsDescription;
   final String checkPost;
+  final String postAt;
 
   final String titleHintText;
   final String contentHintText;
-  final String titleErrorText;
-  final String contentErrorText;
 
   final String deletePost;
   final String deleteConfirmationTitle;
@@ -134,8 +117,7 @@ class TimelineTranslations {
 
   final String deleteReaction;
   final String viewPost;
-  final String oneLikeTitle;
+  final String likesTitle;
-  final String multipleLikesTitle;
   final String commentsTitle;
   final String commentsTitleOnPost;
   final String writeComment;
@@ -150,13 +132,6 @@ class TimelineTranslations {
   final String postIn;
   final String postCreation;
 
-  final String createCategoryPopuptitle;
-  final String addCategoryTitle;
-  final String addCategorySubmitButton;
-  final String addCategoryCancelButtton;
-  final String addCategoryHintText;
-  final String addCategoryErrorText;
-
   final String yes;
   final String no;
   final String timeLineScreenTitle;
@@ -175,6 +150,7 @@ class TimelineTranslations {
     String? allowCommentsDescription,
     String? commentsTitleOnPost,
     String? checkPost,
+    String? postAt,
     String? deletePost,
     String? deleteConfirmationTitle,
     String? deleteConfirmationMessage,
@@ -182,8 +158,7 @@ class TimelineTranslations {
     String? deleteCancelButton,
     String? deleteReaction,
     String? viewPost,
-    String? oneLikeTitle,
+    String? likesTitle,
-    String? multipleLikesTitle,
     String? commentsTitle,
     String? writeComment,
     String? firstComment,
@@ -198,14 +173,6 @@ class TimelineTranslations {
     String? yes,
     String? no,
     String? timeLineScreenTitle,
-    String? createCategoryPopuptitle,
-    String? addCategoryTitle,
-    String? addCategorySubmitButton,
-    String? addCategoryCancelButtton,
-    String? addCategoryHintText,
-    String? addCategoryErrorText,
-    String? titleErrorText,
-    String? contentErrorText,
   }) =>
       TimelineTranslations(
         noPosts: noPosts ?? this.noPosts,
@@ -222,6 +189,7 @@ class TimelineTranslations {
             allowCommentsDescription ?? this.allowCommentsDescription,
         commentsTitleOnPost: commentsTitleOnPost ?? this.commentsTitleOnPost,
         checkPost: checkPost ?? this.checkPost,
+        postAt: postAt ?? this.postAt,
         deletePost: deletePost ?? this.deletePost,
         deleteConfirmationTitle:
             deleteConfirmationTitle ?? this.deleteConfirmationTitle,
@@ -231,8 +199,7 @@ class TimelineTranslations {
         deleteCancelButton: deleteCancelButton ?? this.deleteCancelButton,
         deleteReaction: deleteReaction ?? this.deleteReaction,
         viewPost: viewPost ?? this.viewPost,
-        oneLikeTitle: oneLikeTitle ?? this.oneLikeTitle,
+        likesTitle: likesTitle ?? this.likesTitle,
-        multipleLikesTitle: multipleLikesTitle ?? this.multipleLikesTitle,
         commentsTitle: commentsTitle ?? this.commentsTitle,
         writeComment: writeComment ?? this.writeComment,
         firstComment: firstComment ?? this.firstComment,
@@ -248,16 +215,5 @@ class TimelineTranslations {
         yes: yes ?? this.yes,
         no: no ?? this.no,
         timeLineScreenTitle: timeLineScreenTitle ?? this.timeLineScreenTitle,
-        addCategoryTitle: addCategoryTitle ?? this.addCategoryTitle,
-        addCategorySubmitButton:
-            addCategorySubmitButton ?? this.addCategorySubmitButton,
-        addCategoryCancelButtton:
-            addCategoryCancelButtton ?? this.addCategoryCancelButtton,
-        addCategoryHintText: addCategoryHintText ?? this.addCategoryHintText,
-        createCategoryPopuptitle:
-            createCategoryPopuptitle ?? this.createCategoryPopuptitle,
-        addCategoryErrorText: addCategoryErrorText ?? this.addCategoryErrorText,
-        titleErrorText: titleErrorText ?? this.titleErrorText,
-        contentErrorText: contentErrorText ?? this.contentErrorText,
       );
 }

packages/flutter_timeline_view/lib/src/screens/timeline_post_creation_screen.dart

@@ -11,8 +11,6 @@ import 'package:flutter_image_picker/flutter_image_picker.dart';
 import 'package:flutter_timeline_interface/flutter_timeline_interface.dart';
 import 'package:flutter_timeline_view/flutter_timeline_view.dart';
 import 'package:flutter_timeline_view/src/config/timeline_options.dart';
-import 'package:flutter_timeline_view/src/widgets/default_filled_button.dart';
-import 'package:flutter_timeline_view/src/widgets/post_creation_textfield.dart';
 
 class TimelinePostCreationScreen extends StatefulWidget {
   const TimelinePostCreationScreen({
@@ -53,32 +51,52 @@ class _TimelinePostCreationScreenState
   TextEditingController titleController = TextEditingController();
   TextEditingController contentController = TextEditingController();
   Uint8List? image;
+  bool editingDone = false;
   bool allowComments = false;
-  bool titleIsValid = false;
-  bool contentIsValid = false;
 
   @override
   void initState() {
-    titleController.addListener(_listenForInputs);
-    contentController.addListener(_listenForInputs);
-
     super.initState();
+    titleController.addListener(checkIfEditingDone);
+    contentController.addListener(checkIfEditingDone);
   }
 
-  void _listenForInputs() {
+  @override
-    titleIsValid = titleController.text.isNotEmpty;
+  void dispose() {
-    contentIsValid = contentController.text.isNotEmpty;
+    titleController.dispose();
-    setState(() {});
+    contentController.dispose();
+    super.dispose();
   }
 
-  var formkey = GlobalKey<FormState>();
+  void checkIfEditingDone() {
+    setState(() {
+      editingDone =
+          titleController.text.isNotEmpty && contentController.text.isNotEmpty;
+      if (widget.options.requireImageForPost) {
+        editingDone = editingDone && image != null;
+      }
+      if (widget.options.minTitleLength != null) {
+        editingDone = editingDone &&
+            titleController.text.length >= widget.options.minTitleLength!;
+      }
+      if (widget.options.maxTitleLength != null) {
+        editingDone = editingDone &&
+            titleController.text.length <= widget.options.maxTitleLength!;
+      }
+      if (widget.options.minContentLength != null) {
+        editingDone = editingDone &&
+            contentController.text.length >= widget.options.minContentLength!;
+      }
+      if (widget.options.maxContentLength != null) {
+        editingDone = editingDone &&
+            contentController.text.length <= widget.options.maxContentLength!;
+      }
+    });
+  }
 
   @override
   Widget build(BuildContext context) {
-    var imageRequired = widget.options.requireImageForPost;
-
     Future<void> onPostCreated() async {
-      var user = await widget.service.userService?.getUser(widget.userId);
       var post = TimelinePost(
         id: 'Post${Random().nextInt(1000)}',
         creatorId: widget.userId,
@@ -91,7 +109,6 @@ class _TimelinePostCreationScreenState
         createdAt: DateTime.now(),
         reactionEnabled: allowComments,
         image: image,
-        creator: user,
       );
 
       if (widget.enablePostOverviewScreen) {
@@ -102,93 +119,76 @@ class _TimelinePostCreationScreenState
     }
 
     var theme = Theme.of(context);
-
     return GestureDetector(
       onTap: () => FocusScope.of(context).unfocus(),
-      child: SingleChildScrollView(
       child: Padding(
         padding: widget.options.paddings.mainPadding,
-          child: Form(
+        child: SingleChildScrollView(
-            key: formkey,
           child: Column(
             mainAxisSize: MainAxisSize.max,
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Text(
                 widget.options.translations.title,
-                  style: theme.textTheme.titleMedium,
+                style: const TextStyle(
+                  fontWeight: FontWeight.w800,
+                  fontSize: 20,
                 ),
-                const SizedBox(
-                  height: 4,
               ),
               widget.options.textInputBuilder?.call(
                     titleController,
                     null,
                     '',
                   ) ??
-                    PostCreationTextfield(
+                  TextField(
-                      fieldKey: const ValueKey('title'),
+                    maxLength: widget.options.maxTitleLength,
                     controller: titleController,
+                    decoration: widget.options.contentInputDecoration ??
+                        InputDecoration(
                           hintText: widget.options.translations.titleHintText,
-                      textMaxLength: widget.options.maxTitleLength,
-                      decoration: widget.options.titleInputDecoration,
-                      textCapitalization: TextCapitalization.sentences,
-                      expands: null,
-                      minLines: null,
-                      maxLines: 1,
-                      validator: (value) {
-                        if (value == null || value.isEmpty) {
-                          return widget.options.translations.titleErrorText;
-                        }
-                        if (value.trim().isEmpty) {
-                          return widget.options.translations.titleErrorText;
-                        }
-                        return null;
-                      },
                         ),
-                const SizedBox(height: 24),
+                  ),
+              const SizedBox(height: 16),
               Text(
                 widget.options.translations.content,
-                  style: theme.textTheme.titleMedium,
+                style: const TextStyle(
+                  fontWeight: FontWeight.w800,
+                  fontSize: 20,
                 ),
+              ),
+              const SizedBox(height: 4),
               Text(
                 widget.options.translations.contentDescription,
-                  style: theme.textTheme.bodySmall,
+                style: theme.textTheme.bodyMedium,
               ),
-                const SizedBox(
+              // input field for the content
-                  height: 4,
+              TextField(
-                ),
-                PostCreationTextfield(
-                  fieldKey: const ValueKey('content'),
                 controller: contentController,
-                  hintText: widget.options.translations.contentHintText,
-                  textMaxLength: null,
-                  decoration: widget.options.contentInputDecoration,
                 textCapitalization: TextCapitalization.sentences,
                 expands: false,
-                  minLines: null,
                 maxLines: null,
-                  validator: (value) {
+                minLines: null,
-                    if (value == null || value.isEmpty) {
+                decoration: widget.options.contentInputDecoration ??
-                      return widget.options.translations.contentErrorText;
+                    InputDecoration(
-                    }
+                      hintText: widget.options.translations.contentHintText,
-                    if (value.trim().isEmpty) {
+                    ),
-                      return widget.options.translations.contentErrorText;
-                    }
-                    return null;
-                  },
               ),
               const SizedBox(
-                  height: 24,
+                height: 16,
               ),
+              // input field for the content
               Text(
                 widget.options.translations.uploadImage,
-                  style: theme.textTheme.titleMedium,
+                style: const TextStyle(
+                  fontWeight: FontWeight.w800,
+                  fontSize: 20,
+                ),
               ),
               Text(
                 widget.options.translations.uploadImageDescription,
-                  style: theme.textTheme.bodySmall,
+                style: theme.textTheme.bodyMedium,
               ),
+              // image picker field
               const SizedBox(
                 height: 8,
               ),
@@ -196,36 +196,15 @@ class _TimelinePostCreationScreenState
                 children: [
                   GestureDetector(
                     onTap: () async {
+                      // open a dialog to choose between camera and gallery
                       var result = await showModalBottomSheet<Uint8List?>(
                         context: context,
                         builder: (context) => Container(
-                            padding: const EdgeInsets.all(20),
+                          padding: const EdgeInsets.all(8.0),
                           color: theme.colorScheme.surface,
                           child: ImagePicker(
-                              config: widget.options.imagePickerConfig,
+                            imagePickerConfig: widget.options.imagePickerConfig,
-                              theme: widget.options.imagePickerTheme ??
+                            imagePickerTheme: widget.options.imagePickerTheme,
-                                  ImagePickerTheme(
-                                    titleStyle: theme.textTheme.titleMedium,
-                                    iconSize: 40,
-                                    selectImageText: 'UPLOAD FILE',
-                                    makePhotoText: 'TAKE PICTURE',
-                                    selectImageIcon: const Icon(
-                                      size: 40,
-                                      Icons.insert_drive_file,
-                                    ),
-                                    closeButtonBuilder: (onTap) => TextButton(
-                                      onPressed: () {
-                                        onTap();
-                                      },
-                                      child: Text(
-                                        'Cancel',
-                                        style: theme.textTheme.bodyMedium!
-                                            .copyWith(
-                                          decoration: TextDecoration.underline,
-                                        ),
-                                      ),
-                                    ),
-                                  ),
                           ),
                         ),
                       );
@@ -234,6 +213,7 @@ class _TimelinePostCreationScreenState
                           image = result;
                         });
                       }
+                      checkIfEditingDone();
                     },
                     child: ClipRRect(
                       borderRadius: BorderRadius.circular(8.0),
@@ -271,6 +251,7 @@ class _TimelinePostCreationScreenState
                           setState(() {
                             image = null;
                           });
+                          checkIfEditingDone();
                         },
                         child: Container(
                           decoration: BoxDecoration(
@@ -287,25 +268,24 @@ class _TimelinePostCreationScreenState
                   ],
                 ],
               ),
+
               const SizedBox(height: 16),
+
               Text(
                 widget.options.translations.commentsTitle,
-                  style: theme.textTheme.titleMedium,
+                style: const TextStyle(
+                  fontWeight: FontWeight.w800,
+                  fontSize: 20,
+                ),
               ),
               Text(
                 widget.options.translations.allowCommentsDescription,
-                  style: theme.textTheme.bodySmall,
+                style: theme.textTheme.bodyMedium,
-                ),
-                const SizedBox(
-                  height: 8,
               ),
               Row(
                 mainAxisAlignment: MainAxisAlignment.start,
                 children: <Widget>[
                   Checkbox(
-                      materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                      visualDensity:
-                          const VisualDensity(horizontal: -4, vertical: -4),
                     activeColor: theme.colorScheme.primary,
                     value: allowComments,
                     onChanged: (value) {
@@ -314,20 +294,8 @@ class _TimelinePostCreationScreenState
                       });
                     },
                   ),
-                    const SizedBox(
+                  Text(widget.options.translations.yes),
-                      width: 4,
-                    ),
-                    Text(
-                      widget.options.translations.yes,
-                      style: theme.textTheme.bodyMedium,
-                    ),
-                    const SizedBox(
-                      width: 32,
-                    ),
                   Checkbox(
-                      materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                      visualDensity:
-                          const VisualDensity(horizontal: -4, vertical: -4),
                     activeColor: theme.colorScheme.primary,
                     value: !allowComments,
                     onChanged: (value) {
@@ -336,52 +304,45 @@ class _TimelinePostCreationScreenState
                       });
                     },
                   ),
-                    const SizedBox(
+                  Text(widget.options.translations.no),
-                      width: 4,
-                    ),
-                    Text(
-                      widget.options.translations.no,
-                      style: theme.textTheme.bodyMedium,
-                    ),
                 ],
               ),
               const SizedBox(height: 120),
-                SafeArea(
+
-                  bottom: true,
+              Align(
-                  child: Align(
                 alignment: Alignment.bottomCenter,
-                    child: widget.options.buttonBuilder?.call(
+                child: (widget.options.buttonBuilder != null)
+                    ? widget.options.buttonBuilder!(
                         context,
                         onPostCreated,
                         widget.options.translations.checkPost,
-                          enabled: formkey.currentState!.validate(),
+                        enabled: editingDone,
-                        ) ??
+                      )
-                        Padding(
+                    : ElevatedButton(
-                          padding: const EdgeInsets.symmetric(horizontal: 48),
+                        style: ButtonStyle(
-                          child: Row(
+                          backgroundColor: WidgetStatePropertyAll(
-                            children: [
+                            theme.colorScheme.primary,
-                              Expanded(
+                          ),
-                                child: DefaultFilledButton(
+                        ),
-                                  onPressed: titleIsValid &&
+                        onPressed: editingDone
-                                          contentIsValid &&
-                                          (!imageRequired || image != null)
                             ? () async {
-                                          if (formkey.currentState!
-                                              .validate()) {
                                 await onPostCreated();
                                 await widget.service.postService
                                     .fetchPosts(null);
                               }
-                                        }
                             : null,
-                                  buttonText: widget.enablePostOverviewScreen
+                        child: Padding(
+                          padding: const EdgeInsets.all(12.0),
+                          child: Text(
+                            widget.enablePostOverviewScreen
                                 ? widget.options.translations.checkPost
-                                      : widget
+                                : widget.options.translations.postCreation,
-                                          .options.translations.postCreation,
+                            style: const TextStyle(
+                              color: Colors.white,
+                              fontSize: 20,
+                              fontWeight: FontWeight.w800,
                             ),
                           ),
-                            ],
-                          ),
                         ),
                       ),
               ),
@@ -389,7 +350,6 @@ class _TimelinePostCreationScreenState
           ),
         ),
       ),
-      ),
     );
   }
 }

packages/flutter_timeline_view/lib/src/screens/timeline_post_overview_screen.dart

@@ -1,7 +1,9 @@
+// ignore_for_file: prefer_expression_function_bodies
+
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_timeline_interface/flutter_timeline_interface.dart';
 import 'package:flutter_timeline_view/flutter_timeline_view.dart';
-import 'package:flutter_timeline_view/src/widgets/default_filled_button.dart';
 
 class TimelinePostOverviewScreen extends StatelessWidget {
   const TimelinePostOverviewScreen({
@@ -18,7 +20,13 @@ class TimelinePostOverviewScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    var isSubmitted = false;
+    // the timelinePost.category is a key so we need to get the category object
+    var timelineCategoryName = options.categoriesOptions.categoriesBuilder
+            ?.call(context)
+            .firstWhereOrNull((element) => element.key == timelinePost.category)
+            ?.title ??
+        timelinePost.category;
+    var buttonText = '${options.translations.postIn} $timelineCategoryName';
     return Column(
       mainAxisSize: MainAxisSize.max,
       children: [
@@ -35,43 +43,39 @@ class TimelinePostOverviewScreen extends StatelessWidget {
         options.postOverviewButtonBuilder?.call(
               context,
               () {
-                if (isSubmitted) return;
-                isSubmitted = true;
                 onPostSubmit(timelinePost);
               },
-              options.translations.postIn,
+              buttonText,
-              timelinePost,
             ) ??
             options.buttonBuilder?.call(
               context,
               () {
-                if (isSubmitted) return;
-                isSubmitted = true;
                 onPostSubmit(timelinePost);
               },
-              options.translations.postIn,
+              buttonText,
               enabled: true,
             ) ??
-            SafeArea(
+            ElevatedButton(
-              bottom: true,
+              style: ButtonStyle(
-              child: Padding(
+                backgroundColor:
-                padding: const EdgeInsets.symmetric(horizontal: 80),
+                    WidgetStatePropertyAll(Theme.of(context).primaryColor),
-                child: Row(
+              ),
-                  children: [
+              onPressed: () {
-                    Expanded(
-                      child: DefaultFilledButton(
-                        onPressed: () async {
-                          if (isSubmitted) return;
-                          isSubmitted = true;
                 onPostSubmit(timelinePost);
               },
-                        buttonText: options.translations.postIn,
+              child: Padding(
-                      ),
+                padding: const EdgeInsets.all(12.0),
-                    ),
+                child: Text(
-                  ],
+                  buttonText,
+                  style: const TextStyle(
+                    color: Colors.white,
+                    fontSize: 20,
+                    fontWeight: FontWeight.w800,
                   ),
                 ),
               ),
+            ),
+        SizedBox(height: options.paddings.postOverviewButtonBottomPadding),
       ],
     );
   }

packages/flutter_timeline_view/lib/src/screens/timeline_post_screen.dart

@@ -3,10 +3,12 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 import 'dart:async';
+import 'dart:typed_data';
 
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
+import 'package:flutter_html/flutter_html.dart';
+import 'package:flutter_image_picker/flutter_image_picker.dart';
 import 'package:flutter_timeline_interface/flutter_timeline_interface.dart';
 import 'package:flutter_timeline_view/src/config/timeline_options.dart';
 import 'package:flutter_timeline_view/src/widgets/reaction_bottom.dart';
@@ -58,6 +60,20 @@ class _TimelinePostScreenState extends State<TimelinePostScreen> {
   TimelinePost? post;
   bool isLoading = true;
 
+  late var textInputBuilder = widget.options.textInputBuilder ??
+      (controller, suffixIcon, hintText) => TextField(
+            textCapitalization: TextCapitalization.sentences,
+            controller: controller,
+            decoration: InputDecoration(
+              hintText: hintText,
+              suffixIcon: suffixIcon,
+              border: OutlineInputBorder(
+                borderRadius:
+                    BorderRadius.circular(20.0), // Adjust the value as needed
+              ),
+            ),
+          );
+
   @override
   void initState() {
     super.initState();
@@ -74,7 +90,8 @@ class _TimelinePostScreenState extends State<TimelinePostScreen> {
         post = loadedPost;
         isLoading = false;
       });
-    } on Exception catch (_) {
+    } on Exception catch (e) {
+      debugPrint('Error loading post: $e');
       setState(() {
         isLoading = false;
       });
@@ -91,10 +108,9 @@ class _TimelinePostScreenState extends State<TimelinePostScreen> {
   Widget build(BuildContext context) {
     var theme = Theme.of(context);
     var dateFormat = widget.options.dateFormat ??
-        DateFormat(
+        DateFormat('dd/MM/yyyy', Localizations.localeOf(context).languageCode);
-          "dd/MM/yyyy 'at' HH:mm",
+    var timeFormat = widget.options.timeFormat ?? DateFormat('HH:mm');
-          Localizations.localeOf(context).languageCode,
+
-        );
     if (isLoading) {
       return const Center(
         child: CircularProgressIndicator.adaptive(),
@@ -114,45 +130,6 @@ class _TimelinePostScreenState extends State<TimelinePostScreen> {
           ? a.createdAt.compareTo(b.createdAt)
           : b.createdAt.compareTo(a.createdAt),
     );
-    var isLikedByUser = post.likedBy?.contains(widget.userId) ?? false;
-
-    var textInputBuilder = widget.options.textInputBuilder ??
-        (controller, suffixIcon, hintText) => TextField(
-              style: theme.textTheme.bodyMedium,
-              textCapitalization: TextCapitalization.sentences,
-              controller: controller,
-              decoration: InputDecoration(
-                enabledBorder: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(25),
-                  borderSide: const BorderSide(
-                    color: Colors.black,
-                  ),
-                ),
-                focusedBorder: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(25),
-                  borderSide: const BorderSide(
-                    color: Colors.black,
-                  ),
-                ),
-                contentPadding: const EdgeInsets.symmetric(
-                  vertical: 0,
-                  horizontal: 16,
-                ),
-                hintText: widget.options.translations.writeComment,
-                hintStyle: theme.textTheme.bodyMedium!.copyWith(
-                  color: theme.textTheme.bodyMedium!.color!.withOpacity(0.5),
-                ),
-                fillColor: Colors.white,
-                filled: true,
-                border: const OutlineInputBorder(
-                  borderRadius: BorderRadius.all(
-                    Radius.circular(25),
-                  ),
-                  borderSide: BorderSide.none,
-                ),
-                suffixIcon: suffixIcon,
-              ),
-            );
 
     return Stack(
       children: [
@@ -168,7 +145,7 @@ class _TimelinePostScreenState extends State<TimelinePostScreen> {
           },
           child: SingleChildScrollView(
             child: Padding(
-              padding: widget.options.paddings.postPadding,
+              padding: widget.options.paddings.mainPadding,
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
@@ -214,9 +191,7 @@ class _TimelinePostScreenState extends State<TimelinePostScreen> {
                                     widget.options.translations.anonymousUser,
                                 style: widget.options.theme.textStyles
                                         .postCreatorTitleStyle ??
-                                    theme.textTheme.titleSmall!.copyWith(
+                                    theme.textTheme.titleMedium,
-                                      color: Colors.black,
-                                    ),
                               ),
                             ],
                           ),
@@ -224,7 +199,7 @@ class _TimelinePostScreenState extends State<TimelinePostScreen> {
                       const Spacer(),
                       if (!(widget.isOverviewScreen ?? false) &&
                           (widget.allowAllDeletion ||
-                              post.creator?.userId == widget.userId)) ...[
+                              post.creator?.userId == widget.userId))
                         PopupMenuButton(
                           onSelected: (value) async {
                             if (value == 'delete') {
@@ -264,7 +239,6 @@ class _TimelinePostScreenState extends State<TimelinePostScreen> {
                               ),
                         ),
                     ],
-                    ],
                   ),
                   // image of the posts
                   if (post.imageUrl != null || post.image != null) ...[
@@ -321,70 +295,72 @@ class _TimelinePostScreenState extends State<TimelinePostScreen> {
                   // post information
                   Row(
                     children: [
-                      IconButton(
+                      if (post.likedBy?.contains(widget.userId) ?? false) ...[
-                        padding: EdgeInsets.zero,
+                        InkWell(
-                        constraints: const BoxConstraints(),
+                          onTap: () async {
-                        onPressed: () async {
-                          if (widget.isOverviewScreen ?? false) return;
-                          if (isLikedByUser) {
                             updatePost(
                               await widget.service.postService.unlikePost(
                                 widget.userId,
                                 post,
                               ),
                             );
-                            setState(() {});
+                          },
-                          } else {
+                          child: Container(
+                            color: Colors.transparent,
+                            child: widget.options.theme.likedIcon ??
+                                Icon(
+                                  widget.post.likedBy
+                                              ?.contains(widget.userId) ??
+                                          false
+                                      ? Icons.favorite_rounded
+                                      : Icons.favorite_outline_outlined,
+                                ),
+                          ),
+                        ),
+                      ] else ...[
+                        InkWell(
+                          onTap: () async {
+                            if (widget.isOverviewScreen ?? false) return;
                             updatePost(
                               await widget.service.postService.likePost(
                                 widget.userId,
                                 post,
                               ),
                             );
-                            setState(() {});
-                          }
                           },
-                        icon: isLikedByUser
+                          child: Container(
-                            ? widget.options.theme.likedIcon ??
+                            color: Colors.transparent,
+                            child: widget.options.theme.likeIcon ??
                                 Icon(
-                                  Icons.favorite_rounded,
+                                  widget.post.likedBy
-                                  color: widget.options.theme.iconColor,
+                                              ?.contains(widget.userId) ??
-                                  size: widget.options.iconSize,
+                                          false
-                                )
+                                      ? Icons.favorite_rounded
-                            : widget.options.theme.likeIcon ??
+                                      : Icons.favorite_outline_outlined,
-                                Icon(
-                                  Icons.favorite_outline_outlined,
-                                  color: widget.options.theme.iconColor,
                                   size: widget.options.iconSize,
                                 ),
                           ),
+                        ),
+                      ],
                       const SizedBox(width: 8),
                       if (post.reactionEnabled)
                         widget.options.theme.commentIcon ??
-                            SvgPicture.asset(
+                            Icon(
-                              'assets/Comment.svg',
+                              Icons.chat_bubble_outline_rounded,
-                              package: 'flutter_timeline_view',
-                              // ignore: deprecated_member_use
                               color: widget.options.theme.iconColor,
-                              width: widget.options.iconSize,
+                              size: widget.options.iconSize,
-                              height: widget.options.iconSize,
                             ),
                     ],
                   ),
                   const SizedBox(height: 8),
-                  // ignore: avoid_bool_literals_in_conditional_expressions
-                  if (widget.isOverviewScreen != null
-                      ? !widget.isOverviewScreen!
-                      : false) ...[
                   Text(
-                      // ignore: lines_longer_than_80_chars
+                    '${post.likes} ${widget.options.translations.likesTitle}',
-                      '${post.likes} ${post.likes > 1 ? widget.options.translations.multipleLikesTitle : widget.options.translations.oneLikeTitle}',
+                    style: widget
-                      style: widget.options.theme.textStyles
+                            .options.theme.textStyles.postLikeTitleAndAmount ??
-                              .postLikeTitleAndAmount ??
                         theme.textTheme.titleSmall
                             ?.copyWith(color: Colors.black),
                   ),
-                  ],
+                  const SizedBox(height: 4),
                   Text.rich(
                     TextSpan(
                       text: widget.options.nameBuilder?.call(post.creator) ??
@@ -392,42 +368,62 @@ class _TimelinePostScreenState extends State<TimelinePostScreen> {
                           widget.options.translations.anonymousUser,
                       style: widget
                               .options.theme.textStyles.postCreatorNameStyle ??
-                          theme.textTheme.titleSmall!
+                          theme.textTheme.titleSmall,
-                              .copyWith(color: Colors.black),
                       children: [
+                        const TextSpan(text: ' '),
                         TextSpan(
                           text: post.title,
                           style:
                               widget.options.theme.textStyles.postTitleStyle ??
-                                  theme.textTheme.bodySmall,
+                                  theme.textTheme.bodyMedium,
                         ),
                       ],
                     ),
                   ),
                   const SizedBox(height: 20),
+                  Html(
+                    data: post.content,
+                    style: {
+                      'body': Style(
+                        padding: HtmlPaddings.zero,
+                        margin: Margins.zero,
+                      ),
+                      '#': Style(
+                        maxLines: 3,
+                        textOverflow: TextOverflow.ellipsis,
+                        padding: HtmlPaddings.zero,
+                        margin: Margins.zero,
+                      ),
+                      'H1': Style(
+                        padding: HtmlPaddings.zero,
+                        margin: Margins.zero,
+                      ),
+                      'H2': Style(
+                        padding: HtmlPaddings.zero,
+                        margin: Margins.zero,
+                      ),
+                      'H3': Style(
+                        padding: HtmlPaddings.zero,
+                        margin: Margins.zero,
+                      ),
+                    },
+                  ),
+                  const SizedBox(height: 4),
                   Text(
-                    post.content,
+                    '${dateFormat.format(post.createdAt)} '
+                    '${widget.options.translations.postAt} '
+                    '${timeFormat.format(post.createdAt)}',
                     style: theme.textTheme.bodySmall,
                   ),
-                  Text(
+                  const SizedBox(height: 20),
-                    '${dateFormat.format(post.createdAt)} ',
+                  if (post.reactionEnabled) ...[
-                    style: theme.textTheme.labelSmall?.copyWith(
-                      letterSpacing: 0.5,
-                    ),
-                  ),
-                  const SizedBox(height: 8),
-                  // ignore: avoid_bool_literals_in_conditional_expressions
-                  if (post.reactionEnabled && widget.isOverviewScreen != null
-                      ? !widget.isOverviewScreen!
-                      : false) ...[
                     Text(
                       widget.options.translations.commentsTitleOnPost,
-                      style: theme.textTheme.titleSmall!
+                      style: theme.textTheme.titleMedium,
-                          .copyWith(color: Colors.black),
                     ),
                     for (var reaction
                         in post.reactions ?? <TimelinePostReaction>[]) ...[
-                      const SizedBox(height: 4),
+                      const SizedBox(height: 16),
                       GestureDetector(
                         onLongPressStart: (details) async {
                           if (reaction.creatorId == widget.userId ||
@@ -465,13 +461,15 @@ class _TimelinePostScreenState extends State<TimelinePostScreen> {
                           }
                         },
                         child: Row(
-                          crossAxisAlignment: CrossAxisAlignment.start,
+                          crossAxisAlignment: reaction.imageUrl != null
+                              ? CrossAxisAlignment.start
+                              : CrossAxisAlignment.center,
                           children: [
                             if (reaction.creator?.imageUrl != null &&
                                 reaction.creator!.imageUrl!.isNotEmpty) ...[
                               widget.options.userAvatarBuilder?.call(
                                     reaction.creator!,
-                                    14,
+                                    28,
                                   ) ??
                                   CircleAvatar(
                                     radius: 14,
@@ -482,7 +480,7 @@ class _TimelinePostScreenState extends State<TimelinePostScreen> {
                             ] else ...[
                               widget.options.anonymousAvatarBuilder?.call(
                                     reaction.creator!,
-                                    14,
+                                    28,
                                   ) ??
                                   const CircleAvatar(
                                     radius: 14,
@@ -503,8 +501,7 @@ class _TimelinePostScreenState extends State<TimelinePostScreen> {
                                           reaction.creator?.fullName ??
                                           widget.options.translations
                                               .anonymousUser,
-                                      style: theme.textTheme.titleSmall!
+                                      style: theme.textTheme.titleSmall,
-                                          .copyWith(color: Colors.black),
                                     ),
                                     Padding(
                                       padding: const EdgeInsets.all(8.0),
@@ -525,91 +522,27 @@ class _TimelinePostScreenState extends State<TimelinePostScreen> {
                                         reaction.creator?.fullName ??
                                         widget
                                             .options.translations.anonymousUser,
-                                    style: theme.textTheme.titleSmall!
+                                    style: theme.textTheme.titleSmall,
-                                        .copyWith(color: Colors.black),
                                     children: [
                                       const TextSpan(text: '  '),
                                       TextSpan(
                                         text: reaction.reaction ?? '',
-                                        style: theme.textTheme.bodySmall,
+                                        style: theme.textTheme.bodyMedium,
                                       ),
-                                      const TextSpan(text: '\n'),
-                                      TextSpan(
-                                        text: dateFormat
-                                            .format(reaction.createdAt),
-                                        style: theme.textTheme.labelSmall!
-                                            .copyWith(
-                                          color: theme
-                                              .textTheme.labelSmall!.color!
-                                              .withOpacity(0.5),
-                                          letterSpacing: 0.5,
-                                        ),
-                                      ),
-
                                       // text should go to new line
                                     ],
                                   ),
                                 ),
                               ),
                             ],
-                            Builder(
-                              builder: (context) {
-                                var isLikedByUser =
-                                    reaction.likedBy?.contains(widget.userId) ??
-                                        false;
-                                return IconButton(
-                                  padding: const EdgeInsets.only(left: 12),
-                                  constraints: const BoxConstraints(),
-                                  onPressed: () async {
-                                    if (isLikedByUser) {
-                                      updatePost(
-                                        await widget.service.postService
-                                            .unlikeReaction(
-                                          widget.userId,
-                                          post,
-                                          reaction.id,
-                                        ),
-                                      );
-                                      setState(() {});
-                                    } else {
-                                      updatePost(
-                                        await widget.service.postService
-                                            .likeReaction(
-                                          widget.userId,
-                                          post,
-                                          reaction.id,
-                                        ),
-                                      );
-                                      setState(() {});
-                                    }
-                                  },
-                                  icon: isLikedByUser
-                                      ? widget.options.theme.likedIcon ??
-                                          Icon(
-                                            Icons.favorite_rounded,
-                                            color:
-                                                widget.options.theme.iconColor,
-                                            size: 14,
-                                          )
-                                      : widget.options.theme.likeIcon ??
-                                          Icon(
-                                            Icons.favorite_outline_outlined,
-                                            color:
-                                                widget.options.theme.iconColor,
-                                            size: 14,
-                                          ),
-                                );
-                              },
-                            ),
                           ],
                         ),
                       ),
-                      const SizedBox(height: 4),
                     ],
                     if (post.reactions?.isEmpty ?? true) ...[
+                      const SizedBox(height: 16),
                       Text(
                         widget.options.translations.firstComment,
-                        style: theme.textTheme.bodySmall,
                       ),
                     ],
                     const SizedBox(height: 120),
@@ -622,51 +555,36 @@ class _TimelinePostScreenState extends State<TimelinePostScreen> {
         if (post.reactionEnabled && !(widget.isOverviewScreen ?? false))
           Align(
             alignment: Alignment.bottomCenter,
-            child: Container(
-              color: theme.scaffoldBackgroundColor,
-              constraints: BoxConstraints(
-                maxWidth: MediaQuery.of(context).size.width,
-              ),
-              child: SafeArea(
-                bottom: true,
-                child: Row(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Padding(
-                      padding: const EdgeInsets.only(left: 8),
-                      child: post.creator!.imageUrl != null
-                          ? widget.options.userAvatarBuilder?.call(
-                                post.creator!,
-                                28,
-                              ) ??
-                              CircleAvatar(
-                                radius: 14,
-                                backgroundImage: CachedNetworkImageProvider(
-                                  post.creator!.imageUrl!,
-                                ),
-                              )
-                          : widget.options.anonymousAvatarBuilder?.call(
-                                post.creator!,
-                                28,
-                              ) ??
-                              const CircleAvatar(
-                                radius: 14,
-                                child: Icon(
-                                  Icons.person,
-                                ),
-                              ),
-                    ),
-                    Flexible(
-                      child: Padding(
-                        padding: const EdgeInsets.only(
-                          left: 8,
-                          right: 16,
-                          top: 8,
-                          bottom: 8,
-                        ),
             child: ReactionBottom(
               messageInputBuilder: textInputBuilder,
+              onPressSelectImage: () async {
+                // open the image picker
+                var result = await showModalBottomSheet<Uint8List?>(
+                  context: context,
+                  builder: (context) => Container(
+                    padding: const EdgeInsets.all(8.0),
+                    color: theme.colorScheme.surface,
+                    child: ImagePicker(
+                      imagePickerConfig: widget.options.imagePickerConfig,
+                      imagePickerTheme: widget.options.imagePickerTheme,
+                    ),
+                  ),
+                );
+                if (result != null) {
+                  updatePost(
+                    await widget.service.postService.reactToPost(
+                      post,
+                      TimelinePostReaction(
+                        id: '',
+                        postId: post.id,
+                        creatorId: widget.userId,
+                        createdAt: DateTime.now(),
+                      ),
+                      image: result,
+                    ),
+                  );
+                }
+              },
               onReactionSubmit: (reaction) async => updatePost(
                 await widget.service.postService.reactToPost(
                   post,
@@ -683,12 +601,6 @@ class _TimelinePostScreenState extends State<TimelinePostScreen> {
               iconColor: widget.options.theme.iconColor,
             ),
           ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ),
       ],
     );
   }

packages/flutter_timeline_view/lib/src/screens/timeline_screen.dart

@@ -9,9 +9,9 @@ import 'package:flutter_timeline_interface/flutter_timeline_interface.dart';
 import 'package:flutter_timeline_view/flutter_timeline_view.dart';
 
 class TimelineScreen extends StatefulWidget {
-  TimelineScreen({
+  const TimelineScreen({
     this.userId = 'test_user',
-    TimelineService? service,
+    this.service,
     this.options = const TimelineOptions(),
     this.onPostTap,
     this.scrollController,
@@ -23,10 +23,7 @@ class TimelineScreen extends StatefulWidget {
     this.filterEnabled = false,
     this.allowAllDeletion = false,
     super.key,
-  }) : service = service ??
+  });
-            TimelineService(
-              postService: LocalTimelinePostService(),
-            );
 
   /// The user id of the current user
   final String userId;
@@ -36,7 +33,7 @@ class TimelineScreen extends StatefulWidget {
   final bool allowAllDeletion;
 
   /// The service to use for fetching and manipulating posts
-  final TimelineService service;
+  final TimelineService? service;
 
   /// All the configuration options for the timelinescreens and widgets
   final TimelineOptions options;
@@ -75,6 +72,10 @@ class _TimelineScreenState extends State<TimelineScreen> {
   late var textFieldController = TextEditingController(
     text: widget.options.filterOptions.initialFilterWord,
   );
+  late var service = widget.service ??
+      TimelineService(
+        postService: LocalTimelinePostService(),
+      );
 
   bool isLoading = true;
 
@@ -93,7 +94,7 @@ class _TimelineScreenState extends State<TimelineScreen> {
 
   void _updateIsOnTop() {
     setState(() {
-      _isOnTop = controller.position.pixels < 0.1;
+      _isOnTop = controller.position.pixels < 40;
     });
   }
 
@@ -109,15 +110,6 @@ class _TimelineScreenState extends State<TimelineScreen> {
     });
   }
 
-  @override
-  void didUpdateWidget(covariant TimelineScreen oldWidget) {
-    super.didUpdateWidget(oldWidget);
-
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      unawaited(loadPosts());
-    });
-  }
-
   @override
   Widget build(BuildContext context) {
     if (isLoading && widget.posts == null) {
@@ -126,15 +118,14 @@ class _TimelineScreenState extends State<TimelineScreen> {
 
     // Build the list of posts
     return ListenableBuilder(
-      listenable: widget.service.postService,
+      listenable: service.postService,
       builder: (context, _) {
         if (!context.mounted) return const SizedBox();
-        var posts =
+        var posts = widget.posts ?? service.postService.getPosts(category);
-            widget.posts ?? widget.service.postService.getPosts(category);
 
         if (widget.filterEnabled && filterWord != null) {
-          if (widget.service.postService is TimelineFilterService) {
+          if (service.postService is TimelineFilterService) {
-            posts = (widget.service.postService as TimelineFilterService)
+            posts = (service.postService as TimelineFilterService)
                 .filterPosts(filterWord!, {});
           } else {
             debugPrint('Timeline service needs to mixin'
@@ -157,8 +148,6 @@ class _TimelineScreenState extends State<TimelineScreen> {
           );
         }
 
-        var categories = widget.service.postService.categories;
-
         return Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -226,16 +215,11 @@ class _TimelineScreenState extends State<TimelineScreen> {
               ),
             ],
             CategorySelector(
-              categories: categories,
               isOnTop: _isOnTop,
               filter: category,
               options: widget.options,
               onTapCategory: (categoryKey) {
                 setState(() {
-                  service.postService.selectedCategory =
-                      categories.firstWhereOrNull(
-                    (element) => element.key == categoryKey,
-                  );
                   category = categoryKey;
                 });
               },
@@ -263,7 +247,7 @@ class _TimelineScreenState extends State<TimelineScreen> {
                           padding: widget.options.paddings.postPadding,
                           child: widget.postWidgetBuilder?.call(post) ??
                               TimelinePostWidget(
-                                service: widget.service,
+                                service: service,
                                 userId: widget.userId,
                                 options: widget.options,
                                 allowAllDeletion: widget.allowAllDeletion,
@@ -281,11 +265,11 @@ class _TimelineScreenState extends State<TimelineScreen> {
                                       builder: (context) => Scaffold(
                                         body: TimelinePostScreen(
                                           userId: 'test_user',
-                                          service: widget.service,
+                                          service: service,
                                           options: widget.options,
                                           post: post,
                                           onPostDelete: () {
-                                            widget.service.postService
+                                            service.postService
                                                 .deletePost(post);
                                             Navigator.of(context).pop();
                                           },
@@ -294,14 +278,12 @@ class _TimelineScreenState extends State<TimelineScreen> {
                                     ),
                                   );
                                 },
-                                onTapLike: () async => widget
+                                onTapLike: () async => service.postService
-                                    .service.postService
                                     .likePost(widget.userId, post),
-                                onTapUnlike: () async => widget
+                                onTapUnlike: () async => service.postService
-                                    .service.postService
                                     .unlikePost(widget.userId, post),
                                 onPostDelete: () async =>
-                                    widget.service.postService.deletePost(post),
+                                    service.postService.deletePost(post),
                                 onUserTap: widget.onUserTap,
                               ),
                         ),
@@ -320,14 +302,14 @@ class _TimelineScreenState extends State<TimelineScreen> {
                             ),
                           ),
                         ),
-                      SizedBox(
-                        height: widget.options.paddings.mainPadding.bottom,
-                      ),
                     ],
                   ),
                 ),
               ),
             ),
+            SizedBox(
+              height: widget.options.paddings.mainPadding.bottom,
+            ),
           ],
         );
       },
@@ -337,8 +319,7 @@ class _TimelineScreenState extends State<TimelineScreen> {
   Future<void> loadPosts() async {
     if (widget.posts != null || !context.mounted) return;
     try {
-      await widget.service.postService.fetchCategories();
+      await service.postService.fetchPosts(category);
-      await widget.service.postService.fetchPosts(category);
       setState(() {
         isLoading = false;
       });

packages/flutter_timeline_view/lib/src/screens/timeline_selection_screen.dart

@@ -1,15 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_timeline_interface/flutter_timeline_interface.dart';
 import 'package:flutter_timeline_view/src/config/timeline_options.dart';
-import 'package:flutter_timeline_view/src/widgets/default_filled_button.dart';
-import 'package:flutter_timeline_view/src/widgets/post_creation_textfield.dart';
 
-class TimelineSelectionScreen extends StatefulWidget {
+class TimelineSelectionScreen extends StatelessWidget {
   const TimelineSelectionScreen({
     required this.options,
     required this.categories,
     required this.onCategorySelected,
-    required this.postService,
     super.key,
   });
 
@@ -19,93 +16,52 @@ class TimelineSelectionScreen extends StatefulWidget {
 
   final Function(TimelineCategory) onCategorySelected;
 
-  final TimelinePostService postService;
-
-  @override
-  State<TimelineSelectionScreen> createState() =>
-      _TimelineSelectionScreenState();
-}
-
-class _TimelineSelectionScreenState extends State<TimelineSelectionScreen> {
   @override
   Widget build(BuildContext context) {
     var size = MediaQuery.of(context).size;
-    var theme = Theme.of(context);
-
     return Padding(
       padding: EdgeInsets.symmetric(
         horizontal: size.width * 0.05,
       ),
-      child: SingleChildScrollView(
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Padding(
-              padding: const EdgeInsets.only(top: 20, bottom: 12),
+            padding: EdgeInsets.only(top: size.height * 0.05, bottom: 8),
             child: Text(
-                widget.options.translations.timelineSelectionDescription,
+              options.translations.timelineSelectionDescription,
-                style: theme.textTheme.titleLarge,
+              style: const TextStyle(
+                fontWeight: FontWeight.w800,
+                fontSize: 20,
               ),
             ),
-            for (var category in widget.categories.where(
+          ),
+          const SizedBox(height: 4),
+          for (var category in categories.where(
             (element) => element.canCreate && element.key != null,
           )) ...[
-              widget.options.categorySelectorButtonBuilder?.call(
+            options.categorySelectorButtonBuilder?.call(
                   context,
                   () {
-                      widget.onCategorySelected.call(category);
+                    onCategorySelected.call(category);
                   },
                   category.title,
                 ) ??
                 InkWell(
-                    onTap: () => widget.onCategorySelected.call(category),
+                  onTap: () => onCategorySelected.call(category),
                   child: Container(
                     height: 60,
                     width: double.infinity,
                     decoration: BoxDecoration(
                       borderRadius: BorderRadius.circular(10),
                       border: Border.all(
-                          color: widget.options.theme
+                        color:
-                                  .categorySelectionButtonBorderColor ??
+                            options.theme.categorySelectionButtonBorderColor ??
                                 Theme.of(context).primaryColor,
                         width: 2,
                       ),
-                        color: widget.options.theme
+                      color:
-                            .categorySelectionButtonBackgroundColor,
+                          options.theme.categorySelectionButtonBackgroundColor,
-                      ),
-                      margin: const EdgeInsets.symmetric(vertical: 4),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          Padding(
-                            padding:
-                                const EdgeInsets.symmetric(horizontal: 12.0),
-                            child: Text(
-                              category.title,
-                              style: theme.textTheme.titleMedium,
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-            ],
-            InkWell(
-              onTap: showCategoryPopup,
-              child: Container(
-                height: 60,
-                width: double.infinity,
-                decoration: BoxDecoration(
-                  borderRadius: BorderRadius.circular(10),
-                  border: Border.all(
-                    color: widget
-                            .options.theme.categorySelectionButtonBorderColor ??
-                        const Color(0xFF9E9E9E),
-                    width: 2,
-                  ),
-                  color: widget
-                      .options.theme.categorySelectionButtonBackgroundColor,
                     ),
                     margin: const EdgeInsets.symmetric(vertical: 4),
                     child: Column(
@@ -114,102 +70,21 @@ class _TimelineSelectionScreenState extends State<TimelineSelectionScreen> {
                       children: [
                         Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 12.0),
-                      child: Row(
-                        children: [
-                          Icon(
-                            Icons.add,
-                            color: theme.textTheme.titleMedium?.color!
-                                .withOpacity(0.5),
-                          ),
-                          const SizedBox(width: 8),
-                          Text(
-                            widget.options.translations.addCategoryTitle,
-                            style: theme.textTheme.titleMedium!.copyWith(
-                              color: theme.textTheme.titleMedium?.color!
-                                  .withOpacity(0.5),
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Future<void> showCategoryPopup() async {
-    var theme = Theme.of(context);
-    var controller = TextEditingController();
-    await showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-        backgroundColor: theme.scaffoldBackgroundColor,
-        insetPadding: const EdgeInsets.symmetric(
-          horizontal: 16,
-        ),
-        contentPadding:
-            const EdgeInsets.symmetric(horizontal: 50, vertical: 24),
-        titlePadding: const EdgeInsets.only(left: 44, right: 44, top: 32),
-        title: Text(
-          widget.options.translations.createCategoryPopuptitle,
-          style: theme.textTheme.titleMedium,
-          textAlign: TextAlign.center,
-        ),
-        content: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            PostCreationTextfield(
-              controller: controller,
-              hintText: widget.options.translations.addCategoryHintText,
-              validator: (p0) => p0!.isEmpty
-                  ? widget.options.translations.addCategoryErrorText
-                  : null,
-            ),
-            const SizedBox(height: 16),
-            Row(
-              children: [
-                Expanded(
-                  child: Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 14),
-                    child: DefaultFilledButton(
-                      onPressed: () async {
-                        if (controller.text.isEmpty) return;
-                        await widget.postService.addCategory(
-                          TimelineCategory(
-                            key: controller.text,
-                            title: controller.text,
-                          ),
-                        );
-                        setState(() {});
-                        if (context.mounted) Navigator.pop(context);
-                      },
-                      buttonText:
-                          widget.options.translations.addCategorySubmitButton,
-                    ),
-                  ),
-                ),
-              ],
-            ),
-            TextButton(
-              onPressed: () {
-                Navigator.of(context).pop(false);
-              },
                           child: Text(
-                widget.options.translations.addCategoryCancelButtton,
+                            category.title,
-                style: theme.textTheme.bodyMedium!.copyWith(
+                            style: const TextStyle(
-                  decoration: TextDecoration.underline,
+                              fontSize: 18,
-                  color: theme.textTheme.bodyMedium?.color!.withOpacity(0.5),
+                              fontWeight: FontWeight.w800,
                             ),
                           ),
                         ),
                       ],
                     ),
                   ),
+                ),
+          ],
+        ],
+      ),
     );
   }
 }

packages/flutter_timeline_view/lib/src/services/local_post_service.dart

@@ -13,12 +13,6 @@ class LocalTimelinePostService
   @override
   List<TimelinePost> posts = [];
 
-  @override
-  List<TimelineCategory> categories = [];
-
-  @override
-  TimelineCategory? selectedCategory;
-
   @override
   Future<TimelinePost> createPost(TimelinePost post) async {
     posts.add(
@@ -124,11 +118,10 @@ class LocalTimelinePostService
   }
 
   @override
-  Future<TimelinePost?> getPost(String postId) => Future.value(
+  TimelinePost? getPost(String postId) =>
       (posts.any((element) => element.id == postId))
           ? posts.firstWhere((element) => element.id == postId)
-            : null,
+          : null;
-      );
 
   @override
   List<TimelinePost> getPosts(String? category) => posts
@@ -248,85 +241,4 @@ class LocalTimelinePostService
           ),
         ),
       ];
-
-  @override
-  Future<bool> addCategory(TimelineCategory category) async {
-    categories.add(category);
-    notifyListeners();
-    return true;
-  }
-
-  @override
-  Future<List<TimelineCategory>> fetchCategories() async {
-    categories = [
-      const TimelineCategory(key: null, title: 'All'),
-      const TimelineCategory(
-        key: 'Category',
-        title: 'Category',
-      ),
-      const TimelineCategory(
-        key: 'Category with two lines',
-        title: 'Category with two lines',
-      ),
-    ];
-    notifyListeners();
-
-    return categories;
-  }
-
-  @override
-  Future<TimelinePost> likeReaction(
-    String userId,
-    TimelinePost post,
-    String reactionId,
-  ) async {
-    var updatedPost = post.copyWith(
-      reactions: post.reactions?.map(
-        (r) {
-          if (r.id == reactionId) {
-            return r.copyWith(
-              likedBy: (r.likedBy ?? [])..add(userId),
-            );
-          }
-          return r;
-        },
-      ).toList(),
-    );
-    posts = posts
-        .map(
-          (p) => p.id == post.id ? updatedPost : p,
-        )
-        .toList();
-
-    notifyListeners();
-    return updatedPost;
-  }
-
-  @override
-  Future<TimelinePost> unlikeReaction(
-    String userId,
-    TimelinePost post,
-    String reactionId,
-  ) async {
-    var updatedPost = post.copyWith(
-      reactions: post.reactions?.map(
-        (r) {
-          if (r.id == reactionId) {
-            return r.copyWith(
-              likedBy: r.likedBy?..remove(userId),
-            );
-          }
-          return r;
-        },
-      ).toList(),
-    );
-    posts = posts
-        .map(
-          (p) => p.id == post.id ? updatedPost : p,
-        )
-        .toList();
-
-    notifyListeners();
-    return updatedPost;
-  }
 }

packages/flutter_timeline_view/lib/src/widgets/category_selector.dart

@@ -1,7 +1,6 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_timeline_interface/flutter_timeline_interface.dart';
 import 'package:flutter_timeline_view/flutter_timeline_view.dart';
 
 class CategorySelector extends StatefulWidget {
@@ -10,7 +9,6 @@ class CategorySelector extends StatefulWidget {
     required this.options,
     required this.onTapCategory,
     required this.isOnTop,
-    required this.categories,
     super.key,
   });
 
@@ -18,7 +16,6 @@ class CategorySelector extends StatefulWidget {
   final TimelineOptions options;
   final void Function(String? categoryKey) onTapCategory;
   final bool isOnTop;
-  final List<TimelineCategory> categories;
 
   @override
   State<CategorySelector> createState() => _CategorySelectorState();
@@ -26,10 +23,15 @@ class CategorySelector extends StatefulWidget {
 
 class _CategorySelectorState extends State<CategorySelector> {
   @override
-  Widget build(BuildContext context) => SingleChildScrollView(
+  Widget build(BuildContext context) {
+    if (widget.options.categoriesOptions.categoriesBuilder == null) {
+      return const SizedBox.shrink();
+    }
+
+    var categories =
+        widget.options.categoriesOptions.categoriesBuilder!(context);
+    return SingleChildScrollView(
       scrollDirection: Axis.horizontal,
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 8),
       child: Row(
         children: [
           SizedBox(
@@ -37,7 +39,7 @@ class _CategorySelectorState extends State<CategorySelector> {
                     .categorySelectorHorizontalPadding ??
                 max(widget.options.paddings.mainPadding.left - 20, 0),
           ),
-              for (var category in widget.categories) ...[
+          for (var category in categories) ...[
             widget.options.categoriesOptions.categoryButtonBuilder?.call(
                   category,
                   () => widget.onTapCategory(category.key),
@@ -62,6 +64,6 @@ class _CategorySelectorState extends State<CategorySelector> {
           ),
         ],
       ),
-        ),
     );
+  }
 }

packages/flutter_timeline_view/lib/src/widgets/category_selector_button.dart

@@ -23,8 +23,7 @@ class CategorySelectorButton extends StatelessWidget {
     var theme = Theme.of(context);
     var size = MediaQuery.of(context).size;
 
-    return AnimatedContainer(
+    return SizedBox(
-      duration: const Duration(milliseconds: 100),
       height: isOnTop ? 140 : 40,
       child: TextButton(
         onPressed: onTap,
@@ -82,13 +81,11 @@ class CategorySelectorButton extends StatelessWidget {
                   Flexible(
                     child: Row(
                       children: [
-                        if (category.icon != null) ...[
+                        category.icon,
-                          category.icon!,
                         SizedBox(
                           width:
                               options.paddings.categoryButtonTextPadding ?? 8,
                         ),
-                        ],
                         Expanded(
                           child: _CategoryButtonText(
                             category: category,
@@ -127,9 +124,7 @@ class _CategoryButtonText extends StatelessWidget {
   Widget build(BuildContext context) => Text(
         category.title,
         style: (options.theme.textStyles.categoryTitleStyle ??
-                (selected
+                theme.textTheme.labelLarge)
-                    ? theme.textTheme.titleMedium
-                    : theme.textTheme.bodyMedium))
             ?.copyWith(
           color: selected
               ? options.theme.categorySelectionButtonSelectedTextColor ??

packages/flutter_timeline_view/lib/src/widgets/default_filled_button.dart

@@ -1,35 +0,0 @@
-import 'package:flutter/material.dart';
-
-class DefaultFilledButton extends StatelessWidget {
-  const DefaultFilledButton({
-    required this.onPressed,
-    required this.buttonText,
-    super.key,
-  });
-
-  final Future<void> Function()? onPressed;
-  final String buttonText;
-
-  @override
-  Widget build(BuildContext context) {
-    var theme = Theme.of(context);
-    return FilledButton(
-      style: onPressed != null
-          ? ButtonStyle(
-              backgroundColor: WidgetStatePropertyAll(
-                theme.colorScheme.primary,
-              ),
-            )
-          : null,
-      onPressed: onPressed,
-      child: Padding(
-        padding: const EdgeInsets.all(8),
-        child: Text(
-          buttonText,
-          overflow: TextOverflow.ellipsis,
-          style: theme.textTheme.displayLarge,
-        ),
-      ),
-    );
-  }
-}

packages/flutter_timeline_view/lib/src/widgets/post_creation_textfield.dart

@@ -1,69 +0,0 @@
-import 'package:flutter/material.dart';
-
-class PostCreationTextfield extends StatelessWidget {
-  const PostCreationTextfield({
-    required this.controller,
-    required this.hintText,
-    required this.validator,
-    super.key,
-    this.textMaxLength,
-    this.decoration,
-    this.textCapitalization,
-    this.expands,
-    this.minLines,
-    this.maxLines,
-    this.fieldKey,
-  });
-
-  final TextEditingController controller;
-  final String hintText;
-  final int? textMaxLength;
-  final InputDecoration? decoration;
-  final TextCapitalization? textCapitalization;
-  // ignore: avoid_positional_boolean_parameters
-  final bool? expands;
-  final int? minLines;
-  final int? maxLines;
-  final String? Function(String?)? validator;
-  final Key? fieldKey;
-  @override
-  Widget build(BuildContext context) {
-    var theme = Theme.of(context);
-    return TextFormField(
-      key: fieldKey,
-      validator: validator,
-      style: theme.textTheme.bodySmall,
-      controller: controller,
-      maxLength: textMaxLength,
-      decoration: decoration ??
-          InputDecoration(
-            enabledBorder: OutlineInputBorder(
-              borderRadius: BorderRadius.circular(12),
-              borderSide: BorderSide.none,
-            ),
-            focusedBorder: OutlineInputBorder(
-              borderRadius: BorderRadius.circular(12),
-              borderSide: BorderSide.none,
-            ),
-            contentPadding: const EdgeInsets.symmetric(
-              vertical: 0,
-              horizontal: 16,
-            ),
-            hintText: hintText,
-            hintStyle: theme.textTheme.bodySmall!.copyWith(
-              color: theme.textTheme.bodySmall!.color!.withOpacity(0.5),
-            ),
-            fillColor: Colors.white,
-            filled: true,
-            border: OutlineInputBorder(
-              borderRadius: BorderRadius.circular(12),
-              borderSide: BorderSide.none,
-            ),
-          ),
-      textCapitalization: textCapitalization ?? TextCapitalization.none,
-      expands: expands ?? false,
-      minLines: minLines,
-      maxLines: maxLines,
-    );
-  }
-}

packages/flutter_timeline_view/lib/src/widgets/reaction_bottom.dart

@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:flutter_timeline_view/src/config/timeline_options.dart';
 import 'package:flutter_timeline_view/src/config/timeline_translations.dart';
 
@@ -12,12 +11,14 @@ class ReactionBottom extends StatefulWidget {
     required this.onReactionSubmit,
     required this.messageInputBuilder,
     required this.translations,
+    this.onPressSelectImage,
     this.iconColor,
     super.key,
   });
 
   final Future<void> Function(String text) onReactionSubmit;
   final TextInputBuilder messageInputBuilder;
+  final VoidCallback? onPressSelectImage;
   final TimelineTranslations translations;
   final Color? iconColor;
 
@@ -29,14 +30,38 @@ class _ReactionBottomState extends State<ReactionBottom> {
   final TextEditingController _textEditingController = TextEditingController();
 
   @override
-  Widget build(BuildContext context) => Container(
+  Widget build(BuildContext context) => SafeArea(
+        bottom: true,
+        child: Container(
+          color: Theme.of(context).colorScheme.surface,
+          child: Container(
+            margin: const EdgeInsets.symmetric(
+              horizontal: 12,
+              vertical: 8,
+            ),
+            height: 48,
             child: widget.messageInputBuilder(
               _textEditingController,
               Padding(
                 padding: const EdgeInsets.symmetric(
-              horizontal: 8,
+                  horizontal: 4,
                 ),
-            child: IconButton(
+                child: Row(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    if (widget.onPressSelectImage != null) ...[
+                      IconButton(
+                        onPressed: () async {
+                          _textEditingController.clear();
+                          widget.onPressSelectImage?.call();
+                        },
+                        icon: Icon(
+                          Icons.image,
+                          color: widget.iconColor,
+                        ),
+                      ),
+                    ],
+                    IconButton(
                       onPressed: () async {
                         var value = _textEditingController.text;
                         if (value.isNotEmpty) {
@@ -44,15 +69,17 @@ class _ReactionBottomState extends State<ReactionBottom> {
                           _textEditingController.clear();
                         }
                       },
-              icon: SvgPicture.asset(
+                      icon: Icon(
-                'assets/send.svg',
+                        Icons.send,
-                package: 'flutter_timeline_view',
-                // ignore: deprecated_member_use
                         color: widget.iconColor,
                       ),
                     ),
+                  ],
+                ),
               ),
               widget.translations.writeComment,
             ),
+          ),
+        ),
       );
 }

packages/flutter_timeline_view/lib/src/widgets/tappable_image.dart

@@ -141,7 +141,6 @@ class _HeartAnimationState extends State<HeartAnimation> {
     unawaited(
       Future.delayed(const Duration(milliseconds: 100)).then((value) async {
         active = widget.liked;
-        // ignore: use_build_context_synchronously
         var navigator = Navigator.of(context);
         await Future.delayed(widget.duration);
         navigator.pop();

packages/flutter_timeline_view/lib/src/widgets/timeline_post_widget.dart

@@ -4,10 +4,8 @@
 
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:flutter_timeline_interface/flutter_timeline_interface.dart';
 import 'package:flutter_timeline_view/src/config/timeline_options.dart';
-import 'package:flutter_timeline_view/src/widgets/default_filled_button.dart';
 import 'package:flutter_timeline_view/src/widgets/tappable_image.dart';
 
 class TimelinePostWidget extends StatefulWidget {
@@ -54,9 +52,9 @@ class _TimelinePostWidgetState extends State<TimelinePostWidget> {
   @override
   Widget build(BuildContext context) {
     var theme = Theme.of(context);
-    var isLikedByUser = widget.post.likedBy?.contains(widget.userId) ?? false;
+    return InkWell(
-
+      onTap: widget.onTap,
-    return SizedBox(
+      child: SizedBox(
         height: widget.post.imageUrl != null || widget.post.image != null
             ? widget.options.postWidgetHeight
             : null,
@@ -66,7 +64,7 @@ class _TimelinePostWidgetState extends State<TimelinePostWidget> {
           children: [
             Row(
               children: [
-              if (widget.post.creator != null) ...[
+                if (widget.post.creator != null)
                   InkWell(
                     onTap: widget.onUserTap != null
                         ? () =>
@@ -99,22 +97,20 @@ class _TimelinePostWidgetState extends State<TimelinePostWidget> {
                         ],
                         const SizedBox(width: 10),
                         Text(
-                        widget.options.nameBuilder?.call(widget.post.creator) ??
+                          widget.options.nameBuilder
+                                  ?.call(widget.post.creator) ??
                               widget.post.creator?.fullName ??
                               widget.options.translations.anonymousUser,
                           style: widget.options.theme.textStyles
                                   .postCreatorTitleStyle ??
-                            theme.textTheme.titleSmall!.copyWith(
+                              theme.textTheme.titleMedium,
-                              color: Colors.black,
-                            ),
                         ),
                       ],
                     ),
                   ),
-              ],
                 const Spacer(),
                 if (widget.allowAllDeletion ||
-                  widget.post.creator?.userId == widget.userId) ...[
+                    widget.post.creator?.userId == widget.userId)
                   PopupMenuButton(
                     onSelected: (value) async {
                       if (value == 'delete') {
@@ -133,8 +129,8 @@ class _TimelinePostWidgetState extends State<TimelinePostWidget> {
                           children: [
                             Text(
                               widget.options.translations.deletePost,
-                            style: widget
+                              style: widget.options.theme.textStyles
-                                    .options.theme.textStyles.deletePostStyle ??
+                                      .deletePostStyle ??
                                   theme.textTheme.bodyMedium,
                             ),
                             const SizedBox(width: 8),
@@ -154,7 +150,6 @@ class _TimelinePostWidgetState extends State<TimelinePostWidget> {
                         ),
                   ),
               ],
-            ],
             ),
             // image of the post
             if (widget.post.imageUrl != null || widget.post.image != null) ...[
@@ -175,7 +170,8 @@ class _TimelinePostWidgetState extends State<TimelinePostWidget> {
                             late TimelinePost result;
 
                             if (!liked) {
-                            result = await widget.service.postService.likePost(
+                              result =
+                                  await widget.service.postService.likePost(
                                 userId,
                                 widget.post,
                               );
@@ -208,16 +204,17 @@ class _TimelinePostWidgetState extends State<TimelinePostWidget> {
               height: 8,
             ),
             // post information
-          if (widget.options.iconsWithValues) ...[
+            if (widget.options.iconsWithValues)
               Row(
                 children: [
-                IconButton(
+                  TextButton.icon(
-                  padding: EdgeInsets.zero,
-                  constraints: const BoxConstraints(),
                     onPressed: () async {
                       var userId = widget.userId;
 
-                    if (!isLikedByUser) {
+                      var liked =
+                          widget.post.likedBy?.contains(userId) ?? false;
+
+                      if (!liked) {
                         await widget.service.postService.likePost(
                           userId,
                           widget.post,
@@ -231,81 +228,68 @@ class _TimelinePostWidgetState extends State<TimelinePostWidget> {
                     },
                     icon: widget.options.theme.likeIcon ??
                         Icon(
-                        isLikedByUser
+                          widget.post.likedBy?.contains(widget.userId) ?? false
                               ? Icons.favorite_rounded
                               : Icons.favorite_outline_outlined,
-                        color: widget.options.theme.iconColor,
-                        size: widget.options.iconSize,
                         ),
+                    label: Text('${widget.post.likes}'),
                   ),
-                const SizedBox(
+                  if (widget.post.reactionEnabled)
-                  width: 4,
+                    TextButton.icon(
-                ),
-                Text('${widget.post.likes}'),
-                if (widget.post.reactionEnabled) ...[
-                  const SizedBox(
-                    width: 8,
-                  ),
-                  IconButton(
-                    padding: EdgeInsets.zero,
-                    constraints: const BoxConstraints(),
                       onPressed: widget.onTap,
                       icon: widget.options.theme.commentIcon ??
-                        SvgPicture.asset(
+                          const Icon(
-                          'assets/Comment.svg',
+                            Icons.chat_bubble_outline_outlined,
-                          package: 'flutter_timeline_view',
-                          // ignore: deprecated_member_use
-                          color: widget.options.theme.iconColor,
-                          width: widget.options.iconSize,
-                          height: widget.options.iconSize,
                           ),
+                      label: Text('${widget.post.reaction}'),
                     ),
-                  const SizedBox(
-                    width: 4,
-                  ),
-                  Text('${widget.post.reaction}'),
                 ],
-              ],
+              )
-            ),
+            else
-          ] else ...[
               Row(
                 children: [
-                IconButton(
+                  if (widget.post.likedBy?.contains(widget.userId) ??
-                  padding: EdgeInsets.zero,
+                      false) ...[
-                  constraints: const BoxConstraints(),
+                    InkWell(
-                  onPressed:
+                      onTap: widget.onTapUnlike,
-                      isLikedByUser ? widget.onTapUnlike : widget.onTapLike,
+                      child: Container(
-                  icon: (isLikedByUser
+                        color: Colors.transparent,
-                          ? widget.options.theme.likedIcon
+                        child: widget.options.theme.likedIcon ??
-                          : widget.options.theme.likeIcon) ??
                             Icon(
-                        isLikedByUser
+                              Icons.favorite_rounded,
-                            ? Icons.favorite_rounded
-                            : Icons.favorite_outline,
                               color: widget.options.theme.iconColor,
                               size: widget.options.iconSize,
                             ),
                       ),
+                    ),
+                  ] else ...[
+                    InkWell(
+                      onTap: widget.onTapLike,
+                      child: Container(
+                        color: Colors.transparent,
+                        child: widget.options.theme.likeIcon ??
+                            Icon(
+                              Icons.favorite_outline,
+                              color: widget.options.theme.iconColor,
+                              size: widget.options.iconSize,
+                            ),
+                      ),
+                    ),
+                  ],
                   const SizedBox(width: 8),
                   if (widget.post.reactionEnabled) ...[
-                  IconButton(
+                    Container(
-                    padding: EdgeInsets.zero,
+                      color: Colors.transparent,
-                    constraints: const BoxConstraints(),
+                      child: widget.options.theme.commentIcon ??
-                    onPressed: widget.onTap,
+                          Icon(
-                    icon: widget.options.theme.commentIcon ??
+                            Icons.chat_bubble_outline_rounded,
-                        SvgPicture.asset(
-                          'assets/Comment.svg',
-                          package: 'flutter_timeline_view',
-                          // ignore: deprecated_member_use
                             color: widget.options.theme.iconColor,
-                          width: widget.options.iconSize,
+                            size: widget.options.iconSize,
-                          height: widget.options.iconSize,
                           ),
                     ),
                   ],
                 ],
               ),
-          ],
 
             const SizedBox(
               height: 8,
@@ -316,69 +300,43 @@ class _TimelinePostWidgetState extends State<TimelinePostWidget> {
                 post: widget.post,
               ),
             ] else ...[
-            _PostLikeCountText(
+              Text(
-              post: widget.post,
+                '${widget.post.likes} '
-              options: widget.options,
+                '${widget.options.translations.likesTitle}',
+                style: widget
+                        .options.theme.textStyles.listPostLikeTitleAndAmount ??
+                    theme.textTheme.titleSmall,
               ),
+              const SizedBox(height: 4),
               Text.rich(
                 TextSpan(
                   text: widget.options.nameBuilder?.call(widget.post.creator) ??
                       widget.post.creator?.fullName ??
                       widget.options.translations.anonymousUser,
                   style: widget.options.theme.textStyles.listCreatorNameStyle ??
-                    theme.textTheme.titleSmall!.copyWith(
+                      theme.textTheme.titleSmall,
-                      color: Colors.black,
-                    ),
                   children: [
+                    const TextSpan(text: ' '),
                     TextSpan(
                       text: widget.post.title,
-                    style: widget.options.theme.textStyles.listPostTitleStyle ??
+                      style:
-                        theme.textTheme.bodySmall,
+                          widget.options.theme.textStyles.listPostTitleStyle ??
+                              theme.textTheme.bodyMedium,
                     ),
                   ],
                 ),
               ),
               const SizedBox(height: 4),
-            InkWell(
+              Text(
-              onTap: widget.onTap,
-              child: Text(
                 widget.options.translations.viewPost,
                 style: widget.options.theme.textStyles.viewPostStyle ??
-                    theme.textTheme.titleSmall!.copyWith(
+                    theme.textTheme.bodySmall,
-                      color: const Color(0xFF8D8D8D),
-                    ),
-              ),
               ),
             ],
             if (widget.options.dividerBuilder != null)
               widget.options.dividerBuilder!(),
           ],
         ),
-    );
-  }
-}
-
-class _PostLikeCountText extends StatelessWidget {
-  const _PostLikeCountText({
-    required this.post,
-    required this.options,
-  });
-
-  final TimelineOptions options;
-  final TimelinePost post;
-  @override
-  Widget build(BuildContext context) {
-    var theme = Theme.of(context);
-    var likeTranslation = post.likes > 1
-        ? options.translations.multipleLikesTitle
-        : options.translations.oneLikeTitle;
-
-    return Text(
-      '${post.likes} '
-      '$likeTranslation',
-      style: options.theme.textStyles.listPostLikeTitleAndAmount ??
-          theme.textTheme.titleSmall!.copyWith(
-            color: Colors.black,
       ),
     );
   }
@@ -389,53 +347,30 @@ Future<void> showPostDeletionConfirmationDialog(
   BuildContext context,
   Function() onPostDelete,
 ) async {
-  var theme = Theme.of(context);
   var result = await showDialog(
     context: context,
     builder: (BuildContext context) =>
         options.deletionDialogBuilder?.call(context) ??
         AlertDialog(
-          insetPadding: const EdgeInsets.symmetric(
+          title: Text(options.translations.deleteConfirmationTitle),
-            horizontal: 16,
+          content: Text(options.translations.deleteConfirmationMessage),
-          ),
+          actions: <Widget>[
-          contentPadding:
-              const EdgeInsets.symmetric(horizontal: 64, vertical: 24),
-          titlePadding: const EdgeInsets.only(left: 44, right: 44, top: 32),
-          title: Text(
-            options.translations.deleteConfirmationMessage,
-            style: theme.textTheme.titleMedium,
-            textAlign: TextAlign.center,
-          ),
-          content: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              Row(
-                children: [
-                  Expanded(
-                    child: DefaultFilledButton(
-                      onPressed: () async {
-                        Navigator.of(context).pop(true);
-                      },
-                      buttonText: options.translations.deleteButton,
-                    ),
-                  ),
-                ],
-              ),
             TextButton(
               onPressed: () {
                 Navigator.of(context).pop(false);
               },
-                child: Text(
+              child: Text(options.translations.deleteCancelButton),
-                  options.translations.deleteCancelButton,
-                  style: theme.textTheme.bodyMedium!.copyWith(
-                    decoration: TextDecoration.underline,
-                    color: theme.textTheme.bodyMedium?.color!.withOpacity(0.5),
             ),
+            TextButton(
+              onPressed: () {
+                Navigator.of(context).pop(true);
+              },
+              child: Text(
+                options.translations.deleteButton,
               ),
             ),
           ],
         ),
-        ),
   );
 
   if (result == true) {

packages/flutter_timeline_view/pubspec.yaml

@@ -4,13 +4,11 @@
 
 name: flutter_timeline_view
 description: Visual elements of the Flutter Timeline Component
-version: 5.1.1
+version: 4.1.1
-homepage: https://github.com/Iconica-Development/flutter_timeline
 publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub
 
 environment:
-  sdk: ">=3.4.3 <4.0.0"
+  sdk: '>=3.4.1 <4.0.0'
-  flutter: '>=3.22.2'
 
 dependencies:
   flutter:
@@ -18,21 +16,22 @@ dependencies:
   intl: ^0.19.0
   cached_network_image: ^3.2.2
   dotted_border: ^2.1.0
-  collection: ^1.18.0
+  flutter_html: ^3.0.0-beta.2
-  flutter_svg: ^2.0.10+1
+  
   flutter_timeline_interface:
     hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
-    version: ^5.1.1
+    version: ^4.1.1
   flutter_image_picker:
     hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
-    version: ^4.0.0
+    version: ^1.0.5
+  collection: ^1.18.0
 
 dev_dependencies:
+  flutter_lints: ^2.0.0
   flutter_iconica_analysis:
     git:
       url: https://github.com/Iconica-Development/flutter_iconica_analysis
       ref: 6.0.0
 
 flutter:
-  assets:
+
-    - assets/

pubspec.yaml

@@ -5,6 +5,7 @@
 name: flutter_timeline_workspace
 
 environment:
-  sdk: '>=3.4.3 <4.0.0'
+  sdk: '>=3.1.3 <4.0.0'
+  
 dev_dependencies:
   melos: ^3.0.1