2025-05-19 03:53:45 +02:00
32 changed files with 153 additions and 189 deletions
--- a/.gitignore
+++ b/.gitignore
@ -31,6 +31,7 @@ build/

 .metadata

+
 pubspec.lock

 pubspec_overrides.yaml
@ -40,7 +41,3 @@ example/web
 example/android
 example/linux
 example/macos
-
-# FVM Version Cache
-.fvm/
-.fvmrc
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,14 +1,3 @@
-## 5.0.0
-
-* Changed color of indicators
-* Changed default button text
-
-## 4.0.0
-
-* Added Buildcontext to the pages parameter.
-* Added `dotColor` so the default can be changed.
-* Changed the default `pages` to include theme.
-
 ## 3.1.0

 * Introduction now uses `IntroductionScreenMode` to determine how often the introductions should be shown
--- a/packages/flutter_introduction/CHANGELOG.md
+++ b/packages/flutter_introduction/CHANGELOG.md
@ -1 +0,0 @@
-../../CHANGELOG.md
--- a/packages/flutter_introduction/LICENSE
+++ b/packages/flutter_introduction/LICENSE
@ -1 +0,0 @@
-../../LICENSE
--- a/packages/flutter_introduction/README.md
+++ b/packages/flutter_introduction/README.md
@ -1 +0,0 @@
-../../README.md
--- a/packages/flutter_introduction/example/lib/main.dart
+++ b/packages/flutter_introduction/example/lib/main.dart
@ -38,7 +38,7 @@ class _MyHomePageState extends State<MyHomePage> {
  Widget build(BuildContext context) => Scaffold(
        body: Introduction(
          options: IntroductionOptions(
-            pages: (context) => [
+            pages: [
              const IntroductionPage(
                title: Text('First page'),
                text: Text('Wow a page'),
--- a/packages/flutter_introduction/pubspec.yaml
+++ b/packages/flutter_introduction/pubspec.yaml
@ -1,21 +1,25 @@
 name: flutter_introduction
 description: Combined Package of Flutter Introduction Widget and Flutter Introduction Service
-version: 5.0.0
-publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub
+version: 3.1.0
+publish_to: none

 environment:
-  sdk: ">=3.0.0 <4.0.0"
+  sdk: ">=2.18.0 <3.0.0"
  flutter: ">=1.17.0"

 dependencies:
  flutter:
    sdk: flutter
  flutter_introduction_widget:
-    hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
-    version: "^5.0.0"
+    git:
+      url: https://github.com/Iconica-Development/flutter_introduction
+      ref: 3.1.0
+      path: packages/flutter_introduction_widget
  flutter_introduction_service:
-    hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
-    version: "^5.0.0"
+    git:
+      url: https://github.com/Iconica-Development/flutter_introduction
+      ref: 3.1.0
+      path: packages/flutter_introduction_service

 dev_dependencies:
  flutter_test:
--- a/packages/flutter_introduction_firebase/CHANGELOG.md
+++ b/packages/flutter_introduction_firebase/CHANGELOG.md
@ -1 +0,0 @@
-../../CHANGELOG.md
--- a/packages/flutter_introduction_firebase/LICENSE
+++ b/packages/flutter_introduction_firebase/LICENSE
@ -1 +0,0 @@
-../../LICENSE
--- a/packages/flutter_introduction_firebase/lib/src/introduction_widget.dart
+++ b/packages/flutter_introduction_firebase/lib/src/introduction_widget.dart
@ -115,7 +115,7 @@ class _IntroductionState extends State<IntroductionFirebase> {
                  snapshot.data is List<IntroductionPageData>) {
                return IntroductionScreen(
                  options: widget.options.copyWith(
-                    pages: (context) => snapshot.data!.map(
+                    pages: snapshot.data?.map(
                      (e) {
                        var title = e.title.isEmpty
                            ? ''
--- a/packages/flutter_introduction_firebase/pubspec.yaml
+++ b/packages/flutter_introduction_firebase/pubspec.yaml
@ -1,7 +1,7 @@
 name: flutter_introduction_firebase
 description: Flutter Introduction Page that uses firebase for the pages and some settings
-version: 5.0.0
-publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub
+version: 3.1.0
+publish_to: none

 environment:
  sdk: ">=3.1.5 <4.0.0"
@ -9,15 +9,19 @@ environment:
 dependencies:
  flutter:
    sdk: flutter
-  cloud_firestore: "^4.12.2"
-  cached_network_image: "^3.3.0"
+  cloud_firestore: ^4.12.2
+  cached_network_image: ^3.3.0

  flutter_introduction_widget:
-    hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
-    version: "^5.0.0"
+    git:
+      url: https://github.com/Iconica-Development/flutter_introduction
+      ref: 3.1.0
+      path: packages/flutter_introduction_widget
  flutter_introduction_service:
-    hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
-    version: "^5.0.0"
+    git:
+      url: https://github.com/Iconica-Development/flutter_introduction
+      ref: 3.1.0
+      path: packages/flutter_introduction_service

 dev_dependencies:
  flutter_test:
--- a/packages/flutter_introduction_interface/CHANGELOG.md
+++ b/packages/flutter_introduction_interface/CHANGELOG.md
@ -1 +0,0 @@
-../../CHANGELOG.md
--- a/packages/flutter_introduction_interface/LICENSE
+++ b/packages/flutter_introduction_interface/LICENSE
@ -1 +0,0 @@
-../../LICENSE
--- a/packages/flutter_introduction_interface/README.md
+++ b/packages/flutter_introduction_interface/README.md
@ -1 +0,0 @@
-../../README.md
--- a/packages/flutter_introduction_interface/pubspec.yaml
+++ b/packages/flutter_introduction_interface/pubspec.yaml
@ -1,18 +1,19 @@
 name: flutter_introduction_interface
 description: A new Flutter package project.
-version: 5.0.0
-publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub
+version: 3.1.0
+publish_to: none

 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=2.18.0 <3.0.0'
  flutter: ">=1.17.0"

 dependencies:
  flutter:
    sdk: flutter
  flutter_data_interface:
-    hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
-    version: "^1.0.0"
+    git:
+      url: https://github.com/Iconica-Development/flutter_data_interface.git
+      ref: 1.0.0

 dev_dependencies:
  flutter_test:
--- a/packages/flutter_introduction_service/CHANGELOG.md
+++ b/packages/flutter_introduction_service/CHANGELOG.md
@ -1 +0,0 @@
-../../CHANGELOG.md
--- a/packages/flutter_introduction_service/LICENSE
+++ b/packages/flutter_introduction_service/LICENSE
@ -1 +0,0 @@
-../../LICENSE
--- a/packages/flutter_introduction_service/README.md
+++ b/packages/flutter_introduction_service/README.md
@ -1 +0,0 @@
-../../README.md
--- a/packages/flutter_introduction_service/pubspec.yaml
+++ b/packages/flutter_introduction_service/pubspec.yaml
@ -1,18 +1,20 @@
 name: flutter_introduction_service
 description: A new Flutter package project.
-version: 5.0.0
-publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub
+version: 3.1.0
+publish_to: none

 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=2.18.0 <3.0.0'
  flutter: ">=1.17.0"

 dependencies:
  flutter:
    sdk: flutter
  flutter_introduction_interface:
-    hosted:  https://forgejo.internal.iconica.nl/api/packages/internal/pub
-    version: "^5.0.0"
+    git: 
+      url: https://github.com/Iconica-Development/flutter_introduction
+      ref: 3.1.0
+      path: packages/flutter_introduction_interface
  
 dev_dependencies:
  flutter_test:
--- a/packages/flutter_introduction_shared_preferences/CHANGELOG.md
+++ b/packages/flutter_introduction_shared_preferences/CHANGELOG.md
@ -1 +0,0 @@
-../../CHANGELOG.md
--- a/packages/flutter_introduction_shared_preferences/LICENSE
+++ b/packages/flutter_introduction_shared_preferences/LICENSE
@ -1 +0,0 @@
-../../LICENSE
--- a/packages/flutter_introduction_shared_preferences/README.md
+++ b/packages/flutter_introduction_shared_preferences/README.md
@ -1 +0,0 @@
-../../README.md
--- a/packages/flutter_introduction_shared_preferences/pubspec.yaml
+++ b/packages/flutter_introduction_shared_preferences/pubspec.yaml
@ -1,19 +1,21 @@
 name: flutter_introduction_shared_preferences
 description: A new Flutter package project.
-version: 5.0.0
-publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub
+version: 3.1.0
+publish_to: none

 environment:
-  sdk: '>=3.0.0 <4.0.0'
+  sdk: '>=2.18.0 <3.0.0'
  flutter: ">=1.17.0"

 dependencies:
  flutter:
    sdk: flutter
  flutter_introduction_interface: 
-    hosted: https://forgejo.internal.iconica.nl/api/packages/internal/pub
-    version: "^5.0.0"
-  shared_preferences: "^2.2.0"
+    git: 
+      url: https://github.com/Iconica-Development/flutter_introduction
+      ref: 3.1.0
+      path: packages/flutter_introduction_interface
+  shared_preferences: any

 dev_dependencies:
  flutter_test:
--- a/packages/flutter_introduction_widget/CHANGELOG.md
+++ b/packages/flutter_introduction_widget/CHANGELOG.md
@ -1 +0,0 @@
-../../CHANGELOG.md
--- a/packages/flutter_introduction_widget/LICENSE
+++ b/packages/flutter_introduction_widget/LICENSE
@ -1 +0,0 @@
-../../LICENSE
--- a/packages/flutter_introduction_widget/example/lib/main.dart
+++ b/packages/flutter_introduction_widget/example/lib/main.dart
@ -31,7 +31,7 @@ class MyApp extends StatelessWidget {
      ),
      home: IntroductionScreen(
        options: IntroductionOptions(
-          pages: (context) => [
+          pages: [
            const IntroductionPage(
              title: Text('Basic Page'),
              text: Text(
--- a/packages/flutter_introduction_widget/lib/src/config/default_introduction_pages.dart
+++ b/packages/flutter_introduction_widget/lib/src/config/default_introduction_pages.dart
@ -1,21 +1,19 @@
+
 import 'package:flutter/material.dart';
 import 'package:flutter_introduction_widget/flutter_introduction_widget.dart';

-List<IntroductionPage> defaultIntroductionPages(BuildContext context) {
-  var theme = Theme.of(context);
-  return [
+const List<IntroductionPage> defaultIntroductionPages = [
  IntroductionPage(
    title: Column(
      children: [
-          const SizedBox(height: 50),
+        SizedBox(height: 50),
        Text(
          'welcome to iconinstagram',
-            style: theme.textTheme.headlineLarge,
        ),
-          const SizedBox(height: 6),
+        SizedBox(height: 6),
      ],
    ),
-      graphic: const Image(
+    graphic: Image(
      image: AssetImage(
        'assets/first.png',
        package: 'flutter_introduction_widget',
@ -26,19 +24,17 @@ List<IntroductionPage> defaultIntroductionPages(BuildContext context) {
      ' knows no bounds and connections are made'
      ' through captivating visuals.',
      textAlign: TextAlign.center,
-        style: theme.textTheme.bodyMedium,
    ),
  ),
  IntroductionPage(
    title: Column(
      mainAxisAlignment: MainAxisAlignment.center,
      children: [
-          const SizedBox(height: 50),
+        SizedBox(height: 50),
        Text(
          'discover iconinstagram',
-            style: theme.textTheme.headlineLarge,
        ),
-          const SizedBox(height: 6),
+        SizedBox(height: 6),
      ],
    ),
    text: Text(
@ -47,9 +43,8 @@ List<IntroductionPage> defaultIntroductionPages(BuildContext context) {
      ' From stunning photography to engaging videos,'
      ' Instagram offers a diverse range of content to explore and enjoy.',
      textAlign: TextAlign.center,
-        style: theme.textTheme.bodyMedium,
    ),
-      graphic: const Image(
+    graphic: Image(
      image: AssetImage(
        'assets/second.png',
        package: 'flutter_introduction_widget',
@ -59,15 +54,14 @@ List<IntroductionPage> defaultIntroductionPages(BuildContext context) {
  IntroductionPage(
    title: Column(
      children: [
-          const SizedBox(height: 50),
+        SizedBox(height: 50),
        Text(
          'elevate your experience',
-            style: theme.textTheme.headlineLarge,
        ),
-          const SizedBox(height: 6),
+        SizedBox(height: 6),
      ],
    ),
-      graphic: const Image(
+    graphic: Image(
      image: AssetImage(
        'assets/third.png',
        package: 'flutter_introduction_widget',
@ -78,8 +72,6 @@ List<IntroductionPage> defaultIntroductionPages(BuildContext context) {
      ' with friends and family, Instagram provides the'
      ' tools and platform to make your voice heard.',
      textAlign: TextAlign.center,
-        style: theme.textTheme.bodyMedium,
    ),
  ),
-  ];
-}
+];
--- a/packages/flutter_introduction_widget/lib/src/config/introduction.dart
+++ b/packages/flutter_introduction_widget/lib/src/config/introduction.dart
@ -75,7 +75,6 @@ class IntroductionOptions {
    this.controlMode = IntroductionControlMode.previousNextButton,
    this.dotSize = 12,
    this.dotSpacing = 24,
-    this.dotColor,
  }) : assert(
          !(identical(indicatorMode, IndicatorMode.custom) &&
              indicatorBuilder == null),
@ -96,7 +95,7 @@ class IntroductionOptions {

  /// List of introduction pages to set the text, icons or images for the
  /// introduction screens.
-  final List<IntroductionPage> Function(BuildContext context) pages;
+  final List<IntroductionPage> pages;

  /// Determines whether the user can tap the screen to go to the next
  /// introduction screen.
@ -213,13 +212,9 @@ class IntroductionOptions {
  /// The distance between the center of each dot. Default is 24
  final double dotSpacing;

-  /// The color of the dots in the indicator. Default is the primary color of
-  /// the theme
-  final Color? dotColor;
-
  IntroductionOptions copyWith({
    IntroductionScreenMode? mode,
-    List<IntroductionPage> Function(BuildContext context)? pages,
+    List<IntroductionPage>? pages,
    bool? tapEnabled,
    IntroductionScreenButtonMode? buttonMode,
    IntroductionLayoutStyle? layoutStyle,
@ -264,7 +259,7 @@ class IntroductionTranslations {
    this.skipButton = 'Skip',
    this.nextButton = 'Next',
    this.previousButton = 'Previous',
-    this.finishButton = 'Get started',
+    this.finishButton = 'Get Started',
  });
  final String skipButton;
  final String nextButton;
@ -274,10 +269,22 @@ class IntroductionTranslations {

 class IntroductionButtonTextstyles {
  const IntroductionButtonTextstyles({
-    this.skipButtonStyle,
-    this.nextButtonStyle,
-    this.previousButtonStyle,
-    this.finishButtonStyle,
+    this.skipButtonStyle = const TextStyle(
+      fontSize: 16,
+      fontWeight: FontWeight.w500,
+    ),
+    this.nextButtonStyle = const TextStyle(
+      fontSize: 16,
+      fontWeight: FontWeight.w500,
+    ),
+    this.previousButtonStyle = const TextStyle(
+      fontSize: 16,
+      fontWeight: FontWeight.w500,
+    ),
+    this.finishButtonStyle = const TextStyle(
+      fontSize: 16,
+      fontWeight: FontWeight.w500,
+    ),
  });
  final TextStyle? skipButtonStyle;
  final TextStyle? nextButtonStyle;
--- a/packages/flutter_introduction_widget/lib/src/types/page_introduction.dart
+++ b/packages/flutter_introduction_widget/lib/src/types/page_introduction.dart
@ -77,7 +77,7 @@ class _MultiPageIntroductionScreenState

  @override
  Widget build(BuildContext context) {
-    var pages = widget.options.pages.call(context);
+    var pages = widget.options.pages;
    var translations = widget.options.introductionTranslations;
    return Stack(
      children: [
@ -150,7 +150,6 @@ class _MultiPageIntroductionScreenState
                    AnimatedBuilder(
                      animation: _currentPage,
                      builder: (context, _) => Indicator(
-                        options: widget.options,
                        indicatorBuilder: widget.options.indicatorBuilder,
                        mode: widget.options.indicatorMode,
                        controller: _controller,
@ -342,7 +341,6 @@ class IntroductionTwoButtons extends StatelessWidget {
    var translations = options.introductionTranslations;
    var showFinishButton =
        options.buttonMode == IntroductionScreenButtonMode.singleFinish;
-    var theme = Theme.of(context);
    return Row(
      mainAxisAlignment: MainAxisAlignment.spaceBetween,
      children: [
@ -364,8 +362,7 @@ class IntroductionTwoButtons extends StatelessWidget {
                          Text(
                            translations.previousButton,
                            style: options.introductionButtonTextstyles
-                                    .previousButtonStyle ??
-                                theme.textTheme.bodyMedium,
+                                .previousButtonStyle,
                          ),
                          IntroductionButtonType.previous,
                        ) ??
@ -387,8 +384,7 @@ class IntroductionTwoButtons extends StatelessWidget {
                                child: Text(
                                  translations.previousButton,
                                  style: options.introductionButtonTextstyles
-                                          .previousButtonStyle ??
-                                      theme.textTheme.bodyMedium,
+                                      .previousButtonStyle,
                                ),
                              ),
                            ),
@ -412,9 +408,8 @@ class IntroductionTwoButtons extends StatelessWidget {
                        _next,
                        Text(
                          translations.nextButton,
-                          style: options.introductionButtonTextstyles
-                                  .nextButtonStyle ??
-                              theme.textTheme.bodyMedium,
+                          style: options
+                              .introductionButtonTextstyles.nextButtonStyle,
                        ),
                        IntroductionButtonType.next,
                      ) ??
@ -435,8 +430,7 @@ class IntroductionTwoButtons extends StatelessWidget {
                              child: Text(
                                translations.nextButton,
                                style: options.introductionButtonTextstyles
-                                        .nextButtonStyle ??
-                                    theme.textTheme.bodyMedium,
+                                    .nextButtonStyle,
                              ),
                            ),
                          ),
@ -460,9 +454,8 @@ class IntroductionTwoButtons extends StatelessWidget {
                        },
                        Text(
                          translations.finishButton,
-                          style: options.introductionButtonTextstyles
-                                  .finishButtonStyle ??
-                              theme.textTheme.bodyMedium,
+                          style: options
+                              .introductionButtonTextstyles.finishButtonStyle,
                        ),
                        IntroductionButtonType.finish,
                      ) ??
@ -485,8 +478,7 @@ class IntroductionTwoButtons extends StatelessWidget {
                              child: Text(
                                translations.finishButton,
                                style: options.introductionButtonTextstyles
-                                        .finishButtonStyle ??
-                                    theme.textTheme.bodyMedium,
+                                    .finishButtonStyle,
                              ),
                            ),
                          ),
@ -520,9 +512,8 @@ class IntroductionTwoButtons extends StatelessWidget {
                          },
                          Text(
                            translations.finishButton,
-                            style: options.introductionButtonTextstyles
-                                    .finishButtonStyle ??
-                                theme.textTheme.bodyMedium,
+                            style: options
+                                .introductionButtonTextstyles.finishButtonStyle,
                          ),
                          IntroductionButtonType.finish,
                        ) ??
@ -546,8 +537,7 @@ class IntroductionTwoButtons extends StatelessWidget {
                                child: Text(
                                  translations.finishButton,
                                  style: options.introductionButtonTextstyles
-                                          .finishButtonStyle ??
-                                      theme.textTheme.bodyMedium,
+                                      .finishButtonStyle,
                                ),
                              ),
                            ),
--- a/packages/flutter_introduction_widget/lib/src/widgets/indicator.dart
+++ b/packages/flutter_introduction_widget/lib/src/widgets/indicator.dart
@ -17,7 +17,6 @@ class Indicator extends StatelessWidget {
    required this.indicatorBuilder,
    required this.dotSize,
    required this.dotSpacing,
-    required this.options,
    super.key,
  }) : assert(
          !(mode == IndicatorMode.custom && indicatorBuilder == null),
@ -47,8 +46,6 @@ class Indicator extends StatelessWidget {
  /// The distance between the center of each dot.
  final double dotSpacing;

-  final IntroductionOptions options;
-
  @override
  Widget build(BuildContext context) {
    var theme = Theme.of(context);
@ -60,7 +57,7 @@ class Indicator extends StatelessWidget {
          dotSize: dotSize,
          dotSpacing: dotSpacing,
          controller: controller,
-          color: options.dotColor ?? theme.colorScheme.primary,
+          color: theme.colorScheme.secondary,
          itemCount: count,
          onPageSelected: (int page) {
            unawaited(
@ -76,7 +73,7 @@ class Indicator extends StatelessWidget {
        return DashIndicator(
          color: theme.colorScheme.primary,
          controller: controller,
-          selectedColor: options.dotColor ?? theme.colorScheme.primary,
+          selectedColor: theme.colorScheme.primary,
          itemCount: count,
          onPageSelected: (int page) {
            unawaited(
@ -197,7 +194,7 @@ class DotsIndicator extends AnimatedWidget {
            color:
                (((controller.page ?? controller.initialPage).round()) == index
                    ? color
-                    : color.withAlpha(62)),
+                    : color.withAlpha(125)),
            type: MaterialType.circle,
            child: Container(
              decoration: const BoxDecoration(
--- a/packages/flutter_introduction_widget/pubspec.yaml
+++ b/packages/flutter_introduction_widget/pubspec.yaml
@ -1,12 +1,10 @@
 name: flutter_introduction_widget
 description: Flutter Introduction Widget for showing a list of introduction pages on a single scrollable page or horizontal pageview
-version: 5.0.0
+version: 3.1.0
 homepage: https://github.com/Iconica-Development/flutter_introduction_widget

-publish_to: https://forgejo.internal.iconica.nl/api/packages/internal/pub
-
 environment:
-  sdk: ">=3.0.0 <4.0.0"
+  sdk: ">=2.18.0 <3.0.0"
  flutter: ">=1.17.0"

 dependencies:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -1,8 +1,5 @@
 name: flutter_introduction_workspace
-description: The use case level package using both the flutter_introduction_widget and the flutter_introduction_service combined
-version: 5.0.0
-
-publish_to: None
+version: 3.1.0

 environment:
  sdk: '>=3.1.0 <4.0.0'