Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ android {
dependencies {
implementation project(':flashbar')

implementation "com.android.support:appcompat-v7:$versions.supportVersion"
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@

import android.graphics.Typeface;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView.ScaleType;

import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.content.ContextCompat;

import com.andrognito.flashbar.Flashbar;
import com.andrognito.flashbar.anim.FlashAnim;

Expand Down Expand Up @@ -267,7 +268,7 @@ private Flashbar progressAdvanced() {
return new Flashbar.Builder(this)
.gravity(Flashbar.Gravity.BOTTOM)
.message(
"You can customize the look-and-fell of the progress bar.")
"You can customize the look-and-feel of the progress bar.")
.backgroundColorRes(R.color.slate_black)
.showIcon()
.showProgress(Flashbar.ProgressPosition.RIGHT)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package com.andrognito.flashbardemo

import android.graphics.Typeface
import android.os.Bundle
import android.support.v4.content.ContextCompat
import android.support.v7.app.AppCompatActivity
import android.util.Log
import androidx.appcompat.app.AppCompatActivity
import androidx.core.content.ContextCompat
import com.andrognito.flashbar.Flashbar
import com.andrognito.flashbar.anim.FlashAnim
import kotlinx.android.synthetic.main.activity_main.*
Expand Down
9 changes: 4 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
buildscript {
ext.versions = [
sdkMin : 14,
sdkTarget : 27,
kotlin : '1.2.50',
supportVersion: '27.1.1'
sdkTarget : 29,
kotlin : '1.3.41'
]
ext.kotlin_version = '1.2.50'
ext.kotlin_version = '1.3.41'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.android.tools.build:gradle:3.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
Expand Down
8 changes: 4 additions & 4 deletions flashbar/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ext {
siteUrl = 'https://github.com/aritraroy/Flashbar'
gitUrl = 'https://github.com/aritraroy/Flashbar.git'

libraryVersion = '1.0.2'
libraryVersion = '1.0.4'

developerId = 'aritraroy'
developerName = 'Aritra Roy'
Expand All @@ -32,15 +32,15 @@ android {
defaultConfig {
minSdkVersion versions.sdkMin
targetSdkVersion versions.sdkTarget
versionCode 3
versionName "1.0.2"
versionCode 5
versionName "1.0.4"

consumerProguardFiles 'proguard-rules.pro'
}
}

dependencies {
implementation "com.android.support:appcompat-v7:$versions.supportVersion"
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
}

Expand Down
4 changes: 2 additions & 2 deletions flashbar/src/main/java/com/andrognito/flashbar/Flashbar.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import android.graphics.Bitmap
import android.graphics.PorterDuff
import android.graphics.Typeface
import android.graphics.drawable.Drawable
import android.support.annotation.*
import android.support.v4.content.ContextCompat
import android.text.Spanned
import android.widget.ImageView.ScaleType
import android.widget.ImageView.ScaleType.CENTER_CROP
import androidx.annotation.*
import androidx.core.content.ContextCompat
import com.andrognito.flashbar.Flashbar.Gravity.BOTTOM
import com.andrognito.flashbar.Flashbar.Gravity.TOP
import com.andrognito.flashbar.anim.FlashAnim
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ internal class FlashbarContainerView(context: Context)
}

internal fun adjustOrientation(activity: Activity) {
val flashbarContainerViewLp = RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT)
val flashbarContainerViewLp = LayoutParams(MATCH_PARENT, MATCH_PARENT)

val navigationBarPosition = activity.getNavigationBarPosition()
val navigationBarSize = activity.getNavigationBarSizeInPx()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,17 @@ import android.graphics.drawable.Drawable
import android.os.Build
import android.os.Build.VERSION.SDK_INT
import android.os.Build.VERSION_CODES.M
import android.support.annotation.ColorInt
import android.text.Spanned
import android.text.TextUtils
import android.util.TypedValue
import android.view.ViewGroup
import android.view.ViewGroup.LayoutParams.MATCH_PARENT
import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.RelativeLayout
import android.widget.RelativeLayout.ALIGN_PARENT_BOTTOM
import android.widget.RelativeLayout.ALIGN_PARENT_TOP
import androidx.annotation.ColorInt
import com.andrognito.flashbar.Flashbar.Gravity
import com.andrognito.flashbar.Flashbar.Gravity.BOTTOM
import com.andrognito.flashbar.Flashbar.Gravity.TOP
Expand Down Expand Up @@ -57,7 +56,7 @@ internal class FlashbarView(context: Context) : LinearLayout(context) {
if (!isMarginCompensationApplied) {
isMarginCompensationApplied = true

val params = layoutParams as ViewGroup.MarginLayoutParams
val params = layoutParams as MarginLayoutParams
when (gravity) {
TOP -> params.topMargin = -TOP_COMPENSATION_MARGIN
BOTTOM -> params.bottomMargin = -BOTTOM_COMPENSATION_MARGIN
Expand Down Expand Up @@ -93,7 +92,7 @@ internal class FlashbarView(context: Context) : LinearLayout(context) {
val flashbarViewLp = RelativeLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
val statusBarHeight = activity.getStatusBarHeightInPx()

val flashbarViewContentLp = fbContent.layoutParams as LinearLayout.LayoutParams
val flashbarViewContentLp = fbContent.layoutParams as LayoutParams

when (gravity) {
TOP -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ import android.animation.Animator
import android.animation.AnimatorListenerAdapter
import android.animation.ValueAnimator
import android.os.Build
import android.support.annotation.RequiresApi
import android.view.MotionEvent
import android.view.VelocityTracker
import android.view.View
import android.view.ViewConfiguration
import androidx.annotation.RequiresApi
import kotlin.math.abs
import kotlin.math.max
import kotlin.math.min

internal class SwipeDismissTouchListener(
private val view: View,
Expand Down Expand Up @@ -56,11 +59,11 @@ internal class SwipeDismissTouchListener(
velocityTracker!!.addMovement(motionEvent)
velocityTracker!!.computeCurrentVelocity(1000)
val velocityX = velocityTracker!!.xVelocity
val absVelocityX = Math.abs(velocityX)
val absVelocityY = Math.abs(velocityTracker!!.yVelocity)
val absVelocityX = abs(velocityX)
val absVelocityY = abs(velocityTracker!!.yVelocity)
var dismiss = false
var dismissRight = false
if (Math.abs(deltaX) > viewWidth / 2 && swiping) {
if (abs(deltaX) > viewWidth / 2 && swiping) {
dismiss = true
dismissRight = deltaX > 0
} else if (minFlingVelocity <= absVelocityX && absVelocityY < absVelocityX && swiping) {
Expand Down Expand Up @@ -116,7 +119,7 @@ internal class SwipeDismissTouchListener(
velocityTracker!!.addMovement(motionEvent)
val deltaX = motionEvent.rawX - downX
val deltaY = motionEvent.rawY - downY
if (Math.abs(deltaX) > slop && Math.abs(deltaY) < Math.abs(deltaX) / 2) {
if (abs(deltaX) > slop && abs(deltaY) < abs(deltaX) / 2) {
swiping = true
callbacks.onSwipe(true)
swipingSlop = if (deltaX > 0) slop else -slop
Expand All @@ -131,7 +134,7 @@ internal class SwipeDismissTouchListener(
if (swiping) {
translationX = deltaX
this.view.translationX = deltaX - swipingSlop
this.view.alpha = Math.max(0f, Math.min(1f, 1f - 2f * Math.abs(deltaX) / viewWidth))
this.view.alpha = max(0f, min(1f, 1f - 2f * abs(deltaX) / viewWidth))
return true
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.andrognito.flashbar.anim

import android.content.Context
import android.support.annotation.CallSuper
import android.support.annotation.InterpolatorRes
import android.view.View
import android.view.animation.*
import androidx.annotation.CallSuper
import androidx.annotation.InterpolatorRes
import com.andrognito.flashbar.R

abstract class BaseFlashAnimBuilder(private val context: Context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import android.animation.Animator
import android.animation.AnimatorSet
import android.animation.ObjectAnimator
import android.content.Context
import android.support.annotation.InterpolatorRes
import android.view.View
import android.view.animation.AnticipateInterpolator
import android.view.animation.Interpolator
import android.view.animation.OvershootInterpolator
import androidx.annotation.InterpolatorRes
import com.andrognito.flashbar.Flashbar
import com.andrognito.flashbar.Flashbar.Gravity.BOTTOM
import com.andrognito.flashbar.Flashbar.Gravity.TOP
Expand Down Expand Up @@ -114,7 +114,7 @@ class FlashAnimBarBuilder(context: Context) : BaseFlashAnimBuilder(context) {
// Slide from left/right animation is not specified, default top/bottom
// animation is applied
if (direction == null) {
translationAnim.propertyName = "translationY"
translationAnim.setPropertyName("translationY")

when (type!!) {
ENTER -> when (gravity!!) {
Expand All @@ -127,7 +127,7 @@ class FlashAnimBarBuilder(context: Context) : BaseFlashAnimBuilder(context) {
}
}
} else {
translationAnim.propertyName = "translationX"
translationAnim.setPropertyName("translationX")

when (type!!) {
ENTER -> when (direction!!) {
Expand All @@ -146,7 +146,7 @@ class FlashAnimBarBuilder(context: Context) : BaseFlashAnimBuilder(context) {

if (alpha) {
val alphaAnim = ObjectAnimator()
alphaAnim.propertyName = "alpha"
alphaAnim.setPropertyName("alpha")
alphaAnim.target = view

when (type!!) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import android.animation.PropertyValuesHolder
import android.animation.ValueAnimator.INFINITE
import android.animation.ValueAnimator.REVERSE
import android.content.Context
import android.support.annotation.InterpolatorRes
import android.view.View
import android.view.animation.Interpolator
import androidx.annotation.InterpolatorRes

class FlashAnimIconBuilder(context: Context) : BaseFlashAnimBuilder(context) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import android.view.*
import android.view.Surface.*
import com.andrognito.flashbar.util.NavigationBarPosition.*
import java.lang.reflect.InvocationTargetException
import kotlin.math.roundToInt

internal fun Activity.getStatusBarHeightInPx(): Int {
val rectangle = Rect()
Expand Down Expand Up @@ -47,18 +48,18 @@ internal fun Activity.getNavigationBarSizeInPx(): Int {
}

internal fun Activity?.getRootView(): ViewGroup? {
if (this == null || window == null || window.decorView == null) {
if (this == null || window?.decorView == null) {
return null
}
return window.decorView as ViewGroup
}

internal fun Context.convertDpToPx(dp: Int): Int {
return Math.round(dp * (resources.displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT))
return (dp * (resources.displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)).roundToInt()
}

internal fun Context.convertPxToDp(px: Int): Int {
return Math.round(px / (resources.displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT))
return (px / (resources.displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)).roundToInt()
}

private fun Activity.getRealScreenSize(): Point {
Expand Down
Loading