Brion VIBBER has submitted this change and it was merged.
Change subject: Separate captcha layout into own file
......................................................................
Separate captcha layout into own file
Change-Id: I3d2bdef1f722eacea4e350bd4c5463fb1d28cbe4
---
M wikipedia/res/layout/activity_edit_section.xml
A wikipedia/res/layout/group_captcha.xml
2 files changed, 50 insertions(+), 46 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/res/layout/activity_edit_section.xml
b/wikipedia/res/layout/activity_edit_section.xml
index c4655a7..c63113a 100644
--- a/wikipedia/res/layout/activity_edit_section.xml
+++ b/wikipedia/res/layout/activity_edit_section.xml
@@ -45,53 +45,8 @@
/>
</LinearLayout>
- <LinearLayout
- android:id="@+id/edit_section_captcha_container"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:background="@android:color/background_light"
- android:orientation="vertical"
- android:visibility="gone"
- >
- <org.wikipedia.styledviews.StyledTextView
android:layout_width="match_parent" android:layout_height="wrap_content"
- android:text="@string/edit_section_captcha_message"
- style="?android:textAppearanceMedium"
- android:layout_margin="16dp"
- />
- <FrameLayout android:layout_width="wrap_content"
android:layout_height="wrap_content">
- <ImageView
- android:id="@+id/edit_section_captcha_image"
- android:layout_gravity="center_horizontal"
- android:layout_width="wrap_content"
- android:scaleType="centerInside"
- android:layout_height="wrap_content"
- />
- <ProgressBar
- android:id="@+id/edit_section_captcha_image_progress"
- android:indeterminate="true"
- style="?android:progressBarStyleSmall"
- android:visibility="gone"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
- </FrameLayout>
- <org.wikipedia.styledviews.StyledTextView
android:layout_width="match_parent" android:layout_height="wrap_content"
- android:text="@string/edit_section_captcha_reload"
- style="?android:textAppearanceSmall"
- android:gravity="center"
- />
- <org.wikipedia.styledviews.StylizedEditText
android:layout_width="match_parent" android:layout_height="wrap_content"
- android:layout_margin="16dp"
- style="?android:textAppearanceMedium"
- android:layout_gravity="center_horizontal"
- android:id="@+id/edit_section_captcha_text"
- android:hint="@string/edit_section_captcha_hint"
- android:padding="8dp"
- android:singleLine="true"
- android:inputType="textNoSuggestions"
- />
+ <include layout="@layout/group_captcha" />
- </LinearLayout>
<ScrollView android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/edit_section_abusefilter_container"
diff --git a/wikipedia/res/layout/group_captcha.xml
b/wikipedia/res/layout/group_captcha.xml
new file mode 100644
index 0000000..8e505fd
--- /dev/null
+++ b/wikipedia/res/layout/group_captcha.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
+ android:id="@+id/edit_section_captcha_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:background="@android:color/background_light"
+ android:orientation="vertical"
+ android:visibility="gone"
+ >
+ <org.wikipedia.styledviews.StyledTextView
android:layout_width="match_parent" android:layout_height="wrap_content"
+
android:text="@string/edit_section_captcha_message"
+
style="?android:textAppearanceMedium"
+ android:layout_margin="16dp"
+ />
+ <FrameLayout android:layout_width="wrap_content"
android:layout_height="wrap_content">
+ <ImageView
+ android:id="@+id/edit_section_captcha_image"
+ android:layout_gravity="center_horizontal"
+ android:layout_width="wrap_content"
+ android:scaleType="centerInside"
+ android:layout_height="wrap_content"
+ />
+ <ProgressBar
+ android:id="@+id/edit_section_captcha_image_progress"
+ android:indeterminate="true"
+ style="?android:progressBarStyleSmall"
+ android:visibility="gone"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+ </FrameLayout>
+ <org.wikipedia.styledviews.StyledTextView
android:layout_width="match_parent" android:layout_height="wrap_content"
+
android:text="@string/edit_section_captcha_reload"
+
style="?android:textAppearanceSmall"
+ android:gravity="center"
+ />
+ <org.wikipedia.styledviews.StylizedEditText
android:layout_width="match_parent" android:layout_height="wrap_content"
+ android:layout_margin="16dp"
+
style="?android:textAppearanceMedium"
+
android:layout_gravity="center_horizontal"
+
android:id="@+id/edit_section_captcha_text"
+
android:hint="@string/edit_section_captcha_hint"
+ android:padding="8dp"
+ android:singleLine="true"
+
android:inputType="textNoSuggestions"
+ />
+
+</LinearLayout>
--
To view, visit https://gerrit.wikimedia.org/r/114333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d2bdef1f722eacea4e350bd4c5463fb1d28cbe4
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
