changes

Tarapaty · Oct 23, 2018 · bf0f796 · bf0f796
1 parent 76cbf6c
commit bf0f796
Show file tree

Hide file tree

Showing 25 changed files with 81 additions and 223 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,9 +4,10 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
+    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
-        applicationId "com.potatoinc.instantappsample.app"
+        applicationId "com.example.android.instantappsample.app"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
         versionCode rootProject.versionCode
@@ -31,6 +32,7 @@ android {
 }
 
 dependencies {
-    implementation project(':character-details')
-    implementation project(':character-list')
+    implementation project(':base')
+    implementation project(':details')
+    implementation project(':list')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,2 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.instantappsample.app" />
+    package="com.example.android.instantappsample.app" >
+</manifest>
diff --git a/base/build.gradle b/base/build.gradle
@@ -1,11 +1,14 @@
 apply plugin: 'com.android.feature'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
+    buildToolsVersion rootProject.buildToolsVersion
 
     baseFeature true
+
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
@@ -35,12 +38,12 @@ android {
 
 dependencies {
     application project(':app')
-    feature project(':character-list')
-    feature project(":character-details")
+    feature project(':list')
+    feature project(':details')
 
     api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     api "com.android.support:appcompat-v7:$support_version"
-    api 'com.android.support.constraint:constraint-layout:1.1.2'
+    api 'com.android.support.constraint:constraint-layout:1.1.3'
     api "com.android.support:recyclerview-v7:$support_version"
 
     api 'com.squareup.retrofit2:retrofit:2.4.0'
@@ -49,7 +52,7 @@ dependencies {
 
     api 'com.squareup.okhttp3:okhttp:3.11.0'
     api 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
-    api 'com.squareup.okhttp3:logging-interceptor:3.9.1'
+    api 'com.squareup.okhttp3:logging-interceptor:3.11.0'
 
     api 'com.jakewharton.timber:timber:4.7.1'
 
@@ -58,8 +61,8 @@ dependencies {
     api 'com.github.bumptech.glide:glide:4.8.0'
 
     api "android.arch.lifecycle:extensions:1.1.1"
+    kapt "android.arch.lifecycle:compiler:1.1.1"
 
-    api 'com.google.android.gms:play-services-instantapps:16.0.0'
-    api 'com.google.android.gms:play-services-auth:15.0.1'
-
+    api 'com.google.android.gms:play-services-instantapps:16.0.1'
+    api 'com.google.android.gms:play-services-auth:16.0.1'
 }
diff --git a/base/src/main/AndroidManifest.xml b/base/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.example.android.instantappsample.base">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,8 @@
         android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme" />
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
+    </application>
 
-</manifest>
+</manifest>
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 ext {
-    support_version = '28.0.0-rc01'
+    support_version = '28.0.0'
     compileSdkVersion = 28
     buildToolsVersion = "28.0.2"
     minSdkVersion = 21
@@ -11,14 +11,15 @@ ext {
 }
 
 buildscript {
+    ext.kotlin_version = '1.2.71'
     ext.kotlin_version = '1.2.60'
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -28,4 +29,4 @@ allprojects {
         google()
         jcenter()
     }
-}
+}
diff --git a/character-details/.gitignore → details/.gitignore b/character-details/.gitignore → details/.gitignore
diff --git a/character-details/build.gradle → details/build.gradle b/character-details/build.gradle → details/build.gradle
@@ -4,6 +4,7 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
+    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
@@ -18,13 +19,9 @@ android {
         debug {}
         minified {
             debuggable true
-            minifyEnabled true
             signingConfig signingConfigs.debug
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), '../proguard-rules.pro'
         }
         release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), '../proguard-rules.pro'
         }
     }
 }

diff --git a/...cter-details/src/main/AndroidManifest.xml → details/src/main/AndroidManifest.xml b/...cter-details/src/main/AndroidManifest.xml → details/src/main/AndroidManifest.xml
@@ -1,43 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.instantappsample.character_details">
+    package="com.example.android.instantappsample.characterdetails">
 
     <application>
 
-        <activity android:name="com.example.android.instantappsample.character_details.CharacterDetailsActivity">
-            <intent-filter
-                android:autoVerify="true"
-                android:order="1">
+        <activity android:name=".CharacterDetailsActivity">
 
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
-                <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="potatoinc.com"
-                    android:pathPattern="/character/.*"
-                    android:scheme="https" />
+                    android:scheme="http"
+                    android:host="sample.com"
+                    android:pathPattern="/character/.*" />
             </intent-filter>
 
-            <intent-filter
-                android:autoVerify="true"
-                android:order="1">
-
+            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
-                <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="potatoinc.com"
-                    android:pathPattern="/character/.*"
-                    android:scheme="http" />
-
+                    android:scheme="https"
+                    android:host="sample.com"
+                    android:pathPattern="/character/.*" />
             </intent-filter>
-
         </activity>
 
     </application>
-
-</manifest>
+</manifest>
diff --git a/...acter_details/CharacterDetailsActivity.kt → ...racterdetails/CharacterDetailsActivity.kt b/...acter_details/CharacterDetailsActivity.kt → ...racterdetails/CharacterDetailsActivity.kt
@@ -1,4 +1,4 @@
-package com.example.android.instantappsample.character_details
+package com.example.android.instantappsample.characterdetails
 
 import android.arch.lifecycle.Observer
 import android.arch.lifecycle.ViewModelProviders

diff --git a/...cter_details/CharacterDetailsViewModel.kt → ...acterdetails/CharacterDetailsViewModel.kt b/...cter_details/CharacterDetailsViewModel.kt → ...acterdetails/CharacterDetailsViewModel.kt
@@ -1,4 +1,4 @@
-package com.example.android.instantappsample.character_details
+package com.example.android.instantappsample.characterdetails
 
 import android.arch.lifecycle.MutableLiveData
 import android.arch.lifecycle.ViewModel
@@ -25,4 +25,4 @@ class CharacterDetailsViewModel : ViewModel() {
                     })
         }
     }
-}
+}
diff --git a/...res/layout/activity_character_details.xml → ...res/layout/activity_character_details.xml b/...res/layout/activity_character_details.xml → ...res/layout/activity_character_details.xml
diff --git a/...r-details/src/main/res/values/strings.xml → details/src/main/res/values/strings.xml b/...r-details/src/main/res/values/strings.xml → details/src/main/res/values/strings.xml
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 21 13:41:04 CEST 2018
+#Mon Oct 15 19:59:49 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/instantapp/build.gradle b/instantapp/build.gradle
@@ -4,6 +4,7 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
+    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
@@ -27,7 +28,7 @@ android {
 }
 
 dependencies {
-    implementation project(':character-details')
-    implementation project(':character-list')
+    implementation project(':details')
+    implementation project(':list')
     implementation project(':base')
 }
diff --git a/character-list/.gitignore → list/.gitignore b/character-list/.gitignore → list/.gitignore
diff --git a/character-list/build.gradle → list/build.gradle b/character-list/build.gradle → list/build.gradle
@@ -4,6 +4,7 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
+    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
@@ -18,13 +19,9 @@ android {
         debug {}
         minified {
             debuggable true
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), '../proguard-rules.pro'
             signingConfig signingConfigs.debug
         }
         release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), '../proguard-rules.pro'
         }
     }
     androidExtensions {

diff --git a/character-list/src/main/AndroidManifest.xml → list/src/main/AndroidManifest.xml b/character-list/src/main/AndroidManifest.xml → list/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.android.instantappsample.character_list">
+    package="com.example.android.instantappsample.characterlist">
 
     <application>
 
@@ -13,43 +13,35 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
-            <intent-filter
-                android:autoVerify="true"
-                android:order="2">
+            <meta-data
+                android:name="default-url"
+                android:value="https://android.example.com/character" />
 
+            <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
 
-                <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="potatoinc.com"
+                    android:host="sample.com"
                     android:pathPattern="/character"
-                    android:scheme="https" />
+                    android:scheme="http" />
             </intent-filter>
-
-            <intent-filter
-                android:autoVerify="true"
-                android:order="2">
-
+            <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
 
-                <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
-                    android:host="potatoinc.com"
+                    android:host="sample.com"
                     android:pathPattern="/character"
-                    android:scheme="http" />
-
+                    android:scheme="https" />
             </intent-filter>
 
-            <meta-data
-                android:name="default-url"
-                android:value="https://android.example.com/character" />
-
         </activity>
 
     </application>
 
-</manifest>
+</manifest>
diff --git a/...le/character_list/CharacterItemAdapter.kt → ...ple/characterlist/CharacterItemAdapter.kt b/...le/character_list/CharacterItemAdapter.kt → ...ple/characterlist/CharacterItemAdapter.kt
@@ -1,4 +1,4 @@
-package com.example.android.instantappsample.character_list
+package com.example.android.instantappsample.characterlist
 
 import android.support.v4.content.ContextCompat
 import android.support.v7.widget.RecyclerView
@@ -56,4 +56,4 @@ class CharacterItemAdapter(
 
         }
     }
-}
+}
diff --git a/...e/character_list/CharacterListActivity.kt → ...le/characterlist/CharacterListActivity.kt b/...e/character_list/CharacterListActivity.kt → ...le/characterlist/CharacterListActivity.kt
@@ -1,4 +1,4 @@
-package com.example.android.instantappsample.character_list
+package com.example.android.instantappsample.characterlist
 
 import android.arch.lifecycle.Observer
 import android.arch.lifecycle.ViewModelProviders

diff --git a/.../character_list/CharacterListViewModel.kt → ...e/characterlist/CharacterListViewModel.kt b/.../character_list/CharacterListViewModel.kt → ...e/characterlist/CharacterListViewModel.kt
@@ -1,4 +1,4 @@
-package com.example.android.instantappsample.character_list
+package com.example.android.instantappsample.characterlist
 
 import android.arch.lifecycle.MutableLiveData
 import android.arch.lifecycle.ViewModel
@@ -42,4 +42,4 @@ class CharacterListViewModel : ViewModel() {
             }
         })
     }
-}
+}
diff --git a/...in/res/layout/activity_character_list.xml → ...in/res/layout/activity_character_list.xml b/...in/res/layout/activity_character_list.xml → ...in/res/layout/activity_character_list.xml
diff --git a/...st/src/main/res/layout/item_character.xml → list/src/main/res/layout/item_character.xml b/...st/src/main/res/layout/item_character.xml → list/src/main/res/layout/item_character.xml
diff --git a/...cter-list/src/main/res/values/strings.xml → list/src/main/res/values/strings.xml b/...cter-list/src/main/res/values/strings.xml → list/src/main/res/values/strings.xml