#8 [del] : 필요없는 코드 삭제

AND-SOPT-ANDROID · Nov 14, 2024 · 0c77d44 · 0c77d44
1 parent 07beb20
commit 0c77d44
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 32 deletions.
diff --git a/app/src/main/java/org/sopt/and/feature/login/LoginScreen.kt b/app/src/main/java/org/sopt/and/feature/login/LoginScreen.kt
@@ -25,8 +25,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SnackbarHost
-import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.VerticalDivider
@@ -35,7 +33,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusDirection
@@ -74,14 +71,13 @@ fun LoginScreen(
     val sharedPreferences = context.getSharedPreferences("token", Context.MODE_PRIVATE)
     val editor = sharedPreferences.edit()
 
-    val scope = rememberCoroutineScope()
-    val snackbarHostState = remember { SnackbarHostState() }
 
     val userName by viewModel.userName.observeAsState("")
     val password by viewModel.password.observeAsState("")
     val showPassword = remember { mutableStateOf(false) }
 
-    Scaffold(modifier = Modifier.fillMaxSize(),
+    Scaffold(
+        modifier = Modifier.fillMaxSize(),
         topBar = {
             CenterAlignedTopAppBar(
                 title = {
@@ -110,11 +106,6 @@ fun LoginScreen(
                 colors = TopAppBarDefaults.mediumTopAppBarColors(containerColor = WavveTheme.colors.BackgroundGray)
             )
         },
-        snackbarHost = {
-            SnackbarHost(
-                hostState = snackbarHostState
-            )
-        }
     ) { innerPadding ->
         Box(
             modifier = Modifier

diff --git a/app/src/main/java/org/sopt/and/feature/login/LoginViewModel.kt b/app/src/main/java/org/sopt/and/feature/login/LoginViewModel.kt
@@ -9,6 +9,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.launch
+import org.sopt.and.R
 import org.sopt.and.data.ServicePool
 import org.sopt.and.data.model.dto.ResponseUserTokenDto
 import org.sopt.and.data.model.request.UserLoginRequest
@@ -42,13 +43,13 @@ class LoginViewModel : ViewModel() {
                 } else {
                     val error = response.message()
                     Log.e("error", error.toString())
-                    context.toast("로그인에 실패했습니다.")
+                    context.toast(context.getString(R.string.fail_to_login))
                 }
             }
 
             override fun onFailure(call: Call<ResponseUserTokenDto>, t: Throwable) {
                 Log.e("failure", t.message.toString())
-                context.toast("로그인에 실패했습니다.")
+                context.toast(context.getString(R.string.fail_to_login))
             }
         })
     }

diff --git a/app/src/main/java/org/sopt/and/feature/main/NavGraph.kt b/app/src/main/java/org/sopt/and/feature/main/NavGraph.kt
@@ -46,6 +46,7 @@ fun NavGraph(
 
 
         composable(Routes.Login.screen) {
+            isLoggedIn = false
             LoginScreen(
                 navController = navController,
                 onLoginSuccess = { name, password ->

diff --git a/app/src/main/java/org/sopt/and/feature/mypage/MyScreen.kt b/app/src/main/java/org/sopt/and/feature/mypage/MyScreen.kt
@@ -9,13 +9,9 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SnackbarHost
-import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
@@ -41,19 +37,8 @@ fun MyScreen(
 
     val hobby by viewModel.hobby.observeAsState("")
 
-    val snackbarHostState = remember { SnackbarHostState() }
-
-    LaunchedEffect(Unit) {
-        snackbarHostState.showSnackbar(context.getString(R.string.welcome))
-    }
-
     Scaffold(
         modifier = Modifier.fillMaxSize(),
-        snackbarHost = {
-            SnackbarHost(
-                hostState = snackbarHostState
-            )
-        }
     ) { innerPadding ->
         Box(
             modifier = Modifier
@@ -62,28 +47,24 @@ fun MyScreen(
                 .padding(innerPadding)
         ) {
             Column {
-                //프로필 박스
                 ProfileBox(
                     userEmail = hobby,
                     modifier = Modifier
                 )
 
                 Spacer(modifier = Modifier.height(1.dp))
 
-                //이용권 박스
                 TicketBox()
 
                 Spacer(modifier = Modifier.height(20.dp))
 
-                //전체 시청 내역
                 EmptyBox(
                     stringResource(R.string.viewing_history),
                     stringResource(R.string.no_viewing_history),
                 )
 
                 Spacer(modifier = Modifier.height(30.dp))
 
-                //관심 프로그램
                 EmptyBox(
                     stringResource(R.string.interested_program),
                     stringResource(R.string.no_interested_program),