Merge pull request #5 from santalu/develop

1.0.8
santalu · Oct 24, 2018 · d941ce0 · d941ce0
2 parents 4568598 + 4f861a6
commit d941ce0
Show file tree

Hide file tree

Showing 16 changed files with 170 additions and 130 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,16 +7,16 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-27.0.3
-    - android-27
+    - build-tools-28.0.3
+    - android-28
     - extra-android-m2repository
   licenses:
     - 'android-sdk-preview-license-.+'
     - 'android-sdk-license-.+'
     - 'google-gdk-license-.+'
 
 before_install:
-  - yes | sdkmanager "platforms;android-27"
+  - yes | sdkmanager "platforms;android-28"
   - chmod +x gradlew
 
 script:

diff --git a/README.md b/README.md
@@ -26,13 +26,13 @@ allprojects {
 ```
 ```
 dependencies {
-  implementation 'com.github.santalu:diagonal-imageview:1.0.7'
+  implementation 'com.github.santalu:diagonal-imageview:1.0.8'
 }
 ```
 
 ### XML
 ```xml
-<com.santalu.widget.DiagonalImageView
+<com.santalu.diagonalimageview.DiagonalImageView
     android:id="@+id/image"
     android:layout_width="120dp"
     android:layout_height="120dp"

diff --git a/app/build.gradle b/app/build.gradle
@@ -3,12 +3,13 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-  compileSdkVersion rootProject.compile_sdk_version
+  compileSdkVersion compileSdk_version
+  buildToolsVersion buildTools_version
 
   defaultConfig {
     applicationId "com.santalu.sample"
-    minSdkVersion rootProject.min_sdk_version
-    targetSdkVersion rootProject.target_sdk_version
+    minSdkVersion minSdk_version
+    targetSdkVersion targetSdk_version
     versionCode 1
     versionName "1.0"
   }
@@ -29,7 +30,6 @@ android {
 dependencies {
   implementation fileTree(include: ['*.jar'], dir: 'libs')
   implementation project(':widget')
-
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
   implementation "com.android.support:appcompat-v7:$support_version"
   implementation "com.android.support:recyclerview-v7:$support_version"

diff --git a/app/src/main/java/com/santalu/myapplication/Extensions.kt b/app/src/main/java/com/santalu/myapplication/Extensions.kt
@@ -10,10 +10,10 @@ import android.widget.Toast
  * Created by fatih.santalu on 7/24/2018.
  */
 
-fun ViewGroup.inflate(layoutRes: Int): View {
+internal fun ViewGroup.inflate(layoutRes: Int): View {
   return LayoutInflater.from(context).inflate(layoutRes, this, false)
 }
 
-fun Context.toast(text: CharSequence) {
+internal fun Context.toast(text: CharSequence) {
   Toast.makeText(this, text, Toast.LENGTH_SHORT).show()
 }
diff --git a/app/src/main/java/com/santalu/myapplication/MainActivity.kt b/app/src/main/java/com/santalu/myapplication/MainActivity.kt
@@ -12,16 +12,8 @@ class MainActivity : AppCompatActivity() {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_main)
 
-    listSample.setOnClickListener {
-      SampleListActivity.start(this)
-    }
-
-    cardListSample.setOnClickListener {
-      SampleCardListActivity.start(this)
-    }
-
-    gridSample.setOnClickListener {
-      SampleGridActivity.start(this)
-    }
+    listSample.setOnClickListener { SampleListActivity.start(this) }
+    cardListSample.setOnClickListener { SampleCardListActivity.start(this) }
+    gridSample.setOnClickListener { SampleGridActivity.start(this) }
   }
 }
diff --git a/app/src/main/java/com/santalu/myapplication/SampleCardListActivity.kt b/app/src/main/java/com/santalu/myapplication/SampleCardListActivity.kt
@@ -19,8 +19,10 @@ class SampleCardListActivity : AppCompatActivity() {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_list)
 
-    recyclerView.setHasFixedSize(true)
-    recyclerView.adapter = SampleAdapter()
+    with(recyclerView) {
+      setHasFixedSize(true)
+      adapter = SampleAdapter()
+    }
   }
 
   class SampleAdapter : RecyclerView.Adapter<SampleAdapter.SampleViewHolder>() {
@@ -35,8 +37,8 @@ class SampleCardListActivity : AppCompatActivity() {
     }
 
     override fun onBindViewHolder(holder: SampleViewHolder, position: Int) {
-      holder.itemView.setOnClickListener {
-        it.context.toast("position $position clicked")
+      with(holder.itemView) {
+        setOnClickListener { context.toast("position $position clicked") }
       }
     }
 
@@ -46,8 +48,10 @@ class SampleCardListActivity : AppCompatActivity() {
   companion object {
 
     fun start(activity: Activity) {
-      val intent = Intent(activity, SampleCardListActivity::class.java)
-      activity.startActivity(intent)
+      with(activity) {
+        intent = Intent(this, SampleCardListActivity::class.java)
+        startActivity(intent)
+      }
     }
   }
 

diff --git a/app/src/main/java/com/santalu/myapplication/SampleGridActivity.kt b/app/src/main/java/com/santalu/myapplication/SampleGridActivity.kt
@@ -24,8 +24,10 @@ class SampleGridActivity : AppCompatActivity() {
   companion object {
 
     fun start(activity: Activity) {
-      val intent = Intent(activity, SampleGridActivity::class.java)
-      activity.startActivity(intent)
+      with(activity) {
+        intent = Intent(this, SampleGridActivity::class.java)
+        startActivity(intent)
+      }
     }
   }
 }
diff --git a/app/src/main/java/com/santalu/myapplication/SampleListActivity.kt b/app/src/main/java/com/santalu/myapplication/SampleListActivity.kt
@@ -10,7 +10,7 @@ import android.support.v7.widget.RecyclerView.ItemDecoration
 import android.support.v7.widget.RecyclerView.State
 import android.view.View
 import android.view.ViewGroup
-import com.santalu.widget.DiagonalImageView
+import com.santalu.diagonalimageview.DiagonalImageView
 import kotlinx.android.synthetic.main.activity_list.recyclerView
 import kotlinx.android.synthetic.main.item_list.view.image
 
@@ -24,10 +24,12 @@ class SampleListActivity : AppCompatActivity() {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_list)
 
-    val overlap = resources.getDimensionPixelSize(R.dimen.overlap_size)
-    recyclerView.addItemDecoration(OverlapItemDecoration(-overlap))
-    recyclerView.setHasFixedSize(true)
-    recyclerView.adapter = SampleAdapter()
+    with(recyclerView) {
+      val overlap = resources.getDimensionPixelSize(R.dimen.overlap_size)
+      addItemDecoration(OverlapItemDecoration(-overlap))
+      setHasFixedSize(true)
+      adapter = SampleAdapter()
+    }
   }
 
   class SampleAdapter : RecyclerView.Adapter<SampleAdapter.SampleViewHolder>() {
@@ -42,10 +44,9 @@ class SampleListActivity : AppCompatActivity() {
     }
 
     override fun onBindViewHolder(holder: SampleViewHolder, position: Int) {
-      holder.itemView.image.position =
-          if (position == 0) DiagonalImageView.NONE else DiagonalImageView.TOP
-      holder.itemView.setOnClickListener {
-        it.context.toast("position $position clicked")
+      with(holder.itemView) {
+        image.position = if (position == 0) DiagonalImageView.NONE else DiagonalImageView.TOP
+        setOnClickListener { context.toast("position $position clicked") }
       }
     }
 
@@ -54,21 +55,21 @@ class SampleListActivity : AppCompatActivity() {
 
   class OverlapItemDecoration(private val overlap: Int) : ItemDecoration() {
 
-    override fun getItemOffsets(outRect: Rect?, view: View?, parent: RecyclerView?, state: State?) {
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: State) {
       super.getItemOffsets(outRect, view, parent, state)
-      parent?.let {
-        if (it.getChildAdapterPosition(view) > 0) {
-          outRect?.top = overlap
-        }
+      if (parent.getChildAdapterPosition(view) > 0) {
+        outRect.top = overlap
       }
     }
   }
 
   companion object {
 
     fun start(activity: Activity) {
-      val intent = Intent(activity, SampleListActivity::class.java)
-      activity.startActivity(intent)
+      with(activity) {
+        intent = Intent(this, SampleListActivity::class.java)
+        startActivity(intent)
+      }
     }
   }
 }
diff --git a/app/src/main/res/layout/activity_grid.xml b/app/src/main/res/layout/activity_grid.xml
@@ -9,7 +9,7 @@
     app:rowCount="4"
     app:useDefaultMargins="false">
 
-  <com.santalu.widget.DiagonalImageView
+  <com.santalu.diagonalimageview.DiagonalImageView
       android:layout_width="0dp"
       android:layout_height="@dimen/grid_item_height"
       android:layout_margin="@dimen/grid_item_margin"
@@ -23,7 +23,7 @@
       app:layout_columnWeight="1"
       app:layout_gravity="fill_horizontal"/>
 
-  <com.santalu.widget.DiagonalImageView
+  <com.santalu.diagonalimageview.DiagonalImageView
       android:layout_width="0dp"
       android:layout_height="@dimen/grid_item_height"
       android:layout_margin="@dimen/grid_item_margin"
@@ -37,7 +37,7 @@
       app:layout_columnWeight="1"
       app:layout_gravity="fill_horizontal"/>
 
-  <com.santalu.widget.DiagonalImageView
+  <com.santalu.diagonalimageview.DiagonalImageView
       android:layout_width="0dp"
       android:layout_height="@dimen/grid_item_height"
       android:layout_margin="@dimen/grid_item_margin"
@@ -51,7 +51,7 @@
       app:layout_columnWeight="1"
       app:layout_gravity="fill_horizontal"/>
 
-  <com.santalu.widget.DiagonalImageView
+  <com.santalu.diagonalimageview.DiagonalImageView
       android:layout_width="0dp"
       android:layout_height="@dimen/grid_item_height"
       android:layout_margin="@dimen/grid_item_margin"
@@ -65,7 +65,7 @@
       app:layout_columnWeight="1"
       app:layout_gravity="fill_horizontal"/>
 
-  <com.santalu.widget.DiagonalImageView
+  <com.santalu.diagonalimageview.DiagonalImageView
       android:layout_width="0dp"
       android:layout_height="@dimen/grid_item_height"
       android:layout_margin="@dimen/grid_item_margin"
@@ -79,7 +79,7 @@
       app:layout_columnWeight="1"
       app:layout_gravity="fill_horizontal"/>
 
-  <com.santalu.widget.DiagonalImageView
+  <com.santalu.diagonalimageview.DiagonalImageView
       android:layout_width="0dp"
       android:layout_height="@dimen/grid_item_height"
       android:layout_margin="@dimen/grid_item_margin"
@@ -93,7 +93,7 @@
       app:layout_columnWeight="1"
       app:layout_gravity="fill_horizontal"/>
 
-  <com.santalu.widget.DiagonalImageView
+  <com.santalu.diagonalimageview.DiagonalImageView
       android:layout_width="0dp"
       android:layout_height="@dimen/grid_item_height"
       android:layout_margin="@dimen/grid_item_margin"
@@ -107,7 +107,7 @@
       app:layout_columnWeight="1"
       app:layout_gravity="fill_horizontal"/>
 
-  <com.santalu.widget.DiagonalImageView
+  <com.santalu.diagonalimageview.DiagonalImageView
       android:layout_width="0dp"
       android:layout_height="@dimen/grid_item_height"
       android:layout_margin="@dimen/grid_item_margin"

diff --git a/app/src/main/res/layout/item_card_list.xml b/app/src/main/res/layout/item_card_list.xml
@@ -8,7 +8,7 @@
     app:cardElevation="@dimen/card_elevation"
     app:cardUseCompatPadding="true">
 
-  <com.santalu.widget.DiagonalImageView
+  <com.santalu.diagonalimageview.DiagonalImageView
       android:layout_width="@dimen/grid_item_height"
       android:layout_height="@dimen/grid_item_height"
       android:scaleType="centerCrop"

diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.santalu.widget.DiagonalImageView
+<com.santalu.diagonalimageview.DiagonalImageView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/image"

diff --git a/build.gradle b/build.gradle
@@ -3,12 +3,13 @@
 buildscript {
 
   ext {
-    compile_sdk_version = 27
-    target_sdk_version = 27
-    min_sdk_version = 15
-    gradle_version = "3.1.4"
-    kotlin_version = '1.2.60'
-    support_version = "27.1.1"
+    compileSdk_version = 28
+    targetSdk_version = 28
+    minSdk_version = 15
+    buildTools_version = '28.0.3'
+    gradle_version = '3.2.1'
+    kotlin_version = '1.2.71'
+    support_version = '28.0.0'
   }
 
   repositories {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jul 24 11:24:18 EET 2018
+#Fri Oct 05 16:01:27 EET 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/widget/build.gradle b/widget/build.gradle
@@ -2,13 +2,14 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-  compileSdkVersion rootProject.compile_sdk_version
+  compileSdkVersion compileSdk_version
+  buildToolsVersion buildTools_version
 
   defaultConfig {
-    minSdkVersion rootProject.min_sdk_version
-    targetSdkVersion rootProject.target_sdk_version
-    versionCode 8
-    versionName "1.0.7"
+    minSdkVersion minSdk_version
+    targetSdkVersion targetSdk_version
+    versionCode 9
+    versionName "1.0.8"
   }
 
   buildTypes {

diff --git a/widget/src/main/AndroidManifest.xml b/widget/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.santalu.widget"/>
+    package="com.santalu.diagonalimageview"/>