Pixelfed
/
PixelDroid-App-Android
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'inspection_run' into 'master' 

Drawables, content descriptions, run inspection and address problems

See merge request pixeldroid/PixelDroid!277
This commit is contained in:
Matthieu 2020-12-28 20:59:04 +01:00
parent 1be18289e7 86543ee74c
commit 178ae0b392
57 changed files with 68 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/h/pixeldroid/LoginActivity.kt
View File

@ -1,7 +1,6 @@
package com.h.pixeldroid
import android.app.AlertDialog
import android.content.ActivityNotFoundException
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
@ -10,12 +9,11 @@ import android.os.Bundle
import android.util.Log
import android.view.View
import android.view.inputmethod.InputMethodManager
import androidx.browser.customtabs.CustomTabsIntent
import com.h.pixeldroid.utils.BaseActivity
import com.h.pixeldroid.utils.api.PixelfedAPI
import com.h.pixeldroid.utils.api.objects.*
import com.h.pixeldroid.utils.db.addUser
import com.h.pixeldroid.utils.db.storeInstance
import com.h.pixeldroid.utils.api.objects.*
import com.h.pixeldroid.utils.BaseActivity
import com.h.pixeldroid.utils.hasInternet
import com.h.pixeldroid.utils.normalizeDomain
import com.h.pixeldroid.utils.openUrl
@ -138,7 +136,7 @@ class LoginActivity : BaseActivity() {
appName,"$oauthScheme://$PACKAGE_ID", SCOPE
),
pixelfedAPI.wellKnownNodeInfo(),
BiFunction<Application, NodeInfoJRD, Pair<Application, NodeInfoJRD>> { application, nodeInfoJRD ->
{ application, nodeInfoJRD ->
// we get here when both results have come in:
Pair(application, nodeInfoJRD)
})
@ -246,7 +244,7 @@ class LoginActivity : BaseActivity() {
clientId, clientSecret, "$oauthScheme://$PACKAGE_ID", SCOPE, code,
"authorization_code"
).onErrorReturn { nullToken },
BiFunction<Instance, Token, Pair<Instance, Token>> { instance, token ->
{ instance, token ->
// we get here when all results have come in:
Pair(instance, token)
})

4
app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt
View File

@ -36,8 +36,8 @@ import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response
private val TAG = "Post Creation Activity"
private val MORE_PICTURES_REQUEST_CODE = 0xffff
private const val TAG = "Post Creation Activity"
private const val MORE_PICTURES_REQUEST_CODE = 0xffff
class PostCreationActivity : BaseActivity() {

2
app/src/main/java/com/h/pixeldroid/postCreation/camera/CameraFragment.kt
View File

@ -183,7 +183,7 @@ class CameraFragment : Fragment() {
// Bind the CameraProvider to the LifeCycleOwner
val cameraSelector = CameraSelector.Builder().requireLensFacing(lensFacing).build()
val cameraProviderFuture = ProcessCameraProvider.getInstance(requireContext())
cameraProviderFuture.addListener(Runnable {
cameraProviderFuture.addListener({
// CameraProvider
val cameraProvider: ProcessCameraProvider = cameraProviderFuture.get()

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

@ -575,7 +575,8 @@ class StatusViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
holder.viewComment.text = holder.view.context.getString(R.string.NoCommentsToShow)
} else {
holder.viewComment.apply {
text = "${status?.replies_count} ${holder.view.context.getString(R.string.CommentDisplay)}"
text = holder.view.context.getString(R.string.number_comments)
.format(status?.replies_count)
setOnClickListener {
visibility = View.GONE

2
app/src/main/java/com/h/pixeldroid/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt
View File

@ -115,7 +115,7 @@ class NotificationViewHolder(view: View) : RecyclerView.ViewHolder(view) {
getStringAndDrawable(context, R.string.followed_notification, R.drawable.ic_follow)
}
Notification.NotificationType.mention -> {
getStringAndDrawable(context, R.string.mention_notification, R.drawable.ic_apenstaart)
getStringAndDrawable(context, R.string.mention_notification, R.drawable.mention_at_24dp)
}
Notification.NotificationType.reblog -> {

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

@ -2,7 +2,6 @@ package com.h.pixeldroid.profile
import android.content.Intent
import android.graphics.Typeface
import android.net.Uri
import android.os.Bundle
import android.util.Log
import android.view.View
@ -14,7 +13,6 @@ import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.h.pixeldroid.R
import com.h.pixeldroid.adapters.ProfilePostsRecyclerViewAdapter
import com.h.pixeldroid.utils.api.PixelfedAPI
import com.h.pixeldroid.utils.db.entities.UserDatabaseEntity
import com.h.pixeldroid.utils.api.objects.Account

2
app/src/main/java/com/h/pixeldroid/profile/ProfilePostsRecyclerViewAdapter.kt
View File

@ -1,4 +1,4 @@
package com.h.pixeldroid.adapters
package com.h.pixeldroid.profile
import android.content.Intent
import android.view.LayoutInflater

2
app/src/main/java/com/h/pixeldroid/searchDiscover/SearchDiscoverFragment.kt
View File

@ -16,7 +16,7 @@ import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.h.pixeldroid.R
import com.h.pixeldroid.adapters.ProfilePostViewHolder
import com.h.pixeldroid.profile.ProfilePostViewHolder
import com.h.pixeldroid.utils.api.PixelfedAPI
import com.h.pixeldroid.utils.api.objects.DiscoverPost
import com.h.pixeldroid.utils.api.objects.DiscoverPosts

9
app/src/main/res/drawable-night/add_photo_alternate_black_24dp.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M19,7v2.99s-1.99,0.01 -2,0L17,7h-3s0.01,-1.99 0,-2h3L17,2h2v3h3v2h-3zM16,11L16,8h-3L13,5L5,5c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-8h-3zM5,19l3,-4 2,3 3,-4 4,5L5,19z"
android:fillColor="#FFFFFF"/>
</vector>

4
app/src/main/res/drawable-night/ic_apenstaart.xml
View File

@ -1,4 +0,0 @@
<vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FFFFFF" android:pathData="m18.9609,24.1172q0,2.793 1.3867,4.3945 1.3867,1.582 3.8086,1.582 2.4023,0 3.7695,-1.6016 1.3867,-1.6016 1.3867,-4.375 0,-2.7344 -1.4063,-4.3359 -1.4063,-1.6211 -3.7891,-1.6211 -2.3633,0 -3.7695,1.6016 -1.3867,1.6016 -1.3867,4.3555zM29.6055,29.957q-1.1719,1.5039 -2.6953,2.2266 -1.5039,0.7031 -3.5156,0.7031 -3.3594,0 -5.4688,-2.4219 -2.0898,-2.4414 -2.0898,-6.3477 0,-3.9063 2.1094,-6.3477 2.1094,-2.4414 5.4492,-2.4414 2.0117,0 3.5352,0.7422 1.5234,0.7227 2.6758,2.207v-2.5586h2.793v14.375q2.8516,-0.4297 4.4531,-2.5977 1.6211,-2.1875 1.6211,-5.6445 0,-2.0898 -0.625,-3.9258 -0.6055,-1.8359 -1.8555,-3.3984 -2.0313,-2.5586 -4.9609,-3.9063 -2.9102,-1.3672 -6.3477,-1.3672 -2.4023,0 -4.6094,0.6445 -2.207,0.625 -4.082,1.875 -3.0664,1.9922 -4.8047,5.2344 -1.7188,3.2227 -1.7188,6.9922 0,3.1055 1.1133,5.8203 1.1328,2.7148 3.2617,4.7852 2.0508,2.0313 4.7461,3.0859 2.6953,1.0742 5.7617,1.0742 2.5195,0 4.9414,-0.8594 2.4414,-0.8398 4.4727,-2.4219l1.7578,2.168q-2.4414,1.8945 -5.332,2.8906 -2.8711,1.0156 -5.8398,1.0156 -3.6133,0 -6.8164,-1.2891 -3.2031,-1.2695 -5.7031,-3.7109 -2.5,-2.4414 -3.8086,-5.6445 -1.3086,-3.2227 -1.3086,-6.9141 0,-3.5547 1.3281,-6.7773 1.3281,-3.2227 3.7891,-5.6641 2.5195,-2.4805 5.8203,-3.7891 3.3008,-1.3281 6.9922,-1.3281 4.1406,0 7.6758,1.6992 3.5547,1.6992 5.957,4.8242 1.4648,1.9141 2.2266,4.1602 0.7813,2.2461 0.7813,4.6484 0,5.1367 -3.1055,8.1055 -3.1055,2.9688 -8.5742,3.0859z"/>
</vector>

9
app/src/main/res/drawable-night/ic_crop_black_24dp.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFF"
android:pathData="M17,15h2V7c0,-1.1 -0.9,-2 -2,-2H9v2h8v8zM7,17V1H5v4H1v2h4v10c0,1.1 0.9,2 2,2h10v4h2v-4h4v-2H7z"/>
</vector>

9
app/src/main/res/drawable-night/ic_follow.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFF"
android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
</vector>

4
app/src/main/res/drawable-night/ic_heart.xml
View File

@ -1,4 +0,0 @@
<vector android:height="18dp" android:viewportHeight="512"
android:viewportWidth="512" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FFFFFF" android:pathData="M462.3,62.6C407.5,15.9 326,24.3 275.7,76.2L256,96.5l-19.7,-20.3C186.1,24.3 104.5,15.9 49.7,62.6c-62.8,53.6 -66.1,149.8 -9.9,207.9l193.5,199.8c12.5,12.9 32.8,12.9 45.3,0l193.5,-199.8c56.3,-58.1 53,-154.3 -9.8,-207.9z"/>
</vector>

6
app/src/main/res/drawable-night/ic_like_empty.xml
View File

@ -1,6 +0,0 @@
<vector android:height="21.6dp" android:viewportHeight="99"
android:viewportWidth="110" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#00000000"
android:pathData="M54.5,94.5C58.2,90.74 79.39,69.25 92.63,55.83C104.5,43.8 104.24,26.26 93.46,15.39C82.67,4.5 65.23,4.55 54.5,15.48C43.76,4.55 26.32,4.5 15.54,15.38C4.75,26.25 4.5,43.79 16.36,55.83C29.6,69.25 50.79,90.74 54.5,94.5Z"
android:strokeColor="#FFFFFF" android:strokeWidth="9"/>
</vector>

15
app/src/main/res/drawable-night/ic_reblog.xml
View File

@ -1,15 +0,0 @@
<vector android:height="24dp" android:viewportHeight="85"
android:viewportWidth="111" android:width="31.341177dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#00000000"
android:pathData="M30.5,64.5L90.5,64.5L90.5,39.81"
android:strokeColor="#FFFFFF" android:strokeWidth="9"/>
<path android:fillColor="#FFFFFF"
android:pathData="M90.5,25.56L100,44.56L90.5,39.81L81,44.56Z"
android:strokeColor="#FFFFFF" android:strokeWidth="9"/>
<path android:fillColor="#00000000"
android:pathData="M80.5,18.5L20.5,18.5L20.5,44.19"
android:strokeColor="#FFFFFF" android:strokeWidth="9"/>
<path android:fillColor="#FFFFFF"
android:pathData="M20.5,58.44L11,39.44L20.5,44.19L30,39.44Z"
android:strokeColor="#FFFFFF" android:strokeWidth="9"/>
</vector>

9
app/src/main/res/drawable-night/poll.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-7h2v7zM13,17h-2L11,7h2v10zM17,17h-2v-4h2v4z"
android:fillColor="#FFFFFF"/>
</vector>

2
app/src/main/res/drawable/add_photo_alternate_black_24dp.xml
View File

@ -5,5 +5,5 @@
android:viewportHeight="24">
<path
android:pathData="M19,7v2.99s-1.99,0.01 -2,0L17,7h-3s0.01,-1.99 0,-2h3L17,2h2v3h3v2h-3zM16,11L16,8h-3L13,5L5,5c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-8h-3zM5,19l3,-4 2,3 3,-4 4,5L5,19z"
android:fillColor="#000000"/>
android:fillColor="@color/colorDrawing"/>
</vector>

4
app/src/main/res/drawable/ic_apenstaart.xml
View File

@ -1,4 +0,0 @@
<vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="m18.9609,24.1172q0,2.793 1.3867,4.3945 1.3867,1.582 3.8086,1.582 2.4023,0 3.7695,-1.6016 1.3867,-1.6016 1.3867,-4.375 0,-2.7344 -1.4063,-4.3359 -1.4063,-1.6211 -3.7891,-1.6211 -2.3633,0 -3.7695,1.6016 -1.3867,1.6016 -1.3867,4.3555zM29.6055,29.957q-1.1719,1.5039 -2.6953,2.2266 -1.5039,0.7031 -3.5156,0.7031 -3.3594,0 -5.4688,-2.4219 -2.0898,-2.4414 -2.0898,-6.3477 0,-3.9063 2.1094,-6.3477 2.1094,-2.4414 5.4492,-2.4414 2.0117,0 3.5352,0.7422 1.5234,0.7227 2.6758,2.207v-2.5586h2.793v14.375q2.8516,-0.4297 4.4531,-2.5977 1.6211,-2.1875 1.6211,-5.6445 0,-2.0898 -0.625,-3.9258 -0.6055,-1.8359 -1.8555,-3.3984 -2.0313,-2.5586 -4.9609,-3.9063 -2.9102,-1.3672 -6.3477,-1.3672 -2.4023,0 -4.6094,0.6445 -2.207,0.625 -4.082,1.875 -3.0664,1.9922 -4.8047,5.2344 -1.7188,3.2227 -1.7188,6.9922 0,3.1055 1.1133,5.8203 1.1328,2.7148 3.2617,4.7852 2.0508,2.0313 4.7461,3.0859 2.6953,1.0742 5.7617,1.0742 2.5195,0 4.9414,-0.8594 2.4414,-0.8398 4.4727,-2.4219l1.7578,2.168q-2.4414,1.8945 -5.332,2.8906 -2.8711,1.0156 -5.8398,1.0156 -3.6133,0 -6.8164,-1.2891 -3.2031,-1.2695 -5.7031,-3.7109 -2.5,-2.4414 -3.8086,-5.6445 -1.3086,-3.2227 -1.3086,-6.9141 0,-3.5547 1.3281,-6.7773 1.3281,-3.2227 3.7891,-5.6641 2.5195,-2.4805 5.8203,-3.7891 3.3008,-1.3281 6.9922,-1.3281 4.1406,0 7.6758,1.6992 3.5547,1.6992 5.957,4.8242 1.4648,1.9141 2.2266,4.1602 0.7813,2.2461 0.7813,4.6484 0,5.1367 -3.1055,8.1055 -3.1055,2.9688 -8.5742,3.0859z"/>
</vector>

2
app/src/main/res/drawable/ic_crop_black_24dp.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="@color/colorDrawing"
android:pathData="M17,15h2V7c0,-1.1 -0.9,-2 -2,-2H9v2h8v8zM7,17V1H5v4H1v2h4v10c0,1.1 0.9,2 2,2h10v4h2v-4h4v-2H7z"/>
</vector>

2
app/src/main/res/drawable/ic_follow.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:fillColor="@color/colorDrawing"
android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
</vector>

2
app/src/main/res/drawable/ic_heart.xml
View File

@ -1,4 +1,4 @@
<vector android:height="18dp" android:viewportHeight="512"
android:viewportWidth="512" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#000000" android:pathData="M462.3,62.6C407.5,15.9 326,24.3 275.7,76.2L256,96.5l-19.7,-20.3C186.1,24.3 104.5,15.9 49.7,62.6c-62.8,53.6 -66.1,149.8 -9.9,207.9l193.5,199.8c12.5,12.9 32.8,12.9 45.3,0l193.5,-199.8c56.3,-58.1 53,-154.3 -9.8,-207.9z"/>
<path android:fillColor="@color/colorDrawing" android:pathData="M462.3,62.6C407.5,15.9 326,24.3 275.7,76.2L256,96.5l-19.7,-20.3C186.1,24.3 104.5,15.9 49.7,62.6c-62.8,53.6 -66.1,149.8 -9.9,207.9l193.5,199.8c12.5,12.9 32.8,12.9 45.3,0l193.5,-199.8c56.3,-58.1 53,-154.3 -9.8,-207.9z"/>
</vector>

2
app/src/main/res/drawable/ic_like_empty.xml
View File

@ -2,5 +2,5 @@
android:viewportWidth="110" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#00000000"
android:pathData="M54.5,94.5C58.2,90.74 79.39,69.25 92.63,55.83C104.5,43.8 104.24,26.26 93.46,15.39C82.67,4.5 65.23,4.55 54.5,15.48C43.76,4.55 26.32,4.5 15.54,15.38C4.75,26.25 4.5,43.79 16.36,55.83C29.6,69.25 50.79,90.74 54.5,94.5Z"
android:strokeColor="#000000" android:strokeWidth="9"/>
android:strokeColor="@color/colorDrawing" android:strokeWidth="9"/>
</vector>

5
app/src/main/res/drawable/ic_person_white_24dp.xml
View File

@ -1,5 +0,0 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
</vector>

12
app/src/main/res/drawable/ic_reblog.xml
View File

@ -2,14 +2,14 @@
android:viewportWidth="111" android:width="31.341177dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#00000000"
android:pathData="M30.5,64.5L90.5,64.5L90.5,39.81"
android:strokeColor="#000000" android:strokeWidth="9"/>
<path android:fillColor="#000000"
android:strokeColor="@color/colorDrawing" android:strokeWidth="9"/>
<path android:fillColor="@color/colorDrawing"
android:pathData="M90.5,25.56L100,44.56L90.5,39.81L81,44.56Z"
android:strokeColor="#000000" android:strokeWidth="9"/>
android:strokeColor="@color/colorDrawing" android:strokeWidth="9"/>
<path android:fillColor="#00000000"
android:pathData="M80.5,18.5L20.5,18.5L20.5,44.19"
android:strokeColor="#000000" android:strokeWidth="9"/>
<path android:fillColor="#000000"
android:strokeColor="@color/colorDrawing" android:strokeWidth="9"/>
<path android:fillColor="@color/colorDrawing"
android:pathData="M20.5,58.44L11,39.44L20.5,44.19L30,39.44Z"
android:strokeColor="#000000" android:strokeWidth="9"/>
android:strokeColor="@color/colorDrawing" android:strokeWidth="9"/>
</vector>

9
app/src/main/res/drawable/ic_settings.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
</vector>

9
app/src/main/res/drawable/lens_black_24dp.xml
View File

@ -1,9 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2z"
android:fillColor="#000000"/>
</vector>

9
app/src/main/res/drawable/mention_at_24dp.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10h5v-2h-5c-4.34,0 -8,-3.66 -8,-8s3.66,-8 8,-8 8,3.66 8,8v1.43c0,0.79 -0.71,1.57 -1.5,1.57s-1.5,-0.78 -1.5,-1.57L17,12c0,-2.76 -2.24,-5 -5,-5s-5,2.24 -5,5 2.24,5 5,5c1.38,0 2.64,-0.56 3.54,-1.47 0.65,0.89 1.77,1.47 2.96,1.47 1.97,0 3.5,-1.6 3.5,-3.57L22,12c0,-5.52 -4.48,-10 -10,-10zM12,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3z"
android:fillColor="@color/colorDrawing"/>
</vector>

2
app/src/main/res/drawable/poll.xml
View File

@ -5,5 +5,5 @@
android:viewportHeight="24">
<path
android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-7h2v7zM13,17h-2L11,7h2v10zM17,17h-2v-4h2v4z"
android:fillColor="#000000"/>
android:fillColor="@color/colorDrawing"/>
</vector>

2
app/src/main/res/layout/account_list_entry.xml
View File

@ -11,7 +11,7 @@
android:layout_height="48dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:contentDescription="TODO"
android:contentDescription="@string/profile_picture"
android:scaleType="centerCrop"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"

2
app/src/main/res/layout/activity_login.xml
View File

@ -24,7 +24,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:contentDescription="TODO"
android:contentDescription="@string/mascot_description"
app:srcCompat="@drawable/ic_fred_phone" />
<com.google.android.material.textfield.TextInputLayout

6
app/src/main/res/layout/activity_photo_edit.xml
View File

@ -23,7 +23,8 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight=".70"
android:scaleType="centerInside"/>
android:scaleType="centerInside"
android:contentDescription="@string/image_preview" />
<com.h.pixeldroid.postCreation.photoEdit.NonSwipeableViewPager
android:id="@+id/viewPager"
@ -82,6 +83,7 @@
android:src="@drawable/ic_crop_black_24dp"
app:layout_constraintLeft_toLeftOf="@+id/left_guideline"
app:layout_constraintRight_toRightOf="@+id/right_guideline"
app:layout_constraintBottom_toBottomOf="@+id/bottom_guideline" />
app:layout_constraintBottom_toBottomOf="@+id/bottom_guideline"
android:contentDescription="@string/crop_button" />
</androidx.constraintlayout.widget.ConstraintLayout>

3
app/src/main/res/layout/activity_profile.xml
View File

@ -24,7 +24,8 @@
android:layout_marginTop="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:srcCompat="@tools:sample/avatars" />
tools:srcCompat="@tools:sample/avatars"
android:contentDescription="@string/profile_picture" />
<TextView
android:id="@+id/nbPostsTextView"

3
app/src/main/res/layout/add_more_album_creation.xml
View File

@ -11,5 +11,6 @@
android:layout_height="50dp"
android:layout_centerInParent="true"
android:layout_centerVertical="true"
android:background="@drawable/add_photo_alternate_black_24dp" />
android:background="@drawable/add_photo_alternate_black_24dp"
android:contentDescription="@string/add_photo" />
</com.h.pixeldroid.postCreation.SquareLayout>

1
app/src/main/res/layout/fragment_camera.xml
View File

@ -18,7 +18,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/camera_container"
android:background="@android:color/black"
android:layout_width="match_parent"
android:layoutDirection="ltr"
android:layout_height="match_parent">

2
app/src/main/res/layout/fragment_notifications.xml
View File

@ -45,7 +45,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/notification_type"
tools:src="@drawable/ic_default_user"
android:contentDescription="TODO" />
android:contentDescription="@string/profile_picture" />
<ImageView
android:id="@+id/notification_photo_thumbnail"

35
app/src/main/res/layout/fragment_offline_feed.xml
View File

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/offline_feed_placeholder_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textSize="25sp"
android:text="@string/nothing_to_see_here"
android:visibility="gone"/>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefreshLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/offline_feed_recyclerview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"/>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<ProgressBar
android:id="@+id/offline_feed_progress_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="gone"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

3
app/src/main/res/layout/fragment_profile_posts.xml
View File

@ -38,7 +38,8 @@
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
tools:visibility="visible"
android:contentDescription="@string/post_is_album" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.gridlayout.widget.GridLayout>

5
app/src/main/res/layout/fragment_tags.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto">
@ -10,8 +11,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="28dp"
android:text="TextView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tools:text="#aHashTag" />
</androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/layout/image_album_creation.xml
View File

@ -16,7 +16,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="8dp"
android:scaleType="centerCrop" />
android:scaleType="centerCrop"
android:contentDescription="@string/post_image" />
<ImageView
android:layout_width="30dp"
@ -29,6 +30,7 @@
android:foregroundGravity="center"
android:foregroundTint="#FFFFFF"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
android:contentDescription="@string/click_image_edit" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.h.pixeldroid.postCreation.SquareLayout>

7
app/src/main/res/layout/post_fragment.xml
View File

@ -124,7 +124,7 @@
app:layout_constraintEnd_toStartOf="@id/reblogger"
app:layout_constraintStart_toEndOf="@id/liker"
app:layout_constraintTop_toTopOf="@id/liker"
/>
android:contentDescription="@string/add_comment" />
<at.connyduck.sparkbutton.SparkButton
android:id="@+id/liker"
@ -248,7 +248,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:hint="@string/comment"
android:inputType="text" />
android:inputType="text"
android:importantForAutofill="no" />
</com.google.android.material.textfield.TextInputLayout>
<ImageButton
@ -257,7 +258,7 @@
android:layout_height="match_parent"
android:layout_gravity="end"
android:layout_weight="1"
android:contentDescription="Submit button"
android:contentDescription="@string/submit_comment"
android:src="@drawable/ic_send_blue" />
</LinearLayout>

2
app/src/main/res/layout/thumbnail_list_item.xml
View File

@ -21,5 +21,5 @@
android:adjustViewBounds="true"
android:layout_width="80dp"
android:layout_height="80dp"
android:contentDescription="Thumbnail of filter" />
android:contentDescription="@string/filter_thumbnail" />
</LinearLayout>

1
app/src/main/res/values-ar/strings.xml
View File

@ -27,7 +27,6 @@
<string name="gallery_button_alt">المعرض</string>
<string name="share_picture">شارِك الصورة…</string>
<string name="NoCommentsToShow">لا توجد تعليقات في هذا المنشور…</string>
<string name="CommentDisplay">لإظهاره…</string>
<string name="connect_to_pixelfed">لِج إلى Pixelfed</string>
<string name="lbl_brightness">السطوع</string>
<string name="image_download_failed">فشل التنزيل ، حاول مجددًا مِن فضلك</string>

1
app/src/main/res/values-ca/strings.xml
View File

@ -34,7 +34,6 @@
<string name="capture_button_alt">Captura</string>
<string name="gallery_button_alt">Galeria</string>
<string name="NoCommentsToShow">No hi ha comentaris en aquesta publicació …</string>
<string name="CommentDisplay">mostrar…</string>
<string name="domain_of_your_instance">Domini de la teva instància</string>
<string name="connect_to_pixelfed">Connecta’t a Pixelfed</string>
<string name="cw_nsfw_hidden_media_n_click_to_show">CW / NSFW / Imatges ocultes

1
app/src/main/res/values-de/strings.xml
View File

@ -33,7 +33,6 @@
<string name="capture_button_alt">Erfassen</string>
<string name="gallery_button_alt">Galerie</string>
<string name="share_picture">Foto teilen…</string>
<string name="CommentDisplay">zeigen…</string>
<string name="domain_of_your_instance">Domain Ihrer Instanz</string>
<string name="connect_to_pixelfed">Mit Pixelfed verbinden</string>
<string name="login_connection_required_once">Sie müssen online sein, um das erste Konto hinzuzufügen und um PixelDroid zu verwenden :(</string>

1
app/src/main/res/values-es/strings.xml
View File

@ -33,7 +33,6 @@
<string name="capture_button_alt">Capturar</string>
<string name="gallery_button_alt">Galería</string>
<string name="NoCommentsToShow">No hay comentarios en esta publicación…</string>
<string name="CommentDisplay">para mostrar…</string>
<string name="domain_of_your_instance">Dominio de tu nodo</string>
<string name="connect_to_pixelfed">Conectar con Pixelfed</string>
<string name="login_connection_required_once">Necesitas estar conectado para poder añadir la primera cuenta y utilizar PixelDroid :(</string>

1
app/src/main/res/values-eu/strings.xml
View File

@ -37,7 +37,6 @@
<string name="cw_nsfw_hidden_media_n_click_to_show">Eduki-abisua / Multimedia ezkutatuta
\n (egin klik erakusteko)</string>
<string name="lbl_brightness">DISTIRA</string>
<string name="CommentDisplay">erakutsi…</string>
<string name="domain_of_your_instance">Zure instantziaren domeinua</string>
<string name="add_account_description">Beste Pixelfed kontu bat gehitu</string>
<string name="add_account_name">Kontua gehitu</string>

1
app/src/main/res/values-fa/strings.xml
View File

@ -33,7 +33,6 @@
<string name="gallery_button_alt">نگارخانه</string>
<string name="share_picture">هم‌رسانی تصویر…</string>
<string name="NoCommentsToShow">نظری روی این مطلب نیست…</string>
<string name="CommentDisplay">برای نمایش…</string>
<string name="domain_of_your_instance">دامنهٔ نمونهٔ شما</string>
<string name="connect_to_pixelfed">اتصال به پیکسل‌فد</string>
<string name="app_name">پیکسل‌دروید</string>

1
app/src/main/res/values-fr/strings.xml
View File

@ -37,7 +37,6 @@
<string name="domain_of_your_instance">Domaine de votre instance</string>
<string name="cw_nsfw_hidden_media_n_click_to_show">CW / NSFW / Media caché
\n(Cliquer pour le montrer)</string>
<string name="CommentDisplay">Montrer…</string>
<string name="login_connection_required_once">Vous devez être connecté à internet pour pouvoir ajouter un compte et utiliser PixelDroid :(</string>
<string name="add_account_description">Ajouter un autre compte Pixelfed</string>
<string name="add_account_name">Ajouter un compte Pixelfed</string>

1
app/src/main/res/values-gl/strings.xml
View File

@ -31,7 +31,6 @@
<string name="share_picture">Compartir foto…</string>
<string name="NoCommentsToShow">Sen comentarios na publicación…</string>
<string name="image_download_failed">Fallou a descarga, inténtao outra vez</string>
<string name="CommentDisplay">amostrar…</string>
<string name="domain_of_your_instance">Dominio da túa instancia</string>
<string name="connect_to_pixelfed">Conectar con Pixelfed</string>
<string name="login_connection_required_once">Debes ter conexión a internet para poder engadir a conta e usar PixelDroid :(</string>

1
app/src/main/res/values-it/strings.xml
View File

@ -29,7 +29,6 @@
<string name="image_download_success">Immagine scaricata con successo</string>
<string name="NoCommentsToShow">Nessun commento in questo post…</string>
<string name="registration_failed">Impossibile registrare l\'applicazione con questo server</string>
<string name="CommentDisplay">mostrare…</string>
<string name="cw_nsfw_hidden_media_n_click_to_show">CW / NSFW / Media nascosti
\n (cliccaper visualizzare)</string>
<string name="capture_button_alt">Acquisizione</string>

1
app/src/main/res/values-ja/strings.xml
View File

@ -25,7 +25,6 @@
<string name="switch_camera_button_alt">カメラを切り替え</string>
<string name="gallery_button_alt">ギャラリー</string>
<string name="share_picture">画像を共有…</string>
<string name="CommentDisplay">表示する…</string>
<string name="domain_of_your_instance">あなたの参加しているインスタンスのドメイン</string>
<string name="connect_to_pixelfed">Pixelfedに接続</string>
<string name="login_connection_required_once">PixelDroidを利用するにははじめにインターネットにアクセスする必要があります</string>

1
app/src/main/res/values-nl/strings.xml
View File

@ -35,7 +35,6 @@
<string name="switch_camera_button_alt">Van camera wisselen</string>
<string name="gallery_button_alt">Gallerij</string>
<string name="NoCommentsToShow">Geen reacties op dit bericht…</string>
<string name="CommentDisplay">weer te geven…</string>
<string name="domain_of_your_instance">Domein van je instance</string>
<string name="connect_to_pixelfed">Met Pixelfed verbinden</string>
<string name="login_connection_required_once">Je moet met het internet verbonden zijn om je eerste account toe te voegen en PixelDroid te kunnen gebruiken :(</string>

1
app/src/main/res/values-pt-rBR/strings.xml
View File

@ -15,7 +15,6 @@
<string name="login_connection_required_once">Você precisa estar conectado para poder adicionar a primeira conta e usar o PixelDroid :(</string>
<string name="connect_to_pixelfed">Conectar-se à Pixelfed</string>
<string name="domain_of_your_instance">Domínio da sua instância</string>
<string name="CommentDisplay">mostrar…</string>
<string name="NoCommentsToShow">Nenhum comentário…</string>
<string name="share_picture">Compartilhar imagem…</string>
<string name="gallery_button_alt">Galeria</string>

1
app/src/main/res/values-ru/strings.xml
View File

@ -22,7 +22,6 @@
<string name="switch_camera_button_alt">Переключить камеру</string>
<string name="gallery_button_alt">Галерея</string>
<string name="NoCommentsToShow">Нет комментариев…</string>
<string name="CommentDisplay">показать…</string>
<string name="domain_of_your_instance">Домен вашего инстанса</string>
<string name="connect_to_pixelfed">Подключение к Pixelfed</string>
<string name="app_name">PixelDroid</string>

1
app/src/main/res/values-sv/strings.xml
View File

@ -35,7 +35,6 @@
<string name="gallery_button_alt">Galleri</string>
<string name="share_picture">Dela bild…</string>
<string name="NoCommentsToShow">Inga kommentarer på detta inlägg…</string>
<string name="CommentDisplay">att visa…</string>
<string name="connect_to_pixelfed">Anslut till Pixelfed</string>
<string name="cw_nsfw_hidden_media_n_click_to_show">CW / NSFW / Dold media
\n(Tryck för att visa)</string>

1
app/src/main/res/values-zh-rCN/strings.xml
View File

@ -32,7 +32,6 @@
<string name="switch_camera_button_alt">切换摄像头</string>
<string name="gallery_button_alt">相册</string>
<string name="NoCommentsToShow">这条帖文下没有评论……</string>
<string name="CommentDisplay">显示……</string>
<string name="domain_of_your_instance">实例的域名</string>
<string name="connect_to_pixelfed">连接至 Pixelfed</string>
<string name="share_picture">分享图片……</string>

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

@ -48,16 +48,21 @@
<string name="description">Description…</string>
<string name="post">post</string>
<string name="add_photo">Add a photo</string>
<string name="post_image">One of the images in the post</string>
<string name="click_image_edit">Click the image to edit it</string>
<!-- Post editing -->
<string name="lbl_brightness">BRIGHTNESS</string>
<string name="lbl_contrast">CONTRAST</string>
<string name="lbl_saturation">SATURATION</string>
<string name="tab_filters">FILTERS</string>
<string name="tab_edit">EDIT</string>
<string name="filter_thumbnail">Thumbnail of filter</string>
<string name="normal_filter">Normal</string>
<string name="busy_dialog_text">Still processing image, wait for that to finish first!</string>
<string name="busy_dialog_ok_button">OK, wait for that.</string>
<string name="crop_result_error">"Couldn't retrieve image after crop"</string>
<string name="image_preview">Preview of the image being edited</string>
<string name="crop_button">Button to crop or rotate the image</string>
<!-- Camera -->
<string name="capture_button_alt">Capture</string>
<string name="switch_camera_button_alt">Switch camera</string>
@ -84,7 +89,10 @@
<string name="comment_error">Comment error!</string>
<string name="comment_posted">"Comment: %1$s posted!"</string>
<string name="comment">Comment</string>
<string name="CommentDisplay"> to show…</string>
<string name="number_comments">%1$s comments</string>
<string name="add_comment">Add a comment</string>
<string name="submit_comment">Submit comment</string>
<string name="post_is_album">This post is an album</string>
<!-- Profile page -->
<string name="nb_posts">"%1$s\nPosts"</string>
<string name="nb_followers">"%1$s\nFollowers"</string>
@ -146,6 +154,6 @@
<string name="language">Language</string>
<string name="help_translate">Help translate PixelDroid to your language:</string>
<string name="issues_contribute">Report issues or contribute to the application:</string>
<string name="mascot_description">Image showing a red panda, Pixelfed\'s mascot, using a phone</string>
</resources>