[MediaWiki-commits] [Gerrit] More space between wordmark and slogan - change (apps...wikipedia)

2014-12-17 Thread Dbrant (Code Review) 
Dbrant has submitted this change and it was merged.

Change subject: More space between wordmark and slogan
..


More space between wordmark and slogan

Also, better wordmark alignment in OnboardingActivity for Hebrew

Bug: T78350
Change-Id: Ic69e2f1632f56fd8daef677c9a76adc6d683a587
---
M wikipedia/res/layout/group_onboarding1.xml
M wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
2 files changed, 11 insertions(+), 4 deletions(-)

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



diff --git a/wikipedia/res/layout/group_onboarding1.xml 
b/wikipedia/res/layout/group_onboarding1.xml
index 95125cb..152c6b6 100644
--- a/wikipedia/res/layout/group_onboarding1.xml
+++ b/wikipedia/res/layout/group_onboarding1.xml
@@ -17,8 +17,8 @@
 android:layout_width=@dimen/onboarding_wp_globe
 android:layout_height=wrap_content
 android:layout_gravity=center_horizontal
-android:layout_marginTop=-12dp
-android:layout_marginBottom=-12dp
+android:layout_marginTop=-8dp
+android:layout_marginBottom=-8dp
 android:contentDescription=@string/app_name
 android:scaleType=fitCenter
 android:src=@drawable/wp_wordmark /
@@ -28,8 +28,8 @@
 android:layout_width=wrap_content
 android:layout_height=wrap_content
 android:layout_gravity=center_horizontal
-android:layout_marginTop=-12dp
-android:layout_marginBottom=-12dp
+android:layout_marginTop=-8dp
+android:layout_marginBottom=-4dp
 android:text=@string/app_name
 android:textSize=@dimen/onboarding_wp_logo_text
 android:textAllCaps=true
diff --git 
a/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java 
b/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
index a60fd33..44fd93b 100644
--- a/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
@@ -17,6 +17,8 @@
 import org.wikipedia.login.LoginActivity;
 import org.wikipedia.settings.PrefKeys;
 
+import java.util.Locale;
+
 /**
  * Onboarding screen, which shows up the first time this app is started unless 
the user is already logged in.
  * From there you can create an account, login, or skip to the main activity.
@@ -49,6 +51,11 @@
 } else {
 wikipediaWordMarkImage.setVisibility(View.GONE);
 
wikipediaWordMarkText.setText(Html.fromHtml(getString(R.string.wp_stylized)));
+if (iw.equals(Locale.getDefault().getLanguage())) {
+final float dp = WikipediaApp.getInstance().getScreenDensity();
+// move wordmark a bit to the right so it lines up better with 
the slogan
+wikipediaWordMarkText.setPadding((int) (10 * dp), 0, 0, 0);
+}
 }
 
 createAccountButton.setOnClickListener(new View.OnClickListener() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic69e2f1632f56fd8daef677c9a76adc6d683a587
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] More space between wordmark and slogan - change (apps...wikipedia)

2014-12-16 Thread BearND (Code Review) 
BearND has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/180350

Change subject: More space between wordmark and slogan
..

More space between wordmark and slogan

Also, better wordmark alignment in OnboardingActivity for Hebrew

Bug: T78350
Change-Id: Ic69e2f1632f56fd8daef677c9a76adc6d683a587
---
M wikipedia/res/layout/group_onboarding1.xml
M wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
2 files changed, 11 insertions(+), 4 deletions(-)


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

diff --git a/wikipedia/res/layout/group_onboarding1.xml 
b/wikipedia/res/layout/group_onboarding1.xml
index 95125cb..152c6b6 100644
--- a/wikipedia/res/layout/group_onboarding1.xml
+++ b/wikipedia/res/layout/group_onboarding1.xml
@@ -17,8 +17,8 @@
 android:layout_width=@dimen/onboarding_wp_globe
 android:layout_height=wrap_content
 android:layout_gravity=center_horizontal
-android:layout_marginTop=-12dp
-android:layout_marginBottom=-12dp
+android:layout_marginTop=-8dp
+android:layout_marginBottom=-8dp
 android:contentDescription=@string/app_name
 android:scaleType=fitCenter
 android:src=@drawable/wp_wordmark /
@@ -28,8 +28,8 @@
 android:layout_width=wrap_content
 android:layout_height=wrap_content
 android:layout_gravity=center_horizontal
-android:layout_marginTop=-12dp
-android:layout_marginBottom=-12dp
+android:layout_marginTop=-8dp
+android:layout_marginBottom=-4dp
 android:text=@string/app_name
 android:textSize=@dimen/onboarding_wp_logo_text
 android:textAllCaps=true
diff --git 
a/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java 
b/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
index a60fd33..44fd93b 100644
--- a/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/onboarding/OnboardingActivity.java
@@ -17,6 +17,8 @@
 import org.wikipedia.login.LoginActivity;
 import org.wikipedia.settings.PrefKeys;
 
+import java.util.Locale;
+
 /**
  * Onboarding screen, which shows up the first time this app is started unless 
the user is already logged in.
  * From there you can create an account, login, or skip to the main activity.
@@ -49,6 +51,11 @@
 } else {
 wikipediaWordMarkImage.setVisibility(View.GONE);
 
wikipediaWordMarkText.setText(Html.fromHtml(getString(R.string.wp_stylized)));
+if (iw.equals(Locale.getDefault().getLanguage())) {
+final float dp = WikipediaApp.getInstance().getScreenDensity();
+// move wordmark a bit to the right so it lines up better with 
the slogan
+wikipediaWordMarkText.setPadding((int) (10 * dp), 0, 0, 0);
+}
 }
 
 createAccountButton.setOnClickListener(new View.OnClickListener() {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic69e2f1632f56fd8daef677c9a76adc6d683a587
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND bsitzm...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits