Skip to content

Commit 5a53814

Browse files
committed
Change package name
1 parent 04bf6d5 commit 5a53814

File tree

10 files changed

+72
-42
lines changed

10 files changed

+72
-42
lines changed

app/src/androidTest/java/com/canopas/campose/jettaptarget/ExampleInstrumentedTest.kt renamed to app/src/androidTest/java/com/canopas/campose/showcase/ExampleInstrumentedTest.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
package com.canopas.campose.jettaptarget
1+
package com.canopas.campose.showcase
22

3-
import androidx.test.platform.app.InstrumentationRegistry
43
import androidx.test.ext.junit.runners.AndroidJUnit4
5-
4+
import androidx.test.platform.app.InstrumentationRegistry
5+
import org.junit.Assert.assertEquals
66
import org.junit.Test
77
import org.junit.runner.RunWith
88

9-
import org.junit.Assert.*
10-
119
/**
1210
* Instrumented test, which will execute on an Android device.
1311
*

app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.canopas.campose.jettaptarget">
3+
package="com.canopas.campose.showcase">
44

55
<application
66
android:allowBackup="true"
77
android:icon="@mipmap/ic_launcher"
88
android:label="@string/app_name"
99
android:roundIcon="@mipmap/ic_launcher_round"
1010
android:supportsRtl="true"
11-
android:theme="@style/Theme.JetTapTarget">
11+
android:theme="@style/Theme.IntoShowcase">
1212
<activity
13-
android:name=".MainActivity"
13+
android:name="com.canopas.campose.showcase.MainActivity"
1414
android:exported="true"
1515
android:label="@string/app_name"
16-
android:theme="@style/Theme.JetTapTarget">
16+
android:theme="@style/Theme.IntoShowcase">
1717
<intent-filter>
1818
<action android:name="android.intent.action.MAIN" />
1919

app/src/main/java/com/canopas/campose/jettaptarget/MainActivity.kt renamed to app/src/main/java/com/canopas/campose/showcase/MainActivity.kt

Lines changed: 57 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package com.canopas.campose.jettaptarget
1+
package com.canopas.campose.showcase
22

33
import android.os.Bundle
4-
import android.util.Log
54
import android.widget.Toast
65
import androidx.activity.ComponentActivity
76
import androidx.activity.compose.setContent
@@ -30,11 +29,8 @@ import androidx.compose.material.icons.filled.ArrowBack
3029
import androidx.compose.material.icons.filled.Email
3130
import androidx.compose.material.icons.filled.Search
3231
import androidx.compose.runtime.Composable
33-
import androidx.compose.runtime.getValue
3432
import androidx.compose.runtime.mutableStateMapOf
35-
import androidx.compose.runtime.mutableStateOf
3633
import androidx.compose.runtime.remember
37-
import androidx.compose.runtime.setValue
3834
import androidx.compose.ui.Alignment
3935
import androidx.compose.ui.Modifier
4036
import androidx.compose.ui.draw.clip
@@ -47,10 +43,8 @@ import androidx.compose.ui.text.style.TextAlign
4743
import androidx.compose.ui.tooling.preview.Preview
4844
import androidx.compose.ui.unit.dp
4945
import androidx.compose.ui.unit.sp
50-
import com.canopas.campose.jettaptarget.ui.theme.JetTapTargetTheme
51-
import com.canopas.campose.jettaptarget.ui.theme.ThemeColor
52-
import com.canopas.campose.showcase.IntroShowCase
53-
import com.canopas.campose.showcase.ShowcaseProperty
46+
import com.canopas.campose.showcase.ui.theme.JetTapTargetTheme
47+
import com.canopas.campose.showcase.ui.theme.ThemeColor
5448

5549
class MainActivity : ComponentActivity() {
5650
override fun onCreate(savedInstanceState: Bundle?) {
@@ -71,14 +65,57 @@ class MainActivity : ComponentActivity() {
7165

7266
@Composable
7367
fun ShowcaseSample() {
74-
val context = LocalContext.current
75-
7668
val targets = remember {
7769
mutableStateMapOf<String, ShowcaseProperty>()
7870
}
7971

80-
var isIntroCompleted by remember {
81-
mutableStateOf(false)
72+
Box {
73+
FloatingActionButton(
74+
onClick = {},
75+
modifier = Modifier
76+
.padding(16.dp)
77+
.align(Alignment.BottomEnd)
78+
.onGloballyPositioned { coordinates ->
79+
targets["email"] = ShowcaseProperty(
80+
1, coordinates,
81+
"Check emails", "Click here to check/send emails"
82+
)
83+
},
84+
backgroundColor = ThemeColor,
85+
contentColor = Color.White,
86+
elevation = FloatingActionButtonDefaults.elevation(6.dp)
87+
) {
88+
Icon(
89+
Icons.Filled.Email,
90+
contentDescription = "Email"
91+
)
92+
}
93+
Button(
94+
onClick = {},
95+
modifier = Modifier
96+
.align(Alignment.BottomStart)
97+
.padding(start = 16.dp, bottom = 16.dp)
98+
.onGloballyPositioned { coordinates ->
99+
targets["follow"] = ShowcaseProperty(
100+
2, coordinates,
101+
"Follow me", "Click here to follow"
102+
)
103+
}
104+
) {
105+
Text(text = "Follow")
106+
}
107+
108+
IntroShowCase(targets) {
109+
}
110+
}
111+
}
112+
113+
@Composable
114+
fun ShowcaseSample2() {
115+
val context = LocalContext.current
116+
117+
val targets = remember {
118+
mutableStateMapOf<String, ShowcaseProperty>()
82119
}
83120

84121
Box {
@@ -191,17 +228,13 @@ fun ShowcaseSample() {
191228

192229
}
193230
}
194-
Log.e("Total target", "Target ${targets.size}")
195-
if (!isIntroCompleted)
196-
IntroShowCase(targets) {
197-
targets.clear()
198-
isIntroCompleted = true
199-
Toast.makeText(
200-
context,
201-
"App Intro finished!!",
202-
Toast.LENGTH_SHORT
203-
).show()
204-
}
231+
IntroShowCase(targets) {
232+
Toast.makeText(
233+
context,
234+
"App Intro finished!!",
235+
Toast.LENGTH_SHORT
236+
).show()
237+
}
205238
}
206239

207240
}

app/src/main/java/com/canopas/campose/jettaptarget/ui/theme/Color.kt renamed to app/src/main/java/com/canopas/campose/showcase/ui/theme/Color.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.canopas.campose.jettaptarget.ui.theme
1+
package com.canopas.campose.showcase.ui.theme
22

33
import androidx.compose.ui.graphics.Color
44

app/src/main/java/com/canopas/campose/jettaptarget/ui/theme/Shape.kt renamed to app/src/main/java/com/canopas/campose/showcase/ui/theme/Shape.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.canopas.campose.jettaptarget.ui.theme
1+
package com.canopas.campose.showcase.ui.theme
22

33
import androidx.compose.foundation.shape.RoundedCornerShape
44
import androidx.compose.material.Shapes

app/src/main/java/com/canopas/campose/jettaptarget/ui/theme/Theme.kt renamed to app/src/main/java/com/canopas/campose/showcase/ui/theme/Theme.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.canopas.campose.jettaptarget.ui.theme
1+
package com.canopas.campose.showcase.ui.theme
22

33
import androidx.compose.foundation.isSystemInDarkTheme
44
import androidx.compose.material.MaterialTheme

app/src/main/java/com/canopas/campose/jettaptarget/ui/theme/Type.kt renamed to app/src/main/java/com/canopas/campose/showcase/ui/theme/Type.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.canopas.campose.jettaptarget.ui.theme
1+
package com.canopas.campose.showcase.ui.theme
22

33
import androidx.compose.material.Typography
44
import androidx.compose.ui.text.TextStyle
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<resources>
2-
<string name="app_name">JetTapTarget</string>
2+
<string name="app_name">Intro Showcase</string>
33
</resources>

app/src/main/res/values/themes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33

4-
<style name="Theme.JetTapTarget" parent="android:Theme.Material.Light.NoActionBar" />
4+
<style name="Theme.IntoShowcase" parent="android:Theme.Material.Light.NoActionBar" />
55
</resources>

app/src/test/java/com/canopas/campose/jettaptarget/ExampleUnitTest.kt renamed to app/src/test/java/com/canopas/campose/showcase/ExampleUnitTest.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
package com.canopas.campose.jettaptarget
1+
package com.canopas.campose.showcase
22

3+
import org.junit.Assert.assertEquals
34
import org.junit.Test
45

5-
import org.junit.Assert.*
6-
76
/**
87
* Example local unit test, which will execute on the development machine (host).
98
*

0 commit comments

Comments
 (0)