Merge pull request #115 from Naoki-Hidaka/change-ui-event

Change UI event

Author: dosukoi-android

.gitignore

@@ -7,6 +7,7 @@
 /.idea/workspace.xml
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
+/.idea/misc.xml
 .DS_Store
 /build
 /captures

.idea/misc.xml

@@ -1,25 +1,12 @@
 package jp.dosukoi.ui.view.common
 
-import android.app.Activity
-import android.content.Intent
-import android.net.Uri
+import android.content.Context
 import android.widget.Toast
-import androidx.annotation.StringRes
 import jp.dosukoi.ui.view.R
 import retrofit2.HttpException
 import java.io.IOException
 
-fun Activity.showToast(message: String) {
-    Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
-}
-
-fun Activity.showToast(@StringRes messageResId: Int) {
-    val message = getString(messageResId)
-
-    showToast(message)
-}
-
-fun Activity.showErrorToast(throwable: Throwable) {
+fun Context.showErrorToast(throwable: Throwable) {
     val message = when (throwable) {
         is IOException -> getString(R.string.io_exception)
         is HttpException -> when (throwable.code()) {
@@ -30,8 +17,3 @@ fun Activity.showErrorToast(throwable: Throwable) {
     }
     Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
 }
-
-fun Activity.navigateChrome(url: String) {
-    val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
-    startActivity(intent)
-}

ui/view/src/main/java/jp/dosukoi/ui/view/common/ActivityNavigation.kt

@@ -1,5 +1,7 @@
 package jp.dosukoi.ui.view.myPage
 
+import android.content.Intent
+import android.net.Uri
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -18,11 +20,13 @@ import androidx.compose.material.Card
 import androidx.compose.material.Divider
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
@@ -40,34 +44,35 @@ import jp.dosukoi.ui.view.common.whiteGray
 fun MyPageComponent(
     user: User,
     repositoryList: List<Repository>,
-    onCardClick: (String) -> Unit,
-    onRepositoryItemClick: (String) -> Unit,
     isRefreshing: Boolean?,
     onRefresh: () -> Unit
 ) {
     SwipeRefresh(state = rememberSwipeRefreshState(isRefreshing ?: false), onRefresh = onRefresh) {
         LazyColumn(
             contentPadding = PaddingValues(vertical = 20.dp)
         ) {
-            item { UserInfoCard(user, onCardClick) }
+            item { UserInfoCard(user) }
             itemsIndexed(repositoryList) { index, repository ->
                 RepositoryItem(
                     repository = repository,
-                    isLastItem = index == repositoryList.size,
-                    onRepositoryItemClick = onRepositoryItemClick
+                    isLastItem = index == repositoryList.size
                 )
             }
         }
     }
 }
 
 @Composable
-fun UserInfoCard(user: User, onCardClick: (String) -> Unit) {
+fun UserInfoCard(user: User) {
+    val context = LocalContext.current
+    val intent = remember {
+        Intent(Intent.ACTION_VIEW, Uri.parse(user.htmlUrl))
+    }
     Card(
         modifier = Modifier
             .padding(vertical = 10.dp, horizontal = 16.dp)
             .fillMaxWidth()
-            .clickable { onCardClick(user.htmlUrl) },
+            .clickable { context.startActivity(intent) },
         shape = RoundedCornerShape(10.dp),
         elevation = 4.dp
     ) {
@@ -122,14 +127,17 @@ fun UserInfo(user: User) {
 @Composable
 fun RepositoryItem(
     repository: Repository,
-    isLastItem: Boolean,
-    onRepositoryItemClick: (String) -> Unit
+    isLastItem: Boolean
 ) {
+    val context = LocalContext.current
+    val intent = remember {
+        Intent(Intent.ACTION_VIEW, Uri.parse(repository.htmlUrl))
+    }
     Column(
         modifier = Modifier
             .fillMaxWidth()
             .clickable {
-                onRepositoryItemClick(repository.htmlUrl)
+                context.startActivity(intent)
             }
     ) {
         Text(
@@ -160,8 +168,7 @@ private fun UserInfoCardPreview() {
             null,
             null,
             null
-        ),
-        onCardClick = {}
+        )
     )
 }
 //endregion

ui/view/src/main/java/jp/dosukoi/ui/view/myPage/MyPageComponent.kt

@@ -3,30 +3,34 @@ package jp.dosukoi.ui.view.myPage
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.ui.platform.LocalContext
 import jp.dosukoi.data.entity.myPage.UserStatus
 import jp.dosukoi.ui.view.common.LoadingAndErrorScreen
+import jp.dosukoi.ui.view.common.showErrorToast
 import jp.dosukoi.ui.viewmodel.myPage.MyPageViewModel
 
 @Composable
 fun MyPageScreen(
     viewModel: MyPageViewModel,
 ) {
     val myPageUiState by viewModel.myPageState.collectAsState()
+    if (myPageUiState.errors.isNotEmpty()) {
+        val context = LocalContext.current
+        val throwable = myPageUiState.errors.first()
+        context.showErrorToast(throwable)
+        viewModel.onConsumeErrors(throwable)
+    }
     LoadingAndErrorScreen(
-        state = myPageUiState,
+        state = myPageUiState.screenState,
         loadedContent = { data ->
             when (val state = data.userStatus) {
                 is UserStatus.Authenticated -> MyPageComponent(
                     state.user,
                     data.repositoryList,
-                    viewModel::onCardClick,
-                    viewModel::onRepositoryItemClick,
-                    data.isRefreshing,
+                    myPageUiState.isRefreshing,
                     viewModel::onRefresh
                 )
-                UserStatus.UnAuthenticated -> UnAuthenticatedUserComponent(
-                    viewModel::onLoginButtonClick
-                )
+                UserStatus.UnAuthenticated -> UnAuthenticatedUserComponent()
             }
         },
         onRetryClick = viewModel::onRetryClick

ui/view/src/main/java/jp/dosukoi/ui/view/myPage/MyPageScreen.kt

@@ -1,5 +1,7 @@
 package jp.dosukoi.ui.view.myPage
 
+import android.content.Intent
+import android.net.Uri
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -8,22 +10,30 @@ import androidx.compose.material.Button
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment.Companion.CenterHorizontally
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import jp.dosukoi.ui.view.common.white
 
+private const val CLIENT_ID = "52b65f6025ea1e4264cd"
+private const val VERIFY_URL =
+    "https://github.com/login/oauth/authorize?client_id=$CLIENT_ID&scope=user repo"
+
 @Composable
-fun UnAuthenticatedUserComponent(
-    onLoginButtonClick: () -> Unit
-) {
+fun UnAuthenticatedUserComponent() {
+    val context = LocalContext.current
+    val intent = remember {
+        Intent(Intent.ACTION_VIEW, Uri.parse(VERIFY_URL))
+    }
     Column(
         modifier = Modifier.fillMaxSize(),
         horizontalAlignment = CenterHorizontally,
         verticalArrangement = Arrangement.Center
     ) {
         Button(
-            onClick = onLoginButtonClick,
+            onClick = { context.startActivity(intent) },
             Modifier.background(white),
             elevation = ButtonDefaults.elevation(defaultElevation = 8.dp)
         ) {

ui/view/src/main/java/jp/dosukoi/ui/view/myPage/UnAuthenticatedUserComponent.kt

@@ -38,28 +38,25 @@ import jp.dosukoi.ui.viewmodel.search.SearchUiState
 @Composable
 fun SearchComponent(
     uiState: SearchUiState,
-    isTextError: Boolean?,
     listState: LazyListState,
     onValueChanged: (String) -> Unit,
     onSearchButtonClick: () -> Unit,
-    onRetryClick: () -> Unit,
-    onItemClick: (String) -> Unit
+    onRetryClick: () -> Unit
 ) {
     Column(
         modifier = Modifier
             .fillMaxSize()
     ) {
         SearchTextField(
             searchText = uiState.searchWord,
-            isTextError = isTextError,
+            isTextError = uiState.isSearchWordError,
             onValueChanged = onValueChanged,
             onSearchButtonClick = onSearchButtonClick
         )
         SearchList(
             uiState = uiState,
             listState = listState,
-            onRetryClick = onRetryClick,
-            onItemClick = onItemClick
+            onRetryClick = onRetryClick
         )
     }
 }
@@ -114,8 +111,7 @@ fun SearchTextField(
 fun SearchList(
     uiState: SearchUiState,
     listState: LazyListState,
-    onRetryClick: () -> Unit,
-    onItemClick: (String) -> Unit,
+    onRetryClick: () -> Unit
 ) {
     LoadingAndErrorScreen(
         state = uiState.searchState,
@@ -127,8 +123,7 @@ fun SearchList(
                     SearchedListComponent(
                         it.repositoryList,
                         it.hasMore,
-                        listState,
-                        onItemClick
+                        listState
                     )
             }
         },
@@ -140,8 +135,7 @@ fun SearchList(
 fun SearchedListComponent(
     repositoryList: List<Repository>,
     hasMore: Boolean,
-    listState: LazyListState,
-    onItemClick: (String) -> Unit
+    listState: LazyListState
 ) {
     LazyColumn(
         contentPadding = PaddingValues(top = 10.dp, bottom = 16.dp),
@@ -150,8 +144,7 @@ fun SearchedListComponent(
         itemsIndexed(repositoryList) { index, repository ->
             RepositoryItem(
                 repository = repository,
-                isLastItem = index == repositoryList.size && !hasMore,
-                onRepositoryItemClick = onItemClick
+                isLastItem = index == repositoryList.size && !hasMore
             )
         }
         if (hasMore) item { LoadingFooter() }

ui/view/src/main/java/jp/dosukoi/ui/view/search/SearchComponent.kt

@@ -4,25 +4,29 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.ui.platform.LocalContext
 import jp.dosukoi.ui.view.common.OnScrollEnd
+import jp.dosukoi.ui.view.common.showErrorToast
 import jp.dosukoi.ui.viewmodel.search.SearchViewModel
 
 @Composable
 fun SearchScreen(
     viewModel: SearchViewModel
 ) {
     val uiState by viewModel.searchUiState.collectAsState()
-    val isTextError by viewModel.isError.observeAsState()
+    if (uiState.errors.isNotEmpty()) {
+        val context = LocalContext.current
+        val throwable = uiState.errors.first()
+        context.showErrorToast(throwable)
+        viewModel.onConsumeErrors(throwable)
+    }
     val listState = rememberLazyListState()
     OnScrollEnd(lazyListState = listState, onAppearLastItem = viewModel::onScrollEnd)
     SearchComponent(
         uiState,
-        isTextError,
         listState,
         viewModel::onSearchWordChanged,
         viewModel::onSearchButtonClick,
-        viewModel::onRetryClick,
-        viewModel::onSearchedItemClick
+        viewModel::onRetryClick
     )
 }