From 35ad5c453a64fe2af56485035f366b7ab61a734e Mon Sep 17 00:00:00 2001
From: AhsanSarwar45 <ahsansarwar.as45@gmail.com>
Date: Sun, 17 Dec 2023 16:47:44 +0500
Subject: [PATCH 1/2] Fix screen scrolling to top when duplicating theme

---
 lib/common/widgets/list/custom_list_view.dart | 2 ++
 lib/theme/widgets/theme_card.dart             | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/common/widgets/list/custom_list_view.dart b/lib/common/widgets/list/custom_list_view.dart
index badf25cf..f7ec65df 100644
--- a/lib/common/widgets/list/custom_list_view.dart
+++ b/lib/common/widgets/list/custom_list_view.dart
@@ -165,6 +165,8 @@ class _CustomListViewState<Item extends ListItem>
     // if (_scrollController.offset == 0) {
     //   _scrollController.jumpTo(1);
     // }
+    print(_controller.computeItemBox(0));
+    if (_itemCardHeight == 0) return;
     _scrollController.animateTo(index * _itemCardHeight,
         duration: const Duration(milliseconds: 250), curve: Curves.easeIn);
   }
diff --git a/lib/theme/widgets/theme_card.dart b/lib/theme/widgets/theme_card.dart
index 73c6f1e2..7ffd10cc 100644
--- a/lib/theme/widgets/theme_card.dart
+++ b/lib/theme/widgets/theme_card.dart
@@ -5,14 +5,14 @@ import 'package:flutter/material.dart';
 
 class ThemeCard<Item extends ThemeItem> extends StatelessWidget {
   const ThemeCard({
-    Key? key,
+    super.key,
     required this.themeItem,
     required this.onPressEdit,
     required this.isSelected,
     required this.getThemeFromItem,
     required this.onPressDelete,
     required this.onPressDuplicate,
-  }) : super(key: key);
+  });
 
   final Item themeItem;
   final VoidCallback onPressEdit;

From 2465a8ea0dbc67775c25a33d4844640fb324359f Mon Sep 17 00:00:00 2001
From: AhsanSarwar45 <ahsansarwar.as45@gmail.com>
Date: Sun, 17 Dec 2023 17:25:11 +0500
Subject: [PATCH 2/2] Fix gradle flavor

---
 android/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 481b7833..83216cf1 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -134,7 +134,7 @@ android {
       dev {
         dimension "app"
         resValue "string", "app_name","Chrono Dev"
-        versionNameSuffix "-dev",
+        // versionNameSuffix "-dev",
         applicationIdSuffix ".free"
       }
     }