diff --git a/HackVG/.gitignore b/HackVG/.gitignore index b1448d9..746c877 100644 --- a/HackVG/.gitignore +++ b/HackVG/.gitignore @@ -6,3 +6,5 @@ /build *.class *.jar +HackVG.iml +/.idea \ No newline at end of file diff --git a/HackVG/.idea/.name b/HackVG/.idea/.name deleted file mode 100644 index ad6bcca..0000000 --- a/HackVG/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -HackVG \ No newline at end of file diff --git a/HackVG/.idea/compiler.xml b/HackVG/.idea/compiler.xml deleted file mode 100644 index 9a8b7e5..0000000 --- a/HackVG/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/HackVG/.idea/copyright/profiles_settings.xml b/HackVG/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/HackVG/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/HackVG/.idea/gradle.xml b/HackVG/.idea/gradle.xml deleted file mode 100644 index d0bcd42..0000000 --- a/HackVG/.idea/gradle.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/HackVG/.idea/misc.xml b/HackVG/.idea/misc.xml deleted file mode 100644 index aaaf922..0000000 --- a/HackVG/.idea/misc.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - 1.8 - - - - - - - - \ No newline at end of file diff --git a/HackVG/.idea/modules.xml b/HackVG/.idea/modules.xml deleted file mode 100644 index 9e0dc96..0000000 --- a/HackVG/.idea/modules.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/HackVG/.idea/vcs.xml b/HackVG/.idea/vcs.xml deleted file mode 100644 index 075f87f..0000000 --- a/HackVG/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/HackVG/HackVG.iml b/HackVG/HackVG.iml deleted file mode 100644 index f0e554f..0000000 --- a/HackVG/HackVG.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/HackVG/app/.gitignore b/HackVG/app/.gitignore index 796b96d..cc037c4 100644 --- a/HackVG/app/.gitignore +++ b/HackVG/app/.gitignore @@ -1 +1,2 @@ /build +app.iml diff --git a/HackVG/app/app.iml b/HackVG/app/app.iml deleted file mode 100644 index 9099409..0000000 --- a/HackVG/app/app.iml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/HackVG/app/build.gradle b/HackVG/app/build.gradle index c269158..4a91fc5 100644 --- a/HackVG/app/build.gradle +++ b/HackVG/app/build.gradle @@ -2,8 +2,8 @@ apply plugin: 'com.android.application' apply plugin: 'com.neenbedankt.android-apt' android { - compileSdkVersion 21 - buildToolsVersion "21.1.2" + compileSdkVersion 22 + buildToolsVersion "22.0.1" aaptOptions { useNewCruncher false @@ -20,7 +20,7 @@ android { testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" minSdkVersion 16 - targetSdkVersion 21 + targetSdkVersion 22 versionCode 2 versionName "0.6" } @@ -38,19 +38,19 @@ dependencies { compile project(':domain') // Google libraries - compile 'com.android.support:cardview-v7:21.0.3' - compile 'com.android.support:appcompat-v7:22.0.0' - compile 'com.android.support:recyclerview-v7:21.0.3' - compile 'com.android.support:palette-v7:21.0.0' - compile 'com.android.support:support-v13:21.0.3' - compile 'com.android.support:support-v4:22.0.0' + compile 'com.android.support:cardview-v7:22.1.1' + compile 'com.android.support:appcompat-v7:22.1.1' + compile 'com.android.support:recyclerview-v7:22.1.1' + compile 'com.android.support:palette-v7:22.1.1' + compile 'com.android.support:support-v13:22.1.1' + compile 'com.android.support:support-v4:22.1.1' // Dagger compiler apt 'com.google.dagger:dagger-compiler:2.0' androidTestCompile 'com.android.support.test:testing-support-lib:0.1' androidTestCompile 'com.android.support.test.espresso:espresso-core:2.0' - androidTestCompile ('com.android.support.test.espresso:espresso-contrib:2.0') { + androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.0') { exclude module: 'support-annotations' } diff --git a/HackVG/app/src/main/assets/Lobster-Regular.ttf b/HackVG/app/src/main/assets/Lobster-Regular.ttf old mode 100755 new mode 100644 diff --git a/HackVG/app/src/main/java/com/hackvg/android/MoviesApp.java b/HackVG/app/src/main/java/com/hackvg/android/MoviesApp.java index ea2ae23..34942c1 100644 --- a/HackVG/app/src/main/java/com/hackvg/android/MoviesApp.java +++ b/HackVG/app/src/main/java/com/hackvg/android/MoviesApp.java @@ -1,5 +1,6 @@ /** * Copyright (C) 2015 android10.org. All rights reserved. + * * @author Fernando Cejas (the android10 coder) */ package com.hackvg.android; @@ -16,7 +17,8 @@ public class MoviesApp extends Application { private AppComponent mAppComponent; - @Override public void onCreate() { + @Override + public void onCreate() { super.onCreate(); this.initializeDependencyInjector(); } @@ -24,9 +26,9 @@ public class MoviesApp extends Application { private void initializeDependencyInjector() { mAppComponent = DaggerAppComponent.builder() - .applicationModule(new ApplicationModule(this)) - .domainModule(new DomainModule()) - .build(); + .applicationModule(new ApplicationModule(this)) + .domainModule(new DomainModule()) + .build(); } public AppComponent getAppComponent() { diff --git a/HackVG/app/src/main/java/com/hackvg/android/di/components/AppComponent.java b/HackVG/app/src/main/java/com/hackvg/android/di/components/AppComponent.java index 6a19b68..2189f9a 100644 --- a/HackVG/app/src/main/java/com/hackvg/android/di/components/AppComponent.java +++ b/HackVG/app/src/main/java/com/hackvg/android/di/components/AppComponent.java @@ -12,12 +12,13 @@ @Singleton @Component(modules = { - ApplicationModule.class, - DomainModule.class, + ApplicationModule.class, + DomainModule.class, }) public interface AppComponent { - + Bus bus(); + RestMovieSource restMovieSource(); } diff --git a/HackVG/app/src/main/java/com/hackvg/android/di/components/BasicMoviesUsecasesComponent.java b/HackVG/app/src/main/java/com/hackvg/android/di/components/BasicMoviesUsecasesComponent.java index 16e304b..94f95e8 100644 --- a/HackVG/app/src/main/java/com/hackvg/android/di/components/BasicMoviesUsecasesComponent.java +++ b/HackVG/app/src/main/java/com/hackvg/android/di/components/BasicMoviesUsecasesComponent.java @@ -10,5 +10,5 @@ @Component(dependencies = AppComponent.class, modules = BasicMoviesUsecasesModule.class) public interface BasicMoviesUsecasesComponent { - void inject (MoviesActivity moviesActivity); + void inject(MoviesActivity moviesActivity); } diff --git a/HackVG/app/src/main/java/com/hackvg/android/di/components/MovieUsecasesComponent.java b/HackVG/app/src/main/java/com/hackvg/android/di/components/MovieUsecasesComponent.java index d135d78..2ccb498 100644 --- a/HackVG/app/src/main/java/com/hackvg/android/di/components/MovieUsecasesComponent.java +++ b/HackVG/app/src/main/java/com/hackvg/android/di/components/MovieUsecasesComponent.java @@ -6,8 +6,9 @@ import dagger.Component; -@PerActivity @Component(dependencies = AppComponent.class, modules = MovieUsecasesModule.class) +@PerActivity +@Component(dependencies = AppComponent.class, modules = MovieUsecasesModule.class) public interface MovieUsecasesComponent { - void inject (MovieDetailActivity movieDetailActivity); + void inject(MovieDetailActivity movieDetailActivity); } diff --git a/HackVG/app/src/main/java/com/hackvg/android/di/modules/ApplicationModule.java b/HackVG/app/src/main/java/com/hackvg/android/di/modules/ApplicationModule.java index ad00de7..b94f50f 100644 --- a/HackVG/app/src/main/java/com/hackvg/android/di/modules/ApplicationModule.java +++ b/HackVG/app/src/main/java/com/hackvg/android/di/modules/ApplicationModule.java @@ -19,7 +19,11 @@ public ApplicationModule(MoviesApp application) { this.application = application; } - @Provides @Singleton Context provideApplicationContext () { return application; } + @Provides + @Singleton + Context provideApplicationContext() { + return application; + } public static class MovieUsecasesModule { } diff --git a/HackVG/app/src/main/java/com/hackvg/android/di/modules/BasicMoviesUsecasesModule.java b/HackVG/app/src/main/java/com/hackvg/android/di/modules/BasicMoviesUsecasesModule.java index 18de4aa..8b3d7c9 100644 --- a/HackVG/app/src/main/java/com/hackvg/android/di/modules/BasicMoviesUsecasesModule.java +++ b/HackVG/app/src/main/java/com/hackvg/android/di/modules/BasicMoviesUsecasesModule.java @@ -13,11 +13,13 @@ @Module public class BasicMoviesUsecasesModule { - @Provides ConfigurationUsecase provideConfigurationUsecase (Bus bus, RestMovieSource moviesSource) { + @Provides + ConfigurationUsecase provideConfigurationUsecase(Bus bus, RestMovieSource moviesSource) { return new ConfigurationUsecaseController(moviesSource, bus); } - @Provides GetMoviesUsecase provideMoviesUsecase (Bus bus, RestMovieSource movieSource) { + @Provides + GetMoviesUsecase provideMoviesUsecase(Bus bus, RestMovieSource movieSource) { return new GetMoviesUsecaseController(movieSource, bus); } } diff --git a/HackVG/app/src/main/java/com/hackvg/android/di/modules/DomainModule.java b/HackVG/app/src/main/java/com/hackvg/android/di/modules/DomainModule.java index 1dae84a..7b98d58 100644 --- a/HackVG/app/src/main/java/com/hackvg/android/di/modules/DomainModule.java +++ b/HackVG/app/src/main/java/com/hackvg/android/di/modules/DomainModule.java @@ -11,10 +11,16 @@ @Module public class DomainModule { - @Provides @Singleton Bus provideBus () { + @Provides + @Singleton + Bus provideBus() { return new Bus(); } - @Provides @Singleton RestMovieSource provideDataSource (Bus bus) { return new RestMovieSource(bus); } + @Provides + @Singleton + RestMovieSource provideDataSource(Bus bus) { + return new RestMovieSource(bus); + } } diff --git a/HackVG/app/src/main/java/com/hackvg/android/di/modules/MovieUsecasesModule.java b/HackVG/app/src/main/java/com/hackvg/android/di/modules/MovieUsecasesModule.java index b80df39..dcc5511 100644 --- a/HackVG/app/src/main/java/com/hackvg/android/di/modules/MovieUsecasesModule.java +++ b/HackVG/app/src/main/java/com/hackvg/android/di/modules/MovieUsecasesModule.java @@ -18,7 +18,8 @@ public MovieUsecasesModule(String movieId) { this.movieId = movieId; } - @Provides GetMovieDetailUsecase provideGetMovieDetailUsecase (Bus bus, RestMovieSource movieSource) { + @Provides + GetMovieDetailUsecase provideGetMovieDetailUsecase(Bus bus, RestMovieSource movieSource) { return new GetMovieDetailUsecaseController(movieId, bus, movieSource); } } diff --git a/HackVG/app/src/main/java/com/hackvg/android/di/modules/UsecaseModule.java b/HackVG/app/src/main/java/com/hackvg/android/di/modules/UsecaseModule.java index 34bca9b..10859ee 100644 --- a/HackVG/app/src/main/java/com/hackvg/android/di/modules/UsecaseModule.java +++ b/HackVG/app/src/main/java/com/hackvg/android/di/modules/UsecaseModule.java @@ -12,7 +12,7 @@ public class UsecaseModule { @Provides - ConfigurationUsecase provideConfigurationUsecase (Bus bus, RestMovieSource restMovieSource) { + ConfigurationUsecase provideConfigurationUsecase(Bus bus, RestMovieSource restMovieSource) { return new ConfigurationUsecaseController(restMovieSource, bus); } } diff --git a/HackVG/app/src/main/java/com/hackvg/android/di/scopes/PerActivity.java b/HackVG/app/src/main/java/com/hackvg/android/di/scopes/PerActivity.java index 942c430..a5d16e5 100644 --- a/HackVG/app/src/main/java/com/hackvg/android/di/scopes/PerActivity.java +++ b/HackVG/app/src/main/java/com/hackvg/android/di/scopes/PerActivity.java @@ -2,6 +2,7 @@ package com.hackvg.android.di.scopes; import java.lang.annotation.Retention; + import javax.inject.Scope; import static java.lang.annotation.RetentionPolicy.RUNTIME; diff --git a/HackVG/app/src/main/java/com/hackvg/android/mvp/presenters/MovieDetailPresenter.java b/HackVG/app/src/main/java/com/hackvg/android/mvp/presenters/MovieDetailPresenter.java index fb79c03..f93fa75 100644 --- a/HackVG/app/src/main/java/com/hackvg/android/mvp/presenters/MovieDetailPresenter.java +++ b/HackVG/app/src/main/java/com/hackvg/android/mvp/presenters/MovieDetailPresenter.java @@ -34,7 +34,7 @@ public MovieDetailPresenter(GetMovieDetailUsecase movieDetailUsecase, Bus bus) { mBus = bus; } - public void attachView (DetailView movieDetailView) { + public void attachView(DetailView movieDetailView) { mMovieDetailView = movieDetailView; mMovieDetailView.showFilmCover(MoviesActivity.sPhotoCache.get(0)); diff --git a/HackVG/app/src/main/java/com/hackvg/android/mvp/presenters/MoviesPresenter.java b/HackVG/app/src/main/java/com/hackvg/android/mvp/presenters/MoviesPresenter.java index 877e68b..16b9412 100644 --- a/HackVG/app/src/main/java/com/hackvg/android/mvp/presenters/MoviesPresenter.java +++ b/HackVG/app/src/main/java/com/hackvg/android/mvp/presenters/MoviesPresenter.java @@ -24,12 +24,12 @@ public class MoviesPresenter extends Presenter { @Inject public MoviesPresenter(ConfigurationUsecase configurationUsecase, GetMoviesUsecase getMoviesUsecase, Bus bus) { - mConfigureUsecase = configurationUsecase; - mGetPopularShows = getMoviesUsecase; + mConfigureUsecase = configurationUsecase; + mGetPopularShows = getMoviesUsecase; mBus = bus; } - public void attachView (MoviesView moviesView) { + public void attachView(MoviesView moviesView) { mMoviesView = moviesView; } diff --git a/HackVG/app/src/main/java/com/hackvg/android/views/activities/MovieDetailActivity.java b/HackVG/app/src/main/java/com/hackvg/android/views/activities/MovieDetailActivity.java index 921aae1..f21026c 100644 --- a/HackVG/app/src/main/java/com/hackvg/android/views/activities/MovieDetailActivity.java +++ b/HackVG/app/src/main/java/com/hackvg/android/views/activities/MovieDetailActivity.java @@ -77,7 +77,8 @@ public class MovieDetailActivity extends Activity implements DetailView, // The time that the confirmation view will be shown (milliseconds) private static final int CONFIRMATION_VIEW_DELAY = 1500; - @Inject MovieDetailPresenter mDetailPresenter; + @Inject + MovieDetailPresenter mDetailPresenter; private Swatch mBrightSwatch; @@ -98,16 +99,26 @@ public class MovieDetailActivity extends Activity implements DetailView, }) List movieHeaders; - @InjectView(R.id.activity_detail_title) TextView mTitle; - @InjectView(R.id.activity_detail_fab) ImageView mFabButton; - @InjectView(R.id.activity_detail_container) View mInformationContainer; - @InjectView(R.id.item_movie_cover) ImageView mCoverImageView; - @InjectView(R.id.activity_detail_conf_image) ImageView mConfirmationView; - @Optional @InjectView(R.id.activity_detail_image) ImageView mMovieImageView; - @InjectView(R.id.activity_detail_conf_container) FrameLayout mConfirmationContainer; - @InjectView(R.id.activity_detail_book_info) LinearLayout mMovieDescriptionContainer; - - @InjectView(R.id.activity_detail_scroll) ObservableScrollView mObservableScrollView; + @InjectView(R.id.activity_detail_title) + TextView mTitle; + @InjectView(R.id.activity_detail_fab) + ImageView mFabButton; + @InjectView(R.id.activity_detail_container) + View mInformationContainer; + @InjectView(R.id.item_movie_cover) + ImageView mCoverImageView; + @InjectView(R.id.activity_detail_conf_image) + ImageView mConfirmationView; + @Optional + @InjectView(R.id.activity_detail_image) + ImageView mMovieImageView; + @InjectView(R.id.activity_detail_conf_container) + FrameLayout mConfirmationContainer; + @InjectView(R.id.activity_detail_book_info) + LinearLayout mMovieDescriptionContainer; + + @InjectView(R.id.activity_detail_scroll) + ObservableScrollView mObservableScrollView; private int[] mViewLastLocation; @@ -148,7 +159,7 @@ private void initializeStartAnimation() { } else { mViewLastLocation = getIntent().getIntArrayExtra( - MoviesActivity.EXTRA_MOVIE_LOCATION); + MoviesActivity.EXTRA_MOVIE_LOCATION); configureEnterAnimation (); } @@ -160,9 +171,9 @@ private void initializeDependencyInjector() { MoviesApp app = (MoviesApp) getApplication(); DaggerMovieUsecasesComponent.builder() - .appComponent(app.getAppComponent()) - .movieUsecasesModule(new MovieUsecasesModule(movieId)) - .build().inject(this); + .appComponent(app.getAppComponent()) + .movieUsecasesModule(new MovieUsecasesModule(movieId)) + .build().inject(this); } private void configureEnterAnimation() { @@ -195,7 +206,7 @@ private void configureEnterTransition() { postponeEnterTransition(); int moviePosition = getIntent().getIntExtra( - MoviesActivity.EXTRA_MOVIE_POSITION, 0); + MoviesActivity.EXTRA_MOVIE_POSITION, 0); mCoverImageView.setTransitionName(MoviesActivity.SHARED_ELEMENT_COVER + moviePosition); mObservableScrollView.getViewTreeObserver().addOnPreDrawListener( @@ -320,7 +331,7 @@ public void showReviews(List reviewList) { // Creates a TextView TextView reviewTextView = new TextView(this); reviewTextView.setTextAppearance(this, R.style - .MaterialMoviesReviewTextView); + .MaterialMoviesReviewTextView); if (mReviewsColor != -1) reviewTextView.setTextColor(mReviewsColor); diff --git a/HackVG/app/src/main/java/com/hackvg/android/views/activities/MoviesActivity.java b/HackVG/app/src/main/java/com/hackvg/android/views/activities/MoviesActivity.java index 1f2660e..b849e44 100644 --- a/HackVG/app/src/main/java/com/hackvg/android/views/activities/MoviesActivity.java +++ b/HackVG/app/src/main/java/com/hackvg/android/views/activities/MoviesActivity.java @@ -50,23 +50,29 @@ public class MoviesActivity extends ActionBarActivity implements public static SparseArray sPhotoCache = new SparseArray(1); - private final static String BUNDLE_MOVIES_WRAPPER = "movies_wrapper"; - private final static String BUNDLE_BACK_TRANSLATION = "background_translation"; - public final static String EXTRA_MOVIE_ID = "movie_id"; - public final static String EXTRA_MOVIE_LOCATION = "view_location"; - public final static String EXTRA_MOVIE_POSITION = "movie_position"; - public final static String SHARED_ELEMENT_COVER = "cover"; + private final static String BUNDLE_MOVIES_WRAPPER = "movies_wrapper"; + private final static String BUNDLE_BACK_TRANSLATION = "background_translation"; + public final static String EXTRA_MOVIE_ID = "movie_id"; + public final static String EXTRA_MOVIE_LOCATION = "view_location"; + public final static String EXTRA_MOVIE_POSITION = "movie_position"; + public final static String SHARED_ELEMENT_COVER = "cover"; private NavigationDrawerFragment mNavigationDrawerFragment; private MoviesAdapter mMoviesAdapter; public float mBackgroundTranslation; - @Optional @InjectView(R.id.activity_movies_background_view) View mTabletBackground; - @InjectView(R.id.activity_movies_toolbar) Toolbar mToolbar; - @InjectView(R.id.activity_movies_progress) ProgressBar mProgressBar; - @InjectView(R.id.activity_movies_recycler) RecyclerView mRecycler; - @Inject MoviesPresenter mMoviesPresenter; + @Optional + @InjectView(R.id.activity_movies_background_view) + View mTabletBackground; + @InjectView(R.id.activity_movies_toolbar) + Toolbar mToolbar; + @InjectView(R.id.activity_movies_progress) + ProgressBar mProgressBar; + @InjectView(R.id.activity_movies_recycler) + RecyclerView mRecycler; + @Inject + MoviesPresenter mMoviesPresenter; @Override public void onCreate(Bundle savedInstanceState) { @@ -83,7 +89,7 @@ public void onCreate(Bundle savedInstanceState) { if (savedInstanceState == null) mMoviesPresenter.attachView(this); - else + else initializeFromParams(savedInstanceState); } @@ -97,7 +103,7 @@ protected void onStart() { private void initializeFromParams(Bundle savedInstanceState) { MoviesWrapper moviesWrapper = (MoviesWrapper) savedInstanceState - .getSerializable(BUNDLE_MOVIES_WRAPPER); + .getSerializable(BUNDLE_MOVIES_WRAPPER); mMoviesPresenter.onPopularMoviesReceived(moviesWrapper); } @@ -123,7 +129,7 @@ private void initializeToolbar() { getSupportActionBar().setTitle(""); getSupportActionBar().setHomeAsUpIndicator( - R.drawable.ic_menu_white_24dp); + R.drawable.ic_menu_white_24dp); mToolbar.setNavigationOnClickListener(this); } @@ -133,9 +139,9 @@ private void initializeDependencyInjector() { MoviesApp app = (MoviesApp) getApplication(); DaggerBasicMoviesUsecasesComponent.builder() - .appComponent(app.getAppComponent()) - .basicMoviesUsecasesModule(new BasicMoviesUsecasesModule()) - .build().inject(this); + .appComponent(app.getAppComponent()) + .basicMoviesUsecasesModule(new BasicMoviesUsecasesModule()) + .build().inject(this); } @Override @@ -146,7 +152,7 @@ protected void onSaveInstanceState(Bundle outState) { if (mMoviesAdapter != null) { outState.putSerializable(BUNDLE_MOVIES_WRAPPER, new MoviesWrapper( - mMoviesAdapter.getMovieList())); + mMoviesAdapter.getMovieList())); outState.putFloat(BUNDLE_BACK_TRANSLATION, mBackgroundTranslation); } @@ -182,8 +188,8 @@ public void hideLoading() { public void showLoadingLabel() { Snackbar loadingSnackBar = Snackbar.with(this) - .text(getString(R.string.activity_movies_message_more_films)) - .actionLabel(getString(R.string.action_cancel)) + .text(getString(R.string.activity_movies_message_more_films)) + .actionLabel(getString(R.string.action_cancel)) .duration(Snackbar.SnackbarDuration.LENGTH_INDEFINITE) .color(getResources().getColor(R.color.theme_primary)) .actionColor(getResources().getColor(R.color.theme_accent)); @@ -228,15 +234,15 @@ public void onClick(View touchedView, int moviePosition, float touchedX, float t if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) startDetailActivityBySharedElements(touchedView, moviePosition, - movieDetailActivityIntent); + movieDetailActivityIntent); else startDetailActivityByAnimation(touchedView, (int) touchedX, - (int) touchedY, movieDetailActivityIntent); + (int) touchedY, movieDetailActivityIntent); } else { Toast.makeText(this, getString(R.string.activity_movies_message_loading_film), - Toast.LENGTH_SHORT).show(); + Toast.LENGTH_SHORT).show(); } } @@ -263,7 +269,7 @@ private void startDetailActivityBySharedElements(View touchedView, int moviePosition, Intent movieDetailActivityIntent) { ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation( - this, new Pair<>(touchedView, SHARED_ELEMENT_COVER + moviePosition)); + this, new Pair<>(touchedView, SHARED_ELEMENT_COVER + moviePosition)); startActivity(movieDetailActivityIntent, options.toBundle()); } @@ -276,12 +282,12 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) { super.onScrolled(recyclerView, dx, dy); - int visibleItemCount = mRecycler.getLayoutManager().getChildCount(); - int totalItemCount = mRecycler.getLayoutManager().getItemCount(); - int pastVisibleItems = ((GridLayoutManager) mRecycler.getLayoutManager()) - .findFirstVisibleItemPosition(); + int visibleItemCount = mRecycler.getLayoutManager().getChildCount(); + int totalItemCount = mRecycler.getLayoutManager().getItemCount(); + int pastVisibleItems = ((GridLayoutManager) mRecycler.getLayoutManager()) + .findFirstVisibleItemPosition(); - if((visibleItemCount + pastVisibleItems) >= totalItemCount && !mMoviesPresenter.isLoading()) { + if ((visibleItemCount + pastVisibleItems) >= totalItemCount && !mMoviesPresenter.isLoading()) { mMoviesPresenter.onEndListReached(); } diff --git a/HackVG/build.gradle b/HackVG/build.gradle index 866e467..31edcc6 100644 --- a/HackVG/build.gradle +++ b/HackVG/build.gradle @@ -1,9 +1,11 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + buildscript { repositories { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.1.0' + classpath 'com.android.tools.build:gradle:1.2.3' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4' } } diff --git a/HackVG/common/common.iml b/HackVG/common/common.iml index c4ffe85..582cec1 100644 --- a/HackVG/common/common.iml +++ b/HackVG/common/common.iml @@ -19,8 +19,8 @@ - + @@ -33,4 +33,209 @@ + + + + + \ No newline at end of file diff --git a/HackVG/domain/build/classes/main/com/hackvg/domain/Usecase.class b/HackVG/domain/build/classes/main/com/hackvg/domain/Usecase.class deleted file mode 100644 index 4d87b85..0000000 Binary files a/HackVG/domain/build/classes/main/com/hackvg/domain/Usecase.class and /dev/null differ diff --git a/HackVG/domain/build/tmp/jar/MANIFEST.MF b/HackVG/domain/build/tmp/jar/MANIFEST.MF index 58630c0..59499bc 100644 --- a/HackVG/domain/build/tmp/jar/MANIFEST.MF +++ b/HackVG/domain/build/tmp/jar/MANIFEST.MF @@ -1,2 +1,2 @@ -Manifest-Version: 1.0 - +Manifest-Version: 1.0 + diff --git a/HackVG/domain/domain.iml b/HackVG/domain/domain.iml index 8792a50..83fca54 100644 --- a/HackVG/domain/domain.iml +++ b/HackVG/domain/domain.iml @@ -19,8 +19,8 @@ - + @@ -35,4 +35,209 @@ + + + + + \ No newline at end of file diff --git a/HackVG/domain/src/main/java/com/hackvg/domain/ConfigurationUsecase.java b/HackVG/domain/src/main/java/com/hackvg/domain/ConfigurationUsecase.java index aec2f87..1ee1bc5 100644 --- a/HackVG/domain/src/main/java/com/hackvg/domain/ConfigurationUsecase.java +++ b/HackVG/domain/src/main/java/com/hackvg/domain/ConfigurationUsecase.java @@ -12,7 +12,7 @@ public interface ConfigurationUsecase extends Usecase { /** * Request data source the configuration data */ - void requestConfiguration (); + void requestConfiguration(); /** * Callback used to be notified when the configuration data has been received @@ -20,14 +20,14 @@ public interface ConfigurationUsecase extends Usecase { * @param configurationResponse the configuration with the data about the endpoint * of the images */ - void onConfigurationReceived (ConfigurationResponse configurationResponse); + void onConfigurationReceived(ConfigurationResponse configurationResponse); /** * Configures the endpoint used to retrieve images from the movie database api * * @param configurationResponse the configuration with the data about the endpoint of the images */ - void configureImageUrl (ConfigurationResponse configurationResponse); + void configureImageUrl(ConfigurationResponse configurationResponse); /** * Sends a configured to request images from the movie database api diff --git a/HackVG/domain/src/main/java/com/hackvg/domain/ConfigurationUsecaseController.java b/HackVG/domain/src/main/java/com/hackvg/domain/ConfigurationUsecaseController.java index 777d6ff..d92fe5c 100644 --- a/HackVG/domain/src/main/java/com/hackvg/domain/ConfigurationUsecaseController.java +++ b/HackVG/domain/src/main/java/com/hackvg/domain/ConfigurationUsecaseController.java @@ -11,8 +11,8 @@ @SuppressWarnings("FieldCanBeLocal") public class ConfigurationUsecaseController implements ConfigurationUsecase { - private final String QUALITY_DESIRED = "w780"; - private final String QUALITY_ORIGINAL = "original"; + private final String QUALITY_DESIRED = "w780"; + private final String QUALITY_ORIGINAL = "original"; private final MediaDataSource mMediaDataSource; private final Bus mMainBus; @@ -20,8 +20,8 @@ public class ConfigurationUsecaseController implements ConfigurationUsecase { @Inject public ConfigurationUsecaseController(MediaDataSource mediaDataSource, Bus mainBus) { - mMediaDataSource = mediaDataSource; - mMainBus = mainBus; + mMediaDataSource = mediaDataSource; + mMainBus = mainBus; mMainBus.register(this); } diff --git a/HackVG/domain/src/main/java/com/hackvg/domain/GetMovieDetailUsecase.java b/HackVG/domain/src/main/java/com/hackvg/domain/GetMovieDetailUsecase.java index ac16cd2..9ed9e5a 100644 --- a/HackVG/domain/src/main/java/com/hackvg/domain/GetMovieDetailUsecase.java +++ b/HackVG/domain/src/main/java/com/hackvg/domain/GetMovieDetailUsecase.java @@ -17,13 +17,13 @@ public interface GetMovieDetailUsecase extends Usecase { * * @param movieId of the movie */ - void requestMovieDetail (String movieId); + void requestMovieDetail(String movieId); /** * Request datasource the reviews written about that movie * @param movieId of the film */ - void requestMovieReviews (String movieId); + void requestMovieReviews(String movieId); /** * Request datasource the images of the film submited to the API @@ -38,7 +38,7 @@ public interface GetMovieDetailUsecase extends Usecase { * * @param response the response containing the details of the film */ - void onMovieDetailResponse (MovieDetail response); + void onMovieDetailResponse(MovieDetail response); void onMovieReviewsResponse (ReviewsWrapper reviewsWrapper); @@ -57,5 +57,5 @@ public interface GetMovieDetailUsecase extends Usecase { * * @param response the response containing the details of the film */ - void sendDetailMovieToPresenter (MovieDetail response); + void sendDetailMovieToPresenter(MovieDetail response); } diff --git a/HackVG/domain/src/main/java/com/hackvg/domain/GetMovieDetailUsecaseController.java b/HackVG/domain/src/main/java/com/hackvg/domain/GetMovieDetailUsecaseController.java index f1e0497..1fd5efa 100644 --- a/HackVG/domain/src/main/java/com/hackvg/domain/GetMovieDetailUsecaseController.java +++ b/HackVG/domain/src/main/java/com/hackvg/domain/GetMovieDetailUsecaseController.java @@ -19,11 +19,11 @@ public class GetMovieDetailUsecaseController implements GetMovieDetailUsecase { public GetMovieDetailUsecaseController(String movieId, Bus uiBus, - MediaDataSource dataSource) { + MediaDataSource dataSource) { - mMovieId = movieId; - mUiBus = uiBus; - mMovieDataSource= dataSource; + mMovieId = movieId; + mUiBus = uiBus; + mMovieDataSource = dataSource; mUiBus.register(this); } diff --git a/HackVG/domain/src/main/java/com/hackvg/domain/Usecase.java b/HackVG/domain/src/main/java/com/hackvg/domain/Usecase.java index 66430d5..5b801a2 100644 --- a/HackVG/domain/src/main/java/com/hackvg/domain/Usecase.java +++ b/HackVG/domain/src/main/java/com/hackvg/domain/Usecase.java @@ -5,5 +5,5 @@ */ public interface Usecase { - void execute (); + void execute(); } diff --git a/HackVG/gradle/wrapper/gradle-wrapper.jar b/HackVG/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 8c0fb64..0000000 Binary files a/HackVG/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/HackVG/gradlew b/HackVG/gradlew old mode 100755 new mode 100644 diff --git a/HackVG/gradlew.bat b/HackVG/gradlew.bat index aec9973..8a0b282 100644 --- a/HackVG/gradlew.bat +++ b/HackVG/gradlew.bat @@ -1,90 +1,90 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/HackVG/model/build/classes/main/com/hackvg/model/entities/Belongs_to_collection.class b/HackVG/model/build/classes/main/com/hackvg/model/entities/Belongs_to_collection.class deleted file mode 100644 index 71feb9b..0000000 Binary files a/HackVG/model/build/classes/main/com/hackvg/model/entities/Belongs_to_collection.class and /dev/null differ diff --git a/HackVG/model/build/classes/main/com/hackvg/model/entities/ConfigurationResponse$ConfigurationImages.class b/HackVG/model/build/classes/main/com/hackvg/model/entities/ConfigurationResponse$ConfigurationImages.class deleted file mode 100644 index 42fa776..0000000 Binary files a/HackVG/model/build/classes/main/com/hackvg/model/entities/ConfigurationResponse$ConfigurationImages.class and /dev/null differ diff --git a/HackVG/model/build/classes/main/com/hackvg/model/entities/ConfigurationResponse.class b/HackVG/model/build/classes/main/com/hackvg/model/entities/ConfigurationResponse.class deleted file mode 100644 index e76b848..0000000 Binary files a/HackVG/model/build/classes/main/com/hackvg/model/entities/ConfigurationResponse.class and /dev/null differ diff --git a/HackVG/model/build/classes/main/com/hackvg/model/entities/Genres.class b/HackVG/model/build/classes/main/com/hackvg/model/entities/Genres.class deleted file mode 100644 index c2660aa..0000000 Binary files a/HackVG/model/build/classes/main/com/hackvg/model/entities/Genres.class and /dev/null differ diff --git a/HackVG/model/build/classes/main/com/hackvg/model/entities/TvShow.class b/HackVG/model/build/classes/main/com/hackvg/model/entities/TvShow.class deleted file mode 100644 index faa3602..0000000 Binary files a/HackVG/model/build/classes/main/com/hackvg/model/entities/TvShow.class and /dev/null differ diff --git a/HackVG/model/build/tmp/jar/MANIFEST.MF b/HackVG/model/build/tmp/jar/MANIFEST.MF index 58630c0..59499bc 100644 --- a/HackVG/model/build/tmp/jar/MANIFEST.MF +++ b/HackVG/model/build/tmp/jar/MANIFEST.MF @@ -1,2 +1,2 @@ -Manifest-Version: 1.0 - +Manifest-Version: 1.0 + diff --git a/HackVG/model/model.iml b/HackVG/model/model.iml index bac6944..ecfe2db 100644 --- a/HackVG/model/model.iml +++ b/HackVG/model/model.iml @@ -19,8 +19,8 @@ - + @@ -32,4 +32,209 @@ + + + + + \ No newline at end of file diff --git a/HackVG/model/src/main/java/com/hackvg/model/MediaDataSource.java b/HackVG/model/src/main/java/com/hackvg/model/MediaDataSource.java index 6871f3e..d76d38c 100644 --- a/HackVG/model/src/main/java/com/hackvg/model/MediaDataSource.java +++ b/HackVG/model/src/main/java/com/hackvg/model/MediaDataSource.java @@ -4,16 +4,16 @@ public interface MediaDataSource { void getMovies(); - void getDetailMovie (String id); + void getDetailMovie(String id); /** * Get the reviews for a particular movie id. * * @param id movie id */ - void getReviews (String id); + void getReviews(String id); - void getConfiguration (); + void getConfiguration(); /** * Get a list of images represented by a MoviesWrapper @@ -21,5 +21,5 @@ public interface MediaDataSource { * * @param movieId the movie id */ - void getImages (String movieId); + void getImages(String movieId); } diff --git a/HackVG/model/src/main/java/com/hackvg/model/entities/Belongs_to_collection.java b/HackVG/model/src/main/java/com/hackvg/model/entities/Belongs_to_collection.java old mode 100755 new mode 100644 index a98f392..b9aa23d --- a/HackVG/model/src/main/java/com/hackvg/model/entities/Belongs_to_collection.java +++ b/HackVG/model/src/main/java/com/hackvg/model/entities/Belongs_to_collection.java @@ -1,49 +1,49 @@ - -package com.hackvg.model.entities; - -public class Belongs_to_collection { - private String backdrop_path; - private Number id; - private String name; - private String poster_path; - - public String getBackdrop_path() { - - return this.backdrop_path; - } - - public void setBackdrop_path(String backdrop_path) { - - this.backdrop_path = backdrop_path; - } - - public Number getId() { - - return this.id; - } - - public void setId(Number id) { - - this.id = id; - } - - public String getName() { - - return this.name; - } - - public void setName(String name) { - - this.name = name; - } - - public String getPoster_path() { - - return this.poster_path; - } - - public void setPoster_path(String poster_path) { - - this.poster_path = poster_path; - } -} + +package com.hackvg.model.entities; + +public class Belongs_to_collection { + private String backdrop_path; + private Number id; + private String name; + private String poster_path; + + public String getBackdrop_path() { + + return this.backdrop_path; + } + + public void setBackdrop_path(String backdrop_path) { + + this.backdrop_path = backdrop_path; + } + + public Number getId() { + + return this.id; + } + + public void setId(Number id) { + + this.id = id; + } + + public String getName() { + + return this.name; + } + + public void setName(String name) { + + this.name = name; + } + + public String getPoster_path() { + + return this.poster_path; + } + + public void setPoster_path(String poster_path) { + + this.poster_path = poster_path; + } +} diff --git a/HackVG/model/src/main/java/com/hackvg/model/entities/Genres.java b/HackVG/model/src/main/java/com/hackvg/model/entities/Genres.java old mode 100755 new mode 100644 index c4f0eeb..6afd49b --- a/HackVG/model/src/main/java/com/hackvg/model/entities/Genres.java +++ b/HackVG/model/src/main/java/com/hackvg/model/entities/Genres.java @@ -1,20 +1,20 @@ - -package com.hackvg.model.entities; - -public class Genres{ - private Number id; - private String name; - - public Number getId(){ - return this.id; - } - public void setId(Number id){ - this.id = id; - } - public String getName(){ - return this.name; - } - public void setName(String name){ - this.name = name; - } -} + +package com.hackvg.model.entities; + +public class Genres{ + private Number id; + private String name; + + public Number getId(){ + return this.id; + } + public void setId(Number id){ + this.id = id; + } + public String getName(){ + return this.name; + } + public void setName(String name){ + this.name = name; + } +} diff --git a/HackVG/model/src/main/java/com/hackvg/model/entities/Movie.java b/HackVG/model/src/main/java/com/hackvg/model/entities/Movie.java old mode 100755 new mode 100644 diff --git a/HackVG/model/src/main/java/com/hackvg/model/entities/MovieDetail.java b/HackVG/model/src/main/java/com/hackvg/model/entities/MovieDetail.java old mode 100755 new mode 100644 diff --git a/HackVG/model/src/main/java/com/hackvg/model/entities/MoviesWrapper.java b/HackVG/model/src/main/java/com/hackvg/model/entities/MoviesWrapper.java old mode 100755 new mode 100644 diff --git a/HackVG/model/src/main/java/com/hackvg/model/entities/Production_companies.java b/HackVG/model/src/main/java/com/hackvg/model/entities/Production_companies.java old mode 100755 new mode 100644 index 298890d..aac7ed8 --- a/HackVG/model/src/main/java/com/hackvg/model/entities/Production_companies.java +++ b/HackVG/model/src/main/java/com/hackvg/model/entities/Production_companies.java @@ -1,27 +1,27 @@ - -package com.hackvg.model.entities; - -public class Production_companies { - private Number id; - private String name; - - public Number getId() { - - return this.id; - } - - public void setId(Number id) { - - this.id = id; - } - - public String getName() { - - return this.name; - } - - public void setName(String name) { - - this.name = name; - } -} + +package com.hackvg.model.entities; + +public class Production_companies { + private Number id; + private String name; + + public Number getId() { + + return this.id; + } + + public void setId(Number id) { + + this.id = id; + } + + public String getName() { + + return this.name; + } + + public void setName(String name) { + + this.name = name; + } +} diff --git a/HackVG/model/src/main/java/com/hackvg/model/entities/TvShow.java b/HackVG/model/src/main/java/com/hackvg/model/entities/TvShow.java old mode 100755 new mode 100644 index 9134e06..201031d --- a/HackVG/model/src/main/java/com/hackvg/model/entities/TvShow.java +++ b/HackVG/model/src/main/java/com/hackvg/model/entities/TvShow.java @@ -1,135 +1,135 @@ - -package com.hackvg.model.entities; - -import java.util.List; - - -public class TvShow { - private String backdrop_path; - private String first_air_date; - private Number id; - private String name; - private List origin_country; - private String original_name; - private Number popularity; - private String poster_path; - private Number vote_average; - private Number vote_count; - - public String getBackdrop_path() { - - return this.backdrop_path; - } - - public void setBackdrop_path(String backdrop_path) { - - this.backdrop_path = backdrop_path; - } - - public String getFirst_air_date() { - - return this.first_air_date; - } - - public void setFirst_air_date(String first_air_date) { - - this.first_air_date = first_air_date; - } - - public Number getId() { - - return this.id; - } - - public void setId(Number id) { - - this.id = id; - } - - public String getName() { - - return this.name; - } - - public void setName(String name) { - - this.name = name; - } - - public List getOrigin_country() { - - return this.origin_country; - } - - public void setOrigin_country(List origin_country) { - - this.origin_country = origin_country; - } - - public String getOriginal_name() { - - return this.original_name; - } - - public void setOriginal_name(String original_name) { - - this.original_name = original_name; - } - - public Number getPopularity() { - - return this.popularity; - } - - public void setPopularity(Number popularity) { - - this.popularity = popularity; - } - - public String getPoster_path() { - - return this.poster_path; - } - - public void setPoster_path(String poster_path) { - - this.poster_path = poster_path; - } - - public Number getVote_average() { - - return this.vote_average; - } - - public void setVote_average(Number vote_average) { - - this.vote_average = vote_average; - } - - public Number getVote_count() { - - return this.vote_count; - } - - public void setVote_count(Number vote_count) { - - this.vote_count = vote_count; - } - - @Override - public String toString() { - - return "TvShow{" + - "backdrop_path='" + backdrop_path + '\'' + - ", first_air_date='" + first_air_date + '\'' + - ", id=" + id + - ", name='" + name + '\'' + - ", origin_country=" + origin_country + - ", original_name='" + original_name + '\'' + - ", popularity=" + popularity + - ", poster_path='" + poster_path + '\'' + - ", vote_average=" + vote_average + - ", vote_count=" + vote_count + - '}'; - } -} + +package com.hackvg.model.entities; + +import java.util.List; + + +public class TvShow { + private String backdrop_path; + private String first_air_date; + private Number id; + private String name; + private List origin_country; + private String original_name; + private Number popularity; + private String poster_path; + private Number vote_average; + private Number vote_count; + + public String getBackdrop_path() { + + return this.backdrop_path; + } + + public void setBackdrop_path(String backdrop_path) { + + this.backdrop_path = backdrop_path; + } + + public String getFirst_air_date() { + + return this.first_air_date; + } + + public void setFirst_air_date(String first_air_date) { + + this.first_air_date = first_air_date; + } + + public Number getId() { + + return this.id; + } + + public void setId(Number id) { + + this.id = id; + } + + public String getName() { + + return this.name; + } + + public void setName(String name) { + + this.name = name; + } + + public List getOrigin_country() { + + return this.origin_country; + } + + public void setOrigin_country(List origin_country) { + + this.origin_country = origin_country; + } + + public String getOriginal_name() { + + return this.original_name; + } + + public void setOriginal_name(String original_name) { + + this.original_name = original_name; + } + + public Number getPopularity() { + + return this.popularity; + } + + public void setPopularity(Number popularity) { + + this.popularity = popularity; + } + + public String getPoster_path() { + + return this.poster_path; + } + + public void setPoster_path(String poster_path) { + + this.poster_path = poster_path; + } + + public Number getVote_average() { + + return this.vote_average; + } + + public void setVote_average(Number vote_average) { + + this.vote_average = vote_average; + } + + public Number getVote_count() { + + return this.vote_count; + } + + public void setVote_count(Number vote_count) { + + this.vote_count = vote_count; + } + + @Override + public String toString() { + + return "TvShow{" + + "backdrop_path='" + backdrop_path + '\'' + + ", first_air_date='" + first_air_date + '\'' + + ", id=" + id + + ", name='" + name + '\'' + + ", origin_country=" + origin_country + + ", original_name='" + original_name + '\'' + + ", popularity=" + popularity + + ", poster_path='" + poster_path + '\'' + + ", vote_average=" + vote_average + + ", vote_count=" + vote_count + + '}'; + } +} diff --git a/README.md b/README.md deleted file mode 100644 index dd6e285..0000000 --- a/README.md +++ /dev/null @@ -1,15 +0,0 @@ -This projects support a series of articles about how to setup an android environment to develop an scalable, maintainable and testable projects. - -### A useful stack on android - -- [Architecture](http://saulmm.github.io/2015/02/02/A%20useful%20stack%20on%20android%20%231,%20architecture/) - -- [User interface](http://saulmm.github.io/a-useful-stack-on-android-2-user-interface/) - -- [Compatibility](http://saulmm.github.io/a-useful-stack-on-android-3-compatibility/) - -### Screenshots - -![](http://androcode.es/wp-content/uploads/2015/03/family2.png) - -![](http://androcode.es/wp-content/uploads/2015/03/detailFamily-e1426180053215.png) \ No newline at end of file