Skip to content

Commit c426584

Browse files
committed
Merge branch 'dev'
2 parents fc8620f + f646d72 commit c426584

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ android {
1515
applicationId = "me.rosuh.easywatermark"
1616
minSdk = (Apps.minSdk)
1717
targetSdk = (Apps.targetSdk)
18-
versionCode = 20603
19-
versionName = "2.6.3"
18+
versionCode = 20604
19+
versionName = "2.6.4"
2020
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2121
setProperty("archivesBaseName", "$applicationId-v$versionName($versionCode)")
2222
}

app/src/main/java/me/rosuh/easywatermark/ui/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ class MainActivity : AppCompatActivity() {
697697
viewModel.clearData()
698698
launchView.ivPhoto.reset()
699699
bgTransformAnimator?.cancel()
700-
(launchView.background as ColorDrawable).color.toColor(
700+
(launchView.background as? ColorDrawable?)?.color?.toColor(
701701
this.colorBackground
702702
) {
703703
val c = it.animatedValue as Int

0 commit comments

Comments
 (0)