some more content descriptions - #623

This commit is contained in:
stom79 2018-12-10 09:37:04 +01:00
parent a75afcdd79
commit 93cd7048e8
15 changed files with 37 additions and 39 deletions

View File

@ -92,8 +92,10 @@ public class AccountsInAListAdapter extends RecyclerView.Adapter implements OnLi
if( actionType == type.CURRENT){ if( actionType == type.CURRENT){
holder.account_action.setImageResource(R.drawable.ic_close); holder.account_action.setImageResource(R.drawable.ic_close);
holder.account_action.setContentDescription(context.getString(R.string.remove_account));
}else if(actionType == type.SEARCH){ }else if(actionType == type.SEARCH){
holder.account_action.setImageResource(R.drawable.ic_add); holder.account_action.setImageResource(R.drawable.ic_add);
holder.account_action.setContentDescription(context.getString(R.string.add_account));
} }
holder.account_action.setOnClickListener(new View.OnClickListener() { holder.account_action.setOnClickListener(new View.OnClickListener() {
@Override @Override

View File

@ -15,13 +15,10 @@
You should have received a copy of the GNU General Public License along with Mastalab; if not, You should have received a copy of the GNU General Public License along with Mastalab; if not,
see <http://www.gnu.org/licenses>. see <http://www.gnu.org/licenses>.
--> -->
<RelativeLayout <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/background_image" android:background="@color/background_image">
>
<ImageView <ImageView
android:id="@+id/back_ground_image" android:id="@+id/back_ground_image"
android:alpha="0.2" android:alpha="0.2"
@ -29,7 +26,7 @@
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:ignore="ContentDescription" /> android:contentDescription="@string/profile_banner" />
<RelativeLayout <RelativeLayout
android:padding="@dimen/fab_margin" android:padding="@dimen/fab_margin"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -43,7 +40,7 @@
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_height="80dp" android:layout_height="80dp"
tools:ignore="ContentDescription" /> android:contentDescription="@string/profile_picture" />
<!-- Screen name --> <!-- Screen name -->
<TextView <TextView
android:layout_marginTop="10dp" android:layout_marginTop="10dp"

View File

@ -16,7 +16,6 @@
see <http://www.gnu.org/licenses>. see <http://www.gnu.org/licenses>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -29,7 +28,7 @@
android:id="@+id/account_pp" android:id="@+id/account_pp"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
tools:ignore="ContentDescription" /> android:contentDescription="@string/profile_picture"/>
<LinearLayout <LinearLayout
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
@ -158,6 +157,7 @@
android:scaleType="fitXY" android:scaleType="fitXY"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:contentDescription="@string/action_follow"
/> />
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/account_mute_notification" android:id="@+id/account_mute_notification"
@ -169,6 +169,7 @@
android:scaleType="fitXY" android:scaleType="fitXY"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:contentDescription="@string/action_mute"
/> />
</LinearLayout> </LinearLayout>

View File

@ -16,7 +16,6 @@
see <http://www.gnu.org/licenses>. see <http://www.gnu.org/licenses>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/account_container" android:id="@+id/account_container"
@ -28,8 +27,7 @@
android:id="@+id/account_pp" android:id="@+id/account_pp"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:contentDescription="@string/profile_picture"/>
tools:ignore="ContentDescription" />
<TextView <TextView
android:id="@+id/account_un" android:id="@+id/account_un"
android:padding="5dp" android:padding="5dp"

View File

@ -16,7 +16,6 @@
see <http://www.gnu.org/licenses>. see <http://www.gnu.org/licenses>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
@ -31,7 +30,7 @@
android:id="@+id/account_pp" android:id="@+id/account_pp"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="30dp" android:layout_height="30dp"
tools:ignore="ContentDescription" /> android:contentDescription="@string/profile_picture" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
@ -57,6 +56,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
<!-- Content description set programmatically -->
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/account_action" android:id="@+id/account_action"
app:fabSize="mini" app:fabSize="mini"

View File

@ -16,7 +16,6 @@
see <http://www.gnu.org/licenses>. see <http://www.gnu.org/licenses>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/main_container" android:id="@+id/main_container"
@ -52,7 +51,7 @@
android:id="@+id/account_pp" android:id="@+id/account_pp"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
tools:ignore="ContentDescription" /> android:contentDescription="@string/profile_picture" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"

View File

@ -17,7 +17,6 @@
--> -->
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="2dp" android:padding="2dp"
@ -37,7 +36,7 @@
android:id="@+id/account_pp" android:id="@+id/account_pp"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="30dp" android:layout_height="30dp"
tools:ignore="ContentDescription" /> android:contentDescription="@string/profile_picture" />
<TextView <TextView
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"

View File

@ -17,7 +17,6 @@
--> -->
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="2dp" android:padding="2dp"
@ -29,7 +28,7 @@
android:id="@+id/account_pp" android:id="@+id/account_pp"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="30dp" android:layout_height="30dp"
tools:ignore="ContentDescription" /> android:contentDescription="@string/profile_picture" />
<TextView <TextView
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"

View File

@ -30,7 +30,7 @@
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_margin="10dp" android:layout_margin="10dp"
tools:ignore="ContentDescription"/> android:contentDescription="@string/profile_picture"/>
<LinearLayout <LinearLayout
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
@ -56,6 +56,7 @@
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:layout_gravity="center" android:layout_gravity="center"
app:fabSize="mini" app:fabSize="mini"
android:contentDescription="@string/follow_account"
android:id="@+id/account_follow" android:id="@+id/account_follow"
android:textAllCaps="false" android:textAllCaps="false"
android:src="@drawable/ic_user_plus" android:src="@drawable/ic_user_plus"

View File

@ -33,7 +33,7 @@
android:layout_margin="10dp" android:layout_margin="10dp"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
tools:ignore="ContentDescription" /> android:contentDescription="@string/profile_picture" />
<LinearLayout <LinearLayout
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
@ -60,6 +60,7 @@
android:layout_gravity="center" android:layout_gravity="center"
app:fabSize="mini" app:fabSize="mini"
android:id="@+id/account_follow" android:id="@+id/account_follow"
android:contentDescription="@string/follow_account"
android:textAllCaps="false" android:textAllCaps="false"
android:src="@drawable/ic_user_plus" android:src="@drawable/ic_user_plus"
android:gravity="center" android:gravity="center"

View File

@ -41,5 +41,5 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="10dp" android:padding="10dp"
tools:ignore="ContentDescription" /> android:contentDescription="@string/delete_domain" />
</LinearLayout> </LinearLayout>

View File

@ -16,13 +16,11 @@
see <http://www.gnu.org/licenses>. see <http://www.gnu.org/licenses>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/drafts_container" android:id="@+id/drafts_container"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:orientation="horizontal" android:orientation="horizontal">
>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
@ -54,5 +52,5 @@
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:padding="10dp" android:padding="10dp"
tools:ignore="ContentDescription" /> android:contentDescription="@string/remove_draft" />
</LinearLayout> </LinearLayout>

View File

@ -30,7 +30,7 @@
android:id="@+id/emoji_icon" android:id="@+id/emoji_icon"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="30dp" android:layout_height="30dp"
tools:ignore="ContentDescription" /> android:contentDescription="@string/custom_emoji_picker" />
<TextView <TextView
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"

View File

@ -48,7 +48,7 @@
android:layout_width="50dp" android:layout_width="50dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="center_horizontal|top" android:gravity="center_horizontal|top"
tools:ignore="ContentDescription" /> android:contentDescription="@string/profile_picture"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
@ -91,7 +91,7 @@
android:src="@drawable/ic_delete" android:src="@drawable/ic_delete"
android:layout_width="25dp" android:layout_width="25dp"
android:layout_height="25dp" android:layout_height="25dp"
tools:ignore="ContentDescription" /> android:contentDescription="@string/delete_notification" />
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -156,8 +156,7 @@
android:id="@+id/status_prev1" android:id="@+id/status_prev1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:layout_height="match_parent" android:layout_height="match_parent" />
tools:ignore="ContentDescription" />
<ImageView <ImageView
android:id="@+id/status_prev1_play" android:id="@+id/status_prev1_play"
android:visibility="gone" android:visibility="gone"
@ -165,7 +164,7 @@
android:layout_width="20dp" android:layout_width="20dp"
android:src="@drawable/ic_play_arrow" android:src="@drawable/ic_play_arrow"
android:layout_height="20dp" android:layout_height="20dp"
tools:ignore="ContentDescription" /> android:contentDescription="@string/play_video" />
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
@ -185,7 +184,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:ignore="ContentDescription" /> />
<ImageView <ImageView
android:visibility="gone" android:visibility="gone"
android:id="@+id/status_prev2_play" android:id="@+id/status_prev2_play"
@ -193,7 +192,7 @@
android:layout_width="20dp" android:layout_width="20dp"
android:src="@drawable/ic_play_arrow" android:src="@drawable/ic_play_arrow"
android:layout_height="20dp" android:layout_height="20dp"
tools:ignore="ContentDescription" /> android:contentDescription="@string/play_video" />
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
@ -213,7 +212,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:ignore="ContentDescription" /> />
<ImageView <ImageView
android:id="@+id/status_prev3_play" android:id="@+id/status_prev3_play"
android:layout_centerInParent="true" android:layout_centerInParent="true"
@ -221,7 +220,7 @@
android:src="@drawable/ic_play_arrow" android:src="@drawable/ic_play_arrow"
android:visibility="gone" android:visibility="gone"
android:layout_height="20dp" android:layout_height="20dp"
tools:ignore="ContentDescription" /> android:contentDescription="@string/play_video" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:layout_marginLeft="2dp" android:layout_marginLeft="2dp"
@ -235,7 +234,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:ignore="ContentDescription" /> />
<ImageView <ImageView
android:id="@+id/status_prev4_play" android:id="@+id/status_prev4_play"
android:layout_centerInParent="true" android:layout_centerInParent="true"
@ -243,7 +242,7 @@
android:layout_width="20dp" android:layout_width="20dp"
android:src="@drawable/ic_play_arrow" android:src="@drawable/ic_play_arrow"
android:layout_height="20dp" android:layout_height="20dp"
tools:ignore="ContentDescription" /> android:contentDescription="@string/play_video" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

View File

@ -701,6 +701,10 @@
<string name="emoji_picker">Emoji picker</string> <string name="emoji_picker">Emoji picker</string>
<string name="refresh">Refresh</string> <string name="refresh">Refresh</string>
<string name="expand_conversation">Expand the conversation</string> <string name="expand_conversation">Expand the conversation</string>
<string name="remove_account">Remove an account</string>
<string name="delete_domain">Delete the blocked domain</string>
<string name="custom_emoji_picker">Custom emoji picker</string>
<string name="play_video">Play video</string>
<string-array name="filter_expire"> <string-array name="filter_expire">
<item>Never</item> <item>Never</item>