diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2b75303 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +*.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 diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..34dc27c --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7ac24c7 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..37a7509 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 783cc4c..fc9fd7c 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,29 @@ -# Github Test +# Movies App -Eae Candidato! +This app allows you to view a list of movies, series, and favorites, and view more details of each item -Este desafio consiste em identificar seu nível de conforto com desenvolvimento para Android, portanto esperamos que você tente resolve-lo usando toda a sua capacidade e conhecimento da tecnologia. +# Omdb API -O Desafio Android é o seguinte: +The queries and requests were made using the Omdb API +http://www.omdbapi.com/ -Monte um aplicativo para Android, utilizando Java ou Kotlin (Escolha qualquer um não faz diferença), que consuma uma API REST e mostre uma lista de dados, ao clicar em um dos itens desta lista, uma segunda tela é mostrada contendo mais informações sobre aquele item. +# Tools, Components and Architecture used -Tente colocar ao máximo todos os recursos técnicos que você conhece, quando se trata de padrão de arquitetura, boas práticas de código, novas bibliotecas nativas do Android etc. Mas não se esqueça que nosso grande e querido usuário não vê as rotinas assíncronas majestosas que todos nós escrevemos, sendo assim, tente criar uma interface bem legal, objetiva e agradável. Colocamos também um link para um repositório no Zeplin contendo uma sugestão de interface. +BottomNavigationView +https://developer.android.com/reference/android/support/design/widget/BottomNavigationView -Você deve fazer um Fork deste repositório e solicitar um Pull Request, com seu nome completo na descrição, para nossa avaliação. +CardView +https://developer.android.com/guide/topics/ui/layout/cardview -Recomendamos algumas API’s abertas e gratuitas para estes teste, porém isto é apenas uma recomendação, se sinta livre para fazer outra escolha e nos surpreender ;). +CollapsingToolbar +https://material.io/develop/android/components/collapsing-toolbar-layout/ -# API’s -## The Open Movie Database - [OMDb API - The Open Movie Database](http://www.omdbapi.com/) -## Unsplash -[Unsplash Image API | Free HD Photo API](https://unsplash.com/developers) +RecyclerView +https://developer.android.com/guide/topics/ui/layout/recyclerview -# Design - Zeplin -E-mail - buildbox.mobileguest@gmail.com -Senha - JhZ5dAPG +Retrofit +https://square.github.io/retrofit/ -[Zeplin](https://app.zeplin.io/login) - -![footer](https://miro.medium.com/max/480/1*jA64NTovT-efZ96tcq-X5g.png) +MVVM +https://medium.com/brq-techblog/android-mvvm-e-databinding-fd4595e271c9 \ 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..461a3bd --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,71 @@ +apply plugin: 'com.android.application' + +apply plugin: 'kotlin-android' + +apply plugin: 'kotlin-android-extensions' + +apply plugin: 'kotlin-kapt' + +android { + compileSdkVersion 28 + defaultConfig { + applicationId "com.example.movies" + minSdkVersion 21 + targetSdkVersion 28 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + def nav_version = "1.0.0-rc02" + def lifecycle_version = "2.0.0" + def room_version = "2.1.0-alpha04" + + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.1.0-alpha02' + implementation 'androidx.core:core-ktx:1.1.0-alpha04' + + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + + //material components + implementation 'com.google.android.material:material:1.0.0' + //navigation + implementation "android.arch.navigation:navigation-fragment-ktx:$nav_version" // use -ktx for Kotlin + implementation "android.arch.navigation:navigation-ui-ktx:$nav_version" // use -ktx for Kotlin + //Viewmodel and Livedata + implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version" + //Room Database + implementation "androidx.room:room-runtime:$room_version" + implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01' + implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0-beta01' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0' + kapt "androidx.room:room-compiler:$room_version" + //Koin + implementation 'org.koin:koin-android-viewmodel:1.0.2' + //Retrofit and Gson + implementation 'com.squareup.retrofit2:converter-gson:2.5.0' + implementation 'com.squareup.retrofit2:retrofit:2.5.0' + + //Glide + implementation 'com.github.bumptech.glide:glide:4.4.0' + kapt 'com.github.bumptech.glide:compiler:4.4.0' + + implementation 'com.android.support:design:28.1.0' + + implementation 'com.android.support:cardview-v7:28.0.+' + + implementation 'androidx.vectordrawable:vectordrawable:1.1.0-alpha01' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test:runner:1.1.2-alpha01' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.2-alpha01' + implementation 'androidx.cardview:cardview:1.0.0' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /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 diff --git a/app/src/androidTest/java/com/example/movies/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/movies/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..0d7ed7c --- /dev/null +++ b/app/src/androidTest/java/com/example/movies/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.example.movies + +import androidx.test.InstrumentationRegistry +import androidx.test.runner.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.getTargetContext() + assertEquals("com.example.movies", appContext.packageName) + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..5404ba6 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/movies/MyApplication.kt b/app/src/main/java/com/example/movies/MyApplication.kt new file mode 100644 index 0000000..559b994 --- /dev/null +++ b/app/src/main/java/com/example/movies/MyApplication.kt @@ -0,0 +1,14 @@ +package com.example.movies + +import android.app.Application +import com.example.movies.dependencies_injection.DiModules +import org.koin.android.ext.android.startKoin + +class MyApplication: Application() { + + override fun onCreate() { + super.onCreate() + + startKoin(this, listOf(DiModules.appModule)) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/movies/api/OmdbInstance.kt b/app/src/main/java/com/example/movies/api/OmdbInstance.kt new file mode 100644 index 0000000..83c82e8 --- /dev/null +++ b/app/src/main/java/com/example/movies/api/OmdbInstance.kt @@ -0,0 +1,21 @@ +package com.example.movies.api + +import com.example.movies.api.interfaces.GetMovieDataService +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + +class OmdbInstance { + private var retrofit: Retrofit? = null + fun getOmdbInstance(): Retrofit { + if (retrofit == null) { + retrofit = retrofit2.Retrofit.Builder() + .baseUrl("http://www.omdbapi.com/") + .addConverterFactory(GsonConverterFactory.create()) + .build() + } + return retrofit!! + } + + fun movieService() = getOmdbInstance().create(GetMovieDataService::class.java) + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/movies/api/interfaces/GetMovieDataService.kt b/app/src/main/java/com/example/movies/api/interfaces/GetMovieDataService.kt new file mode 100644 index 0000000..376c608 --- /dev/null +++ b/app/src/main/java/com/example/movies/api/interfaces/GetMovieDataService.kt @@ -0,0 +1,17 @@ +package com.example.movies.api.interfaces + +import com.example.movies.data.Movie +import com.example.movies.data.MovieList +import retrofit2.Call +import retrofit2.http.GET +import retrofit2.http.Query + +interface GetMovieDataService { + + @GET("/") + abstract fun list(@Query("s") s: String, @Query("apikey") apikey: String, @Query("type") type: String): Call + @GET("/") + abstract fun detail(@Query("i") s: String, @Query("apikey") apikey: String): Call + + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/movies/data/Database.kt b/app/src/main/java/com/example/movies/data/Database.kt new file mode 100644 index 0000000..c608f31 --- /dev/null +++ b/app/src/main/java/com/example/movies/data/Database.kt @@ -0,0 +1,51 @@ +package com.example.movies.data + +import android.util.Log +import androidx.lifecycle.MutableLiveData +import com.example.movies.api.OmdbInstance +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class Database { + + val call = OmdbInstance().movieService() + + + private val dataMovieList: MutableLiveData> = MutableLiveData() + private val dataMovieDetail: MutableLiveData = MutableLiveData() + + fun insertMovies(s: String, apikey: String, type: String): MutableLiveData> { + call.list(s,apikey,type).clone().enqueue(object : Callback { + + override fun onResponse(call: Call, response: Response) { + Log.d("OnResponse","RESPONSE") + dataMovieList.postValue(response.body()?.getSearch()) + } + + override fun onFailure(call: Call, t: Throwable) { + Log.d("OnFail","error" + t.message) + } + }) + + return dataMovieList + } + + fun insertMovieDetail (i: String, apikey: String) : MutableLiveData + { + call.detail(i,apikey).clone().enqueue(object : Callback { + override fun onResponse(call: Call, response: Response) { + Log.d("OnResponseDetail","RESPONSE") + dataMovieDetail.postValue(response.body()) + } + + override fun onFailure(call: Call, t: Throwable) { + Log.d("OnFailDetail","FAILED") + } + + }) + + return dataMovieDetail + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/movies/data/Movie.kt b/app/src/main/java/com/example/movies/data/Movie.kt new file mode 100644 index 0000000..c88bfe5 --- /dev/null +++ b/app/src/main/java/com/example/movies/data/Movie.kt @@ -0,0 +1,69 @@ +package com.example.movies.data + +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName + +class Movie { + @SerializedName("Title") + @Expose + private var title: String? = null + + @SerializedName("Poster") + @Expose + private var poster: String? = null + + @SerializedName("Year") + @Expose + private var year: String? = null + + @SerializedName("Type") + @Expose + private var type: String? = null + + @SerializedName("imdbID") + @Expose + private var imdbid: String? = null + + @SerializedName("Plot") + @Expose + private var plot: String? = null + + fun setTitle(Title: String) { + title = Title + } + + fun getTitle() = title + + + fun setPoster(Poster: String) { + poster = Poster + } + + fun getPoster() = poster + + fun setYear(Year: String) { + year = Year + } + + fun getYear() = year + + fun setType(Type: String) { + type = Type + } + + fun getType() = type + + fun setImdbid(Imdbid: String) { + imdbid = Imdbid + } + + fun getImdbid() = imdbid + + fun setPlot(Plot: String) { + plot = Plot + } + + fun getPlot() = plot + + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/movies/data/MovieList.kt b/app/src/main/java/com/example/movies/data/MovieList.kt new file mode 100644 index 0000000..5513296 --- /dev/null +++ b/app/src/main/java/com/example/movies/data/MovieList.kt @@ -0,0 +1,17 @@ +package com.example.movies.data + +import com.google.gson.annotations.Expose +import com.google.gson.annotations.SerializedName + +class MovieList { + @SerializedName("Search") + @Expose + private var search: List? = null + + fun setSearch(Search: List){ + search = Search + } + + fun getSearch() = search + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/movies/data/MovieManager.kt b/app/src/main/java/com/example/movies/data/MovieManager.kt new file mode 100644 index 0000000..1e9d0b1 --- /dev/null +++ b/app/src/main/java/com/example/movies/data/MovieManager.kt @@ -0,0 +1,15 @@ +package com.example.movies.data + + + +class MovieManager(val database: Database) { + + fun getMovies(s: String, apikey: String, type: String) = database.insertMovies(s,apikey,type) + + + fun getMovieDetail (i: String, apikey: String) = database.insertMovieDetail(i,apikey) + + +} + + diff --git a/app/src/main/java/com/example/movies/dependencies_injection/DiModules.kt b/app/src/main/java/com/example/movies/dependencies_injection/DiModules.kt new file mode 100644 index 0000000..341ac83 --- /dev/null +++ b/app/src/main/java/com/example/movies/dependencies_injection/DiModules.kt @@ -0,0 +1,19 @@ +package com.example.movies.dependencies_injection + +import com.example.movies.data.Database +import com.example.movies.data.MovieManager +import com.example.movies.viewmodels.MoviesViewModel +import org.koin.android.viewmodel.ext.koin.viewModel +import org.koin.dsl.module.module + +object DiModules { + + val appModule = module { + + single { Database() } + + factory { MovieManager(get()) } + + viewModel { MoviesViewModel(get()) } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/movies/ui/DownloadImage.kt b/app/src/main/java/com/example/movies/ui/DownloadImage.kt new file mode 100644 index 0000000..54c0065 --- /dev/null +++ b/app/src/main/java/com/example/movies/ui/DownloadImage.kt @@ -0,0 +1,28 @@ +package com.example.movies.ui + +import android.graphics.Bitmap +import android.graphics.BitmapFactory +import android.os.AsyncTask +import android.util.Log +import android.widget.ImageView + +class DownloadImageWithURLTask(var bmImage: ImageView) : AsyncTask() { + + override fun doInBackground(vararg urls: String): Bitmap? { + val pathToFile = urls[0] + var bitmap: Bitmap? = null + try { + val `in` = java.net.URL(pathToFile).openStream() + + bitmap = BitmapFactory.decodeStream(`in`) + } catch (e: Exception) { + Log.e("Error", e.message) + e.printStackTrace() + } + return bitmap + } + + override fun onPostExecute(result: Bitmap) { + bmImage.setImageBitmap(result) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/movies/ui/activites/MainActivity.kt b/app/src/main/java/com/example/movies/ui/activites/MainActivity.kt new file mode 100644 index 0000000..88ba0ad --- /dev/null +++ b/app/src/main/java/com/example/movies/ui/activites/MainActivity.kt @@ -0,0 +1,83 @@ +package com.example.movies.ui.activites + +import android.content.pm.ActivityInfo +import android.os.Bundle +import android.view.LayoutInflater +import android.view.MenuItem +import androidx.appcompat.app.AlertDialog +import com.google.android.material.bottomnavigation.BottomNavigationView +import androidx.appcompat.app.AppCompatActivity +import androidx.fragment.app.FragmentTransaction +import com.example.movies.R +import com.example.movies.ui.fragments.* +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.dialog_search.view.* + +class MainActivity : AppCompatActivity() { + + private val mOnNavigationItemSelectedListener = BottomNavigationView.OnNavigationItemSelectedListener { item -> + when (item.itemId) { + R.id.navigation_movies -> { + val movieFragment = MovieFragment() + val transaction : FragmentTransaction + transaction = supportFragmentManager.beginTransaction().replace(R.id.fragment_content, movieFragment) + transaction.addToBackStack(null).commit() + item.setCheckable(true) + return@OnNavigationItemSelectedListener true + } + R.id.navigation_series -> { + val seriesFragment = SeriesFragment() + val transaction : FragmentTransaction + transaction = supportFragmentManager.beginTransaction().replace(R.id.fragment_content, seriesFragment) + transaction.addToBackStack(null).commit() + item.setCheckable(true) + return@OnNavigationItemSelectedListener true + } + R.id.navigation_favorites -> { + val favoriteFragment = FavoriteFragment() + val transaction : FragmentTransaction + transaction = supportFragmentManager.beginTransaction().replace(R.id.fragment_content, favoriteFragment) + transaction.addToBackStack(null).commit() + return@OnNavigationItemSelectedListener true + } + } + false + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener) + navigation.selectedItemId = R.id.navigation_movies + requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT + + } + + private fun dialogSearchMovie() { + val layout = LayoutInflater.from(this).inflate(R.layout.dialog_search, null, false) + val title = layout.input_title + val dialog = AlertDialog.Builder(this) + dialog.setView(layout) + dialog.setNegativeButton("Cancel", null) + dialog.setPositiveButton("OK") {d, i -> + val title_recieved = title.text.toString() + val bundle = Bundle() + bundle.putString("title_recived", title_recieved) + val moviesSearchedFragment = MoviesSearchedFragment() + moviesSearchedFragment.arguments = bundle + val transaction : FragmentTransaction + transaction = supportFragmentManager.beginTransaction().replace(R.id.fragment_content, moviesSearchedFragment) + transaction.commit() + } + dialog.create().show() + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId){ + android.R.id.home -> onBackPressed() + } + return super.onOptionsItemSelected(item) + } + + +} diff --git a/app/src/main/java/com/example/movies/ui/adapters/MoviesAdapter.kt b/app/src/main/java/com/example/movies/ui/adapters/MoviesAdapter.kt new file mode 100644 index 0000000..4d82bcc --- /dev/null +++ b/app/src/main/java/com/example/movies/ui/adapters/MoviesAdapter.kt @@ -0,0 +1,76 @@ +package com.example.movies.ui.adapters + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity +import androidx.fragment.app.FragmentTransaction +import androidx.recyclerview.widget.RecyclerView +import com.example.movies.data.Movie +import com.example.movies.R +import kotlinx.android.synthetic.main.item_movie.view.* +import com.example.movies.ui.DownloadImageWithURLTask +import com.example.movies.ui.fragments.MovieDetails + + +class MoviesViewHolder(val view: View): RecyclerView.ViewHolder(view){ + fun bindView(item: Movie){ + with(view){ + var downloadImage = DownloadImageWithURLTask(iv_movie) + if (item.getPoster() != "N/A") + downloadImage.execute(item.getPoster()) + else + downloadImage.execute("https://t3.ftcdn.net/jpg/01/09/49/08/240_F_109490811_fDzc0dpSLS0TmoNu4WP34aozBcI6FKZl.jpg") + tv_movie.text = item.getTitle() + tv_type.text = item.getType() + + + } + } + +} +class MoviesAdapter(val data: MutableList = mutableListOf()): RecyclerView.Adapter(){ + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MoviesViewHolder { + val view = LayoutInflater.from(parent.context).inflate(R.layout.item_movie, parent, false) + return MoviesViewHolder(view) + } + + override fun getItemCount(): Int = data.size + + override fun onBindViewHolder(holder: MoviesViewHolder, position: Int) { + holder.bindView(data[position]) + holder.view.setOnClickListener() { + val bundle = Bundle() + bundle.putString("imdbid_recived", data[position].getImdbid()) + val movieDetails = MovieDetails() + movieDetails.arguments = bundle + val activity = it.context as AppCompatActivity + val transaction : FragmentTransaction + transaction = activity.supportFragmentManager.beginTransaction().replace(R.id.fragment_content, movieDetails) + transaction.addToBackStack(null).commit() + + + } + + + + } + + fun add(item: List){ + data.clear() + data.addAll(item) + notifyDataSetChanged() + } + + fun add(item: Movie){ + data.add(item) + notifyDataSetChanged() + } + + fun remove (item: Movie){ + data.remove(item) + notifyDataSetChanged() + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/movies/ui/fragments/FavoriteFragment.kt b/app/src/main/java/com/example/movies/ui/fragments/FavoriteFragment.kt new file mode 100644 index 0000000..dafecfe --- /dev/null +++ b/app/src/main/java/com/example/movies/ui/fragments/FavoriteFragment.kt @@ -0,0 +1,53 @@ +package com.example.movies.ui.fragments + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.Toast +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.GridLayoutManager + +import com.example.movies.R +import com.example.movies.ui.adapters.MoviesAdapter +import com.example.movies.viewmodels.MoviesViewModel +import kotlinx.android.synthetic.main.movie_fragment.* +import org.koin.android.viewmodel.ext.android.viewModel + +class FavoriteFragment : Fragment() { + + companion object { + fun newInstance() = FavoriteFragment() + } + + private val moviesViewModel: MoviesViewModel by viewModel() + val moviesAdapter: MoviesAdapter by lazy { + MoviesAdapter() + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(R.layout.movie_fragment, container, false) + } + + override fun onActivityCreated(savedInstanceState: Bundle?) { + super.onActivityCreated(savedInstanceState) + + recycler_view.layoutManager = GridLayoutManager(activity, 2) + moviesViewModel.loadMovies("batman","d2e11186", "movie") + moviesViewModel.getMovies().observe(this, Observer {data -> + data?.let { + if (it.isEmpty()) + Toast.makeText(activity,"Empty List!!", Toast.LENGTH_LONG).show() + else + + recycler_view.adapter = moviesAdapter + moviesAdapter.add(it) + } + }) + } + +} diff --git a/app/src/main/java/com/example/movies/ui/fragments/MovieDetails.kt b/app/src/main/java/com/example/movies/ui/fragments/MovieDetails.kt new file mode 100644 index 0000000..7169aac --- /dev/null +++ b/app/src/main/java/com/example/movies/ui/fragments/MovieDetails.kt @@ -0,0 +1,66 @@ +package com.example.movies.ui.fragments + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity +import androidx.lifecycle.Observer + +import com.example.movies.R +import com.example.movies.ui.DownloadImageWithURLTask +import com.example.movies.viewmodels.MoviesViewModel +import kotlinx.android.synthetic.main.movie_details_fragment.* +import org.koin.android.viewmodel.ext.android.viewModel + +class MovieDetails : Fragment() { + + + + companion object { + fun newInstance() = MovieDetails() + } + + + private val moviesViewModel: MoviesViewModel by viewModel() + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + + return inflater.inflate(R.layout.movie_details_fragment, container, false) + } + + override fun onActivityCreated(savedInstanceState: Bundle?) { + + super.onActivityCreated(savedInstanceState) + if(activity is AppCompatActivity){ + (activity as AppCompatActivity).setSupportActionBar(toolbar) + } + (activity as AppCompatActivity).supportActionBar?.setDisplayHomeAsUpEnabled(true) + (activity as AppCompatActivity).supportActionBar?.setHomeButtonEnabled(true) + (activity as AppCompatActivity).supportActionBar?.setTitle("") + + val id_recived = arguments!!.getString("imdbid_recived") + moviesViewModel.loadMovieDetail(id_recived, "d2e11186") + moviesViewModel.getMovieDetail().observe(this, Observer { + + tv_title_detail.setText(it.getTitle()) + tv_movie_plot_detail.setText(it.getPlot()) + tv_type_detail.setText(it.getType()) + tv_year_detail.setText(it.getYear()) + var downloadImage = DownloadImageWithURLTask(iv_movie_detail) + if (it.getPoster() != "N/A") + downloadImage.execute(it.getPoster()) + else + downloadImage.execute("https://t3.ftcdn.net/jpg/01/09/49/08/240_F_109490811_fDzc0dpSLS0TmoNu4WP34aozBcI6FKZl.jpg") + + }) + + } + + + + +} diff --git a/app/src/main/java/com/example/movies/ui/fragments/MovieFragment.kt b/app/src/main/java/com/example/movies/ui/fragments/MovieFragment.kt new file mode 100644 index 0000000..1fbc970 --- /dev/null +++ b/app/src/main/java/com/example/movies/ui/fragments/MovieFragment.kt @@ -0,0 +1,53 @@ +package com.example.movies.ui.fragments + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.Toast +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.GridLayoutManager + +import com.example.movies.R +import com.example.movies.ui.adapters.MoviesAdapter +import com.example.movies.viewmodels.MoviesViewModel +import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.movie_fragment.* +import org.koin.android.viewmodel.ext.android.viewModel + +class MovieFragment : Fragment() { + + companion object { + fun newInstance() = MovieFragment() + } + + private val moviesViewModel: MoviesViewModel by viewModel() + val moviesAdapter: MoviesAdapter by lazy { + MoviesAdapter() + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(R.layout.movie_fragment, container, false) + } + + override fun onActivityCreated(savedInstanceState: Bundle?) { + super.onActivityCreated(savedInstanceState) + recycler_view.layoutManager = GridLayoutManager(activity, 2) + moviesViewModel.loadMovies("deadpool","d2e11186", "movie") + moviesViewModel.getMovies().observe(this, Observer {data -> + data?.let { + if (it.isEmpty()) + Toast.makeText(activity,"Empty List!!", Toast.LENGTH_LONG).show() + else + + recycler_view.adapter = moviesAdapter + moviesAdapter.add(it) + } + }) + } + +} diff --git a/app/src/main/java/com/example/movies/ui/fragments/MoviesSearchedFragment.kt b/app/src/main/java/com/example/movies/ui/fragments/MoviesSearchedFragment.kt new file mode 100644 index 0000000..91564f4 --- /dev/null +++ b/app/src/main/java/com/example/movies/ui/fragments/MoviesSearchedFragment.kt @@ -0,0 +1,51 @@ +package com.example.movies.ui.fragments + + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.Toast +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.GridLayoutManager +import com.example.movies.R +import com.example.movies.ui.adapters.MoviesAdapter +import com.example.movies.viewmodels.MoviesViewModel +import kotlinx.android.synthetic.main.movie_fragment.* +import org.koin.android.viewmodel.ext.android.viewModel + +class MoviesSearchedFragment : androidx.fragment.app.Fragment() { + + companion object { + fun newInstance() = MovieFragment() + } + + private val moviesViewModel: MoviesViewModel by viewModel() + val moviesAdapter: MoviesAdapter by lazy { + MoviesAdapter() + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(R.layout.movie_fragment, container, false) + } + + override fun onActivityCreated(savedInstanceState: Bundle?) { + super.onActivityCreated(savedInstanceState) + val title_recived = arguments!!.getString("title_recived") + recycler_view.adapter = moviesAdapter + recycler_view.layoutManager = GridLayoutManager(activity, 2) + moviesViewModel.loadMovies(title_recived,"d2e11186", "movie") + moviesViewModel.getMovies().observe(this, Observer {data -> + data?.let { + if (it.isEmpty()) + Toast.makeText(activity,"Empty List!!", Toast.LENGTH_LONG).show() + else + moviesAdapter.add(it) + } + }) + } + +} diff --git a/app/src/main/java/com/example/movies/ui/fragments/SeriesFragment.kt b/app/src/main/java/com/example/movies/ui/fragments/SeriesFragment.kt new file mode 100644 index 0000000..bff5a7f --- /dev/null +++ b/app/src/main/java/com/example/movies/ui/fragments/SeriesFragment.kt @@ -0,0 +1,53 @@ +package com.example.movies.ui.fragments + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.Toast +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.GridLayoutManager + +import com.example.movies.R +import com.example.movies.ui.adapters.MoviesAdapter +import com.example.movies.viewmodels.MoviesViewModel +import kotlinx.android.synthetic.main.movie_fragment.* +import org.koin.android.viewmodel.ext.android.viewModel + +class SeriesFragment : Fragment() { + + companion object { + fun newInstance() = SeriesFragment() + } + + private val moviesViewModel: MoviesViewModel by viewModel() + val moviesAdapter: MoviesAdapter by lazy { + MoviesAdapter() + } + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(R.layout.movie_fragment, container, false) + } + + override fun onActivityCreated(savedInstanceState: Bundle?) { + super.onActivityCreated(savedInstanceState) + + recycler_view.layoutManager = GridLayoutManager(activity, 2) + moviesViewModel.loadMovies("super","d2e11186", "series") + moviesViewModel.getMovies().observe(this, Observer {data -> + data?.let { + if (it.isEmpty()) + Toast.makeText(activity,"Empty List!!", Toast.LENGTH_LONG).show() + else + + recycler_view.adapter = moviesAdapter + moviesAdapter.add(it) + } + }) + } + +} diff --git a/app/src/main/java/com/example/movies/viewmodels/MoviesViewModel.kt b/app/src/main/java/com/example/movies/viewmodels/MoviesViewModel.kt new file mode 100644 index 0000000..453ae78 --- /dev/null +++ b/app/src/main/java/com/example/movies/viewmodels/MoviesViewModel.kt @@ -0,0 +1,29 @@ +package com.example.movies.viewmodels + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import com.example.movies.data.Movie +import com.example.movies.data.MovieManager + +class MoviesViewModel(val movieManager: MovieManager): ViewModel() { + + private var mMovies = MutableLiveData>() + + private var mMovieDetail = MutableLiveData() + fun getMovies(): LiveData> = mMovies + + fun loadMovies(s: String, apikey: String, type: String){ + mMovies = movieManager.getMovies(s, apikey, type) + } + + fun getMovieDetail(): LiveData = mMovieDetail + + fun loadMovieDetail(i: String, apikey: String) + { + mMovieDetail = movieManager.getMovieDetail(i,apikey) + } + + + +} \ No newline at end of file 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 0000000..6348baa --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml new file mode 100644 index 0000000..85b70f1 --- /dev/null +++ b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_favorite_black_24dp.xml b/app/src/main/res/drawable/ic_favorite_black_24dp.xml new file mode 100644 index 0000000..67a25e7 --- /dev/null +++ b/app/src/main/res/drawable/ic_favorite_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml new file mode 100644 index 0000000..de832bb --- /dev/null +++ b/app/src/main/res/drawable/ic_home_black_24dp.xml @@ -0,0 +1,9 @@ + + + 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 0000000..a0ad202 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_local_movies_black_24dp.xml b/app/src/main/res/drawable/ic_local_movies_black_24dp.xml new file mode 100644 index 0000000..257896d --- /dev/null +++ b/app/src/main/res/drawable/ic_local_movies_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_movie_creation_black_24dp.xml b/app/src/main/res/drawable/ic_movie_creation_black_24dp.xml new file mode 100644 index 0000000..a7f7b65 --- /dev/null +++ b/app/src/main/res/drawable/ic_movie_creation_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml new file mode 100644 index 0000000..fa1d5fe --- /dev/null +++ b/app/src/main/res/drawable/ic_notifications_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_search_movies.xml b/app/src/main/res/drawable/ic_search_movies.xml new file mode 100644 index 0000000..be5ad99 --- /dev/null +++ b/app/src/main/res/drawable/ic_search_movies.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_series_black_24dp.xml b/app/src/main/res/drawable/ic_series_black_24dp.xml new file mode 100644 index 0000000..b69bfff --- /dev/null +++ b/app/src/main/res/drawable/ic_series_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_share_black_24dp.xml b/app/src/main/res/drawable/ic_share_black_24dp.xml new file mode 100644 index 0000000..045bbc0 --- /dev/null +++ b/app/src/main/res/drawable/ic_share_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_videogame_asset_black_24dp.xml b/app/src/main/res/drawable/ic_videogame_asset_black_24dp.xml new file mode 100644 index 0000000..9379e53 --- /dev/null +++ b/app/src/main/res/drawable/ic_videogame_asset_black_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/screen_border.xml b/app/src/main/res/drawable/screen_border.xml new file mode 100644 index 0000000..198f6b8 --- /dev/null +++ b/app/src/main/res/drawable/screen_border.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file 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..2c2dfdd --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,31 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_search.xml b/app/src/main/res/layout/dialog_search.xml new file mode 100644 index 0000000..5805fdc --- /dev/null +++ b/app/src/main/res/layout/dialog_search.xml @@ -0,0 +1,16 @@ + + + + + + \ 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 0000000..8d52163 --- /dev/null +++ b/app/src/main/res/layout/item_movie.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/movie_details_fragment.xml b/app/src/main/res/layout/movie_details_fragment.xml new file mode 100644 index 0000000..c039e51 --- /dev/null +++ b/app/src/main/res/layout/movie_details_fragment.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/movie_fragment.xml b/app/src/main/res/layout/movie_fragment.xml new file mode 100644 index 0000000..72c9ae9 --- /dev/null +++ b/app/src/main/res/layout/movie_fragment.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation.xml new file mode 100644 index 0000000..45e684d --- /dev/null +++ b/app/src/main/res/menu/navigation.xml @@ -0,0 +1,22 @@ + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..bbd3e02 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..bbd3e02 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file 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..898f3ed Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..dffca36 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.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..64ba76f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..dae5e08 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.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..e5ed465 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..14ed0af Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.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..b0907ca Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d8ae031 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.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..2c18de9 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..beed3cd Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..69b2233 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #008577 + #00574B + #D81B60 + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..47c8224 --- /dev/null +++ b/app/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 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..f68c5c3 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,9 @@ + + Movies + Home + Dashboard + Notifications + + + Hello blank fragment + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..bdfe33e --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/app/src/test/java/com/example/movies/ExampleUnitTest.kt b/app/src/test/java/com/example/movies/ExampleUnitTest.kt new file mode 100644 index 0000000..75ee9d2 --- /dev/null +++ b/app/src/test/java/com/example/movies/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.example.movies + +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) + } +} diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..7f692ed --- /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.20' + repositories { + google() + jcenter() + + } + dependencies { + classpath 'com.android.tools.build:gradle:3.3.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..23339e0 --- /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=-Xmx1536m +# 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/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f 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 0000000..9566c14 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Mar 05 19:25:21 BRT 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..cccdd3d --- /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 0000000..f955316 --- /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 0000000..e7b4def --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app'