diff --git a/README.md b/README.md
index 41dc41a..95502dc 100644
--- a/README.md
+++ b/README.md
@@ -8,24 +8,27 @@
-🔐 Light library that is beautiful Pin Lock screen for Jetpack Compose. The library handles saving pin in Encrypted file. Integration is very easy and fast.
+🔐 PinLock is a light library to display Pin Lock screen in Jetpack Compose. The library handles saving pin in Encrypted file. Integration is very easy and fast.
# Setup
-Add it in your root **build.gradle** at the end of repositories:
-```groovy
-allprojects {
+Add the maven library bucket to the `dependencyResolutionManagement.repositories` block in `settings.gradle.kts` file as follows:
+```kotlin
+dependencyResolutionManagement {
+ ...
repositories {
- maven { url 'https://jitpack.io' }
+ ...
+ maven("https://jitpack.io")
}
}
-```
+```
-Include below dependency in build.gradle of application and sync it:
-```groovy
-implementation 'com.github.raheemadamboev:pin-lock-compose:1.0.1'
+Install the library to the project in desired module's `build.gradle.kts` file. Replace `` with the actual version:
+```kotlin
+implementation("com.github.raheemadamboev:pin-lock-compose:")
```
+
# Implementation
Firstly, initialize the library on your `onCreate` of Application class:
@@ -57,8 +60,8 @@ PinLock(
If there is no saved pin yet, it promtps the user to create pin. If there is saved pin, it promts the user to enter its pin:
- 
- 
+ 
+ 
---
@@ -81,7 +84,7 @@ ChangePinLock(
Use this only if there is already saved pin. If there is no saved pin, use simple `PinLock` instead for creating pin for the first time. When using `ChangePinLock`, firstly it prompts the user to enter original pin. After user succesfully authenticates using his original pin, it prompts the user to creat a new pin:
- 
+ 
---
@@ -110,16 +113,16 @@ PinManager.clearPin()
You can install and try demo app. All the features are implemented in the demo from creating pin to changing pin.
-Download demo
+Download demo
- 
- 
+ 
+ 
# Projects using this library
-**Notepad**: 40 000+ downloads.
+**Notepad**: 100 000+ downloads.
Google Play Store
diff --git a/app-debug.apk b/app-debug.apk
deleted file mode 100644
index 4a81bf2..0000000
Binary files a/app-debug.apk and /dev/null differ
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 5fb3d89..0000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,76 +0,0 @@
-plugins {
- id 'com.android.application'
- id 'org.jetbrains.kotlin.android'
-}
-
-android {
- namespace 'xyz.teamgravity.pinlockcomposedemo'
- compileSdk 33
-
- defaultConfig {
- applicationId "xyz.teamgravity.pinlockcomposedemo"
- minSdk 21
- targetSdk 33
- versionCode 1
- versionName "1.0"
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- vectorDrawables {
- useSupportLibrary true
- }
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-
- kotlinOptions {
- jvmTarget = '1.8'
- }
-
- buildFeatures {
- compose true
- }
-
- composeOptions {
- kotlinCompilerExtensionVersion '1.4.2'
- }
-
- packagingOptions {
- resources {
- excludes += '/META-INF/{AL2.0,LGPL2.1}'
- }
- }
-}
-
-dependencies {
-
- // core
- implementation 'androidx.core:core-ktx:1.9.0'
-
- // compose ui
- implementation "androidx.compose.ui:ui:1.4.0-beta02"
-
- // compose preview
- implementation "androidx.compose.ui:ui-tooling-preview:1.4.0-beta02"
-
- // compose activity
- implementation 'androidx.activity:activity-compose:1.6.1'
-
- // compose material3
- implementation 'androidx.compose.material3:material3:1.1.0-alpha07'
-
- // lifecycle
- implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-
- // pin lock compose
- implementation 'com.github.raheemadamboev:pin-lock-compose:1.0'
-}
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000..dd994b0
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,63 @@
+plugins {
+ alias(libs.plugins.android)
+ alias(libs.plugins.kotlin)
+ alias(libs.plugins.compose)
+}
+
+android {
+ namespace = "xyz.teamgravity.pinlockcomposedemo"
+ compileSdk = libs.versions.sdk.compile.get().toInt()
+
+ defaultConfig {
+ applicationId = "xyz.teamgravity.pinlockcomposedemo"
+ minSdk = libs.versions.sdk.min.get().toInt()
+ targetSdk = libs.versions.sdk.target.get().toInt()
+ versionCode = 1
+ versionName = "1.0.0"
+
+ vectorDrawables {
+ useSupportLibrary = true
+ }
+ }
+
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
+ }
+
+ kotlinOptions {
+ jvmTarget = libs.versions.java.target.get()
+ }
+
+ buildFeatures {
+ compose = true
+ }
+
+ packaging {
+ resources {
+ excludes += "/META-INF/{AL2.0,LGPL2.1}"
+ }
+ }
+}
+
+dependencies {
+
+ // pin lock compose
+ implementation(projects.pinLockCompose)
+
+ // compose
+ implementation(platform(libs.compose))
+ implementation(libs.compose.ui)
+ implementation(libs.compose.graphics)
+ implementation(libs.compose.preview)
+ implementation(libs.compose.material3)
+
+ // compose activity
+ implementation(libs.compose.activity)
+
+ // compose lifecycle
+ implementation(libs.compose.lifecycle)
+
+ // core
+ implementation(libs.core)
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/teamgravity/pinlockcomposedemo/MainActivity.kt b/app/src/main/java/xyz/teamgravity/pinlockcomposedemo/MainActivity.kt
index f9eb822..1bf0d8d 100644
--- a/app/src/main/java/xyz/teamgravity/pinlockcomposedemo/MainActivity.kt
+++ b/app/src/main/java/xyz/teamgravity/pinlockcomposedemo/MainActivity.kt
@@ -1,10 +1,14 @@
package xyz.teamgravity.pinlockcomposedemo
+import android.os.Build
import android.os.Bundle
import android.util.Log
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.*
+import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.Button
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
@@ -24,13 +28,19 @@ import xyz.teamgravity.pinlockcomposedemo.ui.theme.PinLockComposeDemoTheme
class MainActivity : ComponentActivity() {
- companion object {
- private const val TAG = "Tate"
+ private companion object {
+ const val TAG = "PinLock"
}
override fun onCreate(savedInstanceState: Bundle?) {
+ enableEdgeToEdge()
super.onCreate(savedInstanceState)
- window.navigationBarColor = android.graphics.Color.parseColor("#6650a4")
+
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+ @Suppress("DEPRECATION")
+ window.navigationBarColor = android.graphics.Color.parseColor("#6650A4")
+ }
+
setContent {
PinLockComposeDemoTheme {
Surface(
@@ -92,25 +102,32 @@ class MainActivity : ComponentActivity() {
Screen.Main -> {
Column(
horizontalAlignment = Alignment.CenterHorizontally,
- verticalArrangement = Arrangement.Center,
+ verticalArrangement = Arrangement.spacedBy(
+ space = 16.dp,
+ alignment = Alignment.CenterVertically
+ ),
modifier = Modifier.fillMaxSize()
) {
- Text(text = "You entered pin correctly!")
- Spacer(modifier = Modifier.height(16.dp))
+ Text(
+ text = "You entered pin correctly!"
+ )
Button(
onClick = {
navigation = Screen.Authenticate
}
) {
- Text(text = "Authenticate")
+ Text(
+ text = "Authenticate"
+ )
}
- Spacer(modifier = Modifier.height(16.dp))
Button(
onClick = {
navigation = Screen.ChangePin
}
) {
- Text(text = "Change Pin")
+ Text(
+ text = "Change Pin"
+ )
}
}
}
@@ -123,6 +140,6 @@ class MainActivity : ComponentActivity() {
private enum class Screen {
Authenticate,
ChangePin,
- Main
+ Main;
}
}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/teamgravity/pinlockcomposedemo/ui/theme/Color.kt b/app/src/main/java/xyz/teamgravity/pinlockcomposedemo/ui/theme/Color.kt
index 3143d2c..5873b3b 100644
--- a/app/src/main/java/xyz/teamgravity/pinlockcomposedemo/ui/theme/Color.kt
+++ b/app/src/main/java/xyz/teamgravity/pinlockcomposedemo/ui/theme/Color.kt
@@ -2,10 +2,6 @@ package xyz.teamgravity.pinlockcomposedemo.ui.theme
import androidx.compose.ui.graphics.Color
-val Purple80 = Color(0xFFD0BCFF)
-val PurpleGrey80 = Color(0xFFCCC2DC)
-val Pink80 = Color(0xFFEFB8C8)
-
val Purple40 = Color(0xFF6650a4)
val PurpleGrey40 = Color(0xFF625b71)
val Pink40 = Color(0xFF7D5260)
\ No newline at end of file
diff --git a/app/src/main/java/xyz/teamgravity/pinlockcomposedemo/ui/theme/Theme.kt b/app/src/main/java/xyz/teamgravity/pinlockcomposedemo/ui/theme/Theme.kt
index 0429e26..f04d93c 100644
--- a/app/src/main/java/xyz/teamgravity/pinlockcomposedemo/ui/theme/Theme.kt
+++ b/app/src/main/java/xyz/teamgravity/pinlockcomposedemo/ui/theme/Theme.kt
@@ -1,13 +1,8 @@
package xyz.teamgravity.pinlockcomposedemo.ui.theme
-import android.app.Activity
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.lightColorScheme
import androidx.compose.runtime.Composable
-import androidx.compose.runtime.SideEffect
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.LocalView
-import androidx.core.view.ViewCompat
private val LightColorScheme = lightColorScheme(
primary = Purple40,
@@ -19,14 +14,6 @@ private val LightColorScheme = lightColorScheme(
fun PinLockComposeDemoTheme(
content: @Composable () -> Unit,
) {
- val view = LocalView.current
- if (!view.isInEditMode) {
- SideEffect {
- (view.context as Activity).window.statusBarColor = LightColorScheme.primary.toArgb()
- ViewCompat.getWindowInsetsController(view)?.isAppearanceLightStatusBars = false
- }
- }
-
MaterialTheme(
colorScheme = LightColorScheme,
content = content
diff --git a/banner_2.gif b/banner_2.gif
deleted file mode 100644
index c520fb1..0000000
Binary files a/banner_2.gif and /dev/null differ
diff --git a/banner_3.gif b/banner_3.gif
deleted file mode 100644
index 403f4e9..0000000
Binary files a/banner_3.gif and /dev/null differ
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 52f67d1..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,5 +0,0 @@
-plugins {
- id 'com.android.application' version '7.4.1' apply false
- id 'com.android.library' version '7.4.1' apply false
- id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..9f59ae5
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,6 @@
+plugins {
+ alias(libs.plugins.android) apply false
+ alias(libs.plugins.library) apply false
+ alias(libs.plugins.kotlin) apply false
+ alias(libs.plugins.compose) apply false
+}
\ No newline at end of file
diff --git a/extra/app-debug.apk b/extra/app-debug.apk
new file mode 100644
index 0000000..020f657
Binary files /dev/null and b/extra/app-debug.apk differ
diff --git a/banner_1.gif b/extra/banner_1.gif
similarity index 100%
rename from banner_1.gif
rename to extra/banner_1.gif
diff --git a/extra/banner_2.gif b/extra/banner_2.gif
new file mode 100644
index 0000000..6774f88
Binary files /dev/null and b/extra/banner_2.gif differ
diff --git a/extra/banner_3.gif b/extra/banner_3.gif
new file mode 100644
index 0000000..8fb54d2
Binary files /dev/null and b/extra/banner_3.gif differ
diff --git a/screenshot_1.jpg b/extra/screenshot_1.jpg
similarity index 100%
rename from screenshot_1.jpg
rename to extra/screenshot_1.jpg
diff --git a/screenshot_2.jpg b/extra/screenshot_2.jpg
similarity index 100%
rename from screenshot_2.jpg
rename to extra/screenshot_2.jpg
diff --git a/screenshot_3.jpg b/extra/screenshot_3.jpg
similarity index 100%
rename from screenshot_3.jpg
rename to extra/screenshot_3.jpg
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..55f12fa
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,36 @@
+[versions]
+
+compose = "2024.11.00"
+compose-constraintlayout = "1.1.0"
+compose-activity = "1.9.3"
+compose-lifecycle = "2.8.7"
+core = "1.15.0"
+security = "1.1.0-alpha06"
+
+android = "8.7.2"
+kotlin = "2.0.21"
+
+sdk-min = "21"
+sdk-compile = "35"
+sdk-target = "35"
+java-target = "17"
+
+[libraries]
+
+compose = { group = "androidx.compose", name = "compose-bom", version.ref = "compose" }
+compose-ui = { group = "androidx.compose.ui", name = "ui" }
+compose-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
+compose-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+compose-material3 = { group = "androidx.compose.material3", name = "material3" }
+compose-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version.ref = "compose-constraintlayout" }
+compose-activity = { group = "androidx.activity", name = "activity-compose", version.ref = "compose-activity" }
+compose-lifecycle = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "compose-lifecycle" }
+core = { group = "androidx.core", name = "core-ktx", version.ref = "core" }
+security = { group = "androidx.security", name = "security-crypto", version.ref = "security" }
+
+[plugins]
+
+android = { id = "com.android.application", version.ref = "android" }
+library = { id = "com.android.library", version.ref = "android" }
+kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 38b4785..f1989e7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Feb 24 17:26:38 UZT 2023
+#Wed Nov 27 15:26:22 UZT 2024
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/jitpack.yml b/jitpack.yml
index 1bfc0d7..bcf1f6f 100644
--- a/jitpack.yml
+++ b/jitpack.yml
@@ -1,4 +1,4 @@
jdk:
- - openjdk11
+ - openjdk17
before_install:
- ./scripts/prepareJitpackEnvironment.sh
\ No newline at end of file
diff --git a/pin_lock_compose/build.gradle b/pin_lock_compose/build.gradle
deleted file mode 100644
index 8c3cd65..0000000
--- a/pin_lock_compose/build.gradle
+++ /dev/null
@@ -1,90 +0,0 @@
-plugins {
- id 'com.android.library'
- id 'org.jetbrains.kotlin.android'
- id 'maven-publish'
-}
-
-android {
- namespace 'xyz.teamgravity.pin_lock_compose'
- compileSdk 33
-
- defaultConfig {
- minSdk 21
- targetSdk 33
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- consumerProguardFiles "consumer-rules.pro"
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-
- buildFeatures {
- compose true
- }
-
- composeOptions {
- kotlinCompilerExtensionVersion '1.4.2'
- }
-
- packagingOptions {
- resources {
- excludes += '/META-INF/{AL2.0,LGPL2.1}'
- }
- }
-}
-
-dependencies {
-
- // core
- implementation 'androidx.core:core-ktx:1.9.0'
-
- // compose ui
- implementation "androidx.compose.ui:ui:1.4.0-beta02"
-
- // compose preview
- implementation "androidx.compose.ui:ui-tooling-preview:1.4.0-beta02"
-
- // compose activity
- implementation 'androidx.activity:activity-compose:1.6.1'
-
- // compose material3
- implementation 'androidx.compose.material3:material3:1.1.0-alpha07'
-
- // compose constraint layout
- implementation 'androidx.constraintlayout:constraintlayout-compose:1.0.1'
-
- // lifecycle
- implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-
- // security
- implementation "androidx.security:security-crypto:1.1.0-alpha05"
-}
-
-allprojects {
- tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
- kotlinOptions {
- freeCompilerArgs += [
- "-opt-in=androidx.compose.animation.ExperimentalAnimationApi"
- ]
- }
- }
-}
-
-afterEvaluate {
- publishing {
- publications {
- release(MavenPublication) {
- from components.release
-
- groupId = 'com.github.raheemadamboev'
- artifactId = 'pin-lock-compose'
- version = '1.0'
- }
- }
- }
-}
\ No newline at end of file
diff --git a/pin_lock_compose/build.gradle.kts b/pin_lock_compose/build.gradle.kts
new file mode 100644
index 0000000..6f5b712
--- /dev/null
+++ b/pin_lock_compose/build.gradle.kts
@@ -0,0 +1,84 @@
+plugins {
+ alias(libs.plugins.library)
+ alias(libs.plugins.kotlin)
+ alias(libs.plugins.compose)
+ `maven-publish`
+}
+
+android {
+ namespace = "xyz.teamgravity.pin_lock_compose"
+ compileSdk = libs.versions.sdk.compile.get().toInt()
+
+ defaultConfig {
+ minSdk = libs.versions.sdk.min.get().toInt()
+ }
+
+ lint {
+ targetSdk = libs.versions.sdk.target.get().toInt()
+ }
+
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
+ }
+
+ kotlinOptions {
+ jvmTarget = libs.versions.java.target.get()
+ }
+
+ buildFeatures {
+ compose = true
+ }
+
+ packaging {
+ resources {
+ pickFirsts.add("META-INF/atomicfu.kotlin_module")
+ }
+ }
+
+ publishing {
+ singleVariant("release") {
+ withSourcesJar()
+ withJavadocJar()
+ }
+ }
+}
+
+dependencies {
+
+ // compose
+ implementation(platform(libs.compose))
+ implementation(libs.compose.ui)
+ implementation(libs.compose.graphics)
+ implementation(libs.compose.preview)
+ implementation(libs.compose.material3)
+
+ // compose constraint layout
+ implementation(libs.compose.constraintlayout)
+
+ // compose activity
+ implementation(libs.compose.activity)
+
+ // compose lifecycle
+ implementation(libs.compose.lifecycle)
+
+ // core
+ implementation(libs.core)
+
+ // security
+ implementation(libs.security)
+}
+
+afterEvaluate {
+ publishing {
+ publications {
+ register("release") {
+ from(components["release"])
+
+ groupId = "com.github.raheemadamboev"
+ artifactId = "pin-lock-compose"
+ version = "1.0.2"
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/pin_lock_compose/src/androidTest/java/xyz/teamgravity/pin_lock_compose/ExampleInstrumentedTest.kt b/pin_lock_compose/src/androidTest/java/xyz/teamgravity/pin_lock_compose/ExampleInstrumentedTest.kt
deleted file mode 100644
index ecf989a..0000000
--- a/pin_lock_compose/src/androidTest/java/xyz/teamgravity/pin_lock_compose/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package xyz.teamgravity.pin_lock_compose
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
- @Test
- fun useAppContext() {
- // Context of the app under test.
- val appContext = InstrumentationRegistry.getInstrumentation().targetContext
- assertEquals("xyz.teamgravity.pin_lock_compose.test", appContext.packageName)
- }
-}
\ No newline at end of file
diff --git a/pin_lock_compose/src/main/java/xyz/teamgravity/pin_lock_compose/PinLock.kt b/pin_lock_compose/src/main/java/xyz/teamgravity/pin_lock_compose/PinLock.kt
index bcae6b6..974f44c 100644
--- a/pin_lock_compose/src/main/java/xyz/teamgravity/pin_lock_compose/PinLock.kt
+++ b/pin_lock_compose/src/main/java/xyz/teamgravity/pin_lock_compose/PinLock.kt
@@ -1,25 +1,41 @@
package xyz.teamgravity.pin_lock_compose
-import androidx.compose.animation.AnimatedContent
-import androidx.compose.animation.core.Spring
-import androidx.compose.animation.core.spring
-import androidx.compose.animation.slideInHorizontally
-import androidx.compose.animation.slideOutHorizontally
-import androidx.compose.animation.with
import androidx.compose.foundation.background
import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
-import androidx.constraintlayout.compose.*
+import androidx.constraintlayout.compose.ChainStyle
+import androidx.constraintlayout.compose.ConstrainScope
+import androidx.constraintlayout.compose.ConstrainedLayoutReference
+import androidx.constraintlayout.compose.ConstraintLayout
+import androidx.constraintlayout.compose.ConstraintLayoutScope
+import androidx.constraintlayout.compose.Dimension
+import xyz.teamgravity.pin_lock_compose.shake.ShakeController
+import xyz.teamgravity.pin_lock_compose.shake.rememberShakeController
+import xyz.teamgravity.pin_lock_compose.shake.shake
/**
* Covers the whole screen and displays the PinLock. This composable makes the user enter pin if it already exists. If there is
@@ -45,8 +61,7 @@ fun PinLock(
onPinIncorrect: () -> Unit,
onPinCreated: () -> Unit,
) {
- var animate by remember { mutableStateOf(false) }
-
+ val controller = rememberShakeController()
val numbers = rememberMutableStateListOf()
val pinExists = remember { PinManager.pinExists() }
@@ -55,7 +70,7 @@ fun PinLock(
title(pinExists)
},
color = color,
- animate = animate,
+ controller = controller,
numbers = numbers,
onNumberChange = { number ->
if (numbers.size < PinConst.PIN_LENGTH) numbers.add(number)
@@ -66,7 +81,7 @@ fun PinLock(
onPinCorrect()
numbers.clear()
} else {
- animate = !animate
+ controller.incorrect()
onPinIncorrect()
numbers.clear()
}
@@ -107,17 +122,16 @@ fun ChangePinLock(
onPinIncorrect: () -> Unit,
onPinChanged: () -> Unit,
) {
- var authenticated by rememberSaveable { mutableStateOf(false) }
- var animate by remember { mutableStateOf(false) }
-
+ val controller = rememberShakeController()
val numbers = rememberMutableStateListOf()
+ var authenticated by rememberSaveable { mutableStateOf(false) }
BasePinLock(
title = {
title(authenticated)
},
color = color,
- animate = animate,
+ controller = controller,
numbers = numbers,
onNumberChange = { number ->
if (numbers.size < PinConst.PIN_LENGTH) numbers.add(number)
@@ -132,7 +146,7 @@ fun ChangePinLock(
numbers.clear()
authenticated = true
} else {
- animate = !animate
+ controller.incorrect()
onPinIncorrect()
numbers.clear()
}
@@ -152,8 +166,8 @@ fun ChangePinLock(
* Container for title text.
* @param color
* Background color of container.
- * @param animate
- * Whenever this value changes, incorrect pin pattern animation gets executed on pin indicator.
+ * @param controller
+ * ShakeController that allows to animate incorrect animation.
* @param numbers
* List of int that represents entered pin.
* @param onNumberChange
@@ -165,7 +179,7 @@ fun ChangePinLock(
private fun BasePinLock(
title: @Composable () -> Unit,
color: Color,
- animate: Boolean,
+ controller: ShakeController,
numbers: List,
onNumberChange: (number: Int) -> Unit,
onBackspace: () -> Unit,
@@ -180,9 +194,11 @@ private fun BasePinLock(
val (oneB, twoB, threeB, fourB, fiveB, sixB, sevenB, eightB, nineB, zeroB, clearB) = createRefs()
Box(
- modifier = Modifier.constrainAs(titleC) {
- linkTo(start = parent.start, end = parent.end)
- },
+ modifier = Modifier
+ .shake(controller)
+ .constrainAs(titleC) {
+ linkTo(start = parent.start, end = parent.end)
+ }
) {
title()
}
@@ -192,37 +208,27 @@ private fun BasePinLock(
width = Dimension.matchParent
}
)
- AnimatedContent(
- targetState = animate,
- transitionSpec = {
- slideInHorizontally(
- animationSpec = spring(
- dampingRatio = Spring.DampingRatioHighBouncy,
- stiffness = Spring.StiffnessHigh
- )
- ) { 50 }.with(
- slideOutHorizontally(
- animationSpec = spring(
- dampingRatio = Spring.DampingRatioHighBouncy,
- stiffness = Spring.StiffnessHigh
- )
- ) { 0 }
- )
- },
- modifier = Modifier.constrainAs(numberC) {
- width = Dimension.matchParent
- }
+ Row(
+ horizontalArrangement = Arrangement.Center,
+ verticalAlignment = Alignment.CenterVertically,
+ modifier = Modifier
+ .shake(controller)
+ .constrainAs(numberC) {
+ width = Dimension.matchParent
+ }
) {
- Row(
- horizontalArrangement = Arrangement.Center,
- verticalAlignment = Alignment.CenterVertically,
- modifier = Modifier.fillMaxWidth()
- ) {
- PinIndicator(filled = numbers.size > 0)
- PinIndicator(filled = numbers.size > 1)
- PinIndicator(filled = numbers.size > 2)
- PinIndicator(filled = numbers.size > 3)
- }
+ PinIndicator(
+ filled = numbers.size > 0
+ )
+ PinIndicator(
+ filled = numbers.size > 1
+ )
+ PinIndicator(
+ filled = numbers.size > 2
+ )
+ PinIndicator(
+ filled = numbers.size > 3
+ )
}
Spacer(
modifier = Modifier.constrainAs(twoS) {
@@ -381,4 +387,4 @@ private fun ConstraintLayoutScope.NumberButton(
/**
* Background color of number button.
*/
-private val NumberButtonBackground = Color.White.copy(alpha = 0.3F)
\ No newline at end of file
+private val NumberButtonBackground: Color = Color.White.copy(alpha = 0.3F)
\ No newline at end of file
diff --git a/pin_lock_compose/src/main/java/xyz/teamgravity/pin_lock_compose/shake/ShakeConfig.kt b/pin_lock_compose/src/main/java/xyz/teamgravity/pin_lock_compose/shake/ShakeConfig.kt
new file mode 100644
index 0000000..d19c78c
--- /dev/null
+++ b/pin_lock_compose/src/main/java/xyz/teamgravity/pin_lock_compose/shake/ShakeConfig.kt
@@ -0,0 +1,14 @@
+package xyz.teamgravity.pin_lock_compose.shake
+
+internal data class ShakeConfig(
+ val iterations: Int,
+ val intensity: Float = 100_000F,
+ val rotate: Float = 0F,
+ val rotateX: Float = 0F,
+ val rotateY: Float = 0F,
+ val scaleX: Float = 0F,
+ val scaleY: Float = 0F,
+ val translateX: Float = 0F,
+ val translateY: Float = 0F,
+ val trigger: Long = System.currentTimeMillis()
+)
\ No newline at end of file
diff --git a/pin_lock_compose/src/main/java/xyz/teamgravity/pin_lock_compose/shake/ShakeController.kt b/pin_lock_compose/src/main/java/xyz/teamgravity/pin_lock_compose/shake/ShakeController.kt
new file mode 100644
index 0000000..ed57736
--- /dev/null
+++ b/pin_lock_compose/src/main/java/xyz/teamgravity/pin_lock_compose/shake/ShakeController.kt
@@ -0,0 +1,19 @@
+package xyz.teamgravity.pin_lock_compose.shake
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+
+internal class ShakeController {
+ var config: ShakeConfig? by mutableStateOf(null)
+ private set
+
+ fun incorrect() {
+ config = ShakeConfig(
+ iterations = 4,
+ intensity = 2_000F,
+ rotateY = 15F,
+ translateX = 40F
+ )
+ }
+}
\ No newline at end of file
diff --git a/pin_lock_compose/src/main/java/xyz/teamgravity/pin_lock_compose/shake/rememberShareController.kt b/pin_lock_compose/src/main/java/xyz/teamgravity/pin_lock_compose/shake/rememberShareController.kt
new file mode 100644
index 0000000..77781fe
--- /dev/null
+++ b/pin_lock_compose/src/main/java/xyz/teamgravity/pin_lock_compose/shake/rememberShareController.kt
@@ -0,0 +1,9 @@
+package xyz.teamgravity.pin_lock_compose.shake
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+
+@Composable
+internal fun rememberShakeController(): ShakeController {
+ return remember { ShakeController() }
+}
\ No newline at end of file
diff --git a/pin_lock_compose/src/main/java/xyz/teamgravity/pin_lock_compose/shake/shake.kt b/pin_lock_compose/src/main/java/xyz/teamgravity/pin_lock_compose/shake/shake.kt
new file mode 100644
index 0000000..1ff7b26
--- /dev/null
+++ b/pin_lock_compose/src/main/java/xyz/teamgravity/pin_lock_compose/shake/shake.kt
@@ -0,0 +1,54 @@
+package xyz.teamgravity.pin_lock_compose.shake
+
+import androidx.compose.animation.core.Animatable
+import androidx.compose.animation.core.spring
+import androidx.compose.foundation.layout.offset
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
+import androidx.compose.ui.draw.rotate
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.unit.IntOffset
+import kotlin.math.roundToInt
+
+internal fun Modifier.shake(controller: ShakeController): Modifier = composed {
+ return@composed controller.config?.let { config ->
+ val shake = remember { Animatable(0F) }
+
+ LaunchedEffect(
+ key1 = config,
+ block = {
+ (0..config.iterations).forEach { iteration ->
+ shake.animateTo(
+ targetValue = if (iteration % 2 == 0) 1F else -1F,
+ animationSpec = spring(
+ stiffness = config.intensity
+ )
+ )
+ }
+ shake.animateTo(
+ targetValue = 0F
+ )
+ }
+ )
+
+ return@let this
+ .rotate(shake.value * config.rotate)
+ .graphicsLayer {
+ rotationX = shake.value * config.rotateX
+ rotationY = shake.value * config.rotateY
+ }
+ .scale(
+ scaleX = 1F + (shake.value * config.scaleX),
+ scaleY = 1F + (shake.value * config.scaleY)
+ )
+ .offset {
+ IntOffset(
+ x = (shake.value * config.translateX).roundToInt(),
+ y = (shake.value * config.translateY).roundToInt()
+ )
+ }
+ } ?: this
+}
\ No newline at end of file
diff --git a/pin_lock_compose/src/test/java/xyz/teamgravity/pin_lock_compose/ExampleUnitTest.kt b/pin_lock_compose/src/test/java/xyz/teamgravity/pin_lock_compose/ExampleUnitTest.kt
deleted file mode 100644
index b9f2b37..0000000
--- a/pin_lock_compose/src/test/java/xyz/teamgravity/pin_lock_compose/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package xyz.teamgravity.pin_lock_compose
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
- @Test
- fun addition_isCorrect() {
- assertEquals(4, 2 + 2)
- }
-}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle.kts
similarity index 61%
rename from settings.gradle
rename to settings.gradle.kts
index c6de2c8..6d76364 100644
--- a/settings.gradle
+++ b/settings.gradle.kts
@@ -1,3 +1,5 @@
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
pluginManagement {
repositories {
google()
@@ -5,14 +7,16 @@ pluginManagement {
gradlePluginPortal()
}
}
+
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
- maven { url 'https://jitpack.io' }
+ maven("https://jitpack.io")
}
}
-rootProject.name = "PinLockComposeDemo"
-include ':app'
-include ':pin_lock_compose'
+
+rootProject.name = "PinLockComposeAndroid"
+include(":app")
+include(":pin_lock_compose")
\ No newline at end of file