Skip to content

Commit c9de338

Browse files
JuancaG05JuancaG05
committed
feat: added some missing content descriptions
1 parent d43a457 commit c9de338

File tree

25 files changed

+42
-126
lines changed

25 files changed

+42
-126
lines changed

‎owncloudApp/src/main/java/com/owncloud/android/presentation/accounts/ManageAccountsAdapter.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ class ManageAccountsAdapter(
9090
}
9191
holder.binding.name.tag = account.name
9292

93-
holder.binding.account.text = DisplayUtils.convertIdn(account.name, false)
93+
val accountText = DisplayUtils.convertIdn(account.name, false)
94+
holder.binding.account.text = accountText
9495

9596
updateQuota(
9697
quotaText = holder.binding.manageAccountsQuotaText,
@@ -124,11 +125,13 @@ class ManageAccountsAdapter(
124125
holder.binding.cleanAccountLocalStorageButton.apply {
125126
setImageResource(R.drawable.ic_clean_account)
126127
setOnClickListener { accountListener.cleanAccountLocalStorage(account) }
128+
contentDescription = holder.itemView.context.getString(R.string.content_description_clean_account_storage, accountText)
127129
}
128130
/// bind listener to remove account
129131
holder.binding.removeButton.apply {
130132
setImageResource(R.drawable.ic_action_delete_grey)
131133
setOnClickListener { accountListener.removeAccount(account) }
134+
contentDescription = holder.itemView.context.getString(R.string.content_description_remove_account, accountText)
132135
}
133136

134137
///bind listener to switchAccount

‎owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/sharees/ShareUserListAdapter.kt‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,17 @@ class ShareUserListAdapter(
8282

8383
/// bind listener to edit privileges
8484
val editShareButton = view.findViewById<ImageView>(R.id.editShareButton)
85-
editShareButton.setOnClickListener { listener.editShare(shares[position]) }
85+
editShareButton.apply {
86+
setOnClickListener { listener.editShare(shares[position]) }
87+
contentDescription = context.getString(R.string.content_description_edit_share, name)
88+
}
8689

8790
/// bind listener to unshare
8891
val unshareButton = view.findViewById<ImageView>(R.id.unshareButton)
89-
unshareButton.setOnClickListener { listener.unshareButtonPressed(shares[position]) }
92+
unshareButton.apply {
93+
setOnClickListener { listener.unshareButtonPressed(shares[position]) }
94+
contentDescription = context.getString(R.string.content_description_delete_share, name)
95+
}
9096

9197
}
9298
return view

‎owncloudApp/src/main/java/com/owncloud/android/presentation/sharing/shares/SharePublicLinkListAdapter.kt‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import android.view.LayoutInflater
2828
import android.view.View
2929
import android.view.ViewGroup
3030
import android.widget.ArrayAdapter
31+
import com.owncloud.android.R
3132
import com.owncloud.android.databinding.SharePublicLinkItemBinding
3233
import com.owncloud.android.domain.sharing.shares.model.OCShare
3334
import com.owncloud.android.utils.PreferenceUtils
@@ -64,16 +65,26 @@ class SharePublicLinkListAdapter(
6465
val share = publicLinks[position]
6566

6667
// If there's no name, set the token as name
67-
binding.publicLinkName.text = if (share.name.isNullOrEmpty()) share.token else share.name
68+
val linkName = if (share.name.isNullOrEmpty()) share.token else share.name
69+
binding.publicLinkName.text = linkName
6870

6971
// bind listener to get link
70-
binding.getPublicLinkButton.setOnClickListener { listener.copyOrSendPublicLink(publicLinks[position]) }
72+
binding.getPublicLinkButton.apply {
73+
setOnClickListener { listener.copyOrSendPublicLink(publicLinks[position]) }
74+
contentDescription = mContext.getString(R.string.content_description_get_public_link, linkName)
75+
}
7176

7277
// bind listener to delete
73-
binding.deletePublicLinkButton.setOnClickListener { listener.removeShare(publicLinks[position]) }
78+
binding.deletePublicLinkButton.apply {
79+
setOnClickListener { listener.removeShare(publicLinks[position]) }
80+
contentDescription = mContext.getString(R.string.content_description_delete_public_link, linkName)
81+
}
7482

7583
// bind listener to edit
76-
binding.editPublicLinkButton.setOnClickListener { listener.editPublicShare(publicLinks[position]) }
84+
binding.editPublicLinkButton.apply {
85+
setOnClickListener { listener.editPublicShare(publicLinks[position]) }
86+
contentDescription = mContext.getString(R.string.content_description_edit_public_link, linkName)
87+
}
7788
}
7889

7990
return binding.root

‎owncloudApp/src/main/res/layout/account_item.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@
9999
android:paddingEnd="@dimen/standard_half_padding"
100100
android:paddingBottom="@dimen/standard_padding"
101101
android:src="@drawable/ic_clean_account"
102-
android:contentDescription="@string/content_description_clean_account_storage"
103102
app:layout_constraintBottom_toBottomOf="parent"
104103
app:layout_constraintEnd_toStartOf="@+id/removeButton"
105104
app:layout_constraintTop_toTopOf="parent"
@@ -120,7 +119,6 @@
120119
app:layout_constraintBottom_toBottomOf="parent"
121120
app:layout_constraintEnd_toEndOf="parent"
122121
app:layout_constraintTop_toTopOf="parent"
123-
android:contentDescription="@string/content_description_remove_account"
124122
app:tint="@color/black" />
125123

126124
</androidx.constraintlayout.widget.ConstraintLayout>

‎owncloudApp/src/main/res/layout/file_options_bottom_sheet_fragment.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@
7373
android:scaleType="center"
7474
android:src="@drawable/ic_close"
7575
app:layout_constraintEnd_toEndOf="parent"
76-
app:layout_constraintTop_toTopOf="parent" />
76+
app:layout_constraintTop_toTopOf="parent"
77+
android:contentDescription="@string/drawer_close"/>
7778

7879
<View
7980
android:id="@+id/divider"

‎owncloudApp/src/main/res/layout/share_public_link_item.xml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@
4848
android:padding="14dp"
4949
android:src="@drawable/copy_link"
5050
android:scaleType="centerCrop"
51-
android:background="@color/transparent"
52-
android:contentDescription="@string/content_description_get_public_link" />
51+
android:background="@color/transparent" />
5352

5453
<ImageButton
5554
android:id="@+id/deletePublicLinkButton"
@@ -59,8 +58,7 @@
5958
android:padding="14dp"
6059
android:src="@drawable/ic_action_delete_grey"
6160
android:scaleType="centerCrop"
62-
android:background="@color/transparent"
63-
android:contentDescription="@string/content_description_delete_public_link" />
61+
android:background="@color/transparent" />
6462

6563
<ImageButton
6664
android:id="@+id/editPublicLinkButton"
@@ -69,8 +67,7 @@
6967
android:layout_gravity="center_vertical"
7068
android:padding="14dp"
7169
android:src="@drawable/ic_lead_pencil_grey"
72-
android:background="@color/transparent"
73-
android:contentDescription="@string/content_description_get_edit_public_link" />
70+
android:background="@color/transparent" />
7471

7572
</LinearLayout>
7673

‎owncloudApp/src/main/res/layout/share_user_item.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,15 @@
5858
android:src="@drawable/ic_action_delete_grey"
5959
android:padding="14dp"
6060
android:scaleType="centerCrop"
61-
android:background="@color/transparent"
62-
android:contentDescription="@string/content_description_delete_share" />
61+
android:background="@color/transparent" />
6362

6463
<ImageButton
6564
android:layout_width="48dp"
6665
android:layout_height="48dp"
6766
android:id="@+id/editShareButton"
6867
android:src="@drawable/ic_lead_pencil_grey"
6968
android:padding="14dp"
70-
android:background="@color/transparent"
71-
android:contentDescription="@string/content_description_edit_share" />
69+
android:background="@color/transparent" />
7270

7371
</LinearLayout>
7472

‎owncloudApp/src/main/res/values-cs-rCZ/strings.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -583,12 +583,7 @@ správce systému.</string>
583583
<string name="content_description_manage_accounts">Spravovat účty</string>
584584
<string name="content_description_search">Hledat</string>
585585
<string name="content_description_add_public_link">Přidat veřejný odkaz</string>
586-
<string name="content_description_get_public_link">Získat veřejný odkaz</string>
587-
<string name="content_description_delete_public_link">Odstranit veřejný odkaz</string>
588-
<string name="content_description_get_edit_public_link">Upravit veřejný odkaz</string>
589-
<string name="content_description_remove_account">Odebrat účet</string>
590586
<string name="content_description_logo">Logo</string>
591-
<string name="content_description_delete_share">Zrušit sdílení</string>
592587
<string name="content_description_create_new_folder">Vytvořit novou složku</string>
593588
<string name="create_shortcut_dialog_url">URL</string>
594589
<string name="open_shortcut_title">Otevřít odkaz</string>

‎owncloudApp/src/main/res/values-de-rDE/strings.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -730,17 +730,10 @@
730730
<string name="content_description_image_previewed">Vorschaubild angesehen</string>
731731
<string name="content_description_add_public_link">Öffentlichen Link hinzufügen</string>
732732
<string name="content_description_get_private_link">Privaten Link erhalten</string>
733-
<string name="content_description_get_public_link">Öffentlichen Link erhalten</string>
734-
<string name="content_description_delete_public_link">Öffentlichen Link löschen</string>
735-
<string name="content_description_get_edit_public_link">Öffentlichen Link bearbeiten</string>
736-
<string name="content_description_remove_account">Benutzerkonto löschen</string>
737733
<string name="content_description_add_new_content">Neuen Inhalt hinzufügen</string>
738734
<string name="content_description_add_new_content_expanded">Neuen Inhalt erweitert hinzufügen</string>
739-
<string name="content_description_clean_account_storage">Accountspeicher bereinigen</string>
740735
<string name="content_description_logo">Logo</string>
741736
<string name="content_description_add_share">Freigabe hinzufügen</string>
742-
<string name="content_description_edit_share">Freigabe bearbeiten</string>
743-
<string name="content_description_delete_share">Freigabe entfernen</string>
744737
<string name="content_description_file_operations">%1$s Operationen</string>
745738
<string name="content_description_sort_by_name_ascending">Nach %1$s aufsteigend sortieren</string>
746739
<string name="content_description_sort_by_name_descending">Nach %1$s absteigend sortieren</string>

‎owncloudApp/src/main/res/values-de/strings.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -730,17 +730,10 @@
730730
<string name="content_description_image_previewed">Vorschaubild angesehen</string>
731731
<string name="content_description_add_public_link">Öffentlichen Link hinzufügen</string>
732732
<string name="content_description_get_private_link">Privaten Link erhalten</string>
733-
<string name="content_description_get_public_link">Öffentlichen Link erhalten</string>
734-
<string name="content_description_delete_public_link">Öffentlichen Link löschen</string>
735-
<string name="content_description_get_edit_public_link">Öffentlichen Link bearbeiten</string>
736-
<string name="content_description_remove_account">Benutzerkonto löschen</string>
737733
<string name="content_description_add_new_content">Neuen Inhalt erstellen</string>
738734
<string name="content_description_add_new_content_expanded">Neue Inhalte erweitert hinzufügen</string>
739-
<string name="content_description_clean_account_storage">Benutzer Speicher bereinigen</string>
740735
<string name="content_description_logo">Logo</string>
741736
<string name="content_description_add_share">Teilen hinzufügen</string>
742-
<string name="content_description_edit_share">Teilen bearbeiten</string>
743-
<string name="content_description_delete_share">Teilen löschen</string>
744737
<string name="content_description_file_operations">%1$s Operationen</string>
745738
<string name="content_description_sort_by_name_ascending"> %1$s aufsteigend sortieren</string>
746739
<string name="content_description_sort_by_name_descending"> %1$s absteigend sortieren</string>

0 commit comments

Comments
 (0)