subject:"\[MediaWiki\-commits\] \[Gerrit\] apps...wikipedia\[master\]\: Fix alignment of the first edit pencil on articles"

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix alignment of the first edit pencil on articles

2017-12-14 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397923 )

Change subject: Fix alignment of the first edit pencil on articles
..


Fix alignment of the first edit pencil on articles

  - Update layout
  - Add an autoMirrored attribute to the pencil icon

Bug: T160753
Change-Id: I51c3785b440fce8f336ba5b55a51569ab869638b
---
M app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
M app/src/main/res/drawable/ic_mode_edit_white_24dp.xml
M app/src/main/res/layout/view_page_header.xml
M app/src/main/res/values/dimens.xml
4 files changed, 61 insertions(+), 62 deletions(-)

Approvals:
  Dbrant: Looks good to me, approved
  jenkins-bot: Verified



diff --git 
a/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java 
b/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
index a024c16..8072167 100644
--- a/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
@@ -24,7 +24,6 @@
 import android.view.Gravity;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
@@ -60,6 +59,7 @@
 @BindView(R.id.view_page_subtitle_text) AppTextView subtitleText;
 @BindView(R.id.view_page_header_divider) View divider;
 @BindView(R.id.view_page_header_edit_pencil) ImageView editPencil;
+@BindView(R.id.view_page_subtitle_container) LinearLayout 
subtitleContainer;
 
 @Nullable private Callback callback;
 @VisibleForTesting @NonNull CharSequence title = "";
@@ -167,13 +167,16 @@
 LinearLayout.LayoutParams dividerParams = (LinearLayout.LayoutParams) 
divider.getLayoutParams();
 dividerParams.gravity = isLangRTL(locale) ? Gravity.RIGHT : 
Gravity.LEFT;
 divider.setLayoutParams(dividerParams);
-FrameLayout.LayoutParams pencilParams = (FrameLayout.LayoutParams) 
editPencil.getLayoutParams();
+LinearLayout.LayoutParams pencilParams = (LinearLayout.LayoutParams) 
editPencil.getLayoutParams();
 pencilParams.gravity = Gravity.BOTTOM | (isLangRTL(locale) ? 
Gravity.LEFT : Gravity.RIGHT);
+subtitleContainer.setLayoutDirection(isLangRTL(locale) ? 
LAYOUT_DIRECTION_RTL : LAYOUT_DIRECTION_LTR);
+
 int subtitlePadding = editPencil.getWidth();
 subtitleText.setPadding(isLangRTL(locale) ? subtitlePadding : 0,
 subtitleText.getPaddingTop(),
 isLangRTL(locale) ? 0 : subtitlePadding,
 subtitleText.getPaddingBottom());
+
 if (TextUtils.isEmpty(subtitle)) {
 subtitleText.setCompoundDrawablesWithIntrinsicBounds(
 isLangRTL(locale) ? 0 : R.drawable.ic_short_text,
diff --git a/app/src/main/res/drawable/ic_mode_edit_white_24dp.xml 
b/app/src/main/res/drawable/ic_mode_edit_white_24dp.xml
index 7dc0640..b58ac1d 100644
--- a/app/src/main/res/drawable/ic_mode_edit_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_mode_edit_white_24dp.xml
@@ -3,7 +3,8 @@
 android:width="24dp"
 android:height="24dp"
 android:viewportWidth="24"
-android:viewportHeight="24">
+android:viewportHeight="24"
+android:autoMirrored="true">
 
 http://schemas.android.com/apk/res/android;
 xmlns:app="http://schemas.android.com/apk/res-auto;
 xmlns:tools="http://schemas.android.com/tools;
 android:layout_width="match_parent"
-android:layout_height="wrap_content">
+android:layout_height="wrap_content"
+android:orientation="vertical">
+
+
+
+
 
 
-
-
+android:layout_height="wrap_content"
+android:layout_marginLeft="@dimen/activity_horizontal_margin"
+android:layout_marginRight="@dimen/activity_horizontal_margin">
 
 
-
-
 
-
+
 
 
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml 
b/app/src/main/res/values/dimens.xml
index e9641fb..8fb01e8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,9 +5,6 @@
 
 4dp
 
-24dp
-24dp
-
 8dp
 -8dp
 

-- 
To view, visit https://gerrit.wikimedia.org/r/397923
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I51c3785b440fce8f336ba5b55a51569ab869638b
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Cooltey 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Sharvaniharan 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix alignment of the first edit pencil on articles

2017-12-12 Thread Cooltey (Code Review)

Cooltey has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397923 )

Change subject: Fix alignment of the first edit pencil on articles
..

Fix alignment of the first edit pencil on articles

  - Update layout, xml and code to programmtically change the parameter's rules

Bug: T160753
Change-Id: I51c3785b440fce8f336ba5b55a51569ab869638b
---
M app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
M app/src/main/res/layout/view_page_header.xml
M app/src/main/res/values/dimens.xml
3 files changed, 72 insertions(+), 60 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/23/397923/1

diff --git 
a/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java 
b/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
index a024c16..35f4168 100644
--- a/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
@@ -24,9 +24,9 @@
 import android.view.Gravity;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 
 import org.wikipedia.R;
 import org.wikipedia.media.AvPlayer;
@@ -164,16 +164,29 @@
 public void setLocale(@NonNull String locale) {
 titleText.setLocale(locale);
 subtitleText.setLocale(locale);
+
 LinearLayout.LayoutParams dividerParams = (LinearLayout.LayoutParams) 
divider.getLayoutParams();
 dividerParams.gravity = isLangRTL(locale) ? Gravity.RIGHT : 
Gravity.LEFT;
 divider.setLayoutParams(dividerParams);
-FrameLayout.LayoutParams pencilParams = (FrameLayout.LayoutParams) 
editPencil.getLayoutParams();
-pencilParams.gravity = Gravity.BOTTOM | (isLangRTL(locale) ? 
Gravity.LEFT : Gravity.RIGHT);
+
+RelativeLayout.LayoutParams pencilParams = 
(RelativeLayout.LayoutParams) editPencil.getLayoutParams();
+pencilParams.removeRule(isLangRTL(locale) ? 
RelativeLayout.ALIGN_PARENT_END : RelativeLayout.ALIGN_PARENT_START);
+pencilParams.addRule(isLangRTL(locale) ? 
RelativeLayout.ALIGN_PARENT_START : RelativeLayout.ALIGN_PARENT_END);
+pencilParams.addRule(RelativeLayout.ALIGN_START, isLangRTL(locale) ? 
R.dimen.edit_pencil_horizontal_margin : 
R.dimen.edit_pencil_space_between_subtitle);
+pencilParams.addRule(RelativeLayout.ALIGN_END, isLangRTL(locale) ? 
R.dimen.edit_pencil_space_between_subtitle : 
R.dimen.edit_pencil_horizontal_margin);
+editPencil.setLayoutParams(pencilParams);
+
+RelativeLayout.LayoutParams subtitleParams = 
(RelativeLayout.LayoutParams) subtitleText.getLayoutParams();
+subtitleParams.removeRule(isLangRTL(locale) ? RelativeLayout.START_OF 
: RelativeLayout.END_OF);
+subtitleParams.addRule(isLangRTL(locale) ? RelativeLayout.END_OF : 
RelativeLayout.START_OF, editPencil.getId());
+subtitleText.setLayoutParams(subtitleParams);
+
 int subtitlePadding = editPencil.getWidth();
 subtitleText.setPadding(isLangRTL(locale) ? subtitlePadding : 0,
 subtitleText.getPaddingTop(),
 isLangRTL(locale) ? 0 : subtitlePadding,
 subtitleText.getPaddingBottom());
+
 if (TextUtils.isEmpty(subtitle)) {
 subtitleText.setCompoundDrawablesWithIntrinsicBounds(
 isLangRTL(locale) ? 0 : R.drawable.ic_short_text,
diff --git a/app/src/main/res/layout/view_page_header.xml 
b/app/src/main/res/layout/view_page_header.xml
index c712e40..c23c508 100644
--- a/app/src/main/res/layout/view_page_header.xml
+++ b/app/src/main/res/layout/view_page_header.xml
@@ -1,74 +1,72 @@
-http://schemas.android.com/apk/res/android;
 xmlns:app="http://schemas.android.com/apk/res-auto;
 xmlns:tools="http://schemas.android.com/tools;
 android:layout_width="match_parent"
-android:layout_height="wrap_content">
+android:layout_height="wrap_content"
+android:orientation="vertical">
 
-
+android:layout_height="wrap_content" />
 
-
+
+
+
 
 
-
-
 
-
-
+
+
 
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml 
b/app/src/main/res/values/dimens.xml
index e9641fb..2935093 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,8 +5,9 @@
 
 4dp
 
+16dp
 24dp
-24dp
+8dp
 
 8dp
 -8dp

-- 
To view, visit https://gerrit.wikimedia.org/r/397923
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I51c3785b440fce8f336ba5b55a51569ab869638b
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Cooltey

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix alignment of the first edit pencil on articles

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix alignment of the first edit pencil on articles

2 matches

Site Navigation

Mail list logo

Footer information