From 04d055d6e6f62a16c9f8d195ed5e9f45e39f9c7f Mon Sep 17 00:00:00 2001
From: Jungwoo <108061510+jwson-automation@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:04:02 +0900
Subject: [PATCH] =?UTF-8?q?=EC=98=A8=EB=B3=B4=EB=94=A9=20=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=EC=97=90=20=EB=B2=84=ED=8A=BC=20=ED=8C=A8=ED=82=A4?=
 =?UTF-8?q?=EC=A7=80=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20(#9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add 온보딩 버튼

* fix issue
---
 android/app/src/main/AndroidManifest.xml     |  2 +-
 lib/feature/onboarding/OnboardingScreen.dart | 29 ++++++++++++++------
 pubspec.yaml                                 |  3 ++
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index df227bd..b5d931f 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
 
     <application
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/launcher_icon"
         android:label="boyvoice"
         android:enableOnBackInvokedCallback="true">
         <meta-data
diff --git a/lib/feature/onboarding/OnboardingScreen.dart b/lib/feature/onboarding/OnboardingScreen.dart
index d04748d..82b9698 100644
--- a/lib/feature/onboarding/OnboardingScreen.dart
+++ b/lib/feature/onboarding/OnboardingScreen.dart
@@ -1,12 +1,11 @@
 import 'package:blueberry_flutter_template/core/TopScreen.dart';
 import 'package:blueberry_flutter_template/feature/onboarding/widgets/OnboardingPageViewBuilder.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_custom_page_steps_indication/CustomPageStepsIndication.dart';
 import 'package:go_router/go_router.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import 'OnboardingData.dart';
-import 'widgets/OnboardingDotWidget.dart';
-import 'widgets/OnboardingPageButton.dart';
 
 class OnboardingScreen extends StatefulWidget {
   static const String name = 'OnboardingScreen';
@@ -68,12 +67,26 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
             flex: 1,
             child: Column(
               children: [
-                OnboardingDotWidget(currentPage: _currentPage),
-                const SizedBox(height: 20),
-                OnboardingPageButton(
-                  currentPage: _currentPage,
-                  onNextPressed: _onNextPressed,
-                ),
+                StepProgress(
+                  totalSteps: OnboardingData.pageDataList.length,
+                  currentStep: _currentPage,
+                  continueButtonColor: Colors.black,
+                  backButtonColor: Colors.blue,
+                  finishButtonColor: Colors.red,
+                  enableFinishButtonGlow: false,
+                  onNext: (int) {
+                    _onNextPressed();
+                  },
+                  onBack: (int) {
+                    _pageController.previousPage(
+                      duration: const Duration(milliseconds: 300),
+                      curve: Curves.easeIn,
+                    );
+                  },
+                  onFinish: () {
+                    context.goNamed(TopScreen.name);
+                  },
+                )
               ],
             ),
           ),
diff --git a/pubspec.yaml b/pubspec.yaml
index 11b8310..36287f8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -117,6 +117,9 @@ dependencies:
   audioplayers: ^6.0.0
   lottie: ^3.1.2
 
+  # page indicator
+  flutter_custom_page_steps_indication: ^1.1.1
+
 
 
 dev_dependencies: