jenkins-bot has submitted this change and it was merged.
Change subject: Tweak appearance of tooltips.
......................................................................
Tweak appearance of tooltips.
- Make the text-selection tooltip centered.
- Add separate default color for tooltips in light and dark mode.
- Refactored function to display a tooltip with the default color.
Bug: T105820
Change-Id: I81b78804d9d30831005d73e16fec9a5b2d410f65
---
M wikipedia/res/layout/fragment_page.xml
M wikipedia/res/values/attrs.xml
M wikipedia/res/values/colors.xml
M wikipedia/res/values/styles_wikidark.xml
M wikipedia/res/values/styles_wikilight.xml
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
M wikipedia/src/main/java/org/wikipedia/tooltip/ToolTipUtil.java
8 files changed, 17 insertions(+), 6 deletions(-)
Approvals:
BearND: Looks good to me, approved
Niedzielski: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/wikipedia/res/layout/fragment_page.xml
b/wikipedia/res/layout/fragment_page.xml
index ffb8964..b193410 100644
--- a/wikipedia/res/layout/fragment_page.xml
+++ b/wikipedia/res/layout/fragment_page.xml
@@ -302,6 +302,6 @@
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_marginTopPercent="88%"
- app:layout_marginLeftPercent="70%" />
+ app:layout_marginLeftPercent="50%" />
</android.support.percent.PercentFrameLayout>
diff --git a/wikipedia/res/values/attrs.xml b/wikipedia/res/values/attrs.xml
index a4c60e7..1140f64 100644
--- a/wikipedia/res/values/attrs.xml
+++ b/wikipedia/res/values/attrs.xml
@@ -19,6 +19,7 @@
<attr name="tab_shadow_drawable" format="reference"/>
<attr name="tab_shadow_color" format="reference"/>
<attr name="toc_button_color" format="reference"/>
+ <attr name="tool_tip_default_color" format="reference"/>
<declare-styleable name="CabSearchView">
<attr name="cabEnabled" format="boolean" />
diff --git a/wikipedia/res/values/colors.xml b/wikipedia/res/values/colors.xml
index 3595ecd..a5847d7 100644
--- a/wikipedia/res/values/colors.xml
+++ b/wikipedia/res/values/colors.xml
@@ -27,7 +27,6 @@
<color name="search_bar">#ff404040</color>
<color name="search_text_hint">#ff808080</color>
<color name="lead_gradient_start">#b8000000</color>
- <color name="tool_tip_default">@android:color/black</color>
<color name="delete_action">#955251</color>
<!-- Make the main toolbar have its own unique color (but
indistinguishable from
@@ -50,6 +49,7 @@
<color name="list_separator_light">#ffcccccc</color>
<color name="tab_shadow_light">#ffc0c0c0</color>
<color name="toc_button_light">#ff009688</color>
+ <color name="tool_tip_default_light">@android:color/black</color>
<color name="link_dark">#ff2B6FB2</color>
<color name="button_dark">#ff2B6FB2</color>
@@ -65,6 +65,7 @@
<color name="list_separator_dark">#ff606060</color>
<color name="tab_shadow_dark">#ff505050</color>
<color name="toc_button_dark">#ff005850</color>
+ <color name="tool_tip_default_dark">#ff303030</color>
<color name="list_item_highlight">#a033b5e5</color>
<color name="list_item_selected">#d033b5e5</color>
diff --git a/wikipedia/res/values/styles_wikidark.xml
b/wikipedia/res/values/styles_wikidark.xml
index 946b627..0e853a8 100644
--- a/wikipedia/res/values/styles_wikidark.xml
+++ b/wikipedia/res/values/styles_wikidark.xml
@@ -35,6 +35,7 @@
<item
name="tab_shadow_drawable">@drawable/tab_item_bottom_gradient_light</item>
<item name="tab_shadow_color">@color/tab_shadow_dark</item>
<item name="toc_button_color">@color/toc_button_dark</item>
+ <item name="tool_tip_default_color">@color/tool_tip_default_dark</item>
</style>
<style name="DropDownListView.WikiDark"
parent="@style/Widget.AppCompat.ListView.DropDown">
diff --git a/wikipedia/res/values/styles_wikilight.xml
b/wikipedia/res/values/styles_wikilight.xml
index 0ff7007..24ddb88 100644
--- a/wikipedia/res/values/styles_wikilight.xml
+++ b/wikipedia/res/values/styles_wikilight.xml
@@ -35,6 +35,7 @@
<item
name="tab_shadow_drawable">@drawable/tab_item_bottom_gradient_light</item>
<item name="tab_shadow_color">@color/tab_shadow_light</item>
<item name="toc_button_color">@color/toc_button_light</item>
+ <item
name="tool_tip_default_color">@color/tool_tip_default_light</item>
</style>
<style name="DropDownListView.WikiLight"
parent="@style/Widget.AppCompat.Light.ListView.DropDown">
diff --git
a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
index ad5db39..a5446dc 100755
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java
@@ -45,7 +45,6 @@
import android.app.AlertDialog;
import android.content.Intent;
import android.graphics.Bitmap;
-import android.graphics.Color;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@@ -1095,8 +1094,8 @@
public void run() {
if (getActivity() != null) {
ToolTipUtil.showToolTip(getActivity(),
- targetView, R.layout.inflate_tool_tip_select_text,
Color.BLACK,
- ToolTip.Position.RIGHT);
+ targetView, R.layout.inflate_tool_tip_select_text,
+ ToolTip.Position.CENTER);
app.getOnboardingStateMachine().setSelectTextTutorial();
}
}
diff --git a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
index 56f9bcb..5e55c4d 100755
--- a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java
@@ -272,7 +272,6 @@
ToolTipUtil.showToolTip(parentActivity,
tocButton,
R.layout.inflate_tool_tip_toc_button,
-
parentActivity.getResources().getColor(R.color.tool_tip_default),
ToolTip.Position.CENTER);
WikipediaApp.getInstance().getOnboardingStateMachine().setTocTutorial();
}
diff --git a/wikipedia/src/main/java/org/wikipedia/tooltip/ToolTipUtil.java
b/wikipedia/src/main/java/org/wikipedia/tooltip/ToolTipUtil.java
index ccca676..c1d05e3 100644
--- a/wikipedia/src/main/java/org/wikipedia/tooltip/ToolTipUtil.java
+++ b/wikipedia/src/main/java/org/wikipedia/tooltip/ToolTipUtil.java
@@ -12,6 +12,7 @@
import com.appenguin.onboarding.ToolTipView;
import org.wikipedia.R;
+import org.wikipedia.Utils;
import org.wikipedia.activity.ActivityUtil;
public final class ToolTipUtil {
@@ -36,6 +37,14 @@
addToolTip(activity, toolTip);
}
+ public static void showToolTip(Activity activity,
+ View targetView,
+ @LayoutRes int contentLayout,
+ ToolTip.Position position) {
+ int color =
activity.getResources().getColor(Utils.getThemedAttributeId(activity,
R.attr.tool_tip_default_color));
+ showToolTip(activity, targetView, contentLayout, color, position);
+ }
+
/** @return True if dismissed, false if not present. */
public static boolean dismissToolTip(Activity activity) {
return removeToolTip(activity);
--
To view, visit https://gerrit.wikimedia.org/r/224793
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I81b78804d9d30831005d73e16fec9a5b2d410f65
Gerrit-PatchSet: 4
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
