Detailed changes
@@ -211,6 +211,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
intent.putExtra("uuid", mConversation.getUuid());
startActivity(intent);
});
+ this.binding.editMucNameButton.setContentDescription(getString(R.string.edit_name_and_topic));
this.binding.editMucNameButton.setOnClickListener(this::onMucEditButtonClicked);
this.binding.mucEditTitle.addTextChangedListener(this);
this.binding.mucEditSubject.addTextChangedListener(this);
@@ -288,6 +289,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
this.binding.mucEditor.setVisibility(View.VISIBLE);
this.binding.mucDisplay.setVisibility(View.GONE);
this.binding.editMucNameButton.setImageResource(R.drawable.ic_cancel_24dp);
+ this.binding.editMucNameButton.setContentDescription(getString(R.string.cancel));
final String name = mucOptions.getName();
this.binding.mucEditTitle.setText("");
final boolean owner = mucOptions.getSelf().getAffiliation().ranks(MucOptions.Affiliation.OWNER);
@@ -322,6 +324,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
this.binding.mucEditor.setVisibility(View.GONE);
this.binding.mucDisplay.setVisibility(View.VISIBLE);
this.binding.editMucNameButton.setImageResource(R.drawable.ic_edit_24dp);
+ this.binding.editMucNameButton.setContentDescription(getString(R.string.edit_name_and_topic));
}
private void onMucInfoUpdated(String subject, String name) {
@@ -630,8 +633,10 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
boolean nameChanged = changed(binding.mucEditTitle.getEditableText().toString(), mucOptions.getName());
if (subjectChanged || nameChanged) {
this.binding.editMucNameButton.setImageResource(R.drawable.ic_save_24dp);
+ this.binding.editMucNameButton.setContentDescription(getString(R.string.save));
} else {
this.binding.editMucNameButton.setImageResource(R.drawable.ic_cancel_24dp);
+ this.binding.editMucNameButton.setContentDescription(getString(R.string.cancel));
}
}
}
@@ -418,6 +418,7 @@ public class StartConversationActivity extends XmppActivity
.create();
speedDialView.addActionItem(actionItem);
}
+ speedDialView.setContentDescription(getString(R.string.add_contact_or_create_or_join_group_chat));
}
public static boolean isValidJid(String input) {
@@ -107,8 +107,8 @@
android:id="@+id/hostname_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_weight="0.7"
android:layout_marginEnd="4sp"
+ android:layout_weight="0.7"
android:hint="@string/account_settings_hostname">
<EditText
@@ -123,8 +123,8 @@
android:id="@+id/port_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_weight="0.3"
android:layout_marginStart="4sp"
+ android:layout_weight="0.3"
android:hint="@string/account_settings_port">
<EditText
@@ -154,7 +154,8 @@
android:layout_marginTop="@dimen/activity_vertical_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginBottom="@dimen/activity_vertical_margin"
- android:visibility="gone">
+ android:visibility="gone"
+ tools:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
@@ -210,7 +211,8 @@
android:layout_marginTop="@dimen/activity_vertical_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginBottom="@dimen/activity_vertical_margin"
- android:visibility="gone">
+ android:visibility="gone"
+ tools:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
@@ -513,6 +515,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:background="?attr/selectableItemBackgroundBorderless"
+ android:contentDescription="@string/edit_nick"
android:padding="@dimen/image_button_padding"
android:src="@drawable/ic_edit_24dp"
android:visibility="visible" />
@@ -554,6 +557,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:background="?attr/selectableItemBackgroundBorderless"
+ android:contentDescription="@string/delete_pgp_key"
android:padding="@dimen/image_button_padding"
android:src="@drawable/ic_delete_24dp"
android:visibility="visible" />
@@ -600,7 +604,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackgroundBorderless"
- android:contentDescription="@string/copy_omemo_clipboard_description"
+ android:contentDescription="@string/show_qr_code"
android:padding="@dimen/image_button_padding"
android:src="@drawable/ic_qr_code_24dp"
android:visibility="visible" />
@@ -628,7 +632,8 @@
android:layout_marginTop="@dimen/activity_vertical_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginBottom="@dimen/activity_vertical_margin"
- android:visibility="gone">
+ android:visibility="gone"
+ tools:visibility="visible">
<LinearLayout
android:layout_width="match_parent"
@@ -160,6 +160,7 @@
android:layout_centerVertical="true"
android:layout_gravity="center_horizontal"
android:background="?attr/selectableItemBackgroundBorderless"
+ android:contentDescription="@string/edit_configuration"
android:padding="@dimen/image_button_padding"
android:src="@drawable/ic_settings_24dp" />
</RelativeLayout>
@@ -307,6 +308,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:background="?attr/selectableItemBackgroundBorderless"
+ android:contentDescription="@string/edit_nick"
android:padding="@dimen/image_button_padding"
android:src="@drawable/ic_edit_24dp" />
</RelativeLayout>
@@ -334,6 +336,7 @@
android:layout_centerVertical="true"
android:layout_gravity="center_horizontal"
android:background="?attr/selectableItemBackgroundBorderless"
+ android:contentDescription="@string/change_notification_settings"
android:padding="@dimen/image_button_padding"
android:src="@drawable/ic_notifications_24dp" />
</RelativeLayout>
@@ -45,7 +45,8 @@
<ImageView
android:id="@+id/account_image"
android:layout_width="@dimen/publish_avatar_size"
- android:layout_height="@dimen/publish_avatar_size" />
+ android:layout_height="@dimen/publish_avatar_size"
+ android:contentDescription="@string/your_avatar_tap_to_select_new_avatar" />
</FrameLayout>
<TextView
@@ -966,6 +966,7 @@
<string name="search_all_conversations">All chats</string>
<string name="search_this_conversation">This chat</string>
<string name="your_avatar">Your avatar</string>
+ <string name="your_avatar_tap_to_select_new_avatar">Your avatar. Tap to select new avatar from gallery.</string>
<string name="avatar_for_x">Avatar for %s</string>
<string name="encrypted_with_omemo">Encrypted with OMEMO</string>
<string name="encrypted_with_openpgp">Encrypted with OpenPGP</string>
@@ -1064,4 +1065,9 @@
<string name="pref_fullscreen_notification_summary">Allow this app to show incoming call notifications that take up the full screen when the device is locked.</string>
<string name="unsupported_operation">Unsupported operation</string>
<string name="allow_private_messages">Allow private messages</string>
+ <string name="edit_nick">Edit nick</string>
+ <string name="delete_pgp_key">Delete OpenPGP key</string>
+ <string name="edit_name_and_topic">Edit name and topic</string>
+ <string name="edit_configuration">Change configuration</string>
+ <string name="change_notification_settings">Change notification settings</string>
</resources>