diff --git a/.gitmodules b/.gitmodules index 67803610a..a234b2ea7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "yorozuya"] path = yorozuya url = https://github.com/seven332/Yorozuya -[submodule "hotspot"] - path = hotspot - url = https://github.com/seven332/Hotspot [submodule "easyrecyclerview"] path = easyrecyclerview url = https://github.com/seven332/EasyRecyclerView @@ -13,6 +10,3 @@ [submodule "conaco"] path = conaco url = https://github.com/seven332/Conaco -[submodule "rippleold"] - path = rippleold - url = https://github.com/seven332/RippleOld diff --git a/app/build.gradle b/app/build.gradle index 8382e2710..af6371c50 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -74,9 +74,7 @@ dependencies { compile project(':beerbelly') compile project(':conaco') compile project(':easyrecyclerview') - compile project(':hotspot') compile project(':okhttp3') - compile project(':rippleold') compile project(':yorozuya') compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' @@ -86,6 +84,7 @@ dependencies { compile 'com.github.seven332:unifile:0.1.2' compile 'com.github.seven332:drawerLayout:0.1.0' compile 'com.github.seven332:refreshlayout:0.1.0' + compile 'com.github.seven332:ripple:0.1.0' compile 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.8.7' compile 'org.ccil.cowan.tagsoup:tagsoup:1.2.1' compile 'org.jsoup:jsoup:1.8.3' diff --git a/app/src/main/java/com/hippo/ehviewer/ui/DirPickerActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/DirPickerActivity.java index 8c8804216..59dac07ad 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/DirPickerActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/DirPickerActivity.java @@ -27,7 +27,7 @@ import android.widget.TextView; import android.widget.Toast; import com.hippo.ehviewer.R; -import com.hippo.rippleold.RippleSalon; +import com.hippo.ripple.Ripple; import com.hippo.widget.DirExplorer; import com.hippo.yorozuya.ViewUtils; @@ -70,7 +70,7 @@ public class DirPickerActivity extends ToolbarActivity mDirExplorer.setCurrentFile(file); mDirExplorer.setOnChangeDirListener(this); - RippleSalon.addRipple(mOk, false); + Ripple.addRipple(mOk, false); mOk.setOnClickListener(this); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/ExcludedLanguagesActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/ExcludedLanguagesActivity.java index 9679da4c7..53f6a1693 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/ExcludedLanguagesActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/ExcludedLanguagesActivity.java @@ -30,7 +30,7 @@ import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.ehviewer.R; import com.hippo.ehviewer.Settings; import com.hippo.ehviewer.client.EhConfig; -import com.hippo.rippleold.RippleSalon; +import com.hippo.ripple.Ripple; import com.hippo.widget.SensitiveCheckBox; import com.hippo.yorozuya.ViewUtils; @@ -163,11 +163,11 @@ public class ExcludedLanguagesActivity extends ToolbarActivity mDeselectAll.setOnClickListener(this); mInvertSelection.setOnClickListener(this); - RippleSalon.addRipple(mCancel, false); - RippleSalon.addRipple(mOk, false); - RippleSalon.addRipple(mSelectAll, false); - RippleSalon.addRipple(mDeselectAll, false); - RippleSalon.addRipple(mInvertSelection, false); + Ripple.addRipple(mCancel, false); + Ripple.addRipple(mOk, false); + Ripple.addRipple(mSelectAll, false); + Ripple.addRipple(mDeselectAll, false); + Ripple.addRipple(mInvertSelection, false); } private boolean isDecimal(String str) { diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/CrashScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/CrashScene.java index b89d10a8f..a63c0e9da 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/CrashScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/CrashScene.java @@ -26,7 +26,7 @@ import com.hippo.ehviewer.Crash; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.R; import com.hippo.ehviewer.ui.MainActivity; -import com.hippo.rippleold.RippleSalon; +import com.hippo.ripple.Ripple; import com.hippo.util.AppHelper; import com.hippo.yorozuya.ViewUtils; @@ -70,8 +70,8 @@ public class CrashScene extends BaseScene implements View.OnClickListener { mCancel.setOnClickListener(this); mSend.setOnClickListener(this); - RippleSalon.addRipple(mCancel, true); - RippleSalon.addRipple(mSend, true); + Ripple.addRipple(mCancel, true); + Ripple.addRipple(mSend, true); return view; } 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 3c6d3e23f..4ba2273c3 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 @@ -75,7 +75,7 @@ import com.hippo.ehviewer.spider.SpiderDen; import com.hippo.ehviewer.ui.GalleryActivity; import com.hippo.ehviewer.ui.MainActivity; import com.hippo.ehviewer.widget.SimpleRatingView; -import com.hippo.rippleold.RippleSalon; +import com.hippo.ripple.Ripple; import com.hippo.scene.Announcer; import com.hippo.unifile.UniFile; import com.hippo.util.ApiHelper; @@ -292,7 +292,7 @@ public class DownloadsScene extends ToolbarScene mLayoutManager.setColumnSize(resources.getDimensionPixelOffset(R.dimen.gallery_list_column_width)); mLayoutManager.setStrategy(AutoStaggeredGridLayoutManager.STRATEGY_MIN_SIZE); mRecyclerView.setLayoutManager(mLayoutManager); - mRecyclerView.setSelector(RippleSalon.generateRippleDrawable(false)); + mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, false)); mRecyclerView.setDrawSelectorOnTop(true); mRecyclerView.hasFixedSize(); mRecyclerView.setClipToPadding(false); @@ -1065,8 +1065,8 @@ public class DownloadsScene extends ToolbarScene thumb.setOnClickListener(this); start.setOnClickListener(this); stop.setOnClickListener(this); - RippleSalon.addRipple(start, false); - RippleSalon.addRipple(stop, false); + Ripple.addRipple(start, false); + Ripple.addRipple(stop, false); } @Override 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 1700b135e..d4e089169 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 @@ -72,7 +72,7 @@ import com.hippo.ehviewer.ui.annotation.ViewLifeCircle; import com.hippo.ehviewer.ui.annotation.WholeLifeCircle; import com.hippo.ehviewer.widget.SearchBar; import com.hippo.refreshlayout.RefreshLayout; -import com.hippo.rippleold.RippleSalon; +import com.hippo.ripple.Ripple; import com.hippo.scene.Announcer; import com.hippo.scene.SceneFragment; import com.hippo.util.ApiHelper; @@ -252,7 +252,7 @@ public class FavoritesScene extends BaseScene implements contentLayout.getFastScroller().setOnDragHandlerListener(this); mAdapter = new FavoritesAdapter(inflater, resources, mRecyclerView, Settings.getListMode()); - mRecyclerView.setSelector(RippleSalon.generateRippleDrawable(false)); + mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, false)); mRecyclerView.setDrawSelectorOnTop(true); mRecyclerView.hasFixedSize(); mRecyclerView.setClipToPadding(false); @@ -486,7 +486,7 @@ public class FavoritesScene extends BaseScene implements LayoutUtils.dp2pix(context, 1)); decoration.setPadding(ResourcesUtils.getAttrDimensionPixelOffset(context, R.attr.dialogPreferredPadding)); rv.addItemDecoration(decoration); - rv.setSelector(RippleSalon.generateRippleDrawable(false)); + rv.setSelector(Ripple.generateRippleDrawable(context, false)); rv.setClipToPadding(false); builder.setView(rv).show(); } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java index 57773f72a..86ec4b0ea 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java @@ -64,7 +64,7 @@ import com.hippo.ehviewer.client.data.GalleryComment; import com.hippo.ehviewer.client.parser.VoteCommentParser; import com.hippo.ehviewer.ui.MainActivity; import com.hippo.reveal.ViewAnimationUtils; -import com.hippo.rippleold.RippleSalon; +import com.hippo.ripple.Ripple; import com.hippo.scene.SceneFragment; import com.hippo.text.Html; import com.hippo.text.URLImageGetter; @@ -206,7 +206,7 @@ public final class GalleryCommentsScene extends ToolbarScene LayoutUtils.dp2pix(context, 1)); decoration.setShowLastDivider(true); mRecyclerView.addItemDecoration(decoration); - mRecyclerView.setSelector(RippleSalon.generateRippleDrawable(false)); + mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, false)); mRecyclerView.setHasFixedSize(true); mRecyclerView.setOnItemClickListener(this); mRecyclerView.setPadding(mRecyclerView.getPaddingLeft(), mRecyclerView.getPaddingTop(), @@ -339,7 +339,7 @@ public final class GalleryCommentsScene extends ToolbarScene LayoutUtils.dp2pix(context, 1)); decoration.setPadding(ResourcesUtils.getAttrDimensionPixelOffset(context, R.attr.dialogPreferredPadding)); rv.addItemDecoration(decoration); - rv.setSelector(RippleSalon.generateRippleDrawable(false)); + rv.setSelector(Ripple.generateRippleDrawable(context, false)); rv.setClipToPadding(false); builder.setView(rv).show(); } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java index 0921b910e..298cdb670 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java @@ -82,7 +82,7 @@ import com.hippo.ehviewer.ui.GalleryActivity; import com.hippo.ehviewer.ui.MainActivity; import com.hippo.ehviewer.ui.annotation.WholeLifeCircle; import com.hippo.reveal.ViewAnimationUtils; -import com.hippo.rippleold.RippleSalon; +import com.hippo.ripple.Ripple; import com.hippo.scene.Announcer; import com.hippo.scene.SceneFragment; import com.hippo.scene.TransitionHelper; @@ -431,9 +431,9 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mActionGroup = (ViewGroup) ViewUtils.$$(mHeader, R.id.action_card); mDownload = (TextView) ViewUtils.$$(mActionGroup, R.id.download); mRead = ViewUtils.$$(mActionGroup, R.id.read); - RippleSalon.addRipple(mOtherActions, false); - RippleSalon.addRipple(mDownload, false); - RippleSalon.addRipple(mRead, false); + Ripple.addRipple(mOtherActions, false); + Ripple.addRipple(mDownload, false); + Ripple.addRipple(mRead, false); mUploader.setOnClickListener(this); mCategory.setOnClickListener(this); mOtherActions.setOnClickListener(this); @@ -452,7 +452,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mSize = (TextView) ViewUtils.$$(mInfo, R.id.size); mPosted = (TextView) ViewUtils.$$(mInfo, R.id.posted); mFavoredTimes = (TextView) ViewUtils.$$(mInfo, R.id.favoredTimes); - RippleSalon.addRipple(mInfo, false); + Ripple.addRipple(mInfo, false); mInfo.setOnClickListener(this); mActions = ViewUtils.$$(belowHeader, R.id.actions); @@ -466,12 +466,12 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mRate = (TextView) ViewUtils.$$(mActions, R.id.rate); mSimilar = (TextView) ViewUtils.$$(mActions, R.id.similar); mSearchCover = (TextView) ViewUtils.$$(mActions, R.id.search_cover); - RippleSalon.addRipple(mHeartGroup, false); - RippleSalon.addRipple(mTorrent, false); - RippleSalon.addRipple(mShare, false); - RippleSalon.addRipple(mRate, false); - RippleSalon.addRipple(mSimilar, false); - RippleSalon.addRipple(mSearchCover, false); + Ripple.addRipple(mHeartGroup, false); + Ripple.addRipple(mTorrent, false); + Ripple.addRipple(mShare, false); + Ripple.addRipple(mRate, false); + Ripple.addRipple(mSimilar, false); + Ripple.addRipple(mSearchCover, false); mHeartGroup.setOnClickListener(this); mTorrent.setOnClickListener(this); mShare.setOnClickListener(this); @@ -485,13 +485,13 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene mComments = (LinearLayout) ViewUtils.$$(belowHeader, R.id.comments); mCommentsText = (TextView) ViewUtils.$$(mComments, R.id.comments_text); - RippleSalon.addRipple(mComments, false); + Ripple.addRipple(mComments, false); mComments.setOnClickListener(this); mPreviews = ViewUtils.$$(belowHeader, R.id.previews); mGridLayout = (SimpleGridAutoSpanLayout) ViewUtils.$$(mPreviews, R.id.grid_layout); mPreviewText = (TextView) ViewUtils.$$(mPreviews, R.id.preview_text); - RippleSalon.addRipple(mPreviews, false); + Ripple.addRipple(mPreviews, false); mPreviews.setOnClickListener(this); mProgress = ViewUtils.$$(mainView, R.id.progress); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java index 056b24595..a982c438e 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java @@ -36,7 +36,7 @@ import com.hippo.ehviewer.R; import com.hippo.ehviewer.client.EhUrl; import com.hippo.ehviewer.client.EhUtils; import com.hippo.ehviewer.client.data.GalleryDetail; -import com.hippo.rippleold.RippleSalon; +import com.hippo.ripple.Ripple; import com.hippo.yorozuya.AssertUtils; import com.hippo.yorozuya.LayoutUtils; import com.hippo.yorozuya.ViewUtils; @@ -166,7 +166,7 @@ public final class GalleryInfoScene extends ToolbarScene implements EasyRecycler LayoutUtils.dp2pix(context, 1)); decoration.setPadding(context.getResources().getDimensionPixelOffset(R.dimen.keyline_margin)); mRecyclerView.addItemDecoration(decoration); - mRecyclerView.setSelector(RippleSalon.generateRippleDrawable(false)); + mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, false)); mRecyclerView.setClipToPadding(false); mRecyclerView.setHasFixedSize(true); mRecyclerView.setOnItemClickListener(this); 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 ac43e43cb..e0a899391 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 @@ -77,7 +77,7 @@ import com.hippo.ehviewer.ui.MainActivity; import com.hippo.ehviewer.widget.SearchBar; import com.hippo.ehviewer.widget.SearchLayout; import com.hippo.refreshlayout.RefreshLayout; -import com.hippo.rippleold.RippleSalon; +import com.hippo.ripple.Ripple; import com.hippo.scene.Announcer; import com.hippo.scene.SceneFragment; import com.hippo.util.ApiHelper; @@ -413,7 +413,7 @@ public final class GalleryListScene extends BaseScene mAdapter = new GalleryListAdapter(inflater, resources, mRecyclerView, Settings.getListMode()); - mRecyclerView.setSelector(RippleSalon.generateRippleDrawable(false)); + mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, false)); mRecyclerView.setDrawSelectorOnTop(true); mRecyclerView.hasFixedSize(); mRecyclerView.setClipToPadding(false); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java index 7149b5ff5..8d8c6e08f 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java @@ -55,7 +55,7 @@ import com.hippo.ehviewer.dao.HistoryInfo; import com.hippo.ehviewer.ui.CommonOperations; import com.hippo.ehviewer.ui.MainActivity; import com.hippo.ehviewer.widget.SimpleRatingView; -import com.hippo.rippleold.RippleSalon; +import com.hippo.ripple.Ripple; import com.hippo.scene.Announcer; import com.hippo.scene.SceneFragment; import com.hippo.util.ApiHelper; @@ -125,7 +125,7 @@ public class HistoryScene extends ToolbarScene layoutManager.setColumnSize(resources.getDimensionPixelOffset(R.dimen.gallery_list_column_width)); layoutManager.setStrategy(AutoStaggeredGridLayoutManager.STRATEGY_MIN_SIZE); mRecyclerView.setLayoutManager(layoutManager); - mRecyclerView.setSelector(RippleSalon.generateRippleDrawable(false)); + mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, false)); mRecyclerView.setDrawSelectorOnTop(true); mRecyclerView.hasFixedSize(); mRecyclerView.setClipToPadding(false); diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java index 5e976ee29..493ac94f1 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java @@ -43,7 +43,7 @@ import com.hippo.easyrecyclerview.MarginItemDecoration; import com.hippo.ehviewer.R; import com.hippo.ehviewer.client.data.ListUrlBuilder; import com.hippo.ehviewer.client.exception.EhException; -import com.hippo.rippleold.RippleSalon; +import com.hippo.ripple.Ripple; import com.hippo.widget.RadioGridGroup; import com.hippo.yorozuya.ViewUtils; @@ -139,7 +139,7 @@ public class SearchLayout extends EasyRecyclerView implements CompoundButton.OnC mNormalSearchModeHelp = (ImageView) normalView.findViewById(R.id.normal_search_mode_help); mEnableAdvanceSwitch = (SwitchCompat) normalView.findViewById(R.id.search_enable_advance); mNormalSearchModeHelp.setOnClickListener(this); - RippleSalon.addRipple(mNormalSearchModeHelp, false); + Ripple.addRipple(mNormalSearchModeHelp, false); mEnableAdvanceSwitch.setOnCheckedChangeListener(SearchLayout.this); mEnableAdvanceSwitch.setSwitchPadding(resources.getDimensionPixelSize(R.dimen.switch_padding)); diff --git a/app/src/main/java/com/hippo/widget/CheckTextView.java b/app/src/main/java/com/hippo/widget/CheckTextView.java index 181615685..3ec309f94 100644 --- a/app/src/main/java/com/hippo/widget/CheckTextView.java +++ b/app/src/main/java/com/hippo/widget/CheckTextView.java @@ -34,7 +34,7 @@ import android.view.animation.Interpolator; import android.widget.TextView; import com.hippo.ehviewer.R; -import com.hippo.hotspot.HotspotTouchHelper; +import com.hippo.hotspot.Hotspot; import com.hippo.hotspot.Hotspotable; import com.hippo.yorozuya.AnimationUtils; import com.hippo.yorozuya.MathUtils; @@ -81,7 +81,7 @@ public class CheckTextView extends TextView implements OnClickListener, Hotspota setOnClickListener(this); if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { - HotspotTouchHelper.setHotspotTouchHelper(this, new HotspotTouchHelper(this)); + Hotspot.addHotspotable(this, this); } } @@ -111,7 +111,7 @@ public class CheckTextView extends TextView implements OnClickListener, Hotspota return mRadius; } - private Animator.AnimatorListener mAnimatorListener = new SimpleAnimatorListener() { + private final Animator.AnimatorListener mAnimatorListener = new SimpleAnimatorListener() { @Override public void onAnimationEnd(Animator animation) { mAnimator = null; diff --git a/app/src/main/java/com/hippo/widget/DirExplorer.java b/app/src/main/java/com/hippo/widget/DirExplorer.java index 7e39648bd..b2ade3db9 100644 --- a/app/src/main/java/com/hippo/widget/DirExplorer.java +++ b/app/src/main/java/com/hippo/widget/DirExplorer.java @@ -28,7 +28,7 @@ import android.widget.TextView; import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.easyrecyclerview.LinearDividerItemDecoration; import com.hippo.ehviewer.R; -import com.hippo.rippleold.RippleSalon; +import com.hippo.ripple.Ripple; import com.hippo.yorozuya.LayoutUtils; import java.io.File; @@ -77,7 +77,7 @@ public class DirExplorer extends EasyRecyclerView implements EasyRecyclerView.On LayoutUtils.dp2pix(context, 1)); decoration.setShowLastDivider(true); addItemDecoration(decoration); - setSelector(RippleSalon.generateRippleDrawable(false)); + setSelector(Ripple.generateRippleDrawable(context, false)); setOnItemClickListener(this); mCurrentFile = Environment.getExternalStorageDirectory(); diff --git a/easyrecyclerview b/easyrecyclerview index 1ab59455e..c0ee4edea 160000 --- a/easyrecyclerview +++ b/easyrecyclerview @@ -1 +1 @@ -Subproject commit 1ab59455e240e2cf9a5de5d0cc38c86915812960 +Subproject commit c0ee4edeaf95d9228e1767578030cb0a924a137a diff --git a/hotspot b/hotspot deleted file mode 160000 index 399d7bb48..000000000 --- a/hotspot +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 399d7bb48b43c3ff437b6838aa95ba20a1cc7f53 diff --git a/rippleold b/rippleold deleted file mode 160000 index 9464add93..000000000 --- a/rippleold +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9464add932d1db601835c9f03e0a890744a06d4e diff --git a/settings.gradle b/settings.gradle index 8508618d7..667c8e809 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', 'beerbelly', 'conaco', ':daogenerator', ':easyrecyclerview', 'hotspot', ':okhttp3', 'rippleold', 'yorozuya' +include ':app', 'beerbelly', 'conaco', ':daogenerator', ':easyrecyclerview', ':okhttp3', 'yorozuya'