Merge pull request #506 from andhie/tooltip

Replace CheatSheet with TooltipCompat
muzei · Nov 25, 2017 · 7868fc8 · 7868fc8
2 parents d8aa882 + d23c83c
commit 7868fc8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 150 deletions.
diff --git a/main/src/main/java/com/google/android/apps/muzei/ArtDetailFragment.java b/main/src/main/java/com/google/android/apps/muzei/ArtDetailFragment.java
@@ -26,6 +26,7 @@
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.res.ResourcesCompat;
+import android.support.v7.widget.TooltipCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseIntArray;
@@ -54,7 +55,6 @@
 import com.google.android.apps.muzei.settings.AboutActivity;
 import com.google.android.apps.muzei.sync.TaskQueueService;
 import com.google.android.apps.muzei.util.AnimatedMuzeiLoadingSpinnerView;
-import com.google.android.apps.muzei.util.CheatSheet;
 import com.google.android.apps.muzei.util.PanScaleProxyView;
 import com.google.android.apps.muzei.util.ScrimUtil;
 import com.google.android.apps.muzei.widget.AppWidgetUpdateTask;
@@ -288,7 +288,7 @@ public void onClick(View view) {
                 showNextFakeLoading();
             }
         });
-        CheatSheet.setup(mNextButton);
+        TooltipCompat.setTooltipText(mNextButton, mNextButton.getContentDescription());
 
         mPanScaleProxyView = view.findViewById(R.id.pan_scale_proxy);
         mPanScaleProxyView.setMaxZoom(5);

diff --git a/main/src/main/java/com/google/android/apps/muzei/settings/ChooseSourceFragment.java b/main/src/main/java/com/google/android/apps/muzei/settings/ChooseSourceFragment.java
@@ -50,6 +50,7 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.content.res.ResourcesCompat;
 import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.TooltipCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -66,7 +67,6 @@
 import com.google.android.apps.muzei.api.MuzeiArtSource;
 import com.google.android.apps.muzei.notifications.NotificationSettingsDialogFragment;
 import com.google.android.apps.muzei.room.MuzeiDatabase;
-import com.google.android.apps.muzei.util.CheatSheet;
 import com.google.android.apps.muzei.util.ObservableHorizontalScrollView;
 import com.google.android.apps.muzei.util.Scrollbar;
 import com.google.firebase.analytics.FirebaseAnalytics;
@@ -610,7 +610,7 @@ public boolean onLongClick(View v) {
             updateSourceStatusUi(source);
 
             source.settingsButton = source.rootView.findViewById(R.id.source_settings_button);
-            CheatSheet.setup(source.settingsButton);
+            TooltipCompat.setTooltipText(source.settingsButton, source.settingsButton.getContentDescription());
             source.settingsButton.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {

diff --git a/main/src/main/java/com/google/android/apps/muzei/util/CheatSheet.java b/main/src/main/java/com/google/android/apps/muzei/util/CheatSheet.java