Merge branch 'develop' into refactor/all

lib/languages.dart

@@ -141,6 +141,9 @@ class Languages extends Translations {
           'password_input_2': '비밀번호는 10자리 이상이어야 합니다.',
           'password_input_3': '비밀번호는 문자와 숫자가 섞여있어야 합니다.',
           'study_main_title_5': '문단 교정',
+          // bottomNavigationBar
+          'navi_learning': '학습페이지',
+          'navi_mypage': '마이페이지',
         },
         'en_US': {
           // ---------------------- HOME ----------------------
@@ -270,10 +273,10 @@ class Languages extends Translations {
           'study_main_subtitle_1': 'Phoneme Correction Test',
           'study_main_title_2': 'Word',
           'study_main_subtitle_2': 'Word Correction Test',
-          'study_main_title_3': 'Sentence Correction',
+          'study_main_title_3': 'Sentence',
           'study_main_subtitle_3': 'Sentence Correction Test',
-          'study_main_title_4': 'Paragraph Correction',
-          'study_main_subtitle_4': 'Script Test',
+          'study_main_title_4': 'Paragraph',
+          'study_main_subtitle_4': 'Script Correction Test',
           'row_card_badge_1': 'Phoneme',
           'row_card_badge_2': 'Word',
           'row_card_badge_3': 'Sentence',
@@ -295,6 +298,9 @@ class Languages extends Translations {
           'password_input_3':
               'Password must contain a mix of letters and numbers.',
           'study_main_title_5': 'Paragraph Correction',
+          // navi
+          'navi_learning': 'Learning',
+          'navi_mypage': 'Profile',
         },
       };
 }

lib/models/phoneme_model.dart

@@ -0,0 +1,194 @@
+// Vowel
+class Phoneme {
+  final String symbol;
+  final String description;
+  final String imageSrc;
+
+  Phoneme(
+      {required this.symbol,
+      required this.description,
+      required this.imageSrc});
+}
+
+List<Phoneme> vowels = [
+  Phoneme(
+      symbol: 'i',
+      description: 'Close front unrounded vowel',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ɪ',
+      description: 'Near-close near-front unrounded vowel',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'e',
+      description: 'Close-mid front unrounded vowel',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'æ',
+      description: 'Near-open front unrounded vowel',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ɑ',
+      description: 'Open back unrounded vowel',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ɒ',
+      description: 'Open back rounded vowel',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ɔ',
+      description: 'Open-mid back rounded vowel',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'oʊ',
+      description: 'Close-mid back rounded vowel',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'u',
+      description: 'Close back rounded vowel',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ʊ',
+      description: 'Near-close near-back rounded vowel',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ʌ',
+      description: 'Open-mid back unrounded vowel',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ɜ',
+      description: 'Open-mid central unrounded vowel',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ə',
+      description: 'Mid-central vowel',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'eɪ',
+      description: 'Close-mid front unrounded vowel diphthong',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'aɪ',
+      description: 'Open front unrounded vowel diphthong',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+];
+
+// consonants
+List<Phoneme> consonants = [
+  Phoneme(
+      symbol: 'p',
+      description: 'Voiceless bilabial plosive',
+      imageSrc: 'assets/images/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'b',
+      description: 'Voiced bilabial plosive',
+      imageSrc: 'assets/images/vowels_1.jpg'),
+  Phoneme(
+      symbol: 't',
+      description: 'Voiceless alveolar plosive',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'd',
+      description: 'Voiced alveolar plosive',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'k',
+      description: 'Voiceless velar plosive',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'g',
+      description: 'Voiced velar plosive',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'f',
+      description: 'Voiceless labiodental fricative',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'v',
+      description: 'Voiced labiodental fricative',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'θ',
+      description: 'Voiceless dental fricative (think)',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ð',
+      description: 'Voiced dental fricative (this)',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 's',
+      description: 'Voiceless alveolar fricative',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'z',
+      description: 'Voiced alveolar fricative',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ʃ',
+      description: 'Voiceless postalveolar fricative (shoe)',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ʒ',
+      description: 'Voiced postalveolar fricative (measure)',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ʧ',
+      description: 'Voiceless postalveolar affricate (chair)',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ʤ',
+      description: 'Voiced postalveolar affricate (judge)',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'm',
+      description: 'Bilabial nasal',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'n',
+      description: 'Alveolar nasal',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ŋ',
+      description: 'Velar nasal (sing)',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'l',
+      description: 'Alveolar lateral approximant',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'r',
+      description: 'Alveolar approximant',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ɹ',
+      description: 'Postalveolar approximant',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'h',
+      description: 'Voiceless glottal fricative',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'w',
+      description: 'Voiced labio-velar approximant',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+];
+
+// R controlled vowels
+List<Phoneme> rControlledVowels = [
+  Phoneme(
+      symbol: 'ɑr',
+      description: 'Start, car, far',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ɛr',
+      description: 'Terror, error, very',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ɪr',
+      description: 'First, bird, flirt',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+  Phoneme(
+      symbol: 'ɔr',
+      description: 'Fort, more, door',
+      imageSrc: 'assets/images/phoneme/vowels_1.jpg'),
+];

lib/utilities/style/color_system.dart

@@ -99,7 +99,7 @@ class ColorSystem {
   }) {
     return createColorScheme(
       brightness: Brightness.light,
-      primary: primary,
+      primary: Colors.white,
       primaryVariant: primaryVariant,
       secondary: secondary,
       secondaryVariant: secondaryVariant,

lib/views/auth/auth_dialog.dart

@@ -1,4 +1,5 @@
 import 'package:earlips/services/auth/auth_service.dart';
+import 'package:earlips/utilities/style/color_system.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
@@ -14,10 +15,14 @@ Future<void> authDialog({
 
   return Get.defaultDialog(
     title: title,
+    titleStyle: const TextStyle(fontSize: 25),
     content: Text(content),
     textConfirm: textConfirm,
     textCancel: textCancel,
     onCancel: () => Get.back(),
+    backgroundColor: Colors.white,
+    confirmTextColor: ColorSystem.black,
+    cancelTextColor: ColorSystem.black,
     onConfirm: () async {
       title == 'profile_account_logout'.tr
           ? await authService.signOut()

lib/views/phoneme/phoneme_detail_screen.dart

@@ -0,0 +1,81 @@
+import 'package:earlips/models/phoneme_model.dart';
+import 'package:earlips/utilities/style/color_system.dart';
+import 'package:earlips/views/phoneme/widget/phoneme_list_widget.dart';
+import 'package:earlips/views/word/widget/blue_back_appbar.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:get/get.dart';
+
+class PhonemeDetailScreen extends StatelessWidget {
+  final Phoneme phoneme;
+
+  const PhonemeDetailScreen({super.key, required this.phoneme});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: PreferredSize(
+        preferredSize: const Size.fromHeight(kToolbarHeight),
+        child: BlueBackAppbar(title: 'Details for ${phoneme.symbol}'),
+      ),
+      body: Center(
+        child: Column(
+          children: [
+            Container(
+              decoration: const BoxDecoration(
+                color: ColorSystem.main2,
+                borderRadius: BorderRadius.only(
+                  bottomLeft: Radius.circular(24),
+                  bottomRight: Radius.circular(24),
+                ),
+              ),
+              child: Column(
+                children: [
+                  const SizedBox(height: 20),
+                  // --------------------------- 발음 카드
+                  PhonemeListWidget(phoneme: phoneme),
+                  SizedBox(
+                    height: 70,
+                    child: Column(
+                      children: [
+                        const SizedBox(
+                          height: 15,
+                        ),
+                        // --------------------------- 발음 안내
+                        Text(
+                          "word_type_12_height".tr,
+                          style: const TextStyle(
+                            fontSize: 16,
+                            fontWeight: FontWeight.w600,
+                            color: ColorSystem.white,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ),
+
+            // --------------------------- 발음 세부 내용 기입
+// image
+            const Padding(
+              padding: EdgeInsets.all(20),
+              child: Column(
+                children: [
+                  // SvgPicture.asset(
+                  //   'assets/images/phoneme/vowels_1.svg',
+                  //   width: 90,
+                  //   height: 90,
+                  // ),
+                ],
+              ),
+            ),
+            Text(phoneme.description),
+            const Spacer(),
+          ],
+        ),
+      ),
+    );
+  }
+}