QuickBirdEng · Numoy · Sep 26, 2025 · Oct 17, 2025 · Dec 9, 2025 · Dec 9, 2025
diff --git a/.github/workflows/.github-actions.yml b/.github/workflows/.github-actions.yml
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,29 @@
+name: Publish to pub.dev
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish:
+    permissions:
+      id-token: write # Required for OIDC authentication
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+
+      # Used to establish OIDC trust with pub.dev
+      - uses: dart-lang/setup-dart@v1
+
+      - name: Install Melos
+        run: dart pub global activate melos
+
+      - name: Bootstrap Workspace
+        run: melos bootstrap
+
+      - name: Publish Packages
+        run: melos publish -y --no-dry-run
diff --git a/.github/workflows/survey_kit_ci.yml b/.github/workflows/survey_kit_ci.yml
@@ -0,0 +1,38 @@
+name: CI
+
+on:
+  push:
+    branches: [ main, develop ]
+  pull_request:
+    branches: [ main, develop ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+
+      - name: Install Melos
+        run: dart pub global activate melos
+
+      - name: Resolve Root Dependencies
+        run: dart pub get
+
+      - name: Debug Environment
+        run: |
+          ls -la
+          melos --version
+
+      - name: Bootstrap Workspace
+        run: melos bootstrap
+
+      - name: Analyze
+        run: melos exec -- flutter analyze .
+
+      - name: Run Tests
+        run: melos exec --dir-exists="test" -- flutter test
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# 2.0.0
+
+- Infra: Added `melos` for monorepo management.
+- **BREAKING**: Moved video player to a separate package (`survey_kit_video`)
+- **BREAKING**: Moved audio player to a separate package (`survey_kit_audio`)
+- **BREAKING**: Moved lottie support to a separate package (`survey_kit_lottie`)
+- **BREAKING**: Removed `localizations` parameter in `SurveyKit`. Using generated localizations now.
+- **FEATURE**: Migrated to `.arb` files and `flutter_localizations`.
+- See [MIGRATION.md](MIGRATION.md) for details on how to upgrade.
+
+- FIX: Fixed DateTime timezone handling in CustomDateTimeConverter to preserve UTC timestamps during serialization
+- FIX: Added missing JSON serialization methods for TimeResult class
+- FIX: Updated test infrastructure with deterministic Step IDs to ensure reliable test execution
+- CHORE: Updated Android Gradle Plugin to 8.1.4 and Gradle to 8.4 for SDK 35 compatibility
+- CHORE: Updated json_annotation dependency to 4.9.0 for better compatibility
+
+
 # 1.0.3
 
 - CHORE: Removed depracted lint `package_api_docs`

diff --git a/MIGRATION.md b/MIGRATION.md
@@ -0,0 +1,56 @@
+# Migration Guide 1.0 -> 2.0
+
+With the release of version 2.0.0, we have modularized `survey_kit` to allow for a more lightweight core package. This guide outlines the changes and how to migrate your existing project.
+
+## Breaking Changes
+
+### Modularization of Audio and Video Steps
+
+The audio and video steps have been moved to their own packages: `survey_kit_audio` and `survey_kit_video`. This reduces the size of the core package and allows you to include only the dependencies you need. Same goes for `survey_kit_lottie`.
+
+#### Action Required:
+
+If you are using `AudioContent` or `VideoContent`, you need to add the respective packages to your `pubspec.yaml`.
+
+```yaml
+dependencies:
+  survey_kit: ^2.0.0
+  # Add these if you use audio or video steps
+  survey_kit_audio: ^2.0.0
+  survey_kit_video: ^2.0.0
+  survey_kit_lottie: ^2.0.0
+```
+
+### Imports
+
+You will need to update your imports to include the new packages where necessary.
+
+**Before:**
+```dart
+import 'package:survey_kit/survey_kit.dart';
+```
+
+**After:**
+```dart
+import 'package:survey_kit/survey_kit.dart';
+// Add if using audio features
+import 'package:survey_kit_audio/survey_kit_audio.dart';
+// Add if using video features
+import 'package:survey_kit_video/survey_kit_video.dart';
+// Add if using lottie features
+import 'package:survey_kit_lottie/survey_kit_lottie.dart';
+```
+
+## Other Changes
+
+- **Dependencies Updated:** We have updated internal dependencies to be compatible with the latest Flutter versions (3.19.0+).
+- **Fixes:** Various bug fixes and improvements in the core logic.
+
+## Summary
+
+1.  Update `survey_kit` to `^2.0.0`.
+2.  Add `survey_kit_audio` or `survey_kit_video` if you use those features.
+3.  Add `survey_kit_lottie` if you use those features.
+3.  Update imports in your Dart files.
+
+If you encounter any issues during migration, please open an issue on our [GitHub repository](https://github.com/quickbirdstudios/survey_kit/issues).
diff --git a/README.md b/README.md
@@ -29,13 +29,14 @@ This is an early version and work in progress. Do not hesitate to give feedback,
 - [Examples](#examples)
           - [Flow](#flow)
           - [Screenshots](#screenshots)
-  - [📚 Overview: Creating Research Surveys](#-overview-creating-research-surveys)
-  - [What SurveyKit does for you](#what-surveykit-does-for-you)
-  - [What SurveyKit does not (yet) do for you](#what-surveykit-does-not-yet-do-for-you)
+- [📚 Overview: Creating Research Surveys](#-overview-creating-research-surveys)
+- [What SurveyKit does for you](#what-surveykit-does-for-you)
+- [What SurveyKit does not (yet) do for you](#what-surveykit-does-not-yet-do-for-you)
 - [🏃 Setup](#-setup)
-  - [1. Add the dependecy](#1-add-the-dependecy)
-  - [2. Install it](#2-install-it)
-  - [3. Import it](#3-import-it)
+- [1. Add the dependecy](#1-add-the-dependecy)
+- [2. Install it](#2-install-it)
+- [3. Import it](#3-import-it)
+- [4. Setup Localization](#4-setup-localization)
 - [💻 Usage](#-usage)
   - [Example](#example)
     - [Create survey steps](#create-survey-steps)
@@ -91,6 +92,21 @@ flutter pub get
 ```dart
 import 'package:survey_kit/survey_kit.dart';
 ```
+```
+
+## 4. Setup Localization
+```dart
+return MaterialApp(
+  localizationsDelegates: const [
+    SurveyKitLocalizations.delegate,
+    GlobalMaterialLocalizations.delegate,
+    GlobalWidgetsLocalizations.delegate,
+    GlobalCupertinoLocalizations.delegate,
+  ],
+  supportedLocales: SurveyKitLocalizations.supportedLocales,
+  ...
+);
+```
 
 # 💻 Usage
 ## Example
@@ -257,13 +273,17 @@ The styling can be adjusted by the build in Flutter theme.
 | subtitle1   | Textstyle used in TextFields|
 
 ### Localization
-If you want to override the fixed texts or adapt them to different languages like close, next, .... You need to provide SurveyKit a Map of translations
-
+If you want to override the fixed texts or adapt them to different languages like close, next, .... You need to add the `SurveyKitLocalizations` to your `MaterialApp`:
 ```dart
-SurveyKit(
-    localizations: {
-        'cancel': 'Cancel',
-    }
+return MaterialApp(
+  localizationsDelegates: const [
+    SurveyKitLocalizations.delegate,
+    GlobalMaterialLocalizations.delegate,
+    GlobalWidgetsLocalizations.delegate,
+    GlobalCupertinoLocalizations.delegate,
+  ],
+  supportedLocales: SurveyKitLocalizations.supportedLocales,
+  ...
 );
 ```
 Here is a complete list of keys that can be overriden:

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -9,6 +9,7 @@ analyzer:
     missing_return: error
     # Ignored because of freezed and JsonKey (https://github.com/rrousselGit/freezed/issues/488)
     invalid_annotation_target: ignore
+    invalid_dependency: ignore
     body_might_complete_normally_nullable: ignore
 
   exclude:

diff --git a/android/.gitignore b/android/.gitignore
diff --git a/android/build.gradle b/android/build.gradle
diff --git a/android/settings.gradle b/android/settings.gradle
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
diff --git a/android/src/main/kotlin/com/quickbirdstudios/survey_kit/SurveyKitPlugin.kt b/android/src/main/kotlin/com/quickbirdstudios/survey_kit/SurveyKitPlugin.kt
diff --git a/example/.metadata b/example/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "bae5e49bc2a867403c43b2aae2de8f8c33b037e4"
+  revision: "a402d9a4376add5bc2d6b1e33e53edaae58c07f8"
   channel: "stable"
 
 project_type: app
@@ -13,26 +13,26 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
-      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      create_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
+      base_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
     - platform: android
-      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
-      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      create_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
+      base_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
     - platform: ios
-      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
-      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      create_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
+      base_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
     - platform: linux
-      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
-      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      create_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
+      base_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
     - platform: macos
-      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
-      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      create_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
+      base_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
     - platform: web
-      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
-      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      create_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
+      base_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
     - platform: windows
-      create_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
-      base_revision: bae5e49bc2a867403c43b2aae2de8f8c33b037e4
+      create_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
+      base_revision: a402d9a4376add5bc2d6b1e33e53edaae58c07f8
 
   # User provided section