change package name of app

vitaviva · vitaviva · commit 14124b48d479 · 2021-09-18T07:07:05.000+08:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.compose.waveloading">
+    package="com.github.compose.waveloading.sample">
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/com/github/compose/waveloading/sample/MainActivity.kt b/app/src/main/java/com/github/compose/waveloading/sample/MainActivity.kt
@@ -1,18 +1,9 @@
-package com.github.compose.waveloading
+package com.github.compose.waveloading.sample
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.animation.core.CubicBezierEasing
-import androidx.compose.animation.core.LinearEasing
-import androidx.compose.animation.core.RepeatMode
-import androidx.compose.animation.core.animateFloat
-import androidx.compose.animation.core.animateIntAsState
-import androidx.compose.animation.core.infiniteRepeatable
-import androidx.compose.animation.core.rememberInfiniteTransition
-import androidx.compose.animation.core.tween
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -22,7 +13,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.Checkbox
 import androidx.compose.material.MaterialTheme
-import androidx.compose.material.RadioButton
 import androidx.compose.material.Slider
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
@@ -33,16 +23,16 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.rotate
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.github.compose.waveloading.ui.theme.ComposewaveloadingTheme
+import com.github.compose.waveloading.DrawType
+import com.github.compose.waveloading.WaveLoading
+import com.github.compose.waveloading.rememberDrawColor
+import com.github.compose.waveloading.sample.ui.theme.ComposewaveloadingTheme
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -147,7 +137,7 @@ class MainActivity : ComponentActivity() {
 
                         WaveLoading(
                             Modifier.weight(1f),
-                            drawType = DrawType.DrawColor(Color.Cyan),
+                            foreDrawType = DrawType.DrawColor(Color.Cyan),
                             backDrawType = if (_backImage) rememberDrawColor() else DrawType.None,
                             progress = _progress,
                             velocity = _velocity,
diff --git a/app/src/main/java/com/github/compose/waveloading/sample/ui/theme/Color.kt b/app/src/main/java/com/github/compose/waveloading/sample/ui/theme/Color.kt
@@ -1,4 +1,4 @@
-package com.github.compose.waveloading.ui.theme
+package com.github.compose.waveloading.sample.ui.theme
 
 import androidx.compose.ui.graphics.Color
 
diff --git a/app/src/main/java/com/github/compose/waveloading/sample/ui/theme/Shape.kt b/app/src/main/java/com/github/compose/waveloading/sample/ui/theme/Shape.kt
@@ -1,4 +1,4 @@
-package com.github.compose.waveloading.ui.theme
+package com.github.compose.waveloading.sample.ui.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Shapes
diff --git a/app/src/main/java/com/github/compose/waveloading/sample/ui/theme/Theme.kt b/app/src/main/java/com/github/compose/waveloading/sample/ui/theme/Theme.kt
@@ -1,4 +1,4 @@
-package com.github.compose.waveloading.ui.theme
+package com.github.compose.waveloading.sample.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.MaterialTheme
diff --git a/app/src/main/java/com/github/compose/waveloading/sample/ui/theme/Type.kt b/app/src/main/java/com/github/compose/waveloading/sample/ui/theme/Type.kt
@@ -1,4 +1,4 @@
-package com.github.compose.waveloading.ui.theme
+package com.github.compose.waveloading.sample.ui.theme
 
 import androidx.compose.material.Typography
 import androidx.compose.ui.text.TextStyle
diff --git a/lib/src/main/java/com/github/compose/waveloading/WaveLoading.kt b/lib/src/main/java/com/github/compose/waveloading/WaveLoading.kt
@@ -48,7 +48,7 @@ import kotlin.math.roundToInt
 private const val defaultAmlitude = 0.2f
 private const val defaultVelocity = 1.0f
 private const val waveDuration = 2000
-private const val frontDrawAlpha = 0.5f
+private const val foreDrawAlpha = 0.5f
 private const val scaleX = 1f
 private const val scaleY = 1f
 
@@ -57,9 +57,9 @@ private val alphaBitmap by lazy {
 }
 
 data class WaveConfig(
-    val progress: Float,
-    val frontDrawType: DrawType,
+    val foreDrawType: DrawType,
     val backDrawType: DrawType,
+    @FloatRange(from = 0.0, to = 1.0) val progress: Float,
     @FloatRange(from = 0.0, to = 1.0) val amplitude: Float,
     @FloatRange(from = 0.0, to = 1.0) val velocity: Float
 )
@@ -71,9 +71,9 @@ val LocalWave = compositionLocalOf<WaveConfig> {
 @Composable
 fun WaveLoading(
     modifier: Modifier = Modifier,
-    progress: Float = 0f,
-    drawType: DrawType = DrawType.DrawImage,
+    foreDrawType: DrawType = DrawType.DrawImage,
     backDrawType: DrawType = rememberDrawColor(color = Color.LightGray),
+    @FloatRange(from = 0.0, to = 1.0) progress: Float = 0f,
     @FloatRange(from = 0.0, to = 1.0) amplitude: Float = defaultAmlitude,
     @FloatRange(from = 0.0, to = 1.0) velocity: Float = defaultVelocity,
     content: @Composable BoxScope.() -> Unit
@@ -130,7 +130,7 @@ fun WaveLoading(
 
 
         CompositionLocalProvider(
-            LocalWave provides WaveConfig(progress, drawType, backDrawType, amplitude, velocity)
+            LocalWave provides WaveConfig(foreDrawType, backDrawType, progress, amplitude, velocity)
         ) {
             with(LocalDensity.current) {
                 Box(
@@ -159,14 +159,14 @@ private fun WaveLoadingInternal(bitmap: Bitmap) {
 
     val transition = rememberInfiniteTransition()
 
-    val (progress, frontDrawType, backDrawType, amplitude, velocity) = LocalWave.current
+    val (foreDrawType, backDrawType, progress, amplitude, velocity) = LocalWave.current
 
-    val frontPaint = remember(frontDrawType, bitmap) {
+    val forePaint = remember(foreDrawType, bitmap) {
         Paint().apply {
-            alpha = frontDrawAlpha
+            alpha = foreDrawAlpha
             shader = BitmapShader(
-                when (frontDrawType) {
-                    is DrawType.DrawColor -> bitmap.toColor(frontDrawType.color)
+                when (foreDrawType) {
+                    is DrawType.DrawColor -> bitmap.toColor(foreDrawType.color)
                     is DrawType.DrawImage -> bitmap
                     else -> alphaBitmap
                 },
@@ -224,7 +224,7 @@ private fun WaveLoadingInternal(bitmap: Bitmap) {
                         -offsetY
                     )
 
-                    frontPaint.shader?.transform {
+                    forePaint.shader?.transform {
                         setTranslate(offsetX, 0f)
                     }
 
@@ -235,7 +235,7 @@ private fun WaveLoadingInternal(bitmap: Bitmap) {
                             height = maxHeight,
                             amplitude = size.height * amplitude,
                             progress = progress
-                        ), frontPaint
+                        ), forePaint
                     )
                 }
 
@@ -246,7 +246,6 @@ private fun WaveLoadingInternal(bitmap: Bitmap) {
 }
 
 
-
 @Composable
 private fun InfiniteTransition.animateOf(duration: Int) = animateFloat(
     initialValue = 0f, targetValue = 1f, animationSpec = infiniteRepeatable(

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.github.compose.waveloading.ui.theme`
	`1`	`+package com.github.compose.waveloading.sample.ui.theme`
`2`	`2`
`3`	`3`	`import androidx.compose.ui.graphics.Color`
`4`	`4`