diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..aa724b77 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..26d33521 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..61a9130c --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..23a89bbb --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 00000000..23704740 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..33782299 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 8bb0c38d..00000000 --- a/README.md +++ /dev/null @@ -1,44 +0,0 @@ -# Work sample - Application developer - -## Assignment - -- Build an awesome movie app that shows popular and high rated movies. -- Code it for the platform (Android, iOS, web) you applied for or the one you prefer. - -## Requirements - -- Use an open https://developers.themoviedb.org/open source API. Please read the API [Authentication section](https://developers.themoviedb.org/3/getting-started/authentication) to get started. -- Discover most popular and highly rated movies. -- Display the movies with creative look and feel of an app to meet design guidelines for your platform (Material Design etc.). -- Launch a detail screen whenever a particular movie is selected. - -## Examples of bonus features - -- Allow user to save a favorite movie for offline access. -- Allow user to read movie reviews. - -## We expect you to - -- Write clean code. -- Create a responsive design. -- Handle error cases. -- Use the latest libraries and technologies. -- Tested code is a big plus. - -### User experience - -The features of the app might be few, but we expect you to deliver a solution with a high user experience. Imagine this application to be used by real users, with real needs. Make it interesting, fun and intuitive to use. And of course you are allowed to extend your applications functionality. - -### Code - -We expect that the code is of high quality and under source control. Expect the solution to be continuously worked on by other developers and should therefore be easy to understand, adjust and extend. True beauty starts on the inside! - -## Delivery - -Fork the repository, code in your fork and make a pull request when done. A nice commit history describing your work is preferred over squashing it into one commit. -Also send us an e-mail to let us know! - -### Good luck! - ---- - diff --git a/ReadMe b/ReadMe new file mode 100644 index 00000000..b471b88a --- /dev/null +++ b/ReadMe @@ -0,0 +1,16 @@ +Movie application based on provided apis from https://www.themoviedb.org/ + + +Technologies Uesd: +- MVVM architecture. +- Reposaitry architecture. +- Coroutines for Threading. +- Live-data for informing updates. +- Room for offline savings. +- Unit test. +- Pagination. +- Clean Code. + + + + diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 00000000..42afabfd --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 00000000..a2c6402c --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,120 @@ +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-kapt' +apply plugin: "androidx.navigation.safeargs.kotlin" +apply plugin: 'dagger.hilt.android.plugin' + +android { + compileSdkVersion 29 + buildToolsVersion "29.0.3" + buildFeatures { + buildConfig = true + } + defaultConfig { + applicationId "com.movies.tmdb" + minSdkVersion 23 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8.toString() + } +} + +dependencies { + implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'androidx.core:core-ktx:1.3.1' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + + // Material Design + implementation 'com.google.android.material:material:1.3.0-alpha02' + + // Architectural Components + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0" + + // Lifecycle + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.2.0" + implementation "androidx.lifecycle:lifecycle-runtime:2.2.0" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0" + + // Room + implementation "androidx.room:room-runtime:2.2.5" + implementation 'com.android.support:support-annotations:28.0.0' + kapt "androidx.room:room-compiler:2.2.5" + + // Kotlin Extensions and Coroutines support for Room + implementation "androidx.room:room-ktx:2.2.5" + + // Retrofit + implementation 'com.squareup.retrofit2:retrofit:2.9.0' + implementation 'com.squareup.retrofit2:converter-gson:2.9.0' + implementation "com.squareup.okhttp3:logging-interceptor:3.12.0" + implementation "com.google.code.gson:gson:2.8.6" + + // Coroutines + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.5' + + // Coroutine Lifecycle Scopes + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0" + implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0" + + // Navigation Components + implementation "androidx.navigation:navigation-fragment-ktx:2.3.0" + implementation "androidx.navigation:navigation-ui-ktx:2.3.0" + + // Glide + implementation 'com.github.bumptech.glide:glide:4.11.0' + kapt 'com.github.bumptech.glide:compiler:4.11.0' + + // Activity KTX for viewModels() + implementation "androidx.activity:activity-ktx:1.1.0" + + //Dagger - Hilt + implementation "com.google.dagger:hilt-android:2.28-alpha" + kapt "com.google.dagger:hilt-android-compiler:2.28-alpha" + + implementation "androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha02" + kapt "androidx.hilt:hilt-compiler:1.0.0-alpha02" + + + // Timber + implementation 'com.jakewharton.timber:timber:4.7.1' + + implementation 'com.github.eralpyucel:CircleProgressView:v1.1' + + + + // Local Unit Tests + implementation "androidx.test:core:1.2.0" + testImplementation "junit:junit:4.13" + testImplementation "androidx.arch.core:core-testing:2.1.0" + testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.1" + testImplementation "com.google.truth:truth:1.0.1" + + // Instrumented Unit Tests + androidTestImplementation "junit:junit:4.13" + androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.1" + androidTestImplementation "androidx.arch.core:core-testing:2.1.0" + androidTestImplementation "com.google.truth:truth:1.0.1" + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' +} \ No newline at end of file diff --git a/app/gradle.properties b/app/gradle.properties new file mode 100644 index 00000000..2f744e37 --- /dev/null +++ b/app/gradle.properties @@ -0,0 +1,22 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app"s APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official + diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# 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 *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/com/movies/tmdb/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/movies/tmdb/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..c33ddb26 --- /dev/null +++ b/app/src/androidTest/java/com/movies/tmdb/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.movies.tmdb + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.movies.tmdb", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/androidTest/java/com/movies/tmdb/data/LiveDataUtil.kt b/app/src/androidTest/java/com/movies/tmdb/data/LiveDataUtil.kt new file mode 100644 index 00000000..7aff0f2c --- /dev/null +++ b/app/src/androidTest/java/com/movies/tmdb/data/LiveDataUtil.kt @@ -0,0 +1,64 @@ +package com.movies.tmdb.data + +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +import androidx.annotation.VisibleForTesting +import androidx.lifecycle.LiveData +import androidx.lifecycle.Observer +import java.util.concurrent.CountDownLatch +import java.util.concurrent.TimeUnit +import java.util.concurrent.TimeoutException + +/** + * Gets the value of a [LiveData] or waits for it to have one, with a timeout. + * + * Use this extension from host-side (JVM) tests. It's recommended to use it alongside + * `InstantTaskExecutorRule` or a similar mechanism to execute tasks synchronously. + */ +@VisibleForTesting(otherwise = VisibleForTesting.NONE) +fun LiveData.getOrAwaitValue( + time: Long = 2, + timeUnit: TimeUnit = TimeUnit.SECONDS, + afterObserve: () -> Unit = {} +): T { + var data: T? = null + val latch = CountDownLatch(1) + val observer = object : Observer { + override fun onChanged(o: T?) { + data = o + latch.countDown() + this@getOrAwaitValue.removeObserver(this) + } + } + this.observeForever(observer) + + try { + afterObserve.invoke() + + // Don't wait indefinitely if the LiveData is not set. + if (!latch.await(time, timeUnit)) { + throw TimeoutException("LiveData value was never set.") + } + + } finally { + this.removeObserver(observer) + } + + @Suppress("UNCHECKED_CAST") + return data as T +} diff --git a/app/src/androidTest/java/com/movies/tmdb/data/local/MoviesDaoTest.kt b/app/src/androidTest/java/com/movies/tmdb/data/local/MoviesDaoTest.kt new file mode 100644 index 00000000..732aa0e7 --- /dev/null +++ b/app/src/androidTest/java/com/movies/tmdb/data/local/MoviesDaoTest.kt @@ -0,0 +1,85 @@ +import android.content.Context +import androidx.arch.core.executor.testing.InstantTaskExecutorRule +import androidx.room.Room +import androidx.test.core.app.ApplicationProvider +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.movies.tmdb.data.remote.responses.MovieObject +import com.google.common.truth.Truth.assertThat +import com.movies.tmdb.data.getOrAwaitValue +import com.movies.tmdb.data.local.MoviesDao +import com.movies.tmdb.data.local.MoviesDatabase +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.test.runBlockingTest +import org.junit.After +import org.junit.Before +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import java.io.IOException + +@ExperimentalCoroutinesApi +@RunWith(AndroidJUnit4::class) +class SimpleEntityReadWriteTest { + private lateinit var dao: MoviesDao + private lateinit var db: MoviesDatabase + + @get:Rule + var instantTaskExecutorRule = InstantTaskExecutorRule() + + @Before + fun createDb() { + val context = ApplicationProvider.getApplicationContext() + db = Room.inMemoryDatabaseBuilder( + context, MoviesDatabase::class.java + ).build() + dao = db.moviesDao() + } + + @After + @Throws(IOException::class) + fun closeDb() { + db.close() + } + + + @Test + fun insertShoppingItem() = runBlockingTest { + + val movieObject = MovieObject( + false, 1, "Title Test", "Overview Test", "", + "", "Title test", 2.8f, "" + ) + dao.insertMovie(movieObject) + + val allShoppingItems = dao.observeAllMovies().getOrAwaitValue() + + assertThat(allShoppingItems).contains(movieObject) + } + + @Test + fun deleteShoppingItem() = runBlockingTest { + val movieObject = MovieObject( + false, 1, "Title Test", "Overview Test", "", + "", "Title test", 2.8f, "" + ) + dao.insertMovie(movieObject) + dao.deleteMovie(movieObject.id) + + val allShoppingItems = dao.observeAllMovies().getOrAwaitValue() + + assertThat(allShoppingItems).doesNotContain(movieObject) + } + + @Test + fun checkIfMovieExistInDatabase() = runBlockingTest { + val movieObject = MovieObject( + false, 1, "Title Test", "Overview Test", "", + "", "Title test", 2.8f, "" + ) + dao.insertMovie(movieObject) + val existence = dao.isMovieExistsOffline(movieObject.id) + + + assertThat(existence).isTrue() + } +} \ 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 00000000..034567c3 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/MoviesApplication.kt b/app/src/main/java/com/movies/tmdb/MoviesApplication.kt new file mode 100644 index 00000000..3d352317 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/MoviesApplication.kt @@ -0,0 +1,7 @@ +package com.movies.tmdb + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MoviesApplication : Application() \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/adapters/MoviesAdapter.kt b/app/src/main/java/com/movies/tmdb/adapters/MoviesAdapter.kt new file mode 100644 index 00000000..8e43e02a --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/adapters/MoviesAdapter.kt @@ -0,0 +1,88 @@ +package com.movies.tmdb.adapters + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.recyclerview.widget.AsyncListDiffer +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.RequestManager +import com.movies.tmdb.R +import com.movies.tmdb.data.remote.responses.MovieObject +import com.movies.tmdb.other.Extensions.base64ToBitmap +import kotlinx.android.synthetic.main.item_movie.view.* +import javax.inject.Inject + +class MoviesAdapter @Inject constructor( + private val glide: RequestManager +) : RecyclerView.Adapter() { + class MoviesViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) + + private val diffCallback = object : DiffUtil.ItemCallback() { + override fun areItemsTheSame(oldItem: MovieObject, newItem: MovieObject): Boolean { + return oldItem.id == newItem.id + } + + override fun areContentsTheSame(oldItem: MovieObject, newItem: MovieObject): Boolean { + return oldItem == newItem + } + } + + private val differ = AsyncListDiffer(this, diffCallback) + + var movies: List + get() = differ.currentList + set(value) = differ.submitList(value) + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MoviesViewHolder { + return MoviesViewHolder( + LayoutInflater.from(parent.context).inflate( + R.layout.item_movie, + parent, + false + ) + ) + } + + private var onItemClickListener: ((MovieObject) -> Unit)? = null + + fun setOnItemClickListener(listener: (MovieObject) -> Unit) { + onItemClickListener = listener + } + + override fun onBindViewHolder(holder: MoviesViewHolder, position: Int) { + val movie = movies[position] + holder.itemView.apply { + if (movie.imageBase64.isNullOrEmpty()) { + glide.load(movie.getPosterFullImage()).into(movieImage) + } else { + movieImage.setImageBitmap(movie.imageBase64!!.base64ToBitmap()) + } + + setOnClickListener { + onItemClickListener?.let { click -> + click(movie) + } + } + } + } + + override fun getItemCount(): Int { + return movies.size + } +} + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/movies/tmdb/adapters/ReviewsAdapter.kt b/app/src/main/java/com/movies/tmdb/adapters/ReviewsAdapter.kt new file mode 100644 index 00000000..a580f325 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/adapters/ReviewsAdapter.kt @@ -0,0 +1,81 @@ +package com.movies.tmdb.adapters + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.recyclerview.widget.AsyncListDiffer +import androidx.recyclerview.widget.DiffUtil +import androidx.recyclerview.widget.RecyclerView +import com.movies.tmdb.R +import com.movies.tmdb.data.remote.responses.ReviewObject +import kotlinx.android.synthetic.main.item_review.view.* +import javax.inject.Inject + + +class ReviewsAdapter@Inject constructor() : RecyclerView.Adapter() { + class ReviewsViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) + + private val diffCallback = object : DiffUtil.ItemCallback() { + override fun areItemsTheSame(oldItem: ReviewObject, newItem: ReviewObject): Boolean { + return oldItem.id == newItem.id + } + + override fun areContentsTheSame(oldItem: ReviewObject, newItem: ReviewObject): Boolean { + return oldItem.hashCode() == newItem.hashCode() + } + } + + private val differ = AsyncListDiffer(this, diffCallback) + + var reviews: List + get() = differ.currentList + set(value) = differ.submitList(value) + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ReviewsViewHolder { + return ReviewsViewHolder( + LayoutInflater.from(parent.context).inflate( + R.layout.item_review, + parent, + false + ) + ) + } + + private var onItemClickListener: ((ReviewObject) -> Unit)? = null + + fun setOnItemClickListener(listener: (ReviewObject) -> Unit) { + onItemClickListener = listener + } + + override fun onBindViewHolder(holder: ReviewsViewHolder, position: Int) { + val review = reviews[position] + holder.itemView.apply { + author.text = resources.getString(R.string.author, review.author) + reviewContent.text = review.content + setOnClickListener { + onItemClickListener?.let { click -> + click(review) + } + } + } + } + + override fun getItemCount(): Int { + return reviews.size + } +} + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/movies/tmdb/data/local/MoviesDao.kt b/app/src/main/java/com/movies/tmdb/data/local/MoviesDao.kt new file mode 100644 index 00000000..457dea81 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/data/local/MoviesDao.kt @@ -0,0 +1,24 @@ +package com.movies.tmdb.data.local + +import androidx.lifecycle.LiveData +import androidx.room.* +import com.movies.tmdb.data.remote.responses.MovieObject + +@Dao +interface MoviesDao { + + @Insert(onConflict = OnConflictStrategy.REPLACE) + suspend fun insertMovie(movieItem: MovieObject) + + @Query("DELETE FROM shopping_items WHERE id = :id") + suspend fun deleteMovie(id: Int) + + + @Query("SELECT * FROM shopping_items") + fun observeAllMovies(): LiveData> + + @Query("SELECT EXISTS (SELECT 1 FROM shopping_items WHERE id = :id)") + suspend fun isMovieExistsOffline(id: Int): Boolean + + +} \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/data/local/MoviesDatabase.kt b/app/src/main/java/com/movies/tmdb/data/local/MoviesDatabase.kt new file mode 100644 index 00000000..8ed007a5 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/data/local/MoviesDatabase.kt @@ -0,0 +1,14 @@ +package com.movies.tmdb.data.local + +import androidx.room.Database +import androidx.room.RoomDatabase +import com.movies.tmdb.data.remote.responses.MovieObject + +@Database( + entities = [MovieObject::class], + version = 1 +) +abstract class MoviesDatabase : RoomDatabase() { + + abstract fun moviesDao(): MoviesDao +} \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/data/remote/TmdbApi.kt b/app/src/main/java/com/movies/tmdb/data/remote/TmdbApi.kt new file mode 100644 index 00000000..270473b2 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/data/remote/TmdbApi.kt @@ -0,0 +1,50 @@ +package com.movies.tmdb.data.remote + +import com.movies.tmdb.data.remote.responses.MovieDetailsResponse +import com.movies.tmdb.data.remote.responses.MoviesResponse +import com.movies.tmdb.data.remote.responses.ReviewResponse +import com.movies.tmdb.other.Constants.API_KEY +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface TmdbApi { + + + + @GET("movie/top_rated") + suspend fun getTopRatedMovies( + @Query("page") page: Int, + @Query("api_key") apiKey: String = API_KEY + + ): Response + + + + @GET("movie/popular") + suspend fun getMostPopularMovies( + @Query("page") page: Int, + @Query("api_key") apiKey: String = API_KEY + + ): Response + + + @GET("movie/popular") + suspend fun getMovieDetails( + @Query("page") page: Int, + @Query("api_key") apiKey: String = API_KEY + + ): Response + + + + + @GET("movie/{movie_id}/reviews") + suspend fun getMovieReview( + @Path("movie_id") movieId:Int, + @Query("page") page: Int, + @Query("api_key") apiKey: String = API_KEY + + ): Response +} \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/data/remote/responses/IdAndNameObject.kt b/app/src/main/java/com/movies/tmdb/data/remote/responses/IdAndNameObject.kt new file mode 100644 index 00000000..c7bd4443 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/data/remote/responses/IdAndNameObject.kt @@ -0,0 +1,7 @@ +package com.movies.tmdb.data.remote.responses + + +data class IdAndNameObject( + var id: Int, + var name: String +) \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/data/remote/responses/MovieDetailsResponse.kt b/app/src/main/java/com/movies/tmdb/data/remote/responses/MovieDetailsResponse.kt new file mode 100644 index 00000000..e9b60f97 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/data/remote/responses/MovieDetailsResponse.kt @@ -0,0 +1,27 @@ +package com.movies.tmdb.data.remote.responses + +import com.google.gson.annotations.SerializedName +import com.movies.tmdb.other.Constants + + +class MovieDetailsResponse( + var adult: Boolean = false, + var id: Int, + var genres: List, + @SerializedName("original_title") + var originalTitle: String, + var overview: String, + @SerializedName("poster_path") + var posterPath: String, + @SerializedName("release_date") + var releaseDate: String, + var title: String, + var runtime: Float, + var status: String, + @SerializedName("vote_average") + var voteAverage: Float +) { + + fun getPosterFullImage(): String = Constants.BASE_FOR_FULL_IMAGE.plus(posterPath) + +} diff --git a/app/src/main/java/com/movies/tmdb/data/remote/responses/MovieObject.kt b/app/src/main/java/com/movies/tmdb/data/remote/responses/MovieObject.kt new file mode 100644 index 00000000..5377a08a --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/data/remote/responses/MovieObject.kt @@ -0,0 +1,34 @@ +package com.movies.tmdb.data.remote.responses + + +import android.os.Parcelable +import androidx.room.Entity +import androidx.room.PrimaryKey +import com.google.gson.annotations.SerializedName +import com.movies.tmdb.other.Constants +import kotlinx.android.parcel.Parcelize + +@Parcelize +@Entity(tableName = "shopping_items") +data class MovieObject( + var adult: Boolean = false, + @PrimaryKey + var id: Int, + @SerializedName("original_title") + var originalTitle: String, + var overview: String, + @SerializedName("poster_path") + var posterPath: String, + @SerializedName("release_date") + var releaseDate: String, + var title: String, + @SerializedName("vote_average") + var voteAverage: Float, + + var imageBase64: String? + +) : Parcelable { + fun getPosterThumb(): String = Constants.BASE_FOR_THUMB_IMAGE.plus(posterPath) + fun getPosterFullImage(): String = Constants.BASE_FOR_FULL_IMAGE.plus(posterPath) + +} \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/data/remote/responses/MoviesResponse.kt b/app/src/main/java/com/movies/tmdb/data/remote/responses/MoviesResponse.kt new file mode 100644 index 00000000..4d3409b5 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/data/remote/responses/MoviesResponse.kt @@ -0,0 +1,7 @@ +package com.movies.tmdb.data.remote.responses + + +data class MoviesResponse( + val results: List + +) \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/data/remote/responses/ReviewObject.kt b/app/src/main/java/com/movies/tmdb/data/remote/responses/ReviewObject.kt new file mode 100644 index 00000000..78c5542c --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/data/remote/responses/ReviewObject.kt @@ -0,0 +1,15 @@ +package com.movies.tmdb.data.remote.responses + + +import android.os.Parcelable +import com.google.gson.annotations.SerializedName +import kotlinx.android.parcel.Parcelize + +@Parcelize +data class ReviewObject( + var id: String, + var author: String, + var content: String, + @SerializedName("created_at") + var createdAt: String +): Parcelable \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/data/remote/responses/ReviewResponse.kt b/app/src/main/java/com/movies/tmdb/data/remote/responses/ReviewResponse.kt new file mode 100644 index 00000000..9152f0a8 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/data/remote/responses/ReviewResponse.kt @@ -0,0 +1,7 @@ +package com.movies.tmdb.data.remote.responses + + +data class ReviewResponse( + val results: List + +) \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/di/AppModule.kt b/app/src/main/java/com/movies/tmdb/di/AppModule.kt new file mode 100644 index 00000000..73f9757a --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/di/AppModule.kt @@ -0,0 +1,103 @@ +package com.movies.tmdb.di + +import android.content.Context +import androidx.room.Room +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions +import com.movies.tmdb.R +import com.movies.tmdb.data.local.MoviesDao +import com.movies.tmdb.data.local.MoviesDatabase +import com.movies.tmdb.data.remote.TmdbApi +import com.movies.tmdb.other.Constants.BASE_URL +import com.movies.tmdb.other.Constants.DATABASE_NAME +import com.movies.tmdb.repositories.DefaultMoviesRepository +import com.movies.tmdb.repositories.MoviesRepository +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.android.components.ApplicationComponent +import dagger.hilt.android.qualifiers.ApplicationContext +import okhttp3.OkHttpClient +import okhttp3.logging.HttpLoggingInterceptor +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import javax.inject.Singleton + +@Module +@InstallIn(ApplicationComponent::class) +object AppModule { + + @Singleton + @Provides + fun provideMoviesDatabase( + @ApplicationContext context: Context + ) = Room.databaseBuilder(context, MoviesDatabase::class.java, DATABASE_NAME).build() + + @Singleton + @Provides + fun provideDefaultMoviesRepository( + + dao: MoviesDao, + api: TmdbApi + ) = DefaultMoviesRepository(dao, api) as MoviesRepository + + + @Singleton + @Provides + fun providesHttpLoggingInterceptor() = HttpLoggingInterceptor() + .apply { + level = HttpLoggingInterceptor.Level.BODY + } + + @Singleton + @Provides + fun providesOkHttpClient(httpLoggingInterceptor: HttpLoggingInterceptor): OkHttpClient = + OkHttpClient + .Builder() + .addInterceptor(httpLoggingInterceptor) + .build() + + @Singleton + @Provides + fun provideGlideInstance( + @ApplicationContext context: Context + ) = Glide.with(context).setDefaultRequestOptions( + RequestOptions() + .placeholder(R.drawable.ic_image) + .error(R.drawable.ic_image) + ) + + @Singleton + @Provides + fun provideMoviesDao( + database: MoviesDatabase + ) = database.moviesDao() + + @Singleton + @Provides + fun provideTmdbApi(okHttpClient: OkHttpClient): TmdbApi { + return Retrofit.Builder() + .addConverterFactory(GsonConverterFactory.create()) + .client(okHttpClient) + .baseUrl(BASE_URL) + .build() + .create(TmdbApi::class.java) + } +} + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/movies/tmdb/other/Constants.kt b/app/src/main/java/com/movies/tmdb/other/Constants.kt new file mode 100644 index 00000000..ab851ce1 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/other/Constants.kt @@ -0,0 +1,25 @@ +package com.movies.tmdb.other + +object Constants { + + const val DATABASE_NAME = "movies_db" + + const val API_KEY = "d9e7589213d1b047222f2774b376c82a" + const val BASE_URL = "https://api.themoviedb.org/3/" + const val BASE_FOR_FULL_IMAGE = "https://image.tmdb.org/t/p/original" + const val BASE_FOR_THUMB_IMAGE = "https://image.tmdb.org/t/p/w500" + + + const val GRID_SPAN_COUNT = 2 + + + enum class FilterId(val filterId: Int) { + MOST_POPULAR(1), + TOP_RATED(2) + } + + enum class LanguageCode(val languageCode: String) { + SWEDEN("sv"), + ENGLISH("en") + } +} \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/other/Event.kt b/app/src/main/java/com/movies/tmdb/other/Event.kt new file mode 100644 index 00000000..18acfbaa --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/other/Event.kt @@ -0,0 +1,27 @@ +package com.movies.tmdb.other + +/** + * Used as a wrapper for data that is exposed via a LiveData that represents an event. + */ +open class Event(private val content: T) { + + var hasBeenHandled = false + private set // Allow external read but not write + + /** + * Returns the content and prevents its use again. + */ + fun getContentIfNotHandled(): T? { + return if (hasBeenHandled) { + null + } else { + hasBeenHandled = true + content + } + } + + /** + * Returns the content, even if it's already been handled. + */ + fun peekContent(): T = content +} diff --git a/app/src/main/java/com/movies/tmdb/other/Extensions.kt b/app/src/main/java/com/movies/tmdb/other/Extensions.kt new file mode 100644 index 00000000..66b9c872 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/other/Extensions.kt @@ -0,0 +1,64 @@ +package com.movies.tmdb.other + +import android.content.Context +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.net.ConnectivityManager +import android.net.NetworkCapabilities +import android.util.Base64 +import android.util.Log +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import androidx.core.app.ActivityCompat +import java.io.ByteArrayOutputStream +import java.util.* + + +object Extensions { + + + fun Bitmap.toBase64String(): String { + ByteArrayOutputStream().apply { + compress(Bitmap.CompressFormat.JPEG, 10, this) + return Base64.encodeToString(toByteArray(), Base64.DEFAULT) + } + } + + fun String.base64ToBitmap(): Bitmap? { + val imageAsBytes = Base64.decode(this.toByteArray(), Base64.DEFAULT) + return BitmapFactory.decodeByteArray(imageAsBytes, 0, imageAsBytes.size) + } + + fun Context.setAppLocale(language: String): Context { + val locale = Locale(language) + Locale.setDefault(locale) + val config = resources.configuration + config.setLocale(locale) + config.setLayoutDirection(locale) + return createConfigurationContext(config) + } + + fun Context.toast(message: String) { + Toast.makeText(this, message, Toast.LENGTH_LONG).show() + } + + fun Context.isOnline(): Boolean { + val connectivityManager = + getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + val capabilities = + connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork) + if (capabilities != null) { + if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) { + Log.i("Internet", "NetworkCapabilities.TRANSPORT_CELLULAR") + return true + } else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) { + Log.i("Internet", "NetworkCapabilities.TRANSPORT_WIFI") + return true + } else if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)) { + Log.i("Internet", "NetworkCapabilities.TRANSPORT_ETHERNET") + return true + } + } + return false + } +} \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/other/Resource.kt b/app/src/main/java/com/movies/tmdb/other/Resource.kt new file mode 100644 index 00000000..a305abea --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/other/Resource.kt @@ -0,0 +1,23 @@ +package com.movies.tmdb.other + +data class Resource(val status: Status, val data: T?, val message: String?) { + companion object { + fun success(data: T?): Resource { + return Resource(Status.SUCCESS, data, null) + } + + fun error(msg: String, data: T?): Resource { + return Resource(Status.ERROR, data, msg) + } + + fun loading(data: T?): Resource { + return Resource(Status.LOADING, data, null) + } + } +} + +enum class Status { + SUCCESS, + ERROR, + LOADING +} \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/repositories/DefaultMoviesRepository.kt b/app/src/main/java/com/movies/tmdb/repositories/DefaultMoviesRepository.kt new file mode 100644 index 00000000..af44a767 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/repositories/DefaultMoviesRepository.kt @@ -0,0 +1,106 @@ +package com.movies.tmdb.repositories + +import android.util.Log +import androidx.lifecycle.LiveData +import com.movies.tmdb.data.local.MoviesDao +import com.movies.tmdb.data.remote.TmdbApi +import com.movies.tmdb.data.remote.responses.MovieDetailsResponse +import com.movies.tmdb.data.remote.responses.MovieObject +import com.movies.tmdb.data.remote.responses.MoviesResponse +import com.movies.tmdb.data.remote.responses.ReviewResponse +import com.movies.tmdb.other.Constants +import com.movies.tmdb.other.Resource +import retrofit2.Response +import javax.inject.Inject + +class DefaultMoviesRepository @Inject constructor( + private val moviesDao: MoviesDao, + private val tmdbApi: TmdbApi +) : MoviesRepository { + + override suspend fun insertShoppingItem(shoppingItem: MovieObject) { + moviesDao.insertMovie(shoppingItem) + } + + override suspend fun deleteShoppingItem(id: Int) { + moviesDao.deleteMovie(id) + } + + override fun observeAllShoppingItems(): LiveData> { + return moviesDao.observeAllMovies() + } + + override suspend fun isMovieExistsOffline(id: Int): Boolean { + return moviesDao.isMovieExistsOffline(id) + } + + override suspend fun getListOfMovies(filterId: Int, page: Int): Resource { + return try { + var response: Response? = null + when (filterId) { + Constants.FilterId.TOP_RATED.filterId -> response = + tmdbApi.getTopRatedMovies(page) + Constants.FilterId.MOST_POPULAR.filterId -> response = + tmdbApi.getMostPopularMovies(page) + } + if (response!!.isSuccessful) { + response.body()?.let { + return@let Resource.success(it) + } ?: Resource.error("An unknown error occured", null) + } else { + Resource.error("An unknown error occured", null) + } + } catch (e: Exception) { + Log.e("EXCEPTION", "EXCEPTION:", e) + Resource.error("Couldn't reach the server. Check your internet connection", null) + } + } + + override suspend fun getMovieDetails(movieId: Int): Resource { + return try { + var response = tmdbApi.getMovieDetails(movieId) + + if (response.isSuccessful) { + response.body().let { + return@let Resource.success(it) + } ?: Resource.error("An unknown error occured", null) + } else { + Resource.error("An unknown error occured", null) + } + } catch (e: Exception) { + Log.e("EXCEPTION", "EXCEPTION:", e) + Resource.error("Couldn't reach the server. Check your internet connection", null) + } + } + + override suspend fun getMovieReviews(movieId: Int, page: Int): Resource { + return try { + var response = tmdbApi.getMovieReview(movieId, page) + + if (response.isSuccessful) { + response.body()?.let { + return@let Resource.success(it) + } ?: Resource.error("An unknown error occured", null) + } else { + Resource.error("An unknown error occured", null) + } + } catch (e: Exception) { + Log.e("EXCEPTION", "EXCEPTION:", e) + Resource.error("Couldn't reach the server. Check your internet connection", null) + } + } +} + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/movies/tmdb/repositories/MoviesRepository.kt b/app/src/main/java/com/movies/tmdb/repositories/MoviesRepository.kt new file mode 100644 index 00000000..bf151d5c --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/repositories/MoviesRepository.kt @@ -0,0 +1,21 @@ +package com.movies.tmdb.repositories + +import androidx.lifecycle.LiveData +import com.movies.tmdb.data.remote.responses.MovieDetailsResponse +import com.movies.tmdb.data.remote.responses.MovieObject +import com.movies.tmdb.data.remote.responses.MoviesResponse +import com.movies.tmdb.data.remote.responses.ReviewResponse +import com.movies.tmdb.other.Resource + +interface MoviesRepository { + + suspend fun insertShoppingItem(shoppingItem: MovieObject) + suspend fun deleteShoppingItem(id: Int) + fun observeAllShoppingItems(): LiveData> + suspend fun isMovieExistsOffline(id: Int): Boolean + + suspend fun getListOfMovies(filterId: Int, page: Int): Resource + suspend fun getMovieDetails(movieId: Int): Resource + suspend fun getMovieReviews(movieId: Int, page: Int): Resource + +} \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/ui/MainActivity.kt b/app/src/main/java/com/movies/tmdb/ui/MainActivity.kt new file mode 100644 index 00000000..389a86d0 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/ui/MainActivity.kt @@ -0,0 +1,50 @@ +package com.movies.tmdb.ui + +import android.graphics.drawable.ColorDrawable +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import android.view.Menu +import androidx.lifecycle.Observer +import androidx.lifecycle.ViewModelProvider +import androidx.navigation.NavController +import androidx.navigation.fragment.NavHostFragment +import androidx.navigation.ui.setupActionBarWithNavController +import com.movies.tmdb.R +import dagger.hilt.android.AndroidEntryPoint +import javax.inject.Inject + +@AndroidEntryPoint +class MainActivity : AppCompatActivity() { + + @Inject + lateinit var fragmentFactory: MoviesFragmentFactory + + private lateinit var navController: NavController + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + supportFragmentManager.fragmentFactory = fragmentFactory + setContentView(R.layout.activity_main) + + val navHostFragment = supportFragmentManager + .findFragmentById(R.id.navHostFragment) as NavHostFragment + navController = navHostFragment.navController + + setupActionBarWithNavController(navController) + + supportActionBar!!.setBackgroundDrawable(ColorDrawable(resources.getColor(R.color.accent))) + + + } + + override fun onSupportNavigateUp(): Boolean { + return navController.navigateUp() || super.onSupportNavigateUp() + } + + override fun onCreateOptionsMenu(menu: Menu): Boolean { + menuInflater.inflate(R.menu.app_bar_menu, menu) + return super.onCreateOptionsMenu(menu) + } + + +} \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/ui/MovieDetailsFragment.kt b/app/src/main/java/com/movies/tmdb/ui/MovieDetailsFragment.kt new file mode 100644 index 00000000..010efc96 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/ui/MovieDetailsFragment.kt @@ -0,0 +1,94 @@ +package com.movies.tmdb.ui + +import androidx.core.graphics.drawable.toBitmap +import androidx.lifecycle.Observer +import androidx.navigation.fragment.findNavController +import androidx.navigation.fragment.navArgs +import com.bumptech.glide.RequestManager +import com.movies.tmdb.R +import com.movies.tmdb.other.Extensions.base64ToBitmap +import com.movies.tmdb.other.Extensions.toBase64String +import dagger.hilt.android.AndroidEntryPoint +import kotlinx.android.synthetic.main.fragment_movie_details.* +import javax.inject.Inject + + +@AndroidEntryPoint +class MovieDetailsFragment @Inject constructor( + val glide: RequestManager +) : ParentFragment(R.layout.fragment_movie_details) { + + val args: MovieDetailsFragmentArgs by navArgs() + + override fun startViewActions() { + setViews() + + } + + + private fun saveMovieOffline() { + val selectedMovie = args.selectedMovie + selectedMovie.imageBase64 = movieImage.drawable.toBitmap().toBase64String() + viewModel.insertShoppingItemIntoDb(selectedMovie) + } + + private fun setViews() { + + + var selectedMovie = args.selectedMovie + + if (selectedMovie.imageBase64.isNullOrEmpty()) { + glide.load(selectedMovie.getPosterFullImage()) + .into(movieImage) + } else { + movieImage.setImageBitmap(selectedMovie.imageBase64!!.base64ToBitmap()) + + } + + showViewsButton.setOnClickListener { + + findNavController().navigate( + + MovieDetailsFragmentDirections.actionMovieDetailsFragmentToMovieReviewsFragment(args.selectedMovie.id) + ) + } + + movieName.text = selectedMovie.originalTitle + circle_progress_view.setProgressWithAnimation(selectedMovie.voteAverage * 10, 2000) + overViewDetails.text = selectedMovie.overview + + viewModel.isMovieExistOffline(selectedMovie.id) + viewModel.isMovieExist.observe(viewLifecycleOwner, Observer { + saveOfflineButton.isChecked = it + }) + + + saveOfflineButton.setOnCheckedChangeListener { compoundButton, b -> + + when (compoundButton.isChecked) { + true -> saveMovieOffline() + false -> viewModel.deleteShoppingItem(selectedMovie.id) + } + } + } +} + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/movies/tmdb/ui/MovieReviewDetailsFragment.kt b/app/src/main/java/com/movies/tmdb/ui/MovieReviewDetailsFragment.kt new file mode 100644 index 00000000..4d8f1727 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/ui/MovieReviewDetailsFragment.kt @@ -0,0 +1,28 @@ +package com.movies.tmdb.ui + +import androidx.navigation.fragment.navArgs +import com.movies.tmdb.R +import dagger.hilt.android.AndroidEntryPoint +import kotlinx.android.synthetic.main.item_review.* +import javax.inject.Inject + +@AndroidEntryPoint +class MovieReviewDetailsFragment @Inject constructor( + +) : ParentFragment(R.layout.fragment_review_details) { + + override fun startViewActions() { + + setViews() + + + } + + private fun setViews() { + val args: MovieReviewDetailsFragmentArgs by navArgs() + author.text = resources.getString(R.string.author, args.selectedReview.author) + + reviewContent.text = args.selectedReview.content + } + +} diff --git a/app/src/main/java/com/movies/tmdb/ui/MovieReviewsFragment.kt b/app/src/main/java/com/movies/tmdb/ui/MovieReviewsFragment.kt new file mode 100644 index 00000000..17c61b73 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/ui/MovieReviewsFragment.kt @@ -0,0 +1,120 @@ +package com.movies.tmdb.ui + +import android.view.View +import androidx.lifecycle.Observer +import androidx.navigation.fragment.findNavController +import androidx.navigation.fragment.navArgs +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.snackbar.Snackbar +import com.movies.tmdb.R +import com.movies.tmdb.adapters.ReviewsAdapter +import com.movies.tmdb.data.remote.responses.ReviewObject +import com.movies.tmdb.other.Extensions.toast +import com.movies.tmdb.other.Status +import dagger.hilt.android.AndroidEntryPoint +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_reviews_listing.* +import javax.inject.Inject + +@AndroidEntryPoint +class MovieReviewsFragment @Inject constructor( + val imageAdapter: ReviewsAdapter +) : ParentFragment(R.layout.fragment_reviews_listing) { + + + private var allReviews = mutableListOf() + + private var pageNum = 1 + var isLoading = false + + + val args: MovieReviewsFragmentArgs by navArgs() + + override fun startViewActions() { + + setupRecyclerView() + subscribeToObservers() + + + getMovieReviews() + + + imageAdapter.setOnItemClickListener { + findNavController().navigate( + MovieReviewsFragmentDirections.actionMovieReviewsFragmentToMovieReviewDetailsFragment( + it + ) + + ) + } + } + + + private fun getMovieReviews() { + viewModel.getMovieReviewsFromWeb(args.selectedMovieId, pageNum) + isLoading = true + } + + + private fun subscribeToObservers() { + viewModel.reviewsList.observe(viewLifecycleOwner, Observer { + it?.getContentIfNotHandled()?.let { result -> + isLoading = false + when (result.status) { + Status.SUCCESS -> { + progressBar.visibility = View.GONE + allReviews.addAll(result.data?.results!!) + if (allReviews.isEmpty()) { + requireContext().toast(getString(R.string.no_reviews)) + findNavController().popBackStack() + } else { + imageAdapter.reviews = allReviews + } + + + } + Status.ERROR -> { + Snackbar.make( + requireActivity().rootLayout, + result.message ?: "An unknown error occured.", + Snackbar.LENGTH_LONG + ).show() + progressBar.visibility = View.GONE + } + Status.LOADING -> { + progressBar.visibility = View.VISIBLE + } + } + } + }) + } + + private fun setupRecyclerView() { + val linearLayoutManger = LinearLayoutManager(requireContext()) + + rvData.apply { + adapter = imageAdapter + layoutManager = linearLayoutManger + } + + + rvData.addOnScrollListener(object : RecyclerView.OnScrollListener() { + override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { + val visibleItemCount = linearLayoutManger.childCount + val pastVisibleItem = linearLayoutManger.findFirstCompletelyVisibleItemPosition() + val total = imageAdapter.itemCount + + if (!isLoading) { + if ((visibleItemCount + pastVisibleItem) >= total) { + pageNum++ + getMovieReviews() + } + } + super.onScrolled(recyclerView, dx, dy) + } + }) + } + + +} diff --git a/app/src/main/java/com/movies/tmdb/ui/MoviesFragmentFactory.kt b/app/src/main/java/com/movies/tmdb/ui/MoviesFragmentFactory.kt new file mode 100644 index 00000000..a639bd5d --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/ui/MoviesFragmentFactory.kt @@ -0,0 +1,26 @@ +package com.movies.tmdb.ui + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentFactory +import com.bumptech.glide.RequestManager +import com.movies.tmdb.adapters.MoviesAdapter +import com.movies.tmdb.adapters.ReviewsAdapter +import javax.inject.Inject + +class MoviesFragmentFactory @Inject constructor( + private val imageAdapter: MoviesAdapter, + private val glide: RequestManager, + private val reviewsAdapter: ReviewsAdapter +) : FragmentFactory() { + + override fun instantiate(classLoader: ClassLoader, className: String): Fragment { + return when (className) { + MoviesListingFragment::class.java.name -> MoviesListingFragment(imageAdapter) + MovieDetailsFragment::class.java.name -> MovieDetailsFragment(glide) + MovieReviewsFragment::class.java.name -> MovieReviewsFragment(reviewsAdapter) + MovieReviewDetailsFragment::class.java.name -> MovieReviewDetailsFragment() + OfflineMoviesListingFragment::class.java.name -> OfflineMoviesListingFragment(imageAdapter) + else -> super.instantiate(classLoader, className) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/ui/MoviesListingFragment.kt b/app/src/main/java/com/movies/tmdb/ui/MoviesListingFragment.kt new file mode 100644 index 00000000..956768db --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/ui/MoviesListingFragment.kt @@ -0,0 +1,150 @@ +package com.movies.tmdb.ui + +import android.view.MenuItem +import android.view.View +import androidx.lifecycle.Observer +import androidx.navigation.fragment.findNavController +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.snackbar.Snackbar +import com.movies.tmdb.R +import com.movies.tmdb.adapters.MoviesAdapter +import com.movies.tmdb.data.remote.responses.MovieObject +import com.movies.tmdb.other.Constants +import com.movies.tmdb.other.Constants.GRID_SPAN_COUNT +import com.movies.tmdb.other.Extensions.isOnline +import com.movies.tmdb.other.Extensions.toast +import com.movies.tmdb.other.Status +import dagger.hilt.android.AndroidEntryPoint +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.fragment_movies_listing.* +import javax.inject.Inject + +@AndroidEntryPoint +class MoviesListingFragment @Inject constructor( + val imageAdapter: MoviesAdapter +) : ParentFragment(R.layout.fragment_movies_listing) { + + private var allMovies = mutableListOf() + + private var pageNum = 1 + var isLoading = false + + var selectedFilter = 0 + + + override fun startViewActions() { + + setupRecyclerView() + subscribeToObservers() + + selectedFilter = Constants.FilterId.MOST_POPULAR.filterId + getMoviesList() + + + imageAdapter.setOnItemClickListener { + findNavController().navigate( + + MoviesListingFragmentDirections.actionMoviesListingFragmentToMovieDetailsFragment( + selectedMovie = it + ) + ) + } + } + + + private fun getMoviesList() = if (requireActivity().isOnline()) { + viewModel.getMoviesListFromWeb(selectedFilter, pageNum) + isLoading = true + } else { + setViewTittle(getString(R.string.no_internet)) + requireContext().toast("No Internet connection please check internet connection") + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId) { + R.id.fav -> { + findNavController().navigate( + MoviesListingFragmentDirections.actionMoviesListingFragmentToOfflineMoviesListingFragment() + ) + return true + } + R.id.most_popular -> { + selectedFilter = Constants.FilterId.MOST_POPULAR.filterId + setViewTittle(getString(R.string.most_popular)) + allMovies.clear() + getMoviesList() + + return true + } + R.id.top_rated -> { + selectedFilter = Constants.FilterId.TOP_RATED.filterId + setViewTittle(getString(R.string.top_rated)) + allMovies.clear() + getMoviesList() + return true + } + } + return false + } + + private fun subscribeToObservers() { + + viewModel.moviesList.observe(this, Observer { + + isLoading = false + it.getContentIfNotHandled()?.let { result -> + + when (result.status) { + Status.SUCCESS -> { + allMovies.addAll(result.data?.results!!) + imageAdapter.movies = allMovies + progressBar.visibility = View.GONE + } + Status.ERROR -> { + Snackbar.make( + requireActivity().rootLayout, + result.message ?: "An unknown error occured.", + Snackbar.LENGTH_LONG + ).show() + progressBar.visibility = View.GONE + } + Status.LOADING -> { + progressBar.visibility = View.VISIBLE + } + } + } + }) + + } + + + + private fun setupRecyclerView() { + val gridLayoutManger = GridLayoutManager(requireContext(), GRID_SPAN_COUNT) + + rvData.apply { + adapter = imageAdapter + layoutManager = gridLayoutManger + } + + + rvData.addOnScrollListener(object : RecyclerView.OnScrollListener() { + override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { + val visibleItemCount = gridLayoutManger.childCount + val pastVisibleItem = gridLayoutManger.findFirstCompletelyVisibleItemPosition() + val total = imageAdapter.itemCount + + if (!isLoading) { + if ((visibleItemCount + pastVisibleItem) >= total) { + pageNum++ + getMoviesList() + } + } + super.onScrolled(recyclerView, dx, dy) + } + }) + } + + +} \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/ui/MoviesViewModel.kt b/app/src/main/java/com/movies/tmdb/ui/MoviesViewModel.kt new file mode 100644 index 00000000..679e06df --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/ui/MoviesViewModel.kt @@ -0,0 +1,78 @@ +package com.movies.tmdb.ui + +import androidx.hilt.lifecycle.ViewModelInject +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.movies.tmdb.data.remote.responses.MovieObject +import com.movies.tmdb.data.remote.responses.MoviesResponse +import com.movies.tmdb.data.remote.responses.ReviewResponse +import com.movies.tmdb.other.Event +import com.movies.tmdb.other.Resource +import com.movies.tmdb.repositories.MoviesRepository +import kotlinx.coroutines.launch + +class MoviesViewModel @ViewModelInject constructor( + private val repository: MoviesRepository +) : ViewModel() { + + val shoppingItems = repository.observeAllShoppingItems() + val isConnected = MutableLiveData() + + + private val _moviesList = MutableLiveData>>() + val moviesList: MutableLiveData>> = _moviesList + + + private val _reviewsList = MutableLiveData>>() + val reviewsList: LiveData>> = _reviewsList + + private val _isMovieExist = MutableLiveData() + val isMovieExist: MutableLiveData = _isMovieExist + + + fun insertShoppingItemIntoDb(shoppingItem: MovieObject) = viewModelScope.launch { + repository.insertShoppingItem(shoppingItem) + } + + fun deleteShoppingItem(id: Int) = viewModelScope.launch { + repository.deleteShoppingItem(id) + } + + + fun isMovieExistOffline(id: Int) = viewModelScope.launch { + _isMovieExist.value = repository.isMovieExistsOffline(id) + } + + + fun getMoviesListFromWeb(filterId: Int, page: Int) { + + _moviesList.value = Event(Resource.loading(null)) + viewModelScope.launch { + val response = repository.getListOfMovies(filterId, page) + _moviesList.value = Event(response) + } + } + + fun getMovieReviewsFromWeb(movieId: Int, page: Int) { + _reviewsList.value = Event(Resource.loading(null)) + viewModelScope.launch { + val response = repository.getMovieReviews(movieId, page) + _reviewsList.value = Event(response) + } + } +} + + + + + + + + + + + + + diff --git a/app/src/main/java/com/movies/tmdb/ui/OfflineMoviesListingFragment.kt b/app/src/main/java/com/movies/tmdb/ui/OfflineMoviesListingFragment.kt new file mode 100644 index 00000000..92e225c2 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/ui/OfflineMoviesListingFragment.kt @@ -0,0 +1,61 @@ +package com.movies.tmdb.ui + +import androidx.lifecycle.Observer +import androidx.navigation.fragment.findNavController +import androidx.recyclerview.widget.GridLayoutManager +import com.movies.tmdb.R +import com.movies.tmdb.adapters.MoviesAdapter +import com.movies.tmdb.other.Constants.GRID_SPAN_COUNT +import com.movies.tmdb.other.Extensions.toast +import dagger.hilt.android.AndroidEntryPoint +import kotlinx.android.synthetic.main.fragment_offline_movies.* +import javax.inject.Inject + +@AndroidEntryPoint +class OfflineMoviesListingFragment @Inject constructor( + val imageAdapter: MoviesAdapter +) : ParentFragment(R.layout.fragment_offline_movies) { + + + override fun startViewActions() { + + setupRecyclerView() + + + getMoviesList() + + + imageAdapter.setOnItemClickListener { + + findNavController().navigate( + OfflineMoviesListingFragmentDirections.actionOfflineMoviesListingFragmentToMovieDetailsFragment( + selectedMovie = it + ) + + ) + } + } + + + private fun getMoviesList() { + viewModel.shoppingItems.observe(viewLifecycleOwner, Observer { + if (it.isEmpty()) { + requireContext().toast(getString(R.string.no_saved)) + findNavController().popBackStack() + } else { + imageAdapter.movies = viewModel.shoppingItems.value!! + } + + }) + } + + + private fun setupRecyclerView() { + val gridLayoutManger = GridLayoutManager(requireContext(), GRID_SPAN_COUNT) + + rvData.apply { + adapter = imageAdapter + layoutManager = gridLayoutManger + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/movies/tmdb/ui/ParentFragment.kt b/app/src/main/java/com/movies/tmdb/ui/ParentFragment.kt new file mode 100644 index 00000000..4d8e9c77 --- /dev/null +++ b/app/src/main/java/com/movies/tmdb/ui/ParentFragment.kt @@ -0,0 +1,100 @@ +package com.movies.tmdb.ui + +import android.os.Bundle +import android.view.* +import androidx.appcompat.app.AppCompatActivity +import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider +import com.movies.tmdb.R + + +abstract class ParentFragment(val layout: Int) : Fragment(layout) { + + + lateinit var viewModel: MoviesViewModel + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setHasOptionsMenu(true) + + } + + abstract fun startViewActions() + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + + return super.onCreateView(inflater, container, savedInstanceState) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + + super.onViewCreated(view, savedInstanceState) + + viewModel = ViewModelProvider(this).get(MoviesViewModel::class.java) + setAppBaeTittle() + startViewActions() + + } + + + private fun setAppBaeTittle() { + when (layout) { + R.layout.fragment_movies_listing -> setViewTittle(getString(R.string.most_popular)) + R.layout.fragment_movie_details -> setViewTittle(getString(R.string.movie_details)) + R.layout.fragment_reviews_listing -> setViewTittle(getString(R.string.reviews)) + R.layout.fragment_review_details -> setViewTittle(getString(R.string.review_details)) + R.layout.fragment_offline_movies -> setViewTittle(getString(R.string.likes)) + } + } + + fun setViewTittle(title:String) + { + (activity as AppCompatActivity?)!!.supportActionBar!!.title =title + } + + override fun onPrepareOptionsMenu(menu: Menu) { + when (layout) { + R.layout.fragment_movies_listing -> hideShowBarIcons(true, menu) + else -> { + hideShowBarIcons(false, menu) + } + } + + super.onPrepareOptionsMenu(menu) + } + + + /** + * @param hideIcons variable to show or hide the icons , false will hide icons else will show icons. + */ + + private fun hideShowBarIcons(hideIcons: Boolean, menu: Menu) { + menu.findItem(R.id.fav).isVisible = hideIcons + menu.findItem(R.id.filter).isVisible = hideIcons + } + + +} + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable-anydpi/ic_duration.xml b/app/src/main/res/drawable-anydpi/ic_duration.xml new file mode 100644 index 00000000..e8fe14cb --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_duration.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable-anydpi/ic_fav_active.xml b/app/src/main/res/drawable-anydpi/ic_fav_active.xml new file mode 100644 index 00000000..8a3a2423 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_fav_active.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable-anydpi/ic_fav_in_active.xml b/app/src/main/res/drawable-anydpi/ic_fav_in_active.xml new file mode 100644 index 00000000..3d80842f --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_fav_in_active.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable-anydpi/ic_fav_in_active_white.xml b/app/src/main/res/drawable-anydpi/ic_fav_in_active_white.xml new file mode 100644 index 00000000..cacba1f7 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_fav_in_active_white.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable-anydpi/ic_filter.xml b/app/src/main/res/drawable-anydpi/ic_filter.xml new file mode 100644 index 00000000..a2a0eb88 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_filter.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable-hdpi/ic_duration.png b/app/src/main/res/drawable-hdpi/ic_duration.png new file mode 100644 index 00000000..5267f42b Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_duration.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_fav_active.png b/app/src/main/res/drawable-hdpi/ic_fav_active.png new file mode 100644 index 00000000..11b3944e Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_fav_active.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_fav_in_active.png b/app/src/main/res/drawable-hdpi/ic_fav_in_active.png new file mode 100644 index 00000000..2a62480f Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_fav_in_active.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_fav_in_active_white.png b/app/src/main/res/drawable-hdpi/ic_fav_in_active_white.png new file mode 100644 index 00000000..474dc58a Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_fav_in_active_white.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_filter.png b/app/src/main/res/drawable-hdpi/ic_filter.png new file mode 100644 index 00000000..e355fa50 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_filter.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_duration.png b/app/src/main/res/drawable-mdpi/ic_duration.png new file mode 100644 index 00000000..cf529f23 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_duration.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_fav_active.png b/app/src/main/res/drawable-mdpi/ic_fav_active.png new file mode 100644 index 00000000..bf935f60 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_fav_active.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_fav_in_active.png b/app/src/main/res/drawable-mdpi/ic_fav_in_active.png new file mode 100644 index 00000000..b17e3080 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_fav_in_active.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_fav_in_active_white.png b/app/src/main/res/drawable-mdpi/ic_fav_in_active_white.png new file mode 100644 index 00000000..cc1679fe Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_fav_in_active_white.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_filter.png b/app/src/main/res/drawable-mdpi/ic_filter.png new file mode 100644 index 00000000..5abe76a0 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_filter.png differ diff --git a/app/src/main/res/drawable-v24/ic_add.xml b/app/src/main/res/drawable-v24/ic_add.xml new file mode 100644 index 00000000..eb232541 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_add.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable-v24/ic_image.xml b/app/src/main/res/drawable-v24/ic_image.xml new file mode 100644 index 00000000..8232c4de --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_image.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 00000000..2b068d11 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/like_selector.xml b/app/src/main/res/drawable-v24/like_selector.xml new file mode 100644 index 00000000..562092d5 --- /dev/null +++ b/app/src/main/res/drawable-v24/like_selector.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/ic_duration.png b/app/src/main/res/drawable-xhdpi/ic_duration.png new file mode 100644 index 00000000..a90a4c29 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_duration.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_fav_active.png b/app/src/main/res/drawable-xhdpi/ic_fav_active.png new file mode 100644 index 00000000..c586c18d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_fav_active.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_fav_in_active.png b/app/src/main/res/drawable-xhdpi/ic_fav_in_active.png new file mode 100644 index 00000000..33e217ef Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_fav_in_active.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_fav_in_active_white.png b/app/src/main/res/drawable-xhdpi/ic_fav_in_active_white.png new file mode 100644 index 00000000..5a4b77c0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_fav_in_active_white.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_filter.png b/app/src/main/res/drawable-xhdpi/ic_filter.png new file mode 100644 index 00000000..5ee4268d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_filter.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_duration.png b/app/src/main/res/drawable-xxhdpi/ic_duration.png new file mode 100644 index 00000000..cadbe9ac Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_duration.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_fav_active.png b/app/src/main/res/drawable-xxhdpi/ic_fav_active.png new file mode 100644 index 00000000..d6d66709 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_fav_active.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_fav_in_active.png b/app/src/main/res/drawable-xxhdpi/ic_fav_in_active.png new file mode 100644 index 00000000..2c48c5da Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_fav_in_active.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_fav_in_active_white.png b/app/src/main/res/drawable-xxhdpi/ic_fav_in_active_white.png new file mode 100644 index 00000000..fc06011c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_fav_in_active_white.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_filter.png b/app/src/main/res/drawable-xxhdpi/ic_filter.png new file mode 100644 index 00000000..78e0bda2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_filter.png differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..07d5da9c --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/font/poppins_regular.ttf b/app/src/main/res/font/poppins_regular.ttf new file mode 100644 index 00000000..441d3baa Binary files /dev/null and b/app/src/main/res/font/poppins_regular.ttf differ 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 00000000..88d46f4e --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_movie_details.xml b/app/src/main/res/layout/fragment_movie_details.xml new file mode 100644 index 00000000..7e8bb302 --- /dev/null +++ b/app/src/main/res/layout/fragment_movie_details.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_movies_listing.xml b/app/src/main/res/layout/fragment_movies_listing.xml new file mode 100644 index 00000000..52d997cf --- /dev/null +++ b/app/src/main/res/layout/fragment_movies_listing.xml @@ -0,0 +1,33 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_offline_movies.xml b/app/src/main/res/layout/fragment_offline_movies.xml new file mode 100644 index 00000000..52d997cf --- /dev/null +++ b/app/src/main/res/layout/fragment_offline_movies.xml @@ -0,0 +1,33 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_review_details.xml b/app/src/main/res/layout/fragment_review_details.xml new file mode 100644 index 00000000..f621056d --- /dev/null +++ b/app/src/main/res/layout/fragment_review_details.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_reviews_listing.xml b/app/src/main/res/layout/fragment_reviews_listing.xml new file mode 100644 index 00000000..52d997cf --- /dev/null +++ b/app/src/main/res/layout/fragment_reviews_listing.xml @@ -0,0 +1,33 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_movie.xml b/app/src/main/res/layout/item_movie.xml new file mode 100644 index 00000000..58ca61d1 --- /dev/null +++ b/app/src/main/res/layout/item_movie.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_review.xml b/app/src/main/res/layout/item_review.xml new file mode 100644 index 00000000..4d24249d --- /dev/null +++ b/app/src/main/res/layout/item_review.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_shopping.xml b/app/src/main/res/layout/item_shopping.xml new file mode 100644 index 00000000..90731271 --- /dev/null +++ b/app/src/main/res/layout/item_shopping.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/app_bar_menu.xml b/app/src/main/res/menu/app_bar_menu.xml new file mode 100644 index 00000000..6c15b554 --- /dev/null +++ b/app/src/main/res/menu/app_bar_menu.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 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 00000000..a00a3762 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml new file mode 100644 index 00000000..8246779b --- /dev/null +++ b/app/src/main/res/navigation/nav_graph.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 00000000..fa4ca9b8 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,17 @@ + + + + + + + #448AFF + #448AFF + #D1C4E9 + #448AFF + #212121 + #757575 + #FFFFFF + #BDBDBD + #8D000000 + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 00000000..a2ef7101 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,22 @@ + + Movies + Filter + Language + Trending + Most Popular Movies + No Internet connection + No Reviews for this film + No saved movies + + + High Rated Movies + View reviews + User Score + Reviews + A review by %1$s. + Written by %1$s on %2$s + Review Details + Movie Details + Likes + Overview + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..49026db2 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/test/java/com/movies/tmdb/ExampleUnitTest.kt b/app/src/test/java/com/movies/tmdb/ExampleUnitTest.kt new file mode 100644 index 00000000..1a7c3c55 --- /dev/null +++ b/app/src/test/java/com/movies/tmdb/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.movies.tmdb + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..5e879e3d --- /dev/null +++ b/build.gradle @@ -0,0 +1,28 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +buildscript { + ext.kotlin_version = "1.3.72" + repositories { + google() + jcenter() + } + dependencies { + classpath "com.android.tools.build:gradle:4.0.1" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.0" + classpath "com.google.dagger:hilt-android-gradle-plugin:2.28.3-alpha" + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + maven { url 'https://jitpack.io' } + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..98bed167 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,21 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app"s APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..f6b961fd Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..17c24773 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Dec 28 14:32:15 EET 2021 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..cccdd3d5 --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..f9553162 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@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 + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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= + +@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 Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_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=%* + +: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/settings.gradle b/settings.gradle new file mode 100644 index 00000000..262e27eb --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +include ':app' +rootProject.name = "MovieApp" \ No newline at end of file