Adds content descriptions to header and avatar buttons in the profile editor and puts the page in a scroll view so it's navigable in landscape mode.
This commit is contained in:
parent
34873423c7
commit
800ab8001e
|
@ -7,127 +7,117 @@
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
tools:context="com.keylesspalace.tusky.EditProfileActivity">
|
tools:context="com.keylesspalace.tusky.EditProfileActivity">
|
||||||
|
|
||||||
<LinearLayout
|
<ScrollView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent">
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<android.support.v7.widget.Toolbar
|
<LinearLayout
|
||||||
android:id="@+id/toolbar"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="?attr/actionBarSize"
|
|
||||||
android:background="?attr/toolbar_background_color"
|
|
||||||
android:elevation="4dp" />
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="200dp"
|
|
||||||
android:id="@+id/edit_profile_header_preview"
|
|
||||||
android:contentDescription="@null" />
|
|
||||||
|
|
||||||
<ProgressBar
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:id="@+id/edit_profile_header_progress"
|
|
||||||
android:layout_centerInParent="true"
|
|
||||||
android:indeterminate="true"
|
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/label_header"
|
|
||||||
android:labelFor="@+id/edit_profile_header"
|
|
||||||
android:visibility="gone"/>
|
|
||||||
|
|
||||||
<ImageButton
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="200dp"
|
|
||||||
android:id="@id/edit_profile_header"
|
|
||||||
app:srcCompat="@drawable/ic_add_a_photo_32dp"
|
|
||||||
android:text="@string/action_photo_pick"
|
|
||||||
android:textColor="@color/text_color_primary_dark"
|
|
||||||
android:background="#66000000"/>
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingLeft="16dp"
|
|
||||||
android:layout_marginTop="-40dp">
|
|
||||||
|
|
||||||
<com.pkmmte.view.CircularImageView
|
|
||||||
android:layout_width="80dp"
|
|
||||||
android:layout_height="80dp"
|
|
||||||
android:id="@+id/edit_profile_avatar_preview"
|
|
||||||
android:contentDescription="@null" />
|
|
||||||
|
|
||||||
<ProgressBar
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:id="@+id/edit_profile_avatar_progress"
|
|
||||||
android:layout_centerInParent="true"
|
|
||||||
android:indeterminate="true"
|
|
||||||
android:visibility="gone" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/label_avatar"
|
|
||||||
android:labelFor="@+id/edit_profile_avatar"
|
|
||||||
android:visibility="gone"/>
|
|
||||||
|
|
||||||
<ImageButton
|
|
||||||
android:layout_width="80dp"
|
|
||||||
android:layout_height="80dp"
|
|
||||||
android:id="@id/edit_profile_avatar"
|
|
||||||
app:srcCompat="@drawable/ic_add_a_photo_32dp"
|
|
||||||
android:text="@string/action_photo_pick"
|
|
||||||
android:textColor="@color/text_color_primary_dark"
|
|
||||||
android:elevation="4dp"
|
|
||||||
android:background="@drawable/round_button"/>
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
|
||||||
android:id="@+id/layout_edit_profile_display_name"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="30dp">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<EditText
|
<android.support.v7.widget.Toolbar
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
android:background="?attr/toolbar_background_color"
|
||||||
|
android:elevation="4dp" />
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="200dp"
|
||||||
|
android:id="@+id/edit_profile_header_preview"
|
||||||
|
android:contentDescription="@null" />
|
||||||
|
|
||||||
|
<ProgressBar
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/edit_profile_header_progress"
|
||||||
|
android:layout_centerInParent="true"
|
||||||
|
android:indeterminate="true"
|
||||||
|
android:visibility="gone" />
|
||||||
|
|
||||||
|
<ImageButton
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="200dp"
|
||||||
|
android:id="@+id/edit_profile_header"
|
||||||
|
app:srcCompat="@drawable/ic_add_a_photo_32dp"
|
||||||
|
android:background="#66000000"
|
||||||
|
android:contentDescription="@string/label_header" />
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingLeft="16dp"
|
||||||
|
android:layout_marginTop="-40dp">
|
||||||
|
|
||||||
|
<com.pkmmte.view.CircularImageView
|
||||||
|
android:layout_width="80dp"
|
||||||
|
android:layout_height="80dp"
|
||||||
|
android:id="@+id/edit_profile_avatar_preview"
|
||||||
|
android:contentDescription="@null" />
|
||||||
|
|
||||||
|
<ProgressBar
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/edit_profile_avatar_progress"
|
||||||
|
android:layout_centerInParent="true"
|
||||||
|
android:indeterminate="true"
|
||||||
|
android:visibility="gone" />
|
||||||
|
|
||||||
|
<ImageButton
|
||||||
|
android:layout_width="80dp"
|
||||||
|
android:layout_height="80dp"
|
||||||
|
android:id="@+id/edit_profile_avatar"
|
||||||
|
app:srcCompat="@drawable/ic_add_a_photo_32dp"
|
||||||
|
android:elevation="4dp"
|
||||||
|
android:background="@drawable/round_button"
|
||||||
|
android:contentDescription="@string/label_avatar" />
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
<android.support.design.widget.TextInputLayout
|
||||||
|
android:id="@+id/layout_edit_profile_display_name"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:id="@+id/edit_profile_display_name"
|
android:layout_marginTop="30dp">
|
||||||
android:hint="@string/hint_display_name"
|
|
||||||
android:maxLength="30"
|
|
||||||
android:layout_marginStart="16dp"
|
|
||||||
android:layout_marginEnd="16dp" />
|
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
<EditText
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/edit_profile_display_name"
|
||||||
|
android:hint="@string/hint_display_name"
|
||||||
|
android:maxLength="30"
|
||||||
|
android:layout_marginStart="16dp"
|
||||||
|
android:layout_marginEnd="16dp" />
|
||||||
|
|
||||||
<android.support.design.widget.TextInputLayout
|
</android.support.design.widget.TextInputLayout>
|
||||||
android:id="@+id/layout_edit_profile_note"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="30dp">
|
|
||||||
|
|
||||||
<EditText
|
<android.support.design.widget.TextInputLayout
|
||||||
|
android:id="@+id/layout_edit_profile_note"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:id="@+id/edit_profile_note"
|
android:layout_marginTop="30dp">
|
||||||
android:hint="@string/hint_note"
|
|
||||||
android:maxLength="160"
|
|
||||||
android:layout_marginStart="16dp"
|
|
||||||
android:layout_marginEnd="16dp"
|
|
||||||
android:layout_marginBottom="16dp" />
|
|
||||||
|
|
||||||
</android.support.design.widget.TextInputLayout>
|
<EditText
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/edit_profile_note"
|
||||||
|
android:hint="@string/hint_note"
|
||||||
|
android:maxLength="160"
|
||||||
|
android:layout_marginStart="16dp"
|
||||||
|
android:layout_marginEnd="16dp"
|
||||||
|
android:layout_marginBottom="16dp" />
|
||||||
|
|
||||||
</LinearLayout>
|
</android.support.design.widget.TextInputLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</ScrollView>
|
||||||
|
|
||||||
<ProgressBar
|
<ProgressBar
|
||||||
android:id="@+id/edit_profile_save_progress"
|
android:id="@+id/edit_profile_save_progress"
|
||||||
|
|
Loading…
Reference in New Issue