From 6b0fe3ff780fd7bbdb020c9b61a3d9bfa264559a Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Sun, 6 Sep 2020 15:06:36 +0900 Subject: [PATCH] Move viewmodels package to root directory --- .../java/awais/instagrabber/fragments/HashTagFragment.java | 2 +- .../java/awais/instagrabber/fragments/LocationFragment.java | 2 +- .../java/awais/instagrabber/fragments/PostViewFragment.java | 2 +- .../awais/instagrabber/fragments/SavedViewerFragment.java | 2 +- .../awais/instagrabber/fragments/StoryViewerFragment.java | 6 +++--- .../awais/instagrabber/fragments/main/DiscoverFragment.java | 2 +- .../awais/instagrabber/fragments/main/FeedFragment.java | 4 ++-- .../awais/instagrabber/fragments/main/ProfileFragment.java | 4 ++-- .../{fragments/main => }/viewmodels/BasePostViewModel.java | 2 +- .../main => }/viewmodels/DiscoverItemViewModel.java | 2 +- .../main => }/viewmodels/FeedStoriesViewModel.java | 2 +- .../{fragments/main => }/viewmodels/FeedViewModel.java | 2 +- .../main => }/viewmodels/HighlightsViewModel.java | 2 +- .../{fragments/main => }/viewmodels/PostsViewModel.java | 2 +- .../{fragments/main => }/viewmodels/StoriesViewModel.java | 2 +- .../main => }/viewmodels/ViewerPostViewModel.java | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) rename app/src/main/java/awais/instagrabber/{fragments/main => }/viewmodels/BasePostViewModel.java (88%) rename app/src/main/java/awais/instagrabber/{fragments/main => }/viewmodels/DiscoverItemViewModel.java (71%) rename app/src/main/java/awais/instagrabber/{fragments/main => }/viewmodels/FeedStoriesViewModel.java (88%) rename app/src/main/java/awais/instagrabber/{fragments/main => }/viewmodels/FeedViewModel.java (67%) rename app/src/main/java/awais/instagrabber/{fragments/main => }/viewmodels/HighlightsViewModel.java (88%) rename app/src/main/java/awais/instagrabber/{fragments/main => }/viewmodels/PostsViewModel.java (67%) rename app/src/main/java/awais/instagrabber/{fragments/main => }/viewmodels/StoriesViewModel.java (88%) rename app/src/main/java/awais/instagrabber/{fragments/main => }/viewmodels/ViewerPostViewModel.java (89%) diff --git a/app/src/main/java/awais/instagrabber/fragments/HashTagFragment.java b/app/src/main/java/awais/instagrabber/fragments/HashTagFragment.java index a56c936d..132c3570 100644 --- a/app/src/main/java/awais/instagrabber/fragments/HashTagFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/HashTagFragment.java @@ -44,7 +44,7 @@ import awais.instagrabber.customviews.helpers.GridSpacingItemDecoration; import awais.instagrabber.customviews.helpers.NestedCoordinatorLayout; import awais.instagrabber.customviews.helpers.RecyclerLazyLoader; import awais.instagrabber.databinding.FragmentHashtagBinding; -import awais.instagrabber.fragments.main.viewmodels.PostsViewModel; +import awais.instagrabber.viewmodels.PostsViewModel; import awais.instagrabber.interfaces.FetchListener; import awais.instagrabber.models.HashtagModel; import awais.instagrabber.models.PostModel; diff --git a/app/src/main/java/awais/instagrabber/fragments/LocationFragment.java b/app/src/main/java/awais/instagrabber/fragments/LocationFragment.java index b17ab187..42657494 100644 --- a/app/src/main/java/awais/instagrabber/fragments/LocationFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/LocationFragment.java @@ -44,7 +44,7 @@ import awais.instagrabber.customviews.helpers.GridSpacingItemDecoration; import awais.instagrabber.customviews.helpers.NestedCoordinatorLayout; import awais.instagrabber.customviews.helpers.RecyclerLazyLoader; import awais.instagrabber.databinding.FragmentLocationBinding; -import awais.instagrabber.fragments.main.viewmodels.PostsViewModel; +import awais.instagrabber.viewmodels.PostsViewModel; import awais.instagrabber.interfaces.FetchListener; import awais.instagrabber.models.LocationModel; import awais.instagrabber.models.PostModel; diff --git a/app/src/main/java/awais/instagrabber/fragments/PostViewFragment.java b/app/src/main/java/awais/instagrabber/fragments/PostViewFragment.java index f5a67884..98ae40a2 100644 --- a/app/src/main/java/awais/instagrabber/fragments/PostViewFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/PostViewFragment.java @@ -30,7 +30,7 @@ import awais.instagrabber.adapters.PostViewAdapter.OnPostViewChildViewClickListe import awais.instagrabber.asyncs.PostFetcher; import awais.instagrabber.asyncs.i.iPostFetcher; import awais.instagrabber.databinding.FragmentPostViewBinding; -import awais.instagrabber.fragments.main.viewmodels.ViewerPostViewModel; +import awais.instagrabber.viewmodels.ViewerPostViewModel; import awais.instagrabber.interfaces.FetchListener; import awais.instagrabber.interfaces.MentionClickListener; import awais.instagrabber.models.ViewerPostModel; diff --git a/app/src/main/java/awais/instagrabber/fragments/SavedViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/SavedViewerFragment.java index 5587811c..58064b00 100644 --- a/app/src/main/java/awais/instagrabber/fragments/SavedViewerFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/SavedViewerFragment.java @@ -40,7 +40,7 @@ import awais.instagrabber.customviews.helpers.GridSpacingItemDecoration; import awais.instagrabber.customviews.helpers.RecyclerLazyLoader; import awais.instagrabber.databinding.FragmentSavedBinding; import awais.instagrabber.fragments.main.ProfileFragmentDirections; -import awais.instagrabber.fragments.main.viewmodels.PostsViewModel; +import awais.instagrabber.viewmodels.PostsViewModel; import awais.instagrabber.interfaces.FetchListener; import awais.instagrabber.models.PostModel; import awais.instagrabber.models.enums.DownloadMethod; diff --git a/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java index c877d3de..2d407b30 100644 --- a/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java @@ -70,9 +70,9 @@ import awais.instagrabber.asyncs.VoteAction; import awais.instagrabber.asyncs.direct_messages.DirectThreadBroadcaster; import awais.instagrabber.customviews.helpers.SwipeGestureListener; import awais.instagrabber.databinding.ActivityStoryViewerBinding; -import awais.instagrabber.fragments.main.viewmodels.FeedStoriesViewModel; -import awais.instagrabber.fragments.main.viewmodels.HighlightsViewModel; -import awais.instagrabber.fragments.main.viewmodels.StoriesViewModel; +import awais.instagrabber.viewmodels.FeedStoriesViewModel; +import awais.instagrabber.viewmodels.HighlightsViewModel; +import awais.instagrabber.viewmodels.StoriesViewModel; import awais.instagrabber.interfaces.SwipeEvent; import awais.instagrabber.models.FeedStoryModel; import awais.instagrabber.models.HighlightModel; diff --git a/app/src/main/java/awais/instagrabber/fragments/main/DiscoverFragment.java b/app/src/main/java/awais/instagrabber/fragments/main/DiscoverFragment.java index beaecd91..89566f60 100644 --- a/app/src/main/java/awais/instagrabber/fragments/main/DiscoverFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/main/DiscoverFragment.java @@ -36,7 +36,7 @@ import awais.instagrabber.customviews.helpers.GridAutofitLayoutManager; import awais.instagrabber.customviews.helpers.GridSpacingItemDecoration; import awais.instagrabber.customviews.helpers.RecyclerLazyLoader; import awais.instagrabber.databinding.FragmentDiscoverBinding; -import awais.instagrabber.fragments.main.viewmodels.DiscoverItemViewModel; +import awais.instagrabber.viewmodels.DiscoverItemViewModel; import awais.instagrabber.interfaces.FetchListener; import awais.instagrabber.models.DiscoverItemModel; import awais.instagrabber.models.DiscoverTopicModel; diff --git a/app/src/main/java/awais/instagrabber/fragments/main/FeedFragment.java b/app/src/main/java/awais/instagrabber/fragments/main/FeedFragment.java index 14893b2c..d338e208 100644 --- a/app/src/main/java/awais/instagrabber/fragments/main/FeedFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/main/FeedFragment.java @@ -44,8 +44,8 @@ import awais.instagrabber.customviews.RamboTextView; import awais.instagrabber.customviews.helpers.RecyclerLazyLoader; import awais.instagrabber.customviews.helpers.VideoAwareRecyclerScroller; import awais.instagrabber.databinding.FragmentFeedBinding; -import awais.instagrabber.fragments.main.viewmodels.FeedStoriesViewModel; -import awais.instagrabber.fragments.main.viewmodels.FeedViewModel; +import awais.instagrabber.viewmodels.FeedStoriesViewModel; +import awais.instagrabber.viewmodels.FeedViewModel; import awais.instagrabber.interfaces.FetchListener; import awais.instagrabber.interfaces.MentionClickListener; import awais.instagrabber.models.BasePostModel; diff --git a/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java b/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java index 13c1f486..f7d99b17 100644 --- a/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java @@ -57,8 +57,8 @@ import awais.instagrabber.customviews.helpers.GridAutofitLayoutManager; import awais.instagrabber.customviews.helpers.GridSpacingItemDecoration; import awais.instagrabber.customviews.helpers.RecyclerLazyLoader; import awais.instagrabber.databinding.FragmentProfileBinding; -import awais.instagrabber.fragments.main.viewmodels.HighlightsViewModel; -import awais.instagrabber.fragments.main.viewmodels.PostsViewModel; +import awais.instagrabber.viewmodels.HighlightsViewModel; +import awais.instagrabber.viewmodels.PostsViewModel; import awais.instagrabber.interfaces.FetchListener; import awais.instagrabber.interfaces.MentionClickListener; import awais.instagrabber.models.PostModel; diff --git a/app/src/main/java/awais/instagrabber/fragments/main/viewmodels/BasePostViewModel.java b/app/src/main/java/awais/instagrabber/viewmodels/BasePostViewModel.java similarity index 88% rename from app/src/main/java/awais/instagrabber/fragments/main/viewmodels/BasePostViewModel.java rename to app/src/main/java/awais/instagrabber/viewmodels/BasePostViewModel.java index 88264b4a..b0f59e64 100644 --- a/app/src/main/java/awais/instagrabber/fragments/main/viewmodels/BasePostViewModel.java +++ b/app/src/main/java/awais/instagrabber/viewmodels/BasePostViewModel.java @@ -1,4 +1,4 @@ -package awais.instagrabber.fragments.main.viewmodels; +package awais.instagrabber.viewmodels; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; diff --git a/app/src/main/java/awais/instagrabber/fragments/main/viewmodels/DiscoverItemViewModel.java b/app/src/main/java/awais/instagrabber/viewmodels/DiscoverItemViewModel.java similarity index 71% rename from app/src/main/java/awais/instagrabber/fragments/main/viewmodels/DiscoverItemViewModel.java rename to app/src/main/java/awais/instagrabber/viewmodels/DiscoverItemViewModel.java index 566c3643..9d11c51c 100644 --- a/app/src/main/java/awais/instagrabber/fragments/main/viewmodels/DiscoverItemViewModel.java +++ b/app/src/main/java/awais/instagrabber/viewmodels/DiscoverItemViewModel.java @@ -1,4 +1,4 @@ -package awais.instagrabber.fragments.main.viewmodels; +package awais.instagrabber.viewmodels; import awais.instagrabber.models.DiscoverItemModel; diff --git a/app/src/main/java/awais/instagrabber/fragments/main/viewmodels/FeedStoriesViewModel.java b/app/src/main/java/awais/instagrabber/viewmodels/FeedStoriesViewModel.java similarity index 88% rename from app/src/main/java/awais/instagrabber/fragments/main/viewmodels/FeedStoriesViewModel.java rename to app/src/main/java/awais/instagrabber/viewmodels/FeedStoriesViewModel.java index dbd593aa..fd61557d 100644 --- a/app/src/main/java/awais/instagrabber/fragments/main/viewmodels/FeedStoriesViewModel.java +++ b/app/src/main/java/awais/instagrabber/viewmodels/FeedStoriesViewModel.java @@ -1,4 +1,4 @@ -package awais.instagrabber.fragments.main.viewmodels; +package awais.instagrabber.viewmodels; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; diff --git a/app/src/main/java/awais/instagrabber/fragments/main/viewmodels/FeedViewModel.java b/app/src/main/java/awais/instagrabber/viewmodels/FeedViewModel.java similarity index 67% rename from app/src/main/java/awais/instagrabber/fragments/main/viewmodels/FeedViewModel.java rename to app/src/main/java/awais/instagrabber/viewmodels/FeedViewModel.java index 9f4e6eca..a368f0b4 100644 --- a/app/src/main/java/awais/instagrabber/fragments/main/viewmodels/FeedViewModel.java +++ b/app/src/main/java/awais/instagrabber/viewmodels/FeedViewModel.java @@ -1,4 +1,4 @@ -package awais.instagrabber.fragments.main.viewmodels; +package awais.instagrabber.viewmodels; import awais.instagrabber.models.FeedModel; diff --git a/app/src/main/java/awais/instagrabber/fragments/main/viewmodels/HighlightsViewModel.java b/app/src/main/java/awais/instagrabber/viewmodels/HighlightsViewModel.java similarity index 88% rename from app/src/main/java/awais/instagrabber/fragments/main/viewmodels/HighlightsViewModel.java rename to app/src/main/java/awais/instagrabber/viewmodels/HighlightsViewModel.java index 8ae71649..d78b9ef4 100644 --- a/app/src/main/java/awais/instagrabber/fragments/main/viewmodels/HighlightsViewModel.java +++ b/app/src/main/java/awais/instagrabber/viewmodels/HighlightsViewModel.java @@ -1,4 +1,4 @@ -package awais.instagrabber.fragments.main.viewmodels; +package awais.instagrabber.viewmodels; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; diff --git a/app/src/main/java/awais/instagrabber/fragments/main/viewmodels/PostsViewModel.java b/app/src/main/java/awais/instagrabber/viewmodels/PostsViewModel.java similarity index 67% rename from app/src/main/java/awais/instagrabber/fragments/main/viewmodels/PostsViewModel.java rename to app/src/main/java/awais/instagrabber/viewmodels/PostsViewModel.java index 00581198..12427ad1 100644 --- a/app/src/main/java/awais/instagrabber/fragments/main/viewmodels/PostsViewModel.java +++ b/app/src/main/java/awais/instagrabber/viewmodels/PostsViewModel.java @@ -1,4 +1,4 @@ -package awais.instagrabber.fragments.main.viewmodels; +package awais.instagrabber.viewmodels; import awais.instagrabber.models.PostModel; diff --git a/app/src/main/java/awais/instagrabber/fragments/main/viewmodels/StoriesViewModel.java b/app/src/main/java/awais/instagrabber/viewmodels/StoriesViewModel.java similarity index 88% rename from app/src/main/java/awais/instagrabber/fragments/main/viewmodels/StoriesViewModel.java rename to app/src/main/java/awais/instagrabber/viewmodels/StoriesViewModel.java index baafc040..6d6b16e3 100644 --- a/app/src/main/java/awais/instagrabber/fragments/main/viewmodels/StoriesViewModel.java +++ b/app/src/main/java/awais/instagrabber/viewmodels/StoriesViewModel.java @@ -1,4 +1,4 @@ -package awais.instagrabber.fragments.main.viewmodels; +package awais.instagrabber.viewmodels; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; diff --git a/app/src/main/java/awais/instagrabber/fragments/main/viewmodels/ViewerPostViewModel.java b/app/src/main/java/awais/instagrabber/viewmodels/ViewerPostViewModel.java similarity index 89% rename from app/src/main/java/awais/instagrabber/fragments/main/viewmodels/ViewerPostViewModel.java rename to app/src/main/java/awais/instagrabber/viewmodels/ViewerPostViewModel.java index 04a63365..07bf525c 100644 --- a/app/src/main/java/awais/instagrabber/fragments/main/viewmodels/ViewerPostViewModel.java +++ b/app/src/main/java/awais/instagrabber/viewmodels/ViewerPostViewModel.java @@ -1,4 +1,4 @@ -package awais.instagrabber.fragments.main.viewmodels; +package awais.instagrabber.viewmodels; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel;