Skip to content
This repository was archived by the owner on Oct 27, 2024. It is now read-only.

Commit 4399c4b

Browse files
esoxjemesoxjem
committed
Moved around classes according to features.
1 parent 981091f commit 4399c4b

37 files changed

+66
-87
lines changed

‎app/src/main/java/com/esoxjem/movieguide/constants/Api.java renamed to ‎app/src/main/java/com/esoxjem/movieguide/Api.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.esoxjem.movieguide.constants;
1+
package com.esoxjem.movieguide;
22

33
/**
44
* @author arun
55
*/
66
public class Api
77
{
8-
public static final String API_KEY = "";
8+
public static final String API_KEY = ""; // add your API key here
99
public static final String GET_POPULAR_MOVIES = "http://api.themoviedb.org/3/discover/movie?language=en&sort_by=popularity.desc&api_key=" + API_KEY;
1010
public static final String GET_HIGHEST_RATED_MOVIES = "http://api.themoviedb.org/3/discover/movie?vote_count.gte=500&language=en&sort_by=vote_average.desc&api_key=" + API_KEY;
1111
public static final String GET_TRAILERS = "http://api.themoviedb.org/3/movie/%s/videos?api_key=" + API_KEY;

‎app/src/main/java/com/esoxjem/movieguide/di/AppComponent.java renamed to ‎app/src/main/java/com/esoxjem/movieguide/AppComponent.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
package com.esoxjem.movieguide.di;
1+
package com.esoxjem.movieguide;
22

33
import com.esoxjem.movieguide.details.MovieDetailsFragment;
4+
import com.esoxjem.movieguide.details.DetailsModule;
5+
import com.esoxjem.movieguide.favorites.FavoritesModule;
6+
import com.esoxjem.movieguide.listing.ListingModule;
7+
import com.esoxjem.movieguide.network.NetworkModule;
8+
import com.esoxjem.movieguide.sorting.SortingModule;
49
import com.esoxjem.movieguide.listing.MoviesListingFragment;
510
import com.esoxjem.movieguide.sorting.SortingDialogFragment;
611

‎app/src/main/java/com/esoxjem/movieguide/di/AppModule.java renamed to ‎app/src/main/java/com/esoxjem/movieguide/AppModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.esoxjem.movieguide.di;
1+
package com.esoxjem.movieguide;
22

33
import android.app.Application;
44
import android.content.Context;

‎app/src/main/java/com/esoxjem/movieguide/BaseApplication.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
import android.content.Context;
55
import android.os.StrictMode;
66

7-
import com.esoxjem.movieguide.di.AppComponent;
8-
import com.esoxjem.movieguide.di.AppModule;
9-
import com.esoxjem.movieguide.di.DaggerAppComponent;
10-
import com.esoxjem.movieguide.di.DetailsModule;
11-
import com.esoxjem.movieguide.di.FavoritesModule;
12-
import com.esoxjem.movieguide.di.ListingModule;
13-
import com.esoxjem.movieguide.di.NetworkModule;
14-
import com.esoxjem.movieguide.di.SortingModule;
7+
import com.esoxjem.movieguide.details.DetailsModule;
8+
import com.esoxjem.movieguide.favorites.FavoritesModule;
9+
import com.esoxjem.movieguide.listing.ListingModule;
10+
import com.esoxjem.movieguide.network.NetworkModule;
11+
import com.esoxjem.movieguide.sorting.SortingModule;
1512

1613
/**
1714
* @author arun

‎app/src/main/java/com/esoxjem/movieguide/constants/Constants.java renamed to ‎app/src/main/java/com/esoxjem/movieguide/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.esoxjem.movieguide.constants;
1+
package com.esoxjem.movieguide;
22

33
/**
44
* @author arun

‎app/src/main/java/com/esoxjem/movieguide/entities/Movie.java renamed to ‎app/src/main/java/com/esoxjem/movieguide/Movie.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.esoxjem.movieguide.entities;
1+
package com.esoxjem.movieguide;
22

33
import android.os.Parcel;
44
import android.os.Parcelable;

‎app/src/main/java/com/esoxjem/movieguide/entities/Review.java renamed to ‎app/src/main/java/com/esoxjem/movieguide/Review.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.esoxjem.movieguide.entities;
1+
package com.esoxjem.movieguide;
22

33
import android.os.Parcel;
44
import android.os.Parcelable;

‎app/src/main/java/com/esoxjem/movieguide/entities/Video.java renamed to ‎app/src/main/java/com/esoxjem/movieguide/Video.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
package com.esoxjem.movieguide.entities;
1+
package com.esoxjem.movieguide;
22

33
import android.os.Parcel;
44
import android.os.Parcelable;
55

6-
import com.esoxjem.movieguide.constants.Constants;
7-
86
/**
97
* @author arun
108
*/

‎app/src/main/java/com/esoxjem/movieguide/di/DetailsModule.java renamed to ‎app/src/main/java/com/esoxjem/movieguide/details/DetailsModule.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
package com.esoxjem.movieguide.di;
1+
package com.esoxjem.movieguide.details;
22

3-
import com.esoxjem.movieguide.details.IMovieDetailsInteractor;
4-
import com.esoxjem.movieguide.details.IMovieDetailsPresenter;
5-
import com.esoxjem.movieguide.details.MovieDetailsInteractor;
6-
import com.esoxjem.movieguide.details.MovieDetailsPresenter;
3+
import com.esoxjem.movieguide.favorites.FavoritesModule;
4+
import com.esoxjem.movieguide.network.NetworkModule;
75
import com.esoxjem.movieguide.favorites.IFavoritesInteractor;
86
import com.esoxjem.movieguide.network.RequestHandler;
97

‎app/src/main/java/com/esoxjem/movieguide/details/IMovieDetailsInteractor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.esoxjem.movieguide.details;
22

3-
import com.esoxjem.movieguide.entities.Review;
4-
import com.esoxjem.movieguide.entities.Video;
3+
import com.esoxjem.movieguide.Review;
4+
import com.esoxjem.movieguide.Video;
55

66
import java.util.List;
77

‎app/src/main/java/com/esoxjem/movieguide/details/IMovieDetailsPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.esoxjem.movieguide.details;
22

3-
import com.esoxjem.movieguide.entities.Movie;
3+
import com.esoxjem.movieguide.Movie;
44

55
import rx.Subscription;
66

‎app/src/main/java/com/esoxjem/movieguide/details/IMovieDetailsView.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.esoxjem.movieguide.details;
22

3-
import com.esoxjem.movieguide.entities.Movie;
4-
import com.esoxjem.movieguide.entities.Review;
5-
import com.esoxjem.movieguide.entities.Video;
3+
import com.esoxjem.movieguide.Movie;
4+
import com.esoxjem.movieguide.Review;
5+
import com.esoxjem.movieguide.Video;
66

77
import java.util.List;
88

‎app/src/main/java/com/esoxjem/movieguide/details/MovieDetailsActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import android.view.MenuItem;
77

88
import com.esoxjem.movieguide.R;
9-
import com.esoxjem.movieguide.constants.Constants;
10-
import com.esoxjem.movieguide.entities.Movie;
9+
import com.esoxjem.movieguide.Constants;
10+
import com.esoxjem.movieguide.Movie;
1111

1212
public class MovieDetailsActivity extends AppCompatActivity
1313
{

‎app/src/main/java/com/esoxjem/movieguide/details/MovieDetailsFragment.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
import com.bumptech.glide.Glide;
2424
import com.esoxjem.movieguide.BaseApplication;
2525
import com.esoxjem.movieguide.R;
26-
import com.esoxjem.movieguide.constants.Constants;
27-
import com.esoxjem.movieguide.entities.Movie;
28-
import com.esoxjem.movieguide.entities.Review;
29-
import com.esoxjem.movieguide.entities.Video;
26+
import com.esoxjem.movieguide.Constants;
27+
import com.esoxjem.movieguide.Movie;
28+
import com.esoxjem.movieguide.Review;
29+
import com.esoxjem.movieguide.Video;
3030
import com.esoxjem.movieguide.util.RxUtils;
3131
import com.squareup.picasso.Picasso;
3232

‎app/src/main/java/com/esoxjem/movieguide/details/MovieDetailsInteractor.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.esoxjem.movieguide.details;
22

3-
import com.esoxjem.movieguide.constants.Api;
4-
import com.esoxjem.movieguide.entities.Review;
5-
import com.esoxjem.movieguide.entities.Video;
3+
import com.esoxjem.movieguide.Api;
4+
import com.esoxjem.movieguide.Review;
5+
import com.esoxjem.movieguide.Video;
66
import com.esoxjem.movieguide.network.RequestGenerator;
77
import com.esoxjem.movieguide.network.RequestHandler;
88
import com.squareup.okhttp.Request;
@@ -12,8 +12,6 @@
1212
import java.io.IOException;
1313
import java.util.List;
1414

15-
import javax.inject.Inject;
16-
1715
import rx.Observable;
1816
import rx.functions.Func0;
1917

‎app/src/main/java/com/esoxjem/movieguide/details/MovieDetailsParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.esoxjem.movieguide.details;
22

3-
import com.esoxjem.movieguide.entities.Review;
4-
import com.esoxjem.movieguide.entities.Video;
3+
import com.esoxjem.movieguide.Review;
4+
import com.esoxjem.movieguide.Video;
55

66
import org.json.JSONArray;
77
import org.json.JSONException;

‎app/src/main/java/com/esoxjem/movieguide/details/MovieDetailsPresenter.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.esoxjem.movieguide.details;
22

3-
import com.esoxjem.movieguide.entities.Movie;
4-
import com.esoxjem.movieguide.entities.Review;
5-
import com.esoxjem.movieguide.entities.Video;
6-
import com.esoxjem.movieguide.favorites.FavoritesInteractor;
3+
import com.esoxjem.movieguide.Movie;
4+
import com.esoxjem.movieguide.Review;
5+
import com.esoxjem.movieguide.Video;
76
import com.esoxjem.movieguide.favorites.IFavoritesInteractor;
87

98
import java.util.List;

‎app/src/main/java/com/esoxjem/movieguide/favorites/FavoritesInteractor.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package com.esoxjem.movieguide.favorites;
22

3-
import com.esoxjem.movieguide.entities.Movie;
3+
import com.esoxjem.movieguide.Movie;
44

55
import java.io.IOException;
66
import java.util.ArrayList;
77
import java.util.List;
88

9-
import javax.inject.Inject;
10-
119
/**
1210
* @author arun
1311
*/

‎app/src/main/java/com/esoxjem/movieguide/di/FavoritesModule.java renamed to ‎app/src/main/java/com/esoxjem/movieguide/favorites/FavoritesModule.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package com.esoxjem.movieguide.di;
1+
package com.esoxjem.movieguide.favorites;
22

3+
import com.esoxjem.movieguide.AppModule;
34
import com.esoxjem.movieguide.favorites.FavoritesInteractor;
45
import com.esoxjem.movieguide.favorites.FavoritesStore;
56
import com.esoxjem.movieguide.favorites.IFavoritesInteractor;

‎app/src/main/java/com/esoxjem/movieguide/favorites/FavoritesStore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.content.SharedPreferences;
55
import android.text.TextUtils;
66

7-
import com.esoxjem.movieguide.entities.Movie;
7+
import com.esoxjem.movieguide.Movie;
88
import com.squareup.moshi.JsonAdapter;
99
import com.squareup.moshi.Moshi;
1010

‎app/src/main/java/com/esoxjem/movieguide/favorites/IFavoritesInteractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.esoxjem.movieguide.favorites;
22

3-
import com.esoxjem.movieguide.entities.Movie;
3+
import com.esoxjem.movieguide.Movie;
44

55
import java.util.List;
66

‎app/src/main/java/com/esoxjem/movieguide/listing/IMoviesListingInteractor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.esoxjem.movieguide.listing;
22

3-
import com.esoxjem.movieguide.entities.Movie;
3+
import com.esoxjem.movieguide.Movie;
44

55
import java.util.List;
66

‎app/src/main/java/com/esoxjem/movieguide/listing/IMoviesListingView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.esoxjem.movieguide.listing;
22

3-
import com.esoxjem.movieguide.entities.Movie;
3+
import com.esoxjem.movieguide.Movie;
44

55
import java.util.List;
66

‎app/src/main/java/com/esoxjem/movieguide/di/ListingModule.java renamed to ‎app/src/main/java/com/esoxjem/movieguide/listing/ListingModule.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
package com.esoxjem.movieguide.di;
1+
package com.esoxjem.movieguide.listing;
22

3+
import com.esoxjem.movieguide.network.NetworkModule;
4+
import com.esoxjem.movieguide.sorting.SortingModule;
5+
import com.esoxjem.movieguide.favorites.FavoritesModule;
36
import com.esoxjem.movieguide.favorites.IFavoritesInteractor;
4-
import com.esoxjem.movieguide.listing.IMoviesListingInteractor;
5-
import com.esoxjem.movieguide.listing.IMoviesListingPresenter;
6-
import com.esoxjem.movieguide.listing.MoviesListingInteractor;
7-
import com.esoxjem.movieguide.listing.MoviesListingPresenter;
87
import com.esoxjem.movieguide.network.RequestHandler;
98
import com.esoxjem.movieguide.sorting.SortingOptionStore;
109

‎app/src/main/java/com/esoxjem/movieguide/listing/MoviesListingActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import android.view.Menu;
88

99
import com.esoxjem.movieguide.R;
10-
import com.esoxjem.movieguide.constants.Constants;
10+
import com.esoxjem.movieguide.Constants;
1111
import com.esoxjem.movieguide.details.MovieDetailsActivity;
1212
import com.esoxjem.movieguide.details.MovieDetailsFragment;
13-
import com.esoxjem.movieguide.entities.Movie;
13+
import com.esoxjem.movieguide.Movie;
1414

1515
public class MoviesListingActivity extends AppCompatActivity implements MoviesListingFragment.Callback
1616
{

‎app/src/main/java/com/esoxjem/movieguide/listing/MoviesListingAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import com.bumptech.glide.request.animation.GlideAnimation;
1616
import com.bumptech.glide.request.target.BitmapImageViewTarget;
1717
import com.esoxjem.movieguide.R;
18-
import com.esoxjem.movieguide.entities.Movie;
18+
import com.esoxjem.movieguide.Movie;
1919

2020
import java.util.List;
2121

‎app/src/main/java/com/esoxjem/movieguide/listing/MoviesListingFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import com.esoxjem.movieguide.BaseApplication;
1818
import com.esoxjem.movieguide.R;
19-
import com.esoxjem.movieguide.entities.Movie;
19+
import com.esoxjem.movieguide.Movie;
2020
import com.esoxjem.movieguide.sorting.SortingDialogFragment;
2121

2222
import java.util.ArrayList;

‎app/src/main/java/com/esoxjem/movieguide/listing/MoviesListingInteractor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import android.support.annotation.NonNull;
44

5-
import com.esoxjem.movieguide.constants.Api;
6-
import com.esoxjem.movieguide.entities.Movie;
7-
import com.esoxjem.movieguide.entities.SortType;
5+
import com.esoxjem.movieguide.Api;
6+
import com.esoxjem.movieguide.Movie;
7+
import com.esoxjem.movieguide.sorting.SortType;
88
import com.esoxjem.movieguide.favorites.IFavoritesInteractor;
99
import com.esoxjem.movieguide.network.RequestGenerator;
1010
import com.esoxjem.movieguide.network.RequestHandler;

‎app/src/main/java/com/esoxjem/movieguide/listing/MoviesListingParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import android.support.annotation.NonNull;
44

5-
import com.esoxjem.movieguide.constants.Api;
6-
import com.esoxjem.movieguide.entities.Movie;
5+
import com.esoxjem.movieguide.Api;
6+
import com.esoxjem.movieguide.Movie;
77

88
import org.json.JSONArray;
99
import org.json.JSONException;

‎app/src/main/java/com/esoxjem/movieguide/listing/MoviesListingPresenter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.esoxjem.movieguide.listing;
22

3-
import com.esoxjem.movieguide.entities.Movie;
3+
import com.esoxjem.movieguide.Movie;
44

55
import java.util.List;
66

‎app/src/main/java/com/esoxjem/movieguide/di/NetworkModule.java renamed to ‎app/src/main/java/com/esoxjem/movieguide/network/NetworkModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.esoxjem.movieguide.di;
1+
package com.esoxjem.movieguide.network;
22

33
import com.esoxjem.movieguide.network.RequestHandler;
44
import com.squareup.okhttp.OkHttpClient;

‎app/src/main/java/com/esoxjem/movieguide/sorting/ISortingDialogInteractor.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.esoxjem.movieguide.sorting;
22

3-
import com.esoxjem.movieguide.entities.SortType;
4-
53
/**
64
* @author arun
75
*/

‎app/src/main/java/com/esoxjem/movieguide/entities/SortType.java renamed to ‎app/src/main/java/com/esoxjem/movieguide/sorting/SortType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.esoxjem.movieguide.entities;
1+
package com.esoxjem.movieguide.sorting;
22

33
/**
44
* @author arun

‎app/src/main/java/com/esoxjem/movieguide/sorting/SortingDialogInteractor.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.esoxjem.movieguide.sorting;
22

3-
import com.esoxjem.movieguide.entities.SortType;
4-
53
/**
64
* @author arun
75
*/

‎app/src/main/java/com/esoxjem/movieguide/sorting/SortingDialogPresenter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.esoxjem.movieguide.sorting;
22

3-
import com.esoxjem.movieguide.entities.SortType;
4-
53
/**
64
* @author arun
75
*/

‎app/src/main/java/com/esoxjem/movieguide/di/SortingModule.java renamed to ‎app/src/main/java/com/esoxjem/movieguide/sorting/SortingModule.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
package com.esoxjem.movieguide.di;
1+
package com.esoxjem.movieguide.sorting;
22

3-
import com.esoxjem.movieguide.sorting.ISortingDialogInteractor;
4-
import com.esoxjem.movieguide.sorting.ISortingDialogPresenter;
5-
import com.esoxjem.movieguide.sorting.SortingDialogInteractor;
6-
import com.esoxjem.movieguide.sorting.SortingDialogPresenter;
7-
import com.esoxjem.movieguide.sorting.SortingOptionStore;
3+
import com.esoxjem.movieguide.AppModule;
84

95
import javax.inject.Singleton;
106

‎app/src/main/java/com/esoxjem/movieguide/sorting/SortingOptionStore.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
import android.content.Context;
44
import android.content.SharedPreferences;
55

6-
import com.esoxjem.movieguide.BaseApplication;
7-
import com.esoxjem.movieguide.entities.SortType;
8-
96
import javax.inject.Inject;
10-
import javax.inject.Named;
117

128
/**
139
* @author arun

0 commit comments

Comments
 (0)