From e51cd6b90d86426f41dd0a7b92eefed06536e58c Mon Sep 17 00:00:00 2001 From: tarsin Date: Mon, 25 Jul 2022 20:44:59 +0800 Subject: [PATCH] Drop taptargetview * Not MD3 --- app/build.gradle | 1 - .../ehviewer/ui/scene/DownloadsScene.java | 83 ------------------- .../ehviewer/ui/scene/FavoritesScene.java | 33 -------- .../ehviewer/ui/scene/GalleryListScene.java | 33 -------- 4 files changed, 150 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 804a3147d..95c390e96 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -148,7 +148,6 @@ dependencies { implementation 'com.drakeet.drawer:drawer:1.0.3' implementation 'com.google.android.material:material:1.7.0-alpha03' - implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.3' implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0' implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.10' implementation 'dev.rikka.rikkax.core:core-ktx:1.4.1' diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java index 18ace28a4..ca4134fa3 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java @@ -55,8 +55,6 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.SimpleItemAnimator; import androidx.recyclerview.widget.StaggeredGridLayoutManager; -import com.getkeepsafe.taptargetview.TapTarget; -import com.getkeepsafe.taptargetview.TapTargetView; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator; @@ -390,90 +388,9 @@ public class DownloadsScene extends ToolbarScene updateView(); - guide(); - return view; } - private void guide() { - if (Settings.getGuideDownloadThumb() && null != mRecyclerView) { - mRecyclerView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { - @Override - public void onGlobalLayout() { - if (Settings.getGuideDownloadThumb()) { - guideDownloadThumb(); - } - if (null != mRecyclerView) { - ViewUtils.removeOnGlobalLayoutListener(mRecyclerView.getViewTreeObserver(), this); - } - } - }); - } else { - guideDownloadLabels(); - } - } - - private void guideDownloadThumb() { - MainActivity activity = getMainActivity(); - if (null == activity || !Settings.getGuideDownloadThumb() || null == mLayoutManager || null == mRecyclerView) { - guideDownloadLabels(); - return; - } - int position = mLayoutManager.findFirstCompletelyVisibleItemPositions(null)[0]; - if (position < 0) { - guideDownloadLabels(); - return; - } - RecyclerView.ViewHolder holder = mRecyclerView.findViewHolderForAdapterPosition(position); - if (null == holder) { - guideDownloadLabels(); - return; - } - - TapTargetView.showFor(requireActivity(), - TapTarget.forView(((DownloadHolder) holder).thumb, - getString(R.string.guide_download_thumb_title), - getString(R.string.guide_download_thumb_text)) - .transparentTarget(true), - new TapTargetView.Listener() { - @Override - public void onTargetDismissed(TapTargetView view, boolean userInitiated) { - super.onTargetDismissed(view, userInitiated); - Settings.putGuideDownloadThumb(false); - guideDownloadLabels(); - } - }); - } - - private void guideDownloadLabels() { - MainActivity activity = getMainActivity(); - if (null == activity || !Settings.getGuideDownloadLabels()) { - return; - } - - Display display = activity.getWindowManager().getDefaultDisplay(); - Point point = new Point(); - display.getSize(point); - Rect bounds = new Rect(point.x + LayoutUtils.dp2pix(requireContext(), 20), - point.y / 3 + LayoutUtils.dp2pix(requireContext(), 20), - point.x - LayoutUtils.dp2pix(requireContext(), 20), - point.y / 3 - LayoutUtils.dp2pix(requireContext(), 20)); - - TapTargetView.showFor(requireActivity(), - TapTarget.forBounds(bounds, - getString(R.string.guide_download_labels_title), - getString(R.string.guide_download_labels_text)) - .transparentTarget(true), - new TapTargetView.Listener() { - @Override - public void onTargetDismissed(TapTargetView view, boolean userInitiated) { - super.onTargetClick(view); - Settings.puttGuideDownloadLabels(false); - openDrawer(Gravity.RIGHT); - } - }); - } - @Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java index 635cc8b0e..ca4e5eb21 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java @@ -45,8 +45,6 @@ import androidx.drawerlayout.widget.DrawerLayout; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.getkeepsafe.taptargetview.TapTarget; -import com.getkeepsafe.taptargetview.TapTargetView; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.hippo.annotation.Implemented; @@ -311,40 +309,9 @@ public class FavoritesScene extends BaseScene implements mHelper.firstRefresh(); } - guideCollections(); - return view; } - private void guideCollections() { - Activity activity = getMainActivity(); - if (null == activity || !Settings.getGuideCollections()) { - return; - } - - Display display = activity.getWindowManager().getDefaultDisplay(); - Point point = new Point(); - display.getSize(point); - Rect bounds = new Rect(point.x + LayoutUtils.dp2pix(requireContext(), 20), - point.y / 3 + LayoutUtils.dp2pix(requireContext(), 20), - point.x - LayoutUtils.dp2pix(requireContext(), 20), - point.y / 3 - LayoutUtils.dp2pix(requireContext(), 20)); - - TapTargetView.showFor(requireActivity(), - TapTarget.forBounds(bounds, - getString(R.string.guide_collections_title), - getString(R.string.guide_collections_text)) - .transparentTarget(true), - new TapTargetView.Listener() { - @Override - public void onTargetDismissed(TapTargetView view, boolean userInitiated) { - super.onTargetClick(view); - Settings.putGuideCollections(false); - openDrawer(Gravity.RIGHT); - } - }); - } - // keyword of mUrlBuilder, fav cat of mUrlBuilder, mFavCatArray. // They changed, call it private void updateSearchBar() { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java index a235f5db1..9b8210621 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java @@ -59,8 +59,6 @@ import androidx.drawerlayout.widget.DrawerLayout; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.getkeepsafe.taptargetview.TapTarget; -import com.getkeepsafe.taptargetview.TapTargetView; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator; @@ -634,40 +632,9 @@ public final class GalleryListScene extends BaseScene mHelper.firstRefresh(); } - guideQuickSearch(); - return view; } - private void guideQuickSearch() { - Activity activity = getMainActivity(); - if (null == activity || !Settings.getGuideQuickSearch()) { - return; - } - - Display display = activity.getWindowManager().getDefaultDisplay(); - Point point = new Point(); - display.getSize(point); - Rect bounds = new Rect(point.x + LayoutUtils.dp2pix(requireContext(), 20), - point.y / 3 + LayoutUtils.dp2pix(requireContext(), 20), - point.x - LayoutUtils.dp2pix(requireContext(), 20), - point.y / 3 - LayoutUtils.dp2pix(requireContext(), 20)); - - TapTargetView.showFor(requireActivity(), - TapTarget.forBounds(bounds, - getString(R.string.guide_quick_search_title), - getString(R.string.guide_quick_search_text)) - .transparentTarget(true), - new TapTargetView.Listener() { - @Override - public void onTargetDismissed(TapTargetView view, boolean userInitiated) { - super.onTargetClick(view); - Settings.putGuideQuickSearch(false); - openDrawer(Gravity.RIGHT); - } - }); - } - @Override public void onDestroyView() { super.onDestroyView();