rename library

SmartToolFactory · SmartToolFactory · commit f4a39c5eeb9f · 2023-06-05T22:54:00.000+03:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -47,8 +47,7 @@ android {
 }
 
 dependencies {
-    implementation project(':lib')
-
+    implementation project(':bubble')
     implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
     implementation 'androidx.activity:activity-compose:1.7.2'
diff --git a/app/src/main/java/com/smarttoolfactory/composespeechbubble/BubbleLayouts.kt b/app/src/main/java/com/smarttoolfactory/composespeechbubble/BubbleLayouts.kt
@@ -5,9 +5,9 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import com.smarttoolfactory.speechbubble.BubbleShadow
-import com.smarttoolfactory.speechbubble.BubbleState
-import com.smarttoolfactory.speechbubble.bubble
+import com.smarttoolfactory.bubble.BubbleShadow
+import com.smarttoolfactory.bubble.BubbleState
+import com.smarttoolfactory.bubble.bubble
 
 @Composable
 fun BubbleLayout(
diff --git a/app/src/main/java/com/smarttoolfactory/composespeechbubble/demo/DemoBubble.kt b/app/src/main/java/com/smarttoolfactory/composespeechbubble/demo/DemoBubble.kt
@@ -22,7 +22,7 @@ import com.smarttoolfactory.composespeechbubble.HorizontalAlignment
 import com.smarttoolfactory.composespeechbubble.ui.theme.BackgroundColor
 import com.smarttoolfactory.composespeechbubble.ui.theme.DateColor
 import com.smarttoolfactory.composespeechbubble.ui.theme.SentMessageColor
-import com.smarttoolfactory.speechbubble.*
+import com.smarttoolfactory.bubble.*
 
 @Preview
 @Composable
diff --git a/app/src/main/java/com/smarttoolfactory/composespeechbubble/demo/DemoDynamicSize.kt b/app/src/main/java/com/smarttoolfactory/composespeechbubble/demo/DemoDynamicSize.kt
@@ -19,7 +19,7 @@ import com.smarttoolfactory.composespeechbubble.BubbleLayout
 import com.smarttoolfactory.composespeechbubble.ui.theme.BackgroundColor
 import com.smarttoolfactory.composespeechbubble.ui.theme.DateColor
 import com.smarttoolfactory.composespeechbubble.ui.theme.SentMessageColor
-import com.smarttoolfactory.speechbubble.*
+import com.smarttoolfactory.bubble.*
 
 @Preview
 @Composable
diff --git a/app/src/main/java/com/smarttoolfactory/composespeechbubble/demo/DemoFullChat.kt b/app/src/main/java/com/smarttoolfactory/composespeechbubble/demo/DemoFullChat.kt
@@ -20,9 +20,9 @@ import com.smarttoolfactory.composespeechbubble.chat.ChatFlexBoxLayout
 import com.smarttoolfactory.composespeechbubble.chat.MessageTimeText
 import com.smarttoolfactory.composespeechbubble.ui.ChatInput
 import com.smarttoolfactory.composespeechbubble.ui.theme.SentMessageColor
-import com.smarttoolfactory.speechbubble.ArrowAlignment
-import com.smarttoolfactory.speechbubble.BubbleShadow
-import com.smarttoolfactory.speechbubble.rememberBubbleState
+import com.smarttoolfactory.bubble.ArrowAlignment
+import com.smarttoolfactory.bubble.BubbleShadow
+import com.smarttoolfactory.bubble.rememberBubbleState
 import kotlinx.coroutines.launch
 import java.text.SimpleDateFormat
 import java.util.*
diff --git a/app/src/main/java/com/smarttoolfactory/composespeechbubble/demo/DemoProperties.kt b/app/src/main/java/com/smarttoolfactory/composespeechbubble/demo/DemoProperties.kt
@@ -30,11 +30,11 @@ import androidx.compose.ui.unit.sp
 import com.smarttoolfactory.composespeechbubble.BubbleLayout
 import com.smarttoolfactory.composespeechbubble.ui.theme.BackgroundColor
 import com.smarttoolfactory.composespeechbubble.ui.theme.SentMessageColor
-import com.smarttoolfactory.speechbubble.ArrowAlignment
-import com.smarttoolfactory.speechbubble.ArrowShape
-import com.smarttoolfactory.speechbubble.BubbleCornerRadius
-import com.smarttoolfactory.speechbubble.BubbleShadow
-import com.smarttoolfactory.speechbubble.rememberBubbleState
+import com.smarttoolfactory.bubble.ArrowAlignment
+import com.smarttoolfactory.bubble.ArrowShape
+import com.smarttoolfactory.bubble.BubbleCornerRadius
+import com.smarttoolfactory.bubble.BubbleShadow
+import com.smarttoolfactory.bubble.rememberBubbleState
 import kotlin.math.roundToInt
 
 @Preview
diff --git a/app/src/main/java/com/smarttoolfactory/composespeechbubble/demo/DemoTooltip.kt b/app/src/main/java/com/smarttoolfactory/composespeechbubble/demo/DemoTooltip.kt
@@ -33,9 +33,9 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.smarttoolfactory.composespeechbubble.tooltip.ToolTipLayout
 import com.smarttoolfactory.composespeechbubble.tooltip.TooltipState
-import com.smarttoolfactory.speechbubble.ArrowAlignment
-import com.smarttoolfactory.speechbubble.ArrowShape
-import com.smarttoolfactory.speechbubble.BubbleCornerRadius
+import com.smarttoolfactory.bubble.ArrowAlignment
+import com.smarttoolfactory.bubble.ArrowShape
+import com.smarttoolfactory.bubble.BubbleCornerRadius
 import kotlin.math.roundToInt
 
 @Preview
diff --git a/app/src/main/java/com/smarttoolfactory/composespeechbubble/tooltip/ToolTip.kt b/app/src/main/java/com/smarttoolfactory/composespeechbubble/tooltip/ToolTip.kt
@@ -15,11 +15,11 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.smarttoolfactory.composespeechbubble.BubbleLayout
 import com.smarttoolfactory.composespeechbubble.ui.theme.Purple40
-import com.smarttoolfactory.speechbubble.ArrowAlignment
-import com.smarttoolfactory.speechbubble.ArrowShape
-import com.smarttoolfactory.speechbubble.BubbleCornerRadius
-import com.smarttoolfactory.speechbubble.BubbleShadow
-import com.smarttoolfactory.speechbubble.BubbleState
+import com.smarttoolfactory.bubble.ArrowAlignment
+import com.smarttoolfactory.bubble.ArrowShape
+import com.smarttoolfactory.bubble.BubbleCornerRadius
+import com.smarttoolfactory.bubble.BubbleShadow
+import com.smarttoolfactory.bubble.BubbleState
 
 class TooltipState(
     show: Boolean,
diff --git a/app/src/main/java/com/smarttoolfactory/composespeechbubble/ui/theme/Theme.kt b/app/src/main/java/com/smarttoolfactory/composespeechbubble/ui/theme/Theme.kt
@@ -1,6 +1,5 @@
 package com.smarttoolfactory.composespeechbubble.ui.theme
 
-import android.app.Activity
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
@@ -9,11 +8,7 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 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.LocalContext
-import androidx.compose.ui.platform.LocalView
-import androidx.core.view.ViewCompat
 
 private val DarkColorScheme = darkColorScheme(
     primary = Purple80,
@@ -52,13 +47,7 @@ fun ComposeSpeechBubbleTheme(
         darkTheme -> DarkColorScheme
         else -> LightColorScheme
     }
-    val view = LocalView.current
-    if (!view.isInEditMode) {
-        SideEffect {
-            (view.context as Activity).window.statusBarColor = colorScheme.primary.toArgb()
-            ViewCompat.getWindowInsetsController(view)?.isAppearanceLightStatusBars = darkTheme
-        }
-    }
+
     MaterialTheme(
         colorScheme = colorScheme,
         typography = Typography,
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.ComposeSpeechBubble" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.ComposeSpeechBubble" parent="android:Theme.Material.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/teal_700</item>
+    </style>
 </resources>
diff --git a/bubble/.gitignore b/bubble/.gitignore
diff --git a/bubble/build.gradle b/bubble/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    namespace 'com.smarttoolfactory.speechbubble'
+    namespace 'com.smarttoolfactory.bubble'
     compileSdk 33
 
     defaultConfig {
@@ -22,18 +22,24 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true
     }
     composeOptions {
         kotlinCompilerExtensionVersion = "1.4.7"
     }
+
+    packagingOptions {
+        resources {
+            excludes += '/META-INF/{AL2.0,LGPL2.1}'
+        }
+    }
 }
 
 dependencies {
diff --git a/bubble/consumer-rules.pro b/bubble/consumer-rules.pro
diff --git a/bubble/proguard-rules.pro b/bubble/proguard-rules.pro
diff --git a/bubble/src/androidTest/java/com/smarttoolfactory/bubble/ExampleInstrumentedTest.kt b/bubble/src/androidTest/java/com/smarttoolfactory/bubble/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.smarttoolfactory.speechbubble
+package com.smarttoolfactory.bubble
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.smarttoolfactory.speechbubble.test", appContext.packageName)
+        assertEquals("com.smarttoolfactory.bubble.test", appContext.packageName)
     }
 }
diff --git a/bubble/src/main/AndroidManifest.xml b/bubble/src/main/AndroidManifest.xml
diff --git a/bubble/src/main/java/com/smarttoolfactory/bubble/ArrowPath.kt b/bubble/src/main/java/com/smarttoolfactory/bubble/ArrowPath.kt
@@ -1,4 +1,4 @@
-package com.smarttoolfactory.speechbubble
+package com.smarttoolfactory.bubble
 
 import androidx.compose.ui.graphics.Path
 
diff --git a/bubble/src/main/java/com/smarttoolfactory/bubble/ArrowProperties.kt b/bubble/src/main/java/com/smarttoolfactory/bubble/ArrowProperties.kt
@@ -1,4 +1,4 @@
-package com.smarttoolfactory.speechbubble
+package com.smarttoolfactory.bubble
 
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
diff --git a/bubble/src/main/java/com/smarttoolfactory/bubble/BubbleModifier.kt b/bubble/src/main/java/com/smarttoolfactory/bubble/BubbleModifier.kt
@@ -1,4 +1,4 @@
-package com.smarttoolfactory.speechbubble
+package com.smarttoolfactory.bubble
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
diff --git a/bubble/src/main/java/com/smarttoolfactory/bubble/BubblePath.kt b/bubble/src/main/java/com/smarttoolfactory/bubble/BubblePath.kt
@@ -1,4 +1,4 @@
-package com.smarttoolfactory.speechbubble
+package com.smarttoolfactory.bubble
 
 
 import androidx.compose.ui.geometry.CornerRadius
diff --git a/bubble/src/main/java/com/smarttoolfactory/bubble/BubbleRect.kt b/bubble/src/main/java/com/smarttoolfactory/bubble/BubbleRect.kt
@@ -1,4 +1,4 @@
-package com.smarttoolfactory.speechbubble
+package com.smarttoolfactory.bubble
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
diff --git a/bubble/src/main/java/com/smarttoolfactory/bubble/BubbleShadow.kt b/bubble/src/main/java/com/smarttoolfactory/bubble/BubbleShadow.kt
@@ -1,4 +1,4 @@
-package com.smarttoolfactory.speechbubble
+package com.smarttoolfactory.bubble
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.*
diff --git a/bubble/src/main/java/com/smarttoolfactory/bubble/BubbleShape.kt b/bubble/src/main/java/com/smarttoolfactory/bubble/BubbleShape.kt
@@ -1,4 +1,4 @@
-package com.smarttoolfactory.speechbubble
+package com.smarttoolfactory.bubble
 
 import androidx.compose.foundation.shape.GenericShape
 import androidx.compose.ui.geometry.Offset
diff --git a/bubble/src/main/java/com/smarttoolfactory/bubble/BubbleState.kt b/bubble/src/main/java/com/smarttoolfactory/bubble/BubbleState.kt
@@ -1,4 +1,4 @@
-package com.smarttoolfactory.speechbubble
+package com.smarttoolfactory.bubble
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
diff --git a/bubble/src/main/java/com/smarttoolfactory/bubble/Util.kt b/bubble/src/main/java/com/smarttoolfactory/bubble/Util.kt
@@ -1,4 +1,4 @@
-package com.smarttoolfactory.speechbubble
+package com.smarttoolfactory.bubble
 
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
diff --git a/bubble/src/test/java/com/smarttoolfactory/bubble/ExampleUnitTest.kt b/bubble/src/test/java/com/smarttoolfactory/bubble/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package com.smarttoolfactory.speechbubble
+package com.smarttoolfactory.bubble
 
 import org.junit.Test
 
diff --git a/settings.gradle b/settings.gradle
@@ -14,4 +14,4 @@ dependencyResolutionManagement {
 }
 rootProject.name = "Compose Speech Bubble"
 include ':app'
-include ':lib'
+include ':bubble'

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,7 @@ android {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`dependencies {`
`50`		`- implementation project(':lib')`
`51`		`-`
	`50`	`+ implementation project(':bubble')`
`52`	`51`	`implementation 'androidx.core:core-ktx:1.10.1'`
`53`	`52`	`implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'`
`54`	`53`	`implementation 'androidx.activity:activity-compose:1.7.2'`