fix: 로그인 회원 시작 ui fix (#71) (KAN-149)

IoTeaTime · Nov 7, 2024 · 629b09c · 629b09c
2 parents 5153313 + ca354ac
commit 629b09c
Show file tree

Hide file tree

Showing 31 changed files with 1,217 additions and 556 deletions.
diff --git a/.github/ISSUE_TEMPLATE/1-test-issue-form.yml b/.github/ISSUE_TEMPLATE/1-test-issue-form.yml
@@ -5,15 +5,6 @@ title: '⚙️ 이슈 제목'
 assignees:
   - octocat
 body:
-  - type: input
-    id: parentKey
-    attributes:
-      label: '🎫 Parent Ticket Number'
-      description: '상위 작업의 Ticket Number를 기입해주세요'
-      placeholder: 'KAN-24'
-    validations:
-      required: true
-
   - type: textarea
     id: description
     attributes:

diff --git a/.github/ISSUE_TEMPLATE/2-feature-issue-form.yml b/.github/ISSUE_TEMPLATE/2-feature-issue-form.yml
@@ -5,15 +5,6 @@ title: '🐶 이슈 제목'
 assignees:
   - octocat
 body:
-  - type: input
-    id: parentKey
-    attributes:
-      label: '🎫 Parent Ticket Number'
-      description: '상위 작업의 Ticket Number를 기입해주세요'
-      placeholder: 'KAN-24'
-    validations:
-      required: true
-
   - type: textarea
     id: description
     attributes:

diff --git a/.github/ISSUE_TEMPLATE/3-fix-issue-form.yml b/.github/ISSUE_TEMPLATE/3-fix-issue-form.yml
@@ -5,15 +5,6 @@ title: '🍎 이슈 제목'
 assignees:
   - octocat
 body:
-  - type: input
-    id: parentKey
-    attributes:
-      label: '🎫 Parent Ticket Number'
-      description: '상위 작업의 Ticket Number를 기입해주세요'
-      placeholder: 'KAN-24'
-    validations:
-      required: true
-
   - type: textarea
     id: description
     attributes:

diff --git a/.github/ISSUE_TEMPLATE/4-refactor-issue-form.yml b/.github/ISSUE_TEMPLATE/4-refactor-issue-form.yml
@@ -5,15 +5,6 @@ title: '🚧 이슈 제목'
 assignees:
   - octocat
 body:
-  - type: input
-    id: parentKey
-    attributes:
-      label: '🎫 Parent Ticket Number'
-      description: '상위 작업의 Ticket Number를 기입해주세요'
-      placeholder: 'KAN-24'
-    validations:
-      required: true
-
   - type: textarea
     id: description
     attributes:

diff --git a/.github/workflows/close-jira-issue.yml b/.github/workflows/close-jira-issue.yml
diff --git a/.github/workflows/create-jira-issue.yml b/.github/workflows/create-jira-issue.yml
diff --git a/app/src/main/java/com/example/mhnfe/StartScreen.kt b/app/src/main/java/com/example/mhnfe/StartScreen.kt
@@ -6,8 +6,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.example.mhnfe.ui.components.middleButton
+import com.example.mhnfe.ui.components.MiddleButton
+
+
 
 @Composable
 fun StartScreen(
@@ -31,7 +34,7 @@ fun StartScreen(
             contentAlignment = Alignment.Center
         ) {
             Image(
-                painter = painterResource(id = R.drawable.logo),
+                painter = painterResource(id = R.drawable.logo2),
                 contentDescription = "명하냥 로고",
                 modifier = Modifier.size(200.dp)
             )
@@ -46,17 +49,17 @@ fun StartScreen(
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             // 로그인 버튼
-            middleButton(
-                text = "로그인",
+            MiddleButton(
+                text = " 로그인",
                 onClick = onLoginClick,
-                modifier = Modifier.fillMaxWidth()
+                //modifier = Modifier.padding(horizontal = 34.dp).height(48.dp)
             )
 
             // Cam 회원 버튼
-            middleButton(
+            MiddleButton(
                 text = "회원가입",
                 onClick = onSignUpClick,
-                modifier = Modifier.fillMaxWidth()
+                //modifier = Modifier.padding(horizontal = 34.dp).height(48.dp)
             )
 
             // 소셜 로그인 버튼들
@@ -73,9 +76,10 @@ fun StartScreen(
                     modifier = Modifier.size(40.dp)
                 )
                 Image(
-                    painter = painterResource(id = R.drawable.google),
+                    painter = painterResource(id = R.drawable.google1),
                     contentDescription = "구글 로그인",
                     modifier = Modifier.size(40.dp)
+
                 )
                 Image(
                     painter = painterResource(id = R.drawable.naver),
@@ -85,4 +89,20 @@ fun StartScreen(
             }
         }
     }
-}
+}
+
+@Preview(
+    name = "Start Screen",
+    showBackground = true,
+    showSystemUi = true,
+    device = "spec:width=411dp,height=891dp"
+)
+@Composable
+fun StartScreenPreview() {
+
+    StartScreen(
+        onLoginClick = {},
+        onSignUpClick = {}
+    )
+
+}
diff --git a/app/src/main/java/com/example/mhnfe/data/model/CCTV.kt b/app/src/main/java/com/example/mhnfe/data/model/CCTV.kt
@@ -2,7 +2,12 @@ package com.example.mhnfe.data.model
 
 data class CCTV(
     val id: String,
-    val name: String,
+    val deviceName: String,   // 기기명
+    val model: String,        // 기종
+    val os: String,           // OS
+    val appVersion: String,   // 앱 버전
+    val batteryStatus: Int, // 배터리 상태
+    val networkStatus: String  // 네트워크 상태
 )
 
 //아무것도 없는거 테스트 할때
@@ -12,14 +17,29 @@ val emptyCCTVList = emptyList<CCTV>()
 val sampleCCTVList = listOf(
     CCTV(
         id = "1",
-        name = "주방"
+        deviceName = "주방",
+        model = "Flip5",
+        os = "Android 10",
+        appVersion = "2.3.1",
+        batteryStatus = 70,
+        networkStatus = "양호"
     ),
     CCTV(
         id = "2",
-        name = "거실"
+        deviceName = "거실",
+        model = "s24",
+        os = "Android 10",
+        appVersion = "3.0.0",
+        batteryStatus = 30,
+        networkStatus = "나쁨"
     ),
     CCTV(
         id = "3",
-        name = "방1"
-    )
+        deviceName = "방1",
+        model = "s23",
+        os = "Android 12",
+        appVersion = "1.5.2",
+        batteryStatus = 95,
+        networkStatus = "나쁨"
+    ),
 )
diff --git a/app/src/main/java/com/example/mhnfe/ui/bottombar/BottomBarScreen.kt b/app/src/main/java/com/example/mhnfe/ui/bottombar/BottomBarScreen.kt
@@ -66,7 +66,7 @@ fun BottomNavigationBar(
         items.forEach { item ->
             val isSelected = when (item) {
                 is NavigationItem.Monitoring -> {
-                    currentRoute == "group"  // 실제 라우트 값과 매칭
+                    currentRoute == "monitoring/group"
                 }
 
                 is NavigationItem.Report -> {