Merge branch 'release/1.0.1'

.settings/org.eclipse.buildship.core.prefs

@@ -1,2 +1,2 @@
-#Sun Dec 24 17:41:48 BRST 2017
 connection.project.dir=
+eclipse.preferences.version=1

MyApplication/build.gradle

@@ -3,10 +3,11 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
 <<<<<<< HEAD
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.3'
 =======
         classpath 'com.android.tools.build:gradle:2.2.2'
 >>>>>>> origin/master

app/.classpath

@@ -2,5 +2,5 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="bin/default"/>
 </classpath>

app/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'io.fabric.tools:gradle:1.21.6'
+        classpath 'io.fabric.tools:gradle:1.25.4'
     }
 }
 apply plugin: 'com.android.application'
@@ -29,13 +29,12 @@ android {
         exclude 'META-INF/dependencies.txt'
         exclude 'META-INF/LGPL2.1'
     }
-    compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 27
 
     defaultConfig {
         applicationId "br.com.tiagohs.popmovies"
         minSdkVersion 21
-        targetSdkVersion 25
+        targetSdkVersion 27
         versionCode 3
         versionName "1.0.1"
 
@@ -47,6 +46,7 @@ android {
         buildConfigField "String", "TWITTER_KEY", "${TWITTER_KEY}"
         buildConfigField "String", "TWITTER_SECRET", "${TWITTER_SECRET}"
         buildConfigField "String", "OMDB_KEY", "${OMDB_KEY}"
+        buildConfigField "String", "ADMOB_ID", "${ADMOB_ID}"
     }
     buildTypes {
         release {
@@ -57,102 +57,104 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.firebase:firebase-auth:11.0.4'
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile files('libs/YouTubeAndroidPlayerApi.jar')
-    compile 'com.mikepenz:aboutlibraries:5.8.1@aar'
+    implementation 'com.google.firebase:firebase-auth:16.0.2'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation 'junit:junit:4.12'
+    implementation files('libs/YouTubeAndroidPlayerApi.jar')
+    implementation 'com.mikepenz:aboutlibraries:5.8.1@aar'
+    implementation "com.android.support:customtabs:27.1.1"
+    implementation 'com.google.android.gms:play-services-ads:15.0.1'
 
-    compile 'com.android.support:appcompat-v7:25.1.1'
-    compile 'com.android.support:design:25.1.1'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
 
     //Recycler View
-    compile 'com.android.support:recyclerview-v7:25.1.1'
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
 
-    compile 'com.android.support:gridlayout-v7:23.3.0'
+    implementation 'com.android.support:gridlayout-v7:27.1.1'
 
     //Card View
-    compile 'com.android.support:cardview-v7:25.0.+'
-    compile 'com.karumi:dividers:1.0.1'
+    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.karumi:dividers:1.0.1'
 
     //Picasso
-    compile 'com.squareup.picasso:picasso:2.5.2'
+    implementation 'com.squareup.picasso:picasso:2.71828'
 
     //Material Dialogs
-    compile 'com.afollestad.material-dialogs:core:0.9.0.1'
+    implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
 
     //Depêndencias para o Butter Knife
-    compile 'com.jakewharton:butterknife:8.8.1'
+    implementation 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 
     //Depêndencias para o Dagger 2
-    compile 'com.google.dagger:dagger:2.6'
+    implementation 'com.google.dagger:dagger:2.6'
     annotationProcessor 'com.google.dagger:dagger-compiler:2.6'
 
     //Linke Button
-    compile 'com.github.jd-alexander:LikeButton:0.2.0'
+    implementation 'com.github.jd-alexander:LikeButton:0.2.0'
 
     //Rede
-    compile 'com.squareup.okhttp3:okhttp:3.4.1'
-    compile 'com.squareup.okhttp:okhttp-urlconnection:2.7.5'
+    implementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    implementation 'com.squareup.okhttp:okhttp-urlconnection:2.7.5'
 
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.8.3'
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.8.3'
-    compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.3'
-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.4'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.9.4'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.9.4'
+    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.4'
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.4'
 
-    compile 'com.balysv:material-ripple:1.0.2'
+    implementation 'com.balysv:material-ripple:1.0.2'
 
-    compile 'com.mikhaellopez:circularimageview:3.0.2'
+    implementation 'com.mikhaellopez:circularimageview:3.0.2'
 
-    compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
+    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
 
-    compile 'com.github.chrisbanes:PhotoView:1.3.0'
+    implementation 'com.github.chrisbanes:PhotoView:2.1.3'
 
-    compile 'com.pnikosis:materialish-progress:1.7'
+    implementation 'com.pnikosis:materialish-progress:1.7'
 
-    compile 'com.crystal:crystalrangeseekbar:1.1.1'
+    implementation 'com.crystal:crystalrangeseekbar:1.1.1'
 
-    compile 'com.mikepenz:fastadapter:1.8.2@aar'
+    implementation 'com.mikepenz:fastadapter:1.8.2@aar'
 
-    compile 'com.mikepenz:iconics-core:2.8.0@aar'
+    implementation 'com.mikepenz:iconics-core:2.8.0@aar'
 
-    compile 'com.facebook.android:facebook-android-sdk:4.1.0'
+    implementation 'com.facebook.android:facebook-android-sdk:4.25.0'
 
-    compile 'com.google.code.gson:gson:2.8.0'
-    compile('com.twitter.sdk.android:twitter:2.3.0@aar') {
+    implementation 'com.google.code.gson:gson:2.8.2'
+    implementation('com.twitter.sdk.android:twitter:2.3.0@aar') {
         transitive = true;
     }
-    compile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
+    implementation('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
         transitive = true;
     }
 
     //Para transformações Blurr
-    compile 'jp.wasabeef:picasso-transformations:2.1.0'
+    implementation 'jp.wasabeef:picasso-transformations:2.1.0'
 
     //Para Divisão em Páginas das Lists
-    compile group: 'org.apache.commons', name: 'commons-collections4', version: '4.1'
+    implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.1'
 
-    compile 'com.github.PhilJay:MPAndroidChart:v3.0.1'
+    implementation 'com.github.PhilJay:MPAndroidChart:v3.0.1'
 
-    compile 'uk.co.chrisjenx:calligraphy:2.2.0'
+    implementation 'uk.co.chrisjenx:calligraphy:2.2.0'
 
-    compile 'com.github.clans:fab:1.6.4'
+    implementation 'com.github.clans:fab:1.6.4'
 
     //Retrofit
-    compile 'com.squareup.retrofit2:retrofit:2.2.0'
-    compile 'com.squareup.retrofit2:converter-jackson:2.2.0'
-    compile 'com.squareup.retrofit2:adapter-rxjava2:2.2.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.4.0'
+    implementation 'com.squareup.retrofit2:converter-jackson:2.4.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
 
     //RxAndroid
-    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    compile 'io.reactivex.rxjava2:rxjava:2.0.1'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.8'
 
-    compile 'com.google.android.gms:play-services-auth:11.0.4' 
+    implementation 'com.google.android.gms:play-services-auth:15.0.1'
 
-    compile 'com.android.support:multidex:1.0.1'
+    implementation 'com.android.support:multidex:1.0.3'
 
-    compile 'de.hdodenhof:circleimageview:2.1.0'
+    implementation 'de.hdodenhof:circleimageview:2.2.0'
 }
 
 apply plugin: 'com.google.gms.google-services'

app/src/main/AndroidManifest.xml

@@ -33,8 +33,7 @@
         <activity
             android:name="com.facebook.FacebookActivity"
             android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
-            android:label="@string/app_name"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+            android:label="@string/app_name" />
 
         <activity android:name=".ui.view.activity.HomeActivity"
                   android:label="@string/title_activity_home"
@@ -73,9 +72,6 @@
         <activity
             android:name=".ui.view.activity.PersonDetailActivity"
             android:label="@string/title_activity_actor_details" />
-        <activity
-            android:name=".ui.view.activity.WebViewActivity"
-            android:label="@string/title_activity_actor_details" />
         <activity
             android:name=".ui.view.activity.VideosActivity"
             android:label="@string/title_activity_videos_details" />

app/src/main/java/br/com/tiagohs/popmovies/App.java

@@ -4,6 +4,8 @@
 import android.content.Context;
 import android.support.multidex.MultiDex;
 
+import com.crashlytics.android.Crashlytics;
+import com.google.android.gms.ads.MobileAds;
 import com.squareup.picasso.LruCache;
 import com.squareup.picasso.Picasso;
 import com.twitter.sdk.android.Twitter;
@@ -31,13 +33,14 @@ public void onCreate() {
         MultiDex.install(getApplicationContext());
 
         TwitterAuthConfig authConfig = new TwitterAuthConfig(BuildConfig.TWITTER_KEY, BuildConfig.TWITTER_SECRET);
-        Fabric.with(this, new Twitter(authConfig));
+        Fabric.with(this, new Twitter(authConfig), new Crashlytics());
 
         mPopMoviesComponent = DaggerPopMoviesComponent.builder()
                               .appModule(new AppModule(this))
                               .netModule(new NetModule("http://api.themoviedb.org/3/"))
                               .build();
 
+        MobileAds.initialize(this, BuildConfig.ADMOB_ID);
         instance = this;
         initPicasso();
     }

app/src/main/java/br/com/tiagohs/popmovies/model/person/PersonInfo.java

@@ -64,6 +64,8 @@ public class PersonInfo extends PersonBasic {
     private String biography;
     @JsonProperty("birthday")
     private String birthday;
+    @JsonProperty("known_for_department")
+    private String knownForDepartment;
     @JsonProperty("deathday")
     private String deathday;
     @JsonProperty("homepage")
@@ -113,6 +115,14 @@ public void setAlsoKnownAs(List<String> alsoKnownAs) {
 
     }
 
+    public String getKnownForDepartment() {
+        return knownForDepartment;
+    }
+
+    public void setKnownForDepartment(String knownForDepartment) {
+        this.knownForDepartment = knownForDepartment;
+    }
+
     public String getBiography() {
         return biography;
     }

app/src/main/java/br/com/tiagohs/popmovies/ui/adapters/WallpaperPagerAdapter.java

@@ -7,6 +7,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.github.chrisbanes.photoview.PhotoView;
 import com.pnikosis.materialishprogress.ProgressWheel;
 
 import java.util.List;
@@ -18,7 +19,6 @@
 import br.com.tiagohs.popmovies.util.enumerations.TypeShowImage;
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import uk.co.senab.photoview.PhotoView;
 
 public class WallpaperPagerAdapter extends PagerAdapter {