Skip to content

Commit

Permalink
Minor improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
santalu committed Aug 17, 2018
1 parent c4be78c commit c730a2e
Show file tree
Hide file tree
Showing 24 changed files with 42 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
.DS_Store
/build
/captures
.externalNativeBuild
.externalNativeBuild
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ before_install:
- chmod +x gradlew

script:
- ./gradlew clean build
- ./gradlew clean build
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ A simple imageview which allows you to create diagonal cut views easily

<table >
<tr>
<td align="left"><img src="https://github.com/santalu/diagonal-imageview/blob/master/media/rv.png"/></td>
<td align="right"><img src="https://github.com/santalu/diagonal-imageview/blob/master/media/cv.png"/></td>
<td align="left"><img src="https://github.com/santalu/diagonal-imageview/blob/master/media/gl.png"/></td>
<td align="left"><img src="https://github.com/santalu/diagonal-imageview/blob/master/media/rv.webp"/></td>
<td align="right"><img src="https://github.com/santalu/diagonal-imageview/blob/master/media/cv.webp"/></td>
<td align="left"><img src="https://github.com/santalu/diagonal-imageview/blob/master/media/gl.webp"/></td>
</tr>
</table>

Expand All @@ -26,13 +26,13 @@ allprojects {
```
```
dependencies {
implementation 'com.github.santalu:diagonal-imageview:1.0.6'
implementation 'com.github.santalu:diagonal-imageview:1.0.7'
}
```

### XML
```xml
<com.santalu.diagonalimageview.DiagonalImageView
<com.santalu.widget.DiagonalImageView
android:id="@+id/image"
android:layout_width="120dp"
android:layout_height="120dp"
Expand Down
18 changes: 9 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 27
compileSdkVersion rootProject.compile_sdk_version

defaultConfig {
applicationId "com.santalu.myapplication"
minSdkVersion 15
targetSdkVersion 27
applicationId "com.santalu.sample"
minSdkVersion rootProject.min_sdk_version
targetSdkVersion rootProject.target_sdk_version
versionCode 1
versionName "1.0"
}
Expand All @@ -28,11 +28,11 @@ android {

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(':library')
implementation project(':widget')

implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "com.android.support:appcompat-v7:$supportlibrary_version"
implementation "com.android.support:recyclerview-v7:$supportlibrary_version"
implementation "com.android.support:cardview-v7:$supportlibrary_version"
implementation "com.android.support:gridlayout-v7:$supportlibrary_version"
implementation "com.android.support:appcompat-v7:$support_version"
implementation "com.android.support:recyclerview-v7:$support_version"
implementation "com.android.support:cardview-v7:$support_version"
implementation "com.android.support:gridlayout-v7:$support_version"
}
Original file line number Diff line number Diff line change
Expand Up @@ -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.diagonalimageview.DiagonalImageView
import com.santalu.widget.DiagonalImageView
import kotlinx.android.synthetic.main.activity_list.recyclerView
import kotlinx.android.synthetic.main.item_list.view.image

Expand Down
Binary file removed app/src/main/res/drawable/demo.png
Binary file not shown.
Binary file added app/src/main/res/drawable/demo.webp
Binary file not shown.
16 changes: 8 additions & 8 deletions app/src/main/res/layout/activity_grid.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
app:rowCount="4"
app:useDefaultMargins="false">

<com.santalu.diagonalimageview.DiagonalImageView
<com.santalu.widget.DiagonalImageView
android:layout_width="0dp"
android:layout_height="@dimen/grid_item_height"
android:layout_margin="@dimen/grid_item_margin"
Expand All @@ -23,7 +23,7 @@
app:layout_columnWeight="1"
app:layout_gravity="fill_horizontal"/>

<com.santalu.diagonalimageview.DiagonalImageView
<com.santalu.widget.DiagonalImageView
android:layout_width="0dp"
android:layout_height="@dimen/grid_item_height"
android:layout_margin="@dimen/grid_item_margin"
Expand All @@ -37,7 +37,7 @@
app:layout_columnWeight="1"
app:layout_gravity="fill_horizontal"/>

<com.santalu.diagonalimageview.DiagonalImageView
<com.santalu.widget.DiagonalImageView
android:layout_width="0dp"
android:layout_height="@dimen/grid_item_height"
android:layout_margin="@dimen/grid_item_margin"
Expand All @@ -51,7 +51,7 @@
app:layout_columnWeight="1"
app:layout_gravity="fill_horizontal"/>

<com.santalu.diagonalimageview.DiagonalImageView
<com.santalu.widget.DiagonalImageView
android:layout_width="0dp"
android:layout_height="@dimen/grid_item_height"
android:layout_margin="@dimen/grid_item_margin"
Expand All @@ -65,7 +65,7 @@
app:layout_columnWeight="1"
app:layout_gravity="fill_horizontal"/>

<com.santalu.diagonalimageview.DiagonalImageView
<com.santalu.widget.DiagonalImageView
android:layout_width="0dp"
android:layout_height="@dimen/grid_item_height"
android:layout_margin="@dimen/grid_item_margin"
Expand All @@ -79,7 +79,7 @@
app:layout_columnWeight="1"
app:layout_gravity="fill_horizontal"/>

<com.santalu.diagonalimageview.DiagonalImageView
<com.santalu.widget.DiagonalImageView
android:layout_width="0dp"
android:layout_height="@dimen/grid_item_height"
android:layout_margin="@dimen/grid_item_margin"
Expand All @@ -93,7 +93,7 @@
app:layout_columnWeight="1"
app:layout_gravity="fill_horizontal"/>

<com.santalu.diagonalimageview.DiagonalImageView
<com.santalu.widget.DiagonalImageView
android:layout_width="0dp"
android:layout_height="@dimen/grid_item_height"
android:layout_margin="@dimen/grid_item_margin"
Expand All @@ -107,7 +107,7 @@
app:layout_columnWeight="1"
app:layout_gravity="fill_horizontal"/>

<com.santalu.diagonalimageview.DiagonalImageView
<com.santalu.widget.DiagonalImageView
android:layout_width="0dp"
android:layout_height="@dimen/grid_item_height"
android:layout_margin="@dimen/grid_item_margin"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/item_card_list.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
app:cardElevation="@dimen/card_elevation"
app:cardUseCompatPadding="true">

<com.santalu.diagonalimageview.DiagonalImageView
<com.santalu.widget.DiagonalImageView
android:layout_width="@dimen/grid_item_height"
android:layout_height="@dimen/grid_item_height"
android:scaleType="centerCrop"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/item_list.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<com.santalu.diagonalimageview.DiagonalImageView
<com.santalu.widget.DiagonalImageView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/image"
Expand Down
10 changes: 6 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
buildscript {

ext {
gradle_version = '3.1.3'
kotlin_version = '1.2.51'
supportlibrary_version = '27.1.1'
constraintlayout_version = '1.1.2'
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"
}

repositories {
Expand Down
Binary file removed media/cv.png
Binary file not shown.
Binary file added media/cv.webp
Binary file not shown.
Binary file removed media/gl.png
Binary file not shown.
Binary file added media/gl.webp
Binary file not shown.
Binary file removed media/rv.png
Binary file not shown.
Binary file added media/rv.webp
Binary file not shown.
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':app', ':library'
include ':app', ':widget'
File renamed without changes.
11 changes: 6 additions & 5 deletions library/build.gradle → widget/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 27
compileSdkVersion rootProject.compile_sdk_version

defaultConfig {
minSdkVersion 15
targetSdkVersion 27
minSdkVersion rootProject.min_sdk_version
targetSdkVersion rootProject.target_sdk_version
versionCode 8
versionName "1.0.6"
versionName "1.0.7"
}

buildTypes {
Expand All @@ -25,6 +25,7 @@ android {
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "com.android.support:appcompat-v7:$supportlibrary_version"
implementation "com.android.support:appcompat-v7:$support_version"
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.santalu.diagonalimageview"/>
package="com.santalu.widget"/>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.santalu.diagonalimageview
package com.santalu.widget

import android.annotation.SuppressLint
import android.content.Context
Expand All @@ -13,7 +13,6 @@ import android.os.Build.VERSION
import android.os.Build.VERSION_CODES
import android.support.v7.widget.AppCompatImageView
import android.util.AttributeSet
import android.util.Log
import android.view.MotionEvent

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@
<attr format="boolean" name="di_borderEnabled"/>
</declare-styleable>


</resources>

0 comments on commit c730a2e

Please sign in to comment.