commit c1580748d001e9158c609eccea529baea51546e7 Author: danijoo Date: Wed Oct 28 23:44:03 2015 +0100 initial diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4a8297c --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.idea +project +*.sbt +*.scala +target +*.iml \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..1885db1 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,32 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 23 + buildToolsVersion "23.0.1" + + defaultConfig { + applicationId "net.headlezz.udacityproject1" + minSdkVersion 21 + targetSdkVersion 23 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + testCompile 'junit:junit:4.12' + compile 'com.android.support:appcompat-v7:23.1.0' + compile 'com.android.support:design:23.1.0' + compile 'com.android.support:recyclerview-v7:23.1.0' + + compile 'com.squareup.picasso:picasso:2.5.2' + compile 'com.squareup.retrofit:retrofit:2.0.0-beta2' + compile 'com.squareup.retrofit:converter-gson:2.0.0-beta2' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..677edc8 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in C:\android-sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/app/src/androidTest/java/net/headlezz/udacityproject1/ApplicationTest.java b/app/src/androidTest/java/net/headlezz/udacityproject1/ApplicationTest.java new file mode 100644 index 0000000..49c3612 --- /dev/null +++ b/app/src/androidTest/java/net/headlezz/udacityproject1/ApplicationTest.java @@ -0,0 +1,13 @@ +package net.headlezz.udacityproject1; + +import android.app.Application; +import android.test.ApplicationTestCase; + +/** + * Testing Fundamentals + */ +public class ApplicationTest extends ApplicationTestCase { + public ApplicationTest() { + super(Application.class); + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..df57679 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/net/headlezz/udacityproject1/MainActivity.java b/app/src/main/java/net/headlezz/udacityproject1/MainActivity.java new file mode 100644 index 0000000..3382364 --- /dev/null +++ b/app/src/main/java/net/headlezz/udacityproject1/MainActivity.java @@ -0,0 +1,25 @@ +package net.headlezz.udacityproject1; + +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; + +public class MainActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + setTitle(getString(R.string.app_name)); + + if(savedInstanceState == null) { + getSupportFragmentManager() + .beginTransaction() + .add(R.id.fragmentHolder, new MovieListFragment()) + .commit(); + } + } + +} diff --git a/app/src/main/java/net/headlezz/udacityproject1/MovieListAdapter.java b/app/src/main/java/net/headlezz/udacityproject1/MovieListAdapter.java new file mode 100644 index 0000000..185604e --- /dev/null +++ b/app/src/main/java/net/headlezz/udacityproject1/MovieListAdapter.java @@ -0,0 +1,67 @@ +package net.headlezz.udacityproject1; + +import android.content.Context; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.Toast; + +import net.headlezz.udacityproject1.tmdbapi.Movie; +import net.headlezz.udacityproject1.tmdbapi.TMDBApi; + +import java.util.List; + +public class MovieListAdapter extends RecyclerView.Adapter{ + + Context context; + List mMovies; + + public MovieListAdapter(Context context, List movies) { + this.context = context; + mMovies = movies; + } + + @Override + public MovieViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View movieView = LayoutInflater.from(parent.getContext()).inflate(R.layout.movie_list_item, parent, false); + return new MovieViewHolder(movieView); + } + + @Override + public void onBindViewHolder(MovieViewHolder holder, int position) { + holder.setMovie(mMovies.get(position)); + } + + @Override + public int getItemCount() { + return mMovies.size(); + } + + /** + * Viewholder for the movie items + */ + class MovieViewHolder extends RecyclerView.ViewHolder { + + ImageView ivPoster; + Movie movie; + + public MovieViewHolder(View itemView) { + super(itemView); + ivPoster = (ImageView) itemView; + ivPoster.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Toast.makeText(v.getContext(), movie.getTitle() + " clicked.", Toast.LENGTH_SHORT).show(); + } + }); + } + + public void setMovie(Movie movie) { + this.movie = movie; + TMDBApi.loadPoster(ivPoster, movie); + } + } + +} diff --git a/app/src/main/java/net/headlezz/udacityproject1/MovieListFragment.java b/app/src/main/java/net/headlezz/udacityproject1/MovieListFragment.java new file mode 100644 index 0000000..7a166cd --- /dev/null +++ b/app/src/main/java/net/headlezz/udacityproject1/MovieListFragment.java @@ -0,0 +1,141 @@ +package net.headlezz.udacityproject1; + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v7.widget.GridLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Toast; + +import net.headlezz.udacityproject1.tmdbapi.Movie; +import net.headlezz.udacityproject1.tmdbapi.MovieList; +import net.headlezz.udacityproject1.tmdbapi.MovieListCallback; +import net.headlezz.udacityproject1.tmdbapi.TMDBApi; + +import java.util.List; + +import retrofit.Call; + +/** + * A fragment showing a list of movies + */ +public class MovieListFragment extends Fragment { + + // TODO fix restore + + public static final String TAG = MovieListFragment.class.getSimpleName(); + + /** + * The number of columns our movie grid shows + */ + private static final int NUM_COLUMNS = 2; + + /** + * The currently selected sorting order of the list + * @see TMDBApi + */ + private int mSortingOrder = TMDBApi.SORT_ORDER_MOST_POPULAR; + + RecyclerView mMovieGridView; + + /** + * Holding a reference to running api calls. This makes it possible to cancel them if + * the user leaves the app, resorts the list or opens the detail view. + */ + Call mMovieListCall; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setHasOptionsMenu(true); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View view = inflater.inflate(R.layout.fragment_movie_list, container, false); + mMovieGridView = (RecyclerView) view.findViewById(R.id.movie_list_grid); + return view; + } + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + mMovieGridView.setLayoutManager(new GridLayoutManager(getActivity(), NUM_COLUMNS)); + } + + @Override + public void onStart() { + super.onStart(); + loadMovieList(); + } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + super.onCreateOptionsMenu(menu, inflater); + inflater.inflate(R.menu.movie_list_menu, menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.action_sort_popularity: + mSortingOrder = TMDBApi.SORT_ORDER_MOST_POPULAR; + loadMovieList(); + return true; + case R.id.action_sort_rating: + mSortingOrder = TMDBApi.SORT_ORDER_HIGHEST_RATED; + loadMovieList(); + return true; + default: + return super.onOptionsItemSelected(item); + } + } + + /** + * Loads a list of movies into the movie grid. + * mSortingOrder will be used to determine the sorting + */ + private void loadMovieList() { + stopLoadingMovies(); // stop any running query before starting a new one + MovieListCallback cb = new MovieListCallback() { + @Override + protected void onResponse(MovieList movies) { + setListToGrid(movies.getList()); + } + + @Override + public void onFailure(Throwable t) { + Log.d(TAG, t.getMessage()); + Toast.makeText(getActivity(), "Somethig went wrong", Toast.LENGTH_SHORT).show(); + } + }; + mMovieListCall = TMDBApi.discoverMovies(mSortingOrder, getString(R.string.api_key)); + mMovieListCall.enqueue(cb); + } + + private void setListToGrid(List movies) { + mMovieGridView.setAdapter(new MovieListAdapter(getActivity(), movies)); + } + + /** + * Stops the current api query + */ + private void stopLoadingMovies() { + if(mMovieListCall != null) { + mMovieListCall.cancel(); + mMovieListCall = null; + } + } + + @Override + public void onStop() { + super.onStop(); + stopLoadingMovies(); + } +} diff --git a/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/Movie.java b/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/Movie.java new file mode 100644 index 0000000..6861114 --- /dev/null +++ b/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/Movie.java @@ -0,0 +1,29 @@ +package net.headlezz.udacityproject1.tmdbapi; + +/** + * Data object to represent a single movie + * Only required data from the api is stored to save memory + */ +public class Movie { + + String title; + String posterPath; + String overview; + double avRating; + + public String getTitle() { + return title; + } + + public String getPosterPath() { + return posterPath; + } + + public String getOverview() { + return overview; + } + + public double getAvRating() { + return avRating; + } +} diff --git a/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/MovieList.java b/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/MovieList.java new file mode 100644 index 0000000..ec568b2 --- /dev/null +++ b/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/MovieList.java @@ -0,0 +1,15 @@ +package net.headlezz.udacityproject1.tmdbapi; + +import java.util.List; + +public class MovieList { + + public MovieList(List movieList) { + this.movies = movieList; + } + + List movies; + + public List getList() { return movies; } + +} diff --git a/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/MovieListCallback.java b/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/MovieListCallback.java new file mode 100644 index 0000000..a36c0cf --- /dev/null +++ b/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/MovieListCallback.java @@ -0,0 +1,24 @@ +package net.headlezz.udacityproject1.tmdbapi; + +import retrofit.Callback; +import retrofit.Response; +import retrofit.Retrofit; + +public abstract class MovieListCallback implements Callback { + + @Override + public void onResponse(Response response, Retrofit retrofit) { + if(response.isSuccess()) + onResponse(response.body()); + else + onFailure(new MovieDownloadException("Something went wrong" + response.code())); // TODO make this better + } + + protected abstract void onResponse(MovieList movies); + + public static class MovieDownloadException extends Exception { + public MovieDownloadException(String detailMessage) { + super(detailMessage); + } + } +} diff --git a/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/MovieListDeserializer.java b/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/MovieListDeserializer.java new file mode 100644 index 0000000..1cef1a0 --- /dev/null +++ b/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/MovieListDeserializer.java @@ -0,0 +1,36 @@ +package net.headlezz.udacityproject1.tmdbapi; + +import android.util.Log; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; + +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.List; + +public class MovieListDeserializer implements JsonDeserializer { + + @Override + public MovieList deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + List movieList = new ArrayList<>(); + for(JsonElement elem : json.getAsJsonObject().getAsJsonArray("results")) { + try { // TODO fix this and remove try/catch + JsonObject jsonObj = elem.getAsJsonObject(); + Movie m = new Movie(); + m.title = jsonObj.get("title").getAsString(); + m.overview = jsonObj.get("overview").getAsString(); + m.avRating = jsonObj.get("vote_average").getAsDouble(); + JsonElement posterPath = jsonObj.get("poster_path"); + m.posterPath = posterPath.getAsString(); + movieList.add(m); + } catch (Exception e) { + Log.e(MovieListDeserializer.class.getSimpleName(), e.toString()); + } + } + return new MovieList(movieList); + } +} diff --git a/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/TMDBApi.java b/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/TMDBApi.java new file mode 100644 index 0000000..9f6ddbd --- /dev/null +++ b/app/src/main/java/net/headlezz/udacityproject1/tmdbapi/TMDBApi.java @@ -0,0 +1,73 @@ +package net.headlezz.udacityproject1.tmdbapi; + +import android.widget.ImageView; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.squareup.picasso.Picasso; + +import retrofit.Call; +import retrofit.GsonConverterFactory; +import retrofit.Retrofit; +import retrofit.http.GET; +import retrofit.http.Headers; +import retrofit.http.Query; + +/** + * This class provides all the methods to interact with the tmdb api + * Methods are all static and the underlying retrofit service will be reused. + */ +public class TMDBApi { + + private static final String BASE_URL = "http://api.themoviedb.org/3/"; + private static final String IMAGE_BASE_URL = "http://image.tmdb.org/t/p/w342"; // TODO select size depending on device screen ratios + + /** + * These are the possible sorting orders + */ + public static final int SORT_ORDER_MOST_POPULAR = 1; + public static final int SORT_ORDER_HIGHEST_RATED = 2; + + private static TMDBApi.TMDBApiService apiService = buildApiService(); + + /** + * The initialization steps for the retrofit api + * @return TMDBApiService service to make api calls + */ + private static TMDBApiService buildApiService() { + Gson gson = new GsonBuilder() + .registerTypeAdapter(MovieList.class, new MovieListDeserializer()) + .create(); + Retrofit retrofit = new Retrofit.Builder() + .baseUrl(BASE_URL) + .addConverterFactory(GsonConverterFactory.create(gson)) + .build(); + return retrofit.create(TMDBApiService.class); + } + + public static void loadPoster(ImageView imageView, Movie movie) { + Picasso.with(imageView.getContext()).load(IMAGE_BASE_URL + movie.getPosterPath()).into(imageView); + } + + public static Call discoverMovies(int sortOrder, String apiKey) { + String sort; + switch (sortOrder) { + case SORT_ORDER_MOST_POPULAR: + sort = "popularity.desc"; + break; + default: + sort = "vote_average.desc"; + } + return apiService.discoverMovies(sort, apiKey); + } + + /** + * Api interface for retrofit + */ + public interface TMDBApiService { + @Headers("Accept: application/json") + @GET("discover/movie") + Call discoverMovies(@Query("sort_by") String sortOrder, @Query("api_key") String apiKey); + } + +} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..f918c61 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,21 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_movie_list.xml b/app/src/main/res/layout/fragment_movie_list.xml new file mode 100644 index 0000000..39a9b0d --- /dev/null +++ b/app/src/main/res/layout/fragment_movie_list.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/layout/movie_list_item.xml b/app/src/main/res/layout/movie_list_item.xml new file mode 100644 index 0000000..25e2749 --- /dev/null +++ b/app/src/main/res/layout/movie_list_item.xml @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/app/src/main/res/menu/movie_list_menu.xml b/app/src/main/res/menu/movie_list_menu.xml new file mode 100644 index 0000000..f3d4645 --- /dev/null +++ b/app/src/main/res/menu/movie_list_menu.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cde69bc Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c133a0c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..bfa42f0 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..324e72c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..aee44e1 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml new file mode 100644 index 0000000..a7a11de --- /dev/null +++ b/app/src/main/res/values-v21/styles.xml @@ -0,0 +1,7 @@ +> + + diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 0000000..63fc816 --- /dev/null +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ + + + 64dp + diff --git a/app/src/main/res/values/api_key.xml b/app/src/main/res/values/api_key.xml new file mode 100644 index 0000000..f491656 --- /dev/null +++ b/app/src/main/res/values/api_key.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..3ab3e9c --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..812cb7b --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,6 @@ + + + 16dp + 16dp + 16dp + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..ad23fb8 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + UdacityProject1 + Settings + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..44f664f --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,17 @@ + + + + + +