Feature/popular movies security

.gitignore

@@ -74,6 +74,7 @@ obj/
 .idea/copyright/profiles_settings.xml
 .idea/encodings.xml
 .idea/misc.xml
+.idea/gradle.xml
 .idea/modules.xml
 .idea/scopes/scope_settings.xml
 .idea/dictionaries
@@ -132,4 +133,5 @@ fabric.properties
 
 !/gradle/wrapper/gradle-wrapper.jar
 
-# End of https://www.gitignore.io/api/androidstudio
+# End of https://www.gitignore.io/api/androidstudio
+src/main/java/com/egdroid/movieapp/di/

app/build.gradle

@@ -1,96 +1,36 @@
 apply plugin: 'com.android.application'
 apply from: "$project.rootDir/tools/gradle/script/quality.gradle"
+apply from: "$project.rootDir/tools/gradle/base.gradle"
 
 android {
-    compileSdkVersion deps.build.compileSdkVersion
     defaultConfig {
         applicationId "com.egdroid.movieapp"
-        minSdkVersion deps.build.minSdkVersion
-        targetSdkVersion deps.build.targetSdkVersion
-        versionCode deps.build.versionCode
-        versionName deps.build.versionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    externalNativeBuild {
+        ndkBuild {
+            path 'src/main/jni/Android.mk'
+        }
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
 }
 
-dependencies {
-    //UI
-    implementation deps.support.design
-    implementation deps.support.recyclerview
-    implementation deps.support.constraintLayout
-
-    // Arch Component
-    implementation deps.architecturecomponents.lifecycles
-    implementation deps.architecturecomponents.room
-    annotationProcessor deps.architecturecomponents.room_compiler
-
-    // Rx
-    implementation deps.rx.java
-    implementation deps.rx.relay
-    implementation deps.rx.android
-    implementation deps.rx.binding
-    implementation deps.rx.retrofitAdapter
-
-    // Dependency Injection
-    implementation deps.dependencyInjection.dagger
-    implementation deps.dependencyInjection.daggerSupportAndroid
-    annotationProcessor deps.dependencyInjection.daggerCompiler
-    annotationProcessor deps.dependencyInjection.daggerAndroidCompiler
-
-    // View Binding
-    implementation deps.viewBinding.butterknife
-    annotationProcessor deps.viewBinding.butterknifeCompiler
-
-    // Images
-    implementation deps.image.glide
-    annotationProcessor deps.image.glideCompiler
-
-    // Network
-    implementation deps.network.retrofit
-    implementation deps.network.retrofitGsonConverter
+configurations {
+    compile.exclude group: 'androidx.annotation', module: 'annotation'
+}
 
-    // Log
-    implementation deps.log.timber
-    debugImplementation deps.log.leakCanaryDebug
-    releaseImplementation deps.log.leakCanaryRelease
+dependencies{
 
-    // Testing
-    testImplementation deps.test.junit
-    androidTestImplementation deps.test.runner
-    androidTestImplementation deps.test.robolectric
-    androidTestImplementation deps.test.espresso
-    androidTestImplementation deps.test.mockito
-    androidTestImplementation deps.test.powermock_mockito
-    androidTestImplementation deps.test.powermock_easymock
-    androidTestImplementation deps.test.powermock_reflect
-    androidTestImplementation deps.test.powermock_junit4
-    androidTestImplementation deps.test.powermock_junit4_rule
-    androidTestImplementation deps.test.powermock_classloading
+    implementation project(":presentation:popularmoviespresentation")
 
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    configurations.all {
-        resolutionStrategy {
-            force deps.support.annotations
-        }
-        resolutionStrategy.eachDependency { details ->
-            if (details.requested.group == 'com.android.support'
-                    && !details.requested.name.contains('multidex')) {
-                details.useVersion deps.versions.support
-            }
-        }
-    }
-}
+}

app/src/main/AndroidManifest.xml

@@ -2,10 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.egdroid.movieapp">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:name=".EgdoidApp"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">

app/src/main/java/com/egdroid/movieapp/EgdoidApp.kt

@@ -0,0 +1,15 @@
+package com.egdroid.movieapp
+
+import android.app.Application
+import timber.log.Timber
+
+class EgdoidApp : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+
+        if (BuildConfig.DEBUG) {
+            Timber.plant(Timber.DebugTree())
+        }
+    }
+}

app/src/main/java/com/egdroid/movieapp/MainActivity.kt

@@ -0,0 +1,23 @@
+package com.egdroid.movieapp
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.egdroid.presentation.popularmoviespresentation.PopularMoviesFragment
+
+
+class MainActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+//        val key1 = String(Base64.decode(getNativeKey1(), Base64.DEFAULT))
+//        Timber.w(key1)
+
+
+        val manager = supportFragmentManager
+        val transaction = manager.beginTransaction()
+        transaction.replace(R.id.container, PopularMoviesFragment())
+        transaction.commit()
+    }
+}

app/src/main/java/com/egdroid/movieapp/popularmovies/PopularMovieAdapter.kt

@@ -0,0 +1,42 @@
+package com.egdroid.presentation.popularmoviespresentation
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.egdroid.models.popularmovies.MovieUi
+import com.egdroid.movieapp.R
+import kotlinx.android.synthetic.main.popular_movie_row.view.*
+
+class PopularMovieAdapter : RecyclerView.Adapter<PopularMovieAdapter.MovieViewHolder>() {
+
+    private val moviesList: MutableList<MovieUi> = arrayListOf()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MovieViewHolder {
+        val inflater = LayoutInflater.from(parent.context)
+        return MovieViewHolder(inflater, parent)
+    }
+
+    override fun onBindViewHolder(holder: MovieViewHolder, position: Int) {
+        val movie: MovieUi = moviesList[position]
+        holder.bind(movie)
+    }
+
+    override fun getItemCount(): Int = moviesList.size
+
+    fun addPopularMovies(movies: List<MovieUi>) {
+        moviesList.addAll(movies)
+        notifyDataSetChanged()
+    }
+
+    class MovieViewHolder(inflater: LayoutInflater, parent: ViewGroup) :
+            RecyclerView.ViewHolder(inflater.inflate(R.layout.popular_movie_row, parent, false)) {
+
+        fun bind(movie: MovieUi) {
+            Glide.with(itemView).load("https://image.tmdb.org/t/p/w600_and_h900_bestv2/" + movie.posterPath).into(itemView.movieImageView)
+            itemView.titleTextView.text = movie.title
+            itemView.overviewTextView.text = movie.overview
+        }
+
+    }
+}

app/src/main/java/com/egdroid/movieapp/popularmovies/PopularMoviesFragment.kt

@@ -0,0 +1,42 @@
+package com.egdroid.presentation.popularmoviespresentation
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.egdroid.movieapp.R
+import com.egdroid.presentation.popularmoviespresentation.PopularMoviePresentationFactory.providePopularMoviesViewModel
+import kotlinx.android.synthetic.main.fragment_popular_movies.view.*
+
+/**
+ * A simple [Fragment] subclass.
+ */
+class PopularMoviesFragment : Fragment() {
+
+    private lateinit var popularMovieAdapter: PopularMovieAdapter
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        val view = inflater.inflate(R.layout.fragment_popular_movies, container, false)
+
+        val popularMoviesViewModel = providePopularMoviesViewModel(activity!!)
+
+        setupRecyclerView(view)
+
+        popularMoviesViewModel.getMovies().observe(this, Observer {
+            if (it != null) {
+                popularMovieAdapter.addPopularMovies(it)
+            }
+        })
+        return view
+    }
+
+    private fun setupRecyclerView(view: View) {
+        popularMovieAdapter = PopularMovieAdapter()
+        view.popularMoviesRecyclerView.setLayoutManager(LinearLayoutManager(activity))
+        view.popularMoviesRecyclerView.adapter = popularMovieAdapter
+    }
+}

app/src/main/jni/Android.mk

@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := keys
+LOCAL_SRC_FILES := keys.c
+
+include $(BUILD_SHARED_LIBRARY)

app/src/main/jni/Application.mk

@@ -0,0 +1 @@
+APP_ABI := all

app/src/main/jni/keys.c

@@ -0,0 +1,14 @@
+#include <jni.h>
+
+//JNIEXPORT jstring JNICALL
+//Java_com_egdroid_movieapp_MainActivity_getNativeKey1(JNIEnv *env, jobject instance) {
+//
+// return (*env)->  NewStringUTF(env, "ODI4MTU3MDk1YTU0ZWQ4ZjY4Yjg4ODI2MjRlZDc2NjA=");
+//}
+
+JNIEXPORT jstring JNICALL
+Java_com_egdroid_datasource_remote_movie_MoviesServiceFactory_getNativeKey(JNIEnv *env,
+                                                                           jobject instance) {
+
+    return (*env)->NewStringUTF(env, "ODI4MTU3MDk1YTU0ZWQ4ZjY4Yjg4ODI2MjRlZDc2NjA=");
+}

app/src/main/res/layout/activity_main.xml

@@ -6,13 +6,15 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
+    <FrameLayout
+        android:id="@+id/container"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/emptyview.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="@string/empty"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+</RelativeLayout>

app/src/main/res/layout/fragment_popular_movies.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".PopularMoviesFragment">
+
+    <com.malinskiy.superrecyclerview.SuperRecyclerView
+        android:id="@+id/popularMoviesRecyclerView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_empty="@layout/emptyview"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:mainLayoutId="@layout/layout_recyclerview_verticalscroll"
+        app:recyclerClipToPadding="false"
+        app:recyclerPadding="16dp"
+        app:scrollbarStyle="insideInset" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>