diff options
author | David Luhmer <david-dev@live.de> | 2021-03-04 20:01:44 +0300 |
---|---|---|
committer | David Luhmer <david-dev@live.de> | 2021-03-04 20:01:44 +0300 |
commit | 5b71c09a527c85fa3bfc3533a20eaea61e090e6d (patch) | |
tree | 4a80ad9a0fc4068f9fd0a01d677231c110645105 /News-Android-App/src/main/java | |
parent | b09c9a777ebee5e1c8d556a1e089650e80a91438 (diff) |
remove material design showcase view
Diffstat (limited to 'News-Android-App/src/main/java')
-rw-r--r-- | News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java | 25 | ||||
-rw-r--r-- | News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java | 14 |
2 files changed, 1 insertions, 38 deletions
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java index af527c52..1caa0066 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java @@ -115,8 +115,6 @@ import io.reactivex.functions.Action; import io.reactivex.functions.Consumer; import io.reactivex.schedulers.Schedulers; import io.reactivex.subjects.PublishSubject; -import uk.co.deanwild.materialshowcaseview.MaterialShowcaseSequence; -import uk.co.deanwild.materialshowcaseview.ShowcaseConfig; import static android.Manifest.permission.ACCESS_FINE_LOCATION; import static de.luhmer.owncloudnewsreader.LoginDialogActivity.RESULT_LOGIN; @@ -190,12 +188,6 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements startSync(); } - boolean tabletSize = getResources().getBoolean(R.bool.isTablet); - if (tabletSize) { - showTapLogoToSyncShowcaseView(); - } - - // In case automatic theme selection based on time is selected, check if location permission // for twilight manager is given.. otherwise request it if (isUserLoggedIn() && ThemeChooser.isAutoThemeSelectionEnabled() && ActivityCompat.checkSelfPermission(this, ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) { @@ -266,8 +258,6 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements reloadCountNumbersOfSlidingPaneAdapter(); syncState(); - - showTapLogoToSyncShowcaseView(); } }; @@ -370,11 +360,6 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements } } - - private void showTapLogoToSyncShowcaseView() { - getSlidingListFragment().showTapLogoToSyncShowcaseView(); - } - public int getEdgeSizeOfDrawer() { try { Field mDragger = Objects.requireNonNull(binding.drawerLayout).getClass().getDeclaredField("mLeftDragger"); @@ -491,16 +476,6 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements * @return true if new items count was greater than 0 */ private boolean syncFinishedHandler() { - ShowcaseConfig config = new ShowcaseConfig(); - config.setDelay(300); // half second between each showcase view - MaterialShowcaseSequence sequence = new MaterialShowcaseSequence(this, "SWIPE_LEFT_RIGHT_AND_PTR"); - sequence.setConfig(config); - sequence.addSequenceItem(getNewsReaderDetailFragment().binding.pbLoading, - "Pull-to-Refresh to sync with server", "GOT IT", true); - sequence.addSequenceItem(getNewsReaderDetailFragment().binding.pbLoading, - "Swipe Left/Right to mark article as read", "GOT IT", true); - sequence.start(); - NewsReaderListFragment newsReaderListFragment = getSlidingListFragment(); newsReaderListFragment.reloadAdapter(); UpdateItemList(); diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java index b05d63e3..c9fccd9e 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java @@ -68,7 +68,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.annotations.NonNull; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; -import uk.co.deanwild.materialshowcaseview.MaterialShowcaseView; + import static de.luhmer.owncloudnewsreader.Constants.USER_INFO_STRING; import static de.luhmer.owncloudnewsreader.LoginDialogActivity.RESULT_LOGIN; @@ -316,18 +316,6 @@ public class NewsReaderListFragment extends Fragment implements OnCreateContextM return binding.expandableListView; } - - protected void showTapLogoToSyncShowcaseView() { - new MaterialShowcaseView.Builder(getActivity()) - .setTarget(binding.headerLogo) - .setDismissText("GOT IT") - .setContentText("Tap this logo to sync with server") - .setDelay(300) // optional but starting animations immediately in onCreate can make them choppy - .singleUse("LOGO_SYNC") // provide a unique ID used to ensure it is only shown once - .setHideSkipButton(true) - .show(); - } - public void startAsyncTaskGetUserInfo() { mApi.getServerAPI().user() .subscribeOn(Schedulers.newThread()) |