Skip to content

Commit beaf6f5

Browse files
author
siwarat.s
committed
Merge branch 'release/v1.0.1'
2 parents 6ba6326 + 50b5a00 commit beaf6f5

File tree

21 files changed

+18
-99
lines changed

21 files changed

+18
-99
lines changed

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
*.iml
22
.gradle
33
/local.properties
4-
/.idea/libraries
5-
/.idea/modules.xml
6-
/.idea/workspace.xml
4+
/.idea
75
.DS_Store
86
/build
97
/captures
108
.externalNativeBuild
9+
/.gitignore
10+
/build.gradle

.idea/caches/build_file_checksums.ser

2 Bytes
Binary file not shown.

.idea/gradle.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ apply plugin: 'kotlin-android-extensions'
77
android {
88
compileSdkVersion 27
99
defaultConfig {
10-
applicationId "com.github.siwarats.itemdecoration"
10+
applicationId "com.github.siwarats.example"
1111
minSdkVersion 16
1212
targetSdkVersion 27
1313
versionCode 1
@@ -31,5 +31,5 @@ dependencies {
3131
testImplementation 'junit:junit:4.12'
3232
androidTestImplementation 'com.android.support.test:runner:1.0.2'
3333
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
34-
implementation project(':stickyheader')
34+
implementation project(':itemdecoration')
3535
}

app/src/androidTest/java/com/github/siwarats/itemdecoration/ExampleInstrumentedTest.kt

Lines changed: 0 additions & 24 deletions
This file was deleted.

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.github.siwarats.itemdecoration">
3+
package="com.github.siwarats.example">
44

55
<application
66
android:allowBackup="true"
@@ -9,7 +9,7 @@
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
1111
android:theme="@style/AppTheme">
12-
<activity android:name=".MainActivity">
12+
<activity android:name="com.github.siwarats.example.MainActivity">
1313
<intent-filter>
1414
<action android:name="android.intent.action.MAIN"/>
1515

app/src/main/java/com/github/siwarats/itemdecoration/MainActivity.kt renamed to app/src/main/java/com/github/siwarats/example/MainActivity.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
1-
package com.github.siwarats.itemdecoration
1+
package com.github.siwarats.example
22

3-
import android.support.v7.app.AppCompatActivity
43
import android.os.Bundle
4+
import android.support.v7.app.AppCompatActivity
55
import android.support.v7.widget.DividerItemDecoration
66
import android.support.v7.widget.LinearLayoutManager
77
import com.github.siwarats.itemdecoration.stickyheader.StickyHeaderItemDecoration
88
import kotlinx.android.synthetic.main.activity_main.*
99

1010
class MainActivity : AppCompatActivity() {
1111

12+
//Adapter Items
1213
private val objects = arrayListOf<Any>()
1314

1415
override fun onCreate(savedInstanceState: Bundle?) {
1516
super.onCreate(savedInstanceState)
1617
setContentView(R.layout.activity_main)
1718

19+
//Mock data
1820
for (header in 0..100) {
1921
objects.add("Header - $header")
2022
for (item in 1..3) {
2123
objects.add(item)
2224
}
2325
}
2426

27+
//Setup RecyclerView
2528
rcvMain?.adapter = MainAdapter(objects)
2629
rcvMain?.layoutManager = LinearLayoutManager(this)
2730
rcvMain?.addItemDecoration(DividerItemDecoration(this, DividerItemDecoration.VERTICAL))

app/src/main/java/com/github/siwarats/itemdecoration/MainAdapter.kt renamed to app/src/main/java/com/github/siwarats/example/MainAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.siwarats.itemdecoration
1+
package com.github.siwarats.example
22

33
import android.support.v7.widget.RecyclerView
44
import android.view.LayoutInflater

app/src/main/res/layout/activity_main.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:tools="http://schemas.android.com/tools"
66
android:layout_width="match_parent"
77
android:layout_height="match_parent"
8-
tools:context=".MainActivity">
8+
tools:context="com.github.siwarats.example.MainActivity">
99

1010
<android.support.v7.widget.RecyclerView
1111
android:id="@+id/rcvMain"

app/src/test/java/com/github/siwarats/itemdecoration/ExampleUnitTest.kt

Lines changed: 0 additions & 17 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2+
package="com.github.siwarats.itemdecoration"/>

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include ':app', ':stickyheader'
1+
include ':app', ':itemdecoration'

stickyheader/src/androidTest/java/com/github/siwarats/itemdecoration/stickyheader/ExampleInstrumentedTest.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

stickyheader/src/main/AndroidManifest.xml

Lines changed: 0 additions & 2 deletions
This file was deleted.

stickyheader/src/test/java/com/github/siwarats/itemdecoration/stickyheader/ExampleUnitTest.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)