Pixelfed/PixelDroid-App-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added some strings

Browse Source
This commit is contained in:
mjaillot 2021-03-26 17:51:42 +01:00
parent 3972ffd093
commit dce7c45e21
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/h/pixeldroid/posts/feeds/CommonFeedFragmentUtils.kt
View File

@ -67,7 +67,8 @@ internal fun <T: Any> initAdapter(
&& loadState.append is LoadState.NotLoading && loadState.append is LoadState.NotLoading
&& loadState.append.endOfPaginationReached){ && loadState.append.endOfPaginationReached){
progressBar.isVisible = false progressBar.isVisible = false
showError(motionLayout = motionLayout, errorLayout = errorLayout, errorText = "Nothing to see here :(") showError(motionLayout = motionLayout, errorLayout = errorLayout,
errorText = errorLayout.root.context.getString(R.string.empty_feed))
} }
} }

4
app/src/main/java/com/h/pixeldroid/posts/feeds/uncachedFeeds/profile/ProfilePagingSource.kt
View File

@ -26,10 +26,10 @@ class ProfilePagingSource(
prevKey = null, prevKey = null,
nextKey = posts.lastOrNull()?.id nextKey = posts.lastOrNull()?.id
) )
} catch (exception: IOException) {
LoadResult.Error(exception)
} catch (exception: HttpException) { } catch (exception: HttpException) {
LoadResult.Error(exception) LoadResult.Error(exception)
} catch (exception: IOException) {
LoadResult.Error(exception)
} }
} }

4
app/src/main/java/com/h/pixeldroid/profile/ProfileActivity.kt
View File

@ -17,6 +17,7 @@ import androidx.paging.PagingDataAdapter
import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.snackbar.Snackbar
import com.h.pixeldroid.R import com.h.pixeldroid.R
import com.h.pixeldroid.databinding.ActivityProfileBinding import com.h.pixeldroid.databinding.ActivityProfileBinding
import com.h.pixeldroid.databinding.FragmentProfilePostsBinding import com.h.pixeldroid.databinding.FragmentProfilePostsBinding
@ -198,7 +199,8 @@ class ProfileActivity : BaseActivity() {
val url = "$domain/settings/home" val url = "$domain/settings/home"
if(!openUrl(url)) { if(!openUrl(url)) {
Log.e("ProfileActivity", "Cannot open this link") Snackbar.make(binding.root, getString(R.string.edit_link_failed),
Snackbar.LENGTH_LONG).show()
} }
} }

2
app/src/main/res/values/strings.xml
View File

@ -139,6 +139,8 @@ For more info about Pixelfed, you can check here: https://pixelfed.org"</string>
<item quantity="other">"%d\nFollowing"</item> <item quantity="other">"%d\nFollowing"</item>
</plurals> </plurals>
<string name="follow_status_failed">Could not get follow status</string> <string name="follow_status_failed">Could not get follow status</string>
<string name="edit_link_failed">Failed to open edit page</string>
<string name="empty_feed">Nothing to see here :(</string>
<string name="follow_button_failed">Could not display follow button</string> <string name="follow_button_failed">Could not display follow button</string>
<string name="follow_error">Could not follow</string> <string name="follow_error">Could not follow</string>
<string name="action_not_allowed">This action is not allowed</string> <string name="action_not_allowed">This action is not allowed</string>