Merge branch 'develop'

santalu · Feb 6, 2020 · 7ed2f34 · 7ed2f34
2 parents 882cb89 + 3ca8ade
commit 7ed2f34
Show file tree

Hide file tree

Showing 19 changed files with 174 additions and 177 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,14 @@
 language: android
-
-jdk:
-  - oraclejdk8
+sudo: required
+jdk: oraclejdk8
+dist: trusty
 
 android:
   components:
     - tools
     - platform-tools
-    - build-tools-28.0.3
-    - android-28
+    - build-tools-29.0.2
+    - android-29
     - extra-android-m2repository
   licenses:
     - 'android-sdk-preview-license-.+'
@@ -17,7 +17,10 @@ android:
 
 before_install:
   - yes | sdkmanager "platforms;android-28"
+  - yes | sdkmanager "platforms;android-29"
+
+before_script:
   - chmod +x gradlew
 
 script:
-   - ./gradlew clean build
+  - ./gradlew clean build
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-  compileSdkVersion rootProject.compileSdkVersion
+  compileSdkVersion versions.compileSdk
 
   defaultConfig {
     applicationId "com.santalu.sample"
-    minSdkVersion rootProject.minSdkVersion
-    targetSdkVersion rootProject.targetSdkVersion
+    minSdkVersion versions.minSdk
+    targetSdkVersion versions.targetSdk
     versionCode 1
     versionName "1.0"
   }
@@ -23,8 +23,9 @@ android {
 
 dependencies {
   implementation fileTree(include: ['*.jar'], dir: 'libs')
-  implementation project(':aspectratioimageview')
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$rootProject.kotlinVersion"
-  implementation "androidx.appcompat:appcompat:$rootProject.appCompatVersion"
-  implementation "com.google.android.material:material:$rootProject.materialVersion"
+  implementation project(':library')
+
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
+  implementation "androidx.appcompat:appcompat:$versions.appcompat"
+  implementation "com.google.android.material:material:$versions.material"
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/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.santalu.sample">
 
   <application
@@ -8,14 +9,17 @@
       android:label="@string/app_name"
       android:roundIcon="@mipmap/ic_launcher_round"
       android:supportsRtl="true"
-      android:theme="@style/AppTheme">
+      android:theme="@style/AppTheme"
+      tools:ignore="GoogleAppIndexingWarning">
+
     <activity android:name="com.santalu.sample.MainActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
 
         <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
     </activity>
+
   </application>
 
 </manifest>
diff --git a/app/src/main/java/com/santalu/sample/MainActivity.kt b/app/src/main/java/com/santalu/sample/MainActivity.kt
@@ -5,7 +5,7 @@ import androidx.appcompat.app.AppCompatActivity
 import kotlinx.android.synthetic.main.activity_main.image1
 import kotlinx.android.synthetic.main.activity_main.image2
 
-class MainActivity : AppCompatActivity() {
+class MainActivity: AppCompatActivity() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)

diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -1,14 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
     android:height="108dp"
-    android:viewportHeight="108"
     android:viewportWidth="108"
-    android:width="108dp">
+    android:viewportHeight="108">
   <path
       android:fillType="evenOdd"
       android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-      android:strokeColor="#00000000"
-      android:strokeWidth="1">
+      android:strokeWidth="1"
+      android:strokeColor="#00000000">
     <aapt:attr name="android:fillColor">
       <gradient
           android:endX="78.5885"
@@ -29,6 +29,6 @@
       android:fillColor="#FFFFFF"
       android:fillType="nonZero"
       android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-      android:strokeColor="#00000000"
-      android:strokeWidth="1"/>
+      android:strokeWidth="1"
+      android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,171 +1,170 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
     android:height="108dp"
-    android:viewportHeight="108"
     android:viewportWidth="108"
-    android:width="108dp">
+    android:viewportHeight="108">
   <path
       android:fillColor="#26A69A"
       android:pathData="M0,0h108v108h-108z"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M9,0L9,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M19,0L19,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M29,0L29,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M39,0L39,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M49,0L49,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M59,0L59,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M69,0L69,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M79,0L79,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M89,0L89,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M99,0L99,108"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M0,9L108,9"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M0,19L108,19"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M0,29L108,29"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M0,39L108,39"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M0,49L108,49"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M0,59L108,59"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M0,69L108,69"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M0,79L108,79"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M0,89L108,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M0,99L108,99"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M19,29L89,29"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M19,39L89,39"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M19,49L89,49"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M19,59L89,59"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M19,69L89,69"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M19,79L89,79"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M29,19L29,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M39,19L39,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M49,19L49,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M59,19L59,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M69,19L69,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
   <path
       android:fillColor="#00000000"
       android:pathData="M79,19L79,89"
-      android:strokeColor="#33FFFFFF"
-      android:strokeWidth="0.8"/>
+      android:strokeWidth="0.8"
+      android:strokeColor="#33FFFFFF"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -11,7 +11,6 @@
       android:id="@+id/image1"
       android:layout_width="200dp"
       android:layout_height="0dp"
-      android:layout_marginBottom="20dp"
       android:foreground="?selectableItemBackground"
       android:scaleType="centerCrop"
       android:src="@drawable/sample"
@@ -20,7 +19,8 @@
   <com.santalu.aspectratioimageview.AspectRatioImageView
       android:id="@+id/image2"
       android:layout_width="0dp"
-      android:layout_height="200dp"
+      android:layout_height="240dp"
+      android:layout_marginTop="24dp"
       android:foreground="?selectableItemBackground"
       android:scaleType="centerCrop"
       android:src="@drawable/sample"

diff --git a/aspectratioimageview/src/main/AndroidManifest.xml b/aspectratioimageview/src/main/AndroidManifest.xml