Skip to content

Commit 04beae6

Browse files
ing03201DokySp
ing03201
authored and
DokySp
committed
FoKE-Developers#44 comment 반영
- androidManifest permission 구문 추가 - libs.version camelcase -> -로 변경 - SelectMethodScreen 아이콘 대신 이모지 변경 - import 구문 optimize - FourCutFrame TODO 추가
1 parent 628d28f commit 04beae6

File tree

8 files changed

+29
-64
lines changed

8 files changed

+29
-64
lines changed

‎app/src/main/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3+
<!--TODO IP Camera 연결에 사용하기 위해 인터넷 퍼미션을 추가하였습니다.-->
34
<uses-permission android:name="android.permission.INTERNET" />
45
<application
56
android:name=".MainApplication"

‎gradle/libs.versions.toml

+18-18
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ kotlin-kapt = "1.9.20"
2222
# android --------
2323
appcompat = "1.7.0"
2424
composeCompiler = "1.5.5"
25-
lifecycleRuntimeKtx = "2.8.6"
26-
activityCompose = "1.9.2"
27-
composeBom = "2024.09.02"
25+
lifecycle-runtime-ktx = "2.8.6"
26+
activity-compose = "1.9.2"
27+
compose-bom = "2024.09.02"
2828
material = "1.12.0"
29-
navigationCompose = "2.8.1"
29+
navigation-compose = "2.8.1"
3030

3131
# hilt -----------
3232
hilt = "2.49"
@@ -56,14 +56,14 @@ protobuf-plugin = "0.9.4"
5656
protoc = "com.google.protobuf:protoc:4.28.2"
5757

5858
# compose extended UI
59-
constraintlayoutCompose = "1.0.1"
60-
androidMjpegView = "1.1.3"
61-
materialIconsExtended = "1.7.2"
59+
constraint-layout-compose = "1.0.1"
60+
android-mjpeg-view = "1.1.3"
61+
material-icons-extended = "1.7.2"
6262

6363
# test -----------
6464
junit = "4.13.2"
65-
junitVersion = "1.2.1"
66-
espressoCore = "3.6.1"
65+
junit-version = "1.2.1"
66+
espresso-core = "3.6.1"
6767

6868

6969

@@ -73,17 +73,17 @@ androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref =
7373

7474
# android --------
7575
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
76-
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
77-
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
78-
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
76+
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle-runtime-ktx" }
77+
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity-compose" }
78+
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
7979
androidx-ui = { group = "androidx.compose.ui", name = "ui" }
8080
androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
8181
androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
8282
androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
8383
androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
8484
androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
8585
androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
86-
androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }
86+
androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation-compose" }
8787

8888
# hilt -----------
8989
hilt = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
@@ -117,14 +117,14 @@ datastore_preferences_core = { group = "androidx.datastore", name = "datastore-p
117117
protobuf_javalite = { group = "com.google.protobuf", name = "protobuf-javalite", version.ref = "protobuf" }
118118

119119
# compose UI
120-
androidx-constraintlayout-compose = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "constraintlayoutCompose" }
121-
androidx-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "materialIconsExtended" }
122-
android-mjpeg-view = { group = "com.perthcpe23.dev", name = "android-mjpeg-view", version.ref = "androidMjpegView" }
120+
androidx-constraintlayout-compose = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "constraint-layout-compose" }
121+
androidx-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "material-icons-extended" }
122+
android-mjpeg-view = { group = "com.perthcpe23.dev", name = "android-mjpeg-view", version.ref = "android-mjpeg-view" }
123123

124124
# test -----------
125125
junit = { group = "junit", name = "junit", version.ref = "junit" }
126-
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
127-
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
126+
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junit-version" }
127+
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
128128
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
129129

130130

‎presenter/src/main/java/com/foke/together/presenter/frame/FourCutFrame.kt

+2
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ fun FourCutFrame(
5555

5656
) {
5757
items(4){
58+
//TODO: add camera image
59+
// change Box -> ImageView
5860
Box(
5961
modifier = Modifier
6062
.aspectRatio(1.5f)

‎presenter/src/main/java/com/foke/together/presenter/screen/CameraScreen.kt

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ fun CameraScreen(
7676
isAdjustHeight = true
7777
supportPinchZoomAndPan = false
7878
// test url
79+
// TODO : change url in viewmodel
7980
setUrl("https://192.168.137.100:8080/test.mjpg")
8081
startStream()
8182
}

‎presenter/src/main/java/com/foke/together/presenter/screen/HomeScreen.kt

+2-7
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,10 @@ import androidx.compose.foundation.layout.fillMaxSize
55
import androidx.compose.foundation.layout.size
66
import androidx.compose.material.icons.Icons
77
import androidx.compose.material.icons.filled.Settings
8-
import androidx.compose.material3.Button
9-
import androidx.compose.material3.Icon
10-
import androidx.compose.material3.IconButton
11-
import androidx.compose.material3.MaterialTheme
12-
import androidx.compose.material3.Text
8+
import androidx.compose.material3.*
139
import androidx.compose.runtime.Composable
1410
import androidx.compose.runtime.collectAsState
1511
import androidx.compose.runtime.getValue
16-
import androidx.compose.ui.Alignment
1712
import androidx.compose.ui.Modifier
1813
import androidx.compose.ui.res.painterResource
1914
import androidx.compose.ui.text.font.FontWeight
@@ -25,9 +20,9 @@ import androidx.constraintlayout.compose.Dimension
2520
import androidx.hilt.navigation.compose.hiltViewModel
2621
import com.foke.together.domain.input.GetSampleDataInterface
2722
import com.foke.together.domain.input.SampleUiData
23+
import com.foke.together.presenter.R
2824
import com.foke.together.presenter.ui.theme.FourCutTogetherTheme
2925
import com.foke.together.presenter.viewmodel.HomeViewModel
30-
import com.foke.together.presenter.R
3126
import kotlinx.coroutines.flow.Flow
3227
import kotlinx.coroutines.flow.flow
3328

‎presenter/src/main/java/com/foke/together/presenter/screen/SelectMethodScreen.kt

+2-12
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,7 @@ fun SelectMethodScreen(
8585
border = BorderStroke(3.dp, MaterialTheme.colorScheme.primary)
8686
) {
8787
Text(text = "Timer", style = MaterialTheme.typography.titleLarge)
88-
Icon(
89-
imageVector = Icons.Filled.Timer,
90-
contentDescription = "Gesture",
91-
tint = MaterialTheme.colorScheme.primary,
92-
modifier = Modifier.size(24.dp)
93-
)
88+
Text(text = "⏱\uFE0F", style = MaterialTheme.typography.titleLarge)
9489
}
9590
OutlinedButton(
9691
onClick = { navigateToCamera() },
@@ -106,12 +101,7 @@ fun SelectMethodScreen(
106101
border = BorderStroke(3.dp, MaterialTheme.colorScheme.primary)
107102
) {
108103
Text(text = "Gesture", style = MaterialTheme.typography.titleLarge)
109-
Icon(
110-
imageVector = Icons.Filled.Gesture,
111-
contentDescription = "Gesture",
112-
tint = MaterialTheme.colorScheme.primary,
113-
modifier = Modifier.size(24.dp)
114-
)
104+
Text(text = "\uD83D\uDC4B", style = MaterialTheme.typography.titleLarge)
115105
}
116106

117107
}

‎presenter/src/main/java/com/foke/together/presenter/screen/SettingScreen.kt

+2-13
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,9 @@ import androidx.compose.foundation.layout.size
88
import androidx.compose.foundation.shape.RoundedCornerShape
99
import androidx.compose.material.icons.Icons
1010
import androidx.compose.material.icons.automirrored.filled.ArrowBack
11-
import androidx.compose.material.icons.filled.ArrowBack
12-
import androidx.compose.material3.ButtonDefaults
13-
import androidx.compose.material3.Icon
14-
import androidx.compose.material3.IconButton
15-
import androidx.compose.material3.MaterialTheme
16-
import androidx.compose.material3.OutlinedButton
17-
import androidx.compose.material3.Text
18-
import androidx.compose.material3.TextField
19-
import androidx.compose.runtime.Composable
20-
import androidx.compose.runtime.getValue
21-
import androidx.compose.runtime.mutableStateOf
22-
import androidx.compose.runtime.remember
11+
import androidx.compose.material3.*
12+
import androidx.compose.runtime.*
2313
import androidx.compose.runtime.saveable.rememberSaveable
24-
import androidx.compose.runtime.setValue
2514
import androidx.compose.ui.Modifier
2615
import androidx.compose.ui.tooling.preview.Preview
2716
import androidx.compose.ui.unit.dp

‎presenter/src/main/java/com/foke/together/presenter/screen/ShareScreen.kt

+1-14
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,23 @@
11
package com.foke.together.presenter.screen
22

3-
import androidx.compose.foundation.layout.Column
43
import androidx.compose.foundation.layout.fillMaxSize
5-
import androidx.compose.foundation.layout.fillMaxWidth
64
import androidx.compose.foundation.layout.size
75
import androidx.compose.material.icons.Icons
86
import androidx.compose.material.icons.filled.Download
97
import androidx.compose.material.icons.filled.Home
108
import androidx.compose.material.icons.filled.Print
11-
import androidx.compose.material.icons.filled.Settings
129
import androidx.compose.material.icons.filled.Share
13-
import androidx.compose.material3.Button
14-
import androidx.compose.material3.Card
15-
import androidx.compose.material3.Icon
16-
import androidx.compose.material3.IconButton
17-
import androidx.compose.material3.MaterialTheme
18-
import androidx.compose.material3.Surface
19-
import androidx.compose.material3.Text
20-
import androidx.compose.material3.lightColorScheme
10+
import androidx.compose.material3.*
2111
import androidx.compose.runtime.Composable
22-
import androidx.compose.ui.Alignment
2312
import androidx.compose.ui.Modifier
2413
import androidx.compose.ui.tooling.preview.Preview
2514
import androidx.compose.ui.unit.dp
26-
import androidx.compose.ui.unit.sp
2715
import androidx.constraintlayout.compose.ChainStyle
2816
import androidx.constraintlayout.compose.ConstraintLayout
2917
import androidx.constraintlayout.compose.Dimension
3018
import com.foke.together.presenter.frame.FourCutFrame
3119
import com.foke.together.presenter.ui.theme.FourCutTogetherTheme
3220
import com.foke.together.presenter.ui.theme.highContrastDarkColorScheme
33-
import com.foke.together.presenter.ui.theme.mediumContrastLightColorScheme
3421

3522
@Composable
3623
fun ShareScreen(

0 commit comments

Comments
 (0)