Skip to content

Commit d29cbed

Browse files
committed
Merge branch 'release/1.0.1' into main
2 parents 98bc6a4 + 438cfe7 commit d29cbed

File tree

15 files changed

+70
-77
lines changed

15 files changed

+70
-77
lines changed

.github/workflows/publish-on-version-change.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
**1. GitHub Token 설정**
117117
- GitHub Packages를 사용하기 위해 Personal Access Token이 필요합니다.
118118
119-
**2. Gradle 설정
119+
**2. Gradle 설정**
120120
```kotlin
121121
# settings.gradle.kts
122122
dependencyResolutionManagement {
@@ -143,4 +143,4 @@ jobs:
143143
draft: false # 즉시 공개
144144
prerelease: false # 정식 릴리즈로 설정
145145
env:
146-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
146+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ android {
4444

4545
dependencies {
4646
// Project modules
47-
implementation(project(":screennameviewer:compose"))
47+
debugImplementation(project(":screennameviewer:compose"))
4848

4949
// Android Core
5050
implementation(libs.androidx.core.ktx)
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import android.app.Application
2+
import android.graphics.Color
3+
import android.view.Gravity
4+
import com.donglab.screennameviewer.publicapi.dsl.initScreenNameViewer
5+
6+
object ScreenNameViewerInitializer {
7+
8+
fun init(application: Application) {
9+
initScreenNameViewer(application) {
10+
settings {
11+
debugModeCondition = true
12+
enableCondition = true
13+
}
14+
15+
config {
16+
textStyle {
17+
size = 10f
18+
color = Color.BLUE
19+
}
20+
background {
21+
color = Color.argb(80, 255, 255, 255)
22+
padding = 20
23+
}
24+
position {
25+
topMargin = 52
26+
activity = Gravity.TOP or Gravity.START
27+
fragment = Gravity.TOP or Gravity.END
28+
composeRoute = Gravity.TOP or Gravity.END
29+
}
30+
}
31+
}
32+
}
33+
}
Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,12 @@
11
package com.donglab.screennameviewer
22

33
import android.app.Application
4-
import android.graphics.Color
5-
import android.view.Gravity
6-
import com.donglab.screennameviewer.publicapi.dsl.initScreenNameViewer
74

85
class SampleApplication : Application() {
96

107
override fun onCreate() {
118
super.onCreate()
129

13-
initScreenNameViewer(this) {
14-
settings {
15-
debugMode { true }
16-
enabled { true }
17-
}
18-
config {
19-
textStyle {
20-
size = 10f
21-
color = Color.BLUE
22-
}
23-
background {
24-
color = Color.argb(80, 255, 255, 255)
25-
padding = 20
26-
}
27-
position {
28-
topMargin = 52
29-
activity = Gravity.TOP or Gravity.START
30-
fragment = Gravity.TOP or Gravity.END
31-
composeRoute = Gravity.TOP or Gravity.END
32-
}
33-
}
34-
}
10+
ScreenNameViewerInitializer.init(this)
3511
}
3612
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package com.donglab.screennameviewer
2+
3+
import android.app.Application
4+
5+
object ScreenNameViewerInitializer {
6+
7+
fun init(application: Application) {}
8+
}

gradle/libs.versions.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[versions]
2-
sdk_version = "0.0.8"
2+
leakcanaryAndroid = "2.14"
3+
sdk_version = "1.0.1"
34

45
agp = "8.1.4"
56
kotlin = "1.9.20"
@@ -32,6 +33,9 @@ androidx-foundation = { group = "androidx.compose.foundation", name = "foundatio
3233
androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material" }
3334
androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }
3435

36+
# Debugging
37+
leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanaryAndroid" }
38+
3539
# Test
3640
junit = { group = "junit", name = "junit", version.ref = "junit" }
3741
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }

screennameviewer/compose/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ dependencies {
6565
testImplementation(libs.junit)
6666
androidTestImplementation(libs.androidx.junit)
6767
androidTestImplementation(libs.androidx.espresso.core)
68+
69+
debugImplementation(libs.leakcanary.android)
6870
}
6971

7072
publishing {

screennameviewer/compose/src/main/java/com/donglab/screennameviewer/internal/compose/tracker/ComposeScreenNameTracker.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
44
import androidx.navigation.NavController
55
import androidx.navigation.NavDestination
66
import com.donglab.screennameviewer.internal.compose.viewer.ComposeRouteViewer
7+
import com.donglab.screennameviewer.publicapi.viewer.ScreenNameViewer
78

89
/**
910
* Navigation Screen Tracker for ScreenNameViewer integration.
@@ -43,7 +44,7 @@ internal class ComposeScreenNameTracker internal constructor(
4344
init {
4445
// Navigation destination 변경 리스너 등록
4546
navController.addOnDestinationChangedListener(destinationChangedListener)
46-
47+
4748
// 현재 destination이 있다면 즉시 처리
4849
navController.currentDestination?.let { currentDestination ->
4950
handleDestinationChanged(currentDestination)

screennameviewer/compose/src/main/java/com/donglab/screennameviewer/internal/compose/viewer/ComposeRouteViewerImpl.kt

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,16 @@ import com.donglab.screennameviewer.internal.overlay.renderer.ComposeRouteOverla
1313
internal class ComposeRouteViewerImpl(
1414
context: Context,
1515
decorView: ViewGroup,
16-
config: ScreenNameOverlayConfig,
17-
private val settings: ScreenNameViewerSetting
16+
config: ScreenNameOverlayConfig
1817
) : ComposeRouteViewer {
1918

2019
private val composeRouteRenderer = ComposeRouteOverlayRenderer(context, decorView, config)
21-
22-
init {
23-
require(settings.isDebugMode) {
24-
"ComposeRouteViewer should only be used in debug builds"
25-
}
26-
}
2720

2821
override fun addRoute(route: String) {
29-
if (!settings.isEnabled) return
3022
composeRouteRenderer.addRoute(route)
3123
}
3224

3325
override fun removeRoute(route: String) {
34-
if (!settings.isEnabled) return
3526
composeRouteRenderer.removeRoute(route)
3627
}
3728

screennameviewer/compose/src/main/java/com/donglab/screennameviewer/internal/lifecycle/ScreenNameViewerLifecycleHandler.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ internal class ScreenNameViewerLifecycleHandler : ActivityLifecycleCallbacks {
3636
ComponentNameViewerImpl(
3737
activityRef = WeakReference(activity),
3838
config = ScreenNameViewer.config,
39-
settings = ScreenNameViewer.settings
4039
).apply {
4140
debugViewers[activity] = this
4241
}

0 commit comments

Comments
 (0)