Skip to content
This repository was archived by the owner on Nov 15, 2019. It is now read-only.

a little refactoring and change deprecated build.gradle(app) #1

Open
mtjin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

a little refactoring and change deprecated build.gradle(app) #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "com.android.support:appcompat-v7:$support_version"
implementation "com.github.skydoves:baserecyclerviewadapter:0.1.0"
implementation project(':cameleonlayout')
Expand Down
26 changes: 13 additions & 13 deletions cameleonlayout/src/main/java/com/skydoves/cameleonlayout/CameleonLayout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ class CameleonLayout : FrameLayout, FilledStatusListener, View.OnClickListener {

private fun onCreate() {
this.layer = FrameLayout(context)
this.status = FilledStatus.UnFilled()
this.status = FilledStatus.UnFilled
this.handler = FillResolveHandler(this)
this.filledStatusListener = this
this.setOnClickListener(this)

measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED))
measure(MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED))
}

private fun getAttrs(attrs: AttributeSet) {
Expand Down Expand Up @@ -105,25 +105,25 @@ class CameleonLayout : FrameLayout, FilledStatusListener, View.OnClickListener {
}
}

fun setSecondLayout(layout: Int) {
private fun setSecondLayout(layout: Int) {
val inflater = LayoutInflater.from(context)
this.secondLayout = inflater.inflate(layout, null)
}

private fun initSecondLayout() {
this.secondLayout.layoutParams = LayoutParams(measuredWidth, measuredHeight)
this.secondLayout.measure(
View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED))
MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED))
this.layer.addView(this.secondLayout)
}

private fun initLayer() {
this.layer.let {
it.layoutParams = ViewGroup.LayoutParams(measuredWidth, measuredHeight)
it.measure(
View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED))
MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED))
it.isDrawingCacheEnabled = true
it.buildDrawingCache()
}
Expand Down Expand Up @@ -171,7 +171,7 @@ class CameleonLayout : FrameLayout, FilledStatusListener, View.OnClickListener {

fun drawSecondLayout() {
if(status is FilledStatus.UnFilled) {
fireFilledStatus(FilledStatus.Loading())
fireFilledStatus(FilledStatus.Loading)
updateProgress(density.toFloat())

val runnable = Runnable {
Expand All @@ -188,14 +188,14 @@ class CameleonLayout : FrameLayout, FilledStatusListener, View.OnClickListener {
}
}

fun eraseSecondLayout() {
private fun eraseSecondLayout() {
if(status is FilledStatus.Filled) {
val runnable = Runnable {
thread.let {
this.timer = Timer()
val timerTask = object : TimerTask() {
override fun run() {
fireFilledStatus(FilledStatus.Loading())
fireFilledStatus(FilledStatus.Loading)
while (progress > 0) {
Thread.sleep((duration/maxProgress).toLong())
handler.sendEmptyMessage((progress - density).toInt())
Expand All @@ -218,8 +218,8 @@ class CameleonLayout : FrameLayout, FilledStatusListener, View.OnClickListener {
cameleonLayout.let {
it.updateProgress((msg?.what)?.toFloat()!!)
if(it.status is FilledStatus.Loading) {
if (msg.what > it.maxProgress) it.fireFilledStatus(FilledStatus.Filled())
if (msg.what <= 0) { it.fireFilledStatus(FilledStatus.UnFilled()) }
if (msg.what > it.maxProgress) it.fireFilledStatus(FilledStatus.Filled)
if (msg.what <= 0) { it.fireFilledStatus(FilledStatus.UnFilled) }
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions cameleonlayout/src/main/java/com/skydoves/cameleonlayout/FilledStatus.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package com.skydoves.cameleonlayout

sealed class FilledStatus {
class UnFilled: FilledStatus()
class Loading: FilledStatus()
class Filled: FilledStatus()
object UnFilled : FilledStatus()
object Loading : FilledStatus()
object Filled : FilledStatus()
}