🔨Chore: 충돌 해결

GDSC-DGU · May 4, 2024 · 3963254 · 3963254
1 parent 38531d7
commit 3963254
Showing 1 changed file with 47 additions and 76 deletions.
diff --git a/lib/views/phoneme/phoneme_detail_screen.dart b/lib/views/phoneme/phoneme_detail_screen.dart
@@ -38,36 +38,36 @@ class PhonemeDetailScreen extends StatelessWidget {
                     bottomRight: Radius.circular(24),
                   ),
                 ),
-              ),
-              child: Column(
-                children: [
-                  const SizedBox(height: 20),
-                  // --------------------------- 발음 카드
-                  PhonemeListWidget(
-                    phoneme: phoneme,
-                    realString: realString,
-                  ),
-                  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,
+                child: Column(
+                  children: [
+                    const SizedBox(height: 20),
+                    // --------------------------- 발음 카드
+                    PhonemeListWidget(
+                      phoneme: phoneme,
+                      realString: realString,
+                    ),
+                    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,
+                            ),
+                          )
                         ],
                       ),
                     ),
                   ],
                 ),
-              ),        
+              ),
               // --------------------------- 발음 세부 내용 기입
               const Padding(
                 padding: EdgeInsets.all(20),
@@ -95,56 +95,28 @@ class _BottomBox extends StatelessWidget {
 
   final Phoneme phoneme;
 
-// <<<<<<< feature/gemini
-            // --------------------------- 발음 세부 내용 기입
-// image
-            Padding(
-              padding: const EdgeInsets.all(20),
-              child: Column(
-                children: [
-                  Obx(() {
-                    // isLoading이 true이면 로딩 인디케이터를 보여줌
-                    if (wordViewModel.isLoadingGemini.value) {
-                      return const Center(
-                        child: CircularProgressIndicator(), // 로딩 인디케이터
-                      );
-                    } else {
-                      // isLoading이 false이면 설명 텍스트를 보여줌
-                      return Text(
-                        wordViewModel.description.value,
-                        style: const TextStyle(
-                          fontSize: 16,
-                          fontWeight: FontWeight.w600,
-                          color: Colors.black, // ColorSystem.black으로 가정
-                        ),
-                      );
-                    }
-                  }),
-                ],
-// =======
-//   @override
-//   Widget build(BuildContext context) {
-//     return Column(
-//       children: [
-//         Image.asset(
-//           phoneme.imageSrc,
-//           width: Get.width * 0.50,
-//         ),
-//         const SizedBox(height: 25),
-//         Container(
-//           padding: const EdgeInsets.all(20.0),
-//           width: Get.width - 40,
-//           margin: EdgeInsets.only(bottom: 40),
-//           decoration: BoxDecoration(
-//             borderRadius: BorderRadius.circular(15.0),
-//             color: Color(0x80FFFFFF),  // 80은 50%
-//             boxShadow: [
-//               BoxShadow(
-//                 color: Colors.black.withOpacity(0.1),
-//                 spreadRadius: 0,
-//                 blurRadius: 20,
-//                 offset: const Offset(0, 4),
-// >>>>>>> develop
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Image.asset(
+          phoneme.imageSrc,
+          width: Get.width * 0.50,
+        ),
+        const SizedBox(height: 25),
+        Container(
+          padding: const EdgeInsets.all(20.0),
+          width: Get.width - 40,
+          margin: const EdgeInsets.only(bottom: 40),
+          decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(15.0),
+            color: const Color(0x80FFFFFF), // 80은 50%
+            boxShadow: [
+              BoxShadow(
+                color: Colors.black.withOpacity(0.1),
+                spreadRadius: 0,
+                blurRadius: 20,
+                offset: const Offset(0, 4),
               ),
             ],
           ),
@@ -154,8 +126,7 @@ class _BottomBox extends StatelessWidget {
               fontSize: 18,
               fontWeight: FontWeight.w600,
             ),
-            const Spacer(),
-          ],
+          ),
         ),
       ],
     );