#218 Implement Pull request in dev branch

daniebeler · Feb 19, 2025 · 2688b6c · 2688b6c
1 parent 46a7aa2
commit 2688b6c
Show file tree

Hide file tree

Showing 40 changed files with 107 additions and 10 deletions.
diff --git a/app/src/commonMain/composeResources/values-af-rZA/strings.xml b/app/src/commonMain/composeResources/values-af-rZA/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-ar-rSA/strings.xml b/app/src/commonMain/composeResources/values-ar-rSA/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-ca-rES/strings.xml b/app/src/commonMain/composeResources/values-ca-rES/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-cs-rCZ/strings.xml b/app/src/commonMain/composeResources/values-cs-rCZ/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-da-rDK/strings.xml b/app/src/commonMain/composeResources/values-da-rDK/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-de-rDE/strings.xml b/app/src/commonMain/composeResources/values-de-rDE/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-de/strings.xml b/app/src/commonMain/composeResources/values-de/strings.xml
@@ -213,4 +213,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-el-rGR/strings.xml b/app/src/commonMain/composeResources/values-el-rGR/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-en-rUS/strings.xml b/app/src/commonMain/composeResources/values-en-rUS/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-eo-rUY/strings.xml b/app/src/commonMain/composeResources/values-eo-rUY/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-es-rES/strings.xml b/app/src/commonMain/composeResources/values-es-rES/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-fi-rFI/strings.xml b/app/src/commonMain/composeResources/values-fi-rFI/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-fr-rFR/strings.xml b/app/src/commonMain/composeResources/values-fr-rFR/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-gl-rES/strings.xml b/app/src/commonMain/composeResources/values-gl-rES/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-hu-rHU/strings.xml b/app/src/commonMain/composeResources/values-hu-rHU/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-io-rEN/strings.xml b/app/src/commonMain/composeResources/values-io-rEN/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-it-rIT/strings.xml b/app/src/commonMain/composeResources/values-it-rIT/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-iw-rIL/strings.xml b/app/src/commonMain/composeResources/values-iw-rIL/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-ja-rJP/strings.xml b/app/src/commonMain/composeResources/values-ja-rJP/strings.xml
@@ -56,7 +56,7 @@
     <string name="daily">daily</string>
     <string name="i_don_t_have_an_account">I don't have a profile</string>
     <string name="server_url">Server URL</string>
-    <string name="are_you_sure_you_want_to_log_out">Are you sure you want to log out?</string>
+    <string name="are_you_mipmap-mdpisure_you_want_to_log_out">Are you sure you want to log out?</string>
     <string name="logout_questionmark">Logout?</string>
     <string name="view_comments">View %1$s comments</string>
     <string name="comment">Leave a comment</string>
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-ko-rKR/strings.xml b/app/src/commonMain/composeResources/values-ko-rKR/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-nl-rNL/strings.xml b/app/src/commonMain/composeResources/values-nl-rNL/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-no-rNO/strings.xml b/app/src/commonMain/composeResources/values-no-rNO/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-pl-rPL/strings.xml b/app/src/commonMain/composeResources/values-pl-rPL/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-pt-rBR/strings.xml b/app/src/commonMain/composeResources/values-pt-rBR/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-pt-rPT/strings.xml b/app/src/commonMain/composeResources/values-pt-rPT/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-ro-rRO/strings.xml b/app/src/commonMain/composeResources/values-ro-rRO/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-ru-rRU/strings.xml b/app/src/commonMain/composeResources/values-ru-rRU/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-sr-rSP/strings.xml b/app/src/commonMain/composeResources/values-sr-rSP/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-sv-rSE/strings.xml b/app/src/commonMain/composeResources/values-sv-rSE/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-tlh-rAA/strings.xml b/app/src/commonMain/composeResources/values-tlh-rAA/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-tr-rTR/strings.xml b/app/src/commonMain/composeResources/values-tr-rTR/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-uk-rUA/strings.xml b/app/src/commonMain/composeResources/values-uk-rUA/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-vi-rVN/strings.xml b/app/src/commonMain/composeResources/values-vi-rVN/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-zh-rCN/strings.xml b/app/src/commonMain/composeResources/values-zh-rCN/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values-zh-rTW/strings.xml b/app/src/commonMain/composeResources/values-zh-rTW/strings.xml
@@ -215,4 +215,6 @@
     <string name="focus_mode">Focus Mode</string>
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/app/src/commonMain/composeResources/values/strings.xml b/app/src/commonMain/composeResources/values/strings.xml
@@ -217,4 +217,6 @@
     <string name="focus_mode_description">Hides description, likes and buttons from posts.</string>
     <string name="repost_settings">Repost settings</string>
     <string name="amoled">AMOLED</string>
+    <string name="no_followers_yet">No followers yet</string>
+    <string name="not_following_anyone">Not following anyone</string>
 </resources>
diff --git a/...ommonMain/kotlin/com/daniebeler/pfpixelix/ui/composables/followers/FollowersComposable.kt b/...ommonMain/kotlin/com/daniebeler/pfpixelix/ui/composables/followers/FollowersComposable.kt
@@ -13,6 +13,7 @@ import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.key.Key.Companion.R
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import com.daniebeler.pfpixelix.di.injectViewModel
@@ -25,13 +26,13 @@ import com.daniebeler.pfpixelix.ui.composables.states.LoadingComposable
 import org.jetbrains.compose.resources.stringResource
 import pixelix.app.generated.resources.Res
 import pixelix.app.generated.resources.empty
+import pixelix.app.generated.resources.no_followers_yet
 import pixelix.app.generated.resources.nobody_follows_you_yet
 
-@OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun FollowersComposable(
     navController: NavController,
-    viewModel: FollowersViewModel = injectViewModel(key = "followers-viewmodel-key") { followersViewModel }
+    viewModel: FollowersViewModel
 ) {
     val lazyListState = rememberLazyListState()
 
@@ -61,11 +62,16 @@ fun FollowersComposable(
     })
 
     if (!viewModel.followersState.isLoading && viewModel.followersState.error.isEmpty() && viewModel.followersState.followers.isEmpty()) {
+        val message = if (viewModel.loggedInAccountId == viewModel.accountId)
+            stringResource(Res.string.nobody_follows_you_yet)
+        else
+            stringResource(Res.string.no_followers_yet)
+
         FullscreenEmptyStateComposable(
             emptyState = EmptyState(
                 icon = Icons.Outlined.Groups,
                 heading = stringResource(Res.string.empty),
-                message = stringResource(Res.string.nobody_follows_you_yet)
+                message = message
             )
         )
     }

diff --git a/...nMain/kotlin/com/daniebeler/pfpixelix/ui/composables/followers/FollowersMainComposable.kt b/...nMain/kotlin/com/daniebeler/pfpixelix/ui/composables/followers/FollowersMainComposable.kt
@@ -32,6 +32,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
+import co.touchlab.kermit.Logger
 import com.daniebeler.pfpixelix.di.injectViewModel
 import kotlinx.coroutines.launch
 import org.jetbrains.compose.resources.stringResource
@@ -55,9 +56,9 @@ fun FollowersMainComposable(
         viewModel.getAccount(accountId)
         viewModel.getFollowersFirstLoad()
         viewModel.getFollowingFirstLoad()
+        viewModel.setLoggedInAccountIdValue()
     }
 
-
     val pageId = if (page == "followers") 0 else 1
     val pagerState = rememberPagerState(initialPage = pageId, pageCount = { 2 })
 
@@ -146,11 +147,11 @@ fun FollowersMainComposable(
             ) { tabIndex ->
                 when (tabIndex) {
                     0 -> Box(modifier = Modifier.fillMaxSize()) {
-                        FollowersComposable(navController = navController)
+                        FollowersComposable(navController = navController, viewModel)
                     }
 
                     1 -> Box(modifier = Modifier.fillMaxSize()) {
-                        FollowingComposable(navController = navController)
+                        FollowingComposable(navController = navController, viewModel)
                     }
 
                 }

diff --git a/...commonMain/kotlin/com/daniebeler/pfpixelix/ui/composables/followers/FollowersViewModel.kt b/...commonMain/kotlin/com/daniebeler/pfpixelix/ui/composables/followers/FollowersViewModel.kt
@@ -9,6 +9,7 @@ import com.daniebeler.pfpixelix.common.Resource
 import com.daniebeler.pfpixelix.domain.usecase.GetAccountUseCase
 import com.daniebeler.pfpixelix.domain.usecase.GetAccountsFollowersUseCase
 import com.daniebeler.pfpixelix.domain.usecase.GetAccountsFollowingUseCase
+import com.daniebeler.pfpixelix.domain.usecase.GetCurrentLoginDataUseCase
 import com.daniebeler.pfpixelix.ui.composables.profile.AccountState
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -17,14 +18,16 @@ import me.tatarka.inject.annotations.Inject
 class FollowersViewModel @Inject constructor(
     private val getAccountsFollowingUseCase: GetAccountsFollowingUseCase,
     private val getAccountsFollowersUseCase: GetAccountsFollowersUseCase,
-    private val getAccountUseCase: GetAccountUseCase
+    private val getAccountUseCase: GetAccountUseCase,
+    private val getCurrentLoginDataUseCase: GetCurrentLoginDataUseCase
 ) : ViewModel() {
 
     var accountState by mutableStateOf(AccountState())
     var followersState by mutableStateOf(FollowersState())
     var followingState by mutableStateOf(FollowingState())
 
     var accountId: String = ""
+    var loggedInAccountId: String = ""
 
     fun getAccount(userId: String) {
         getAccountUseCase(userId).onEach { result ->
@@ -48,6 +51,10 @@ class FollowersViewModel @Inject constructor(
         accountId = id
     }
 
+    suspend fun setLoggedInAccountIdValue() {
+        loggedInAccountId = getCurrentLoginDataUseCase()?.accountId ?: ""
+    }
+
     fun getFollowersFirstLoad(refreshing: Boolean = false) {
         getAccountsFollowersUseCase(accountId).onEach { result ->
             followersState = when (result) {