From 40ae2d456cf9ee2fcf881cbd70b3cbd7f507d2d3 Mon Sep 17 00:00:00 2001 From: Kr328 <39107975+Kr328@users.noreply.github.com> Date: Wed, 8 Apr 2020 00:42:41 +0800 Subject: [PATCH] rename module component -> common --- app/build.gradle.kts | 2 +- app/src/main/java/com/github/kr328/clash/OnBootReceiver.kt | 2 +- app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt | 2 +- app/src/main/java/com/github/kr328/clash/TileService.kt | 2 +- app/src/main/java/com/github/kr328/clash/remote/Broadcasts.kt | 2 +- .../main/java/com/github/kr328/clash/utils/ServiceUtils.kt | 2 +- {component => common}/build.gradle.kts | 0 {component => common}/consumer-rules.pro | 0 {component => common}/proguard-rules.pro | 0 {component => common}/src/main/AndroidManifest.xml | 2 +- .../main/java/com/github/kr328/clash/common}/ids/Intents.kt | 4 ++-- .../github/kr328/clash/common}/ids/NotificationChannels.kt | 2 +- .../com/github/kr328/clash/common}/ids/NotificationIds.kt | 2 +- .../main/java/com/github/kr328/clash/common}/time/Ticker.kt | 2 +- core/build.gradle.kts | 2 +- design/build.gradle.kts | 2 +- service/build.gradle.kts | 2 +- settings.gradle.kts | 2 +- 18 files changed, 16 insertions(+), 16 deletions(-) rename {component => common}/build.gradle.kts (100%) rename {component => common}/consumer-rules.pro (100%) rename {component => common}/proguard-rules.pro (100%) rename {component => common}/src/main/AndroidManifest.xml (75%) rename {component/src/main/java/com/github/kr328/clash/component => common/src/main/java/com/github/kr328/clash/common}/ids/Intents.kt (93%) rename {component/src/main/java/com/github/kr328/clash/component => common/src/main/java/com/github/kr328/clash/common}/ids/NotificationChannels.kt (65%) rename {component/src/main/java/com/github/kr328/clash/component => common/src/main/java/com/github/kr328/clash/common}/ids/NotificationIds.kt (65%) rename {component/src/main/java/com/github/kr328/clash/component => common/src/main/java/com/github/kr328/clash/common}/time/Ticker.kt (95%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 86aa85c..7af3cb9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -71,7 +71,7 @@ dependencies { implementation(project(":core")) implementation(project(":service")) implementation(project(":design")) - implementation(project(":component")) + implementation(project(":common")) implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$gKotlinVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$gKotlinCoroutineVersion") implementation("androidx.lifecycle:lifecycle-extensions:$gLifecycleVersion") diff --git a/app/src/main/java/com/github/kr328/clash/OnBootReceiver.kt b/app/src/main/java/com/github/kr328/clash/OnBootReceiver.kt index 0b14585..f10a529 100644 --- a/app/src/main/java/com/github/kr328/clash/OnBootReceiver.kt +++ b/app/src/main/java/com/github/kr328/clash/OnBootReceiver.kt @@ -3,7 +3,7 @@ package com.github.kr328.clash import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.github.kr328.clash.component.ids.Intents +import com.github.kr328.clash.common.ids.Intents import com.github.kr328.clash.service.ProfileBackgroundService import com.github.kr328.clash.service.util.componentName import com.github.kr328.clash.service.util.startForegroundServiceCompat diff --git a/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt b/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt index 1ed675d..6926240 100644 --- a/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt +++ b/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt @@ -6,7 +6,7 @@ import android.os.Bundle import androidx.recyclerview.widget.LinearLayoutManager import com.github.kr328.clash.adapter.ProfileAdapter import com.github.kr328.clash.remote.withProfile -import com.github.kr328.clash.component.ids.Intents +import com.github.kr328.clash.common.ids.Intents import com.github.kr328.clash.service.ProfileBackgroundService import com.github.kr328.clash.service.data.ClashProfileEntity import com.github.kr328.clash.service.transact.ProfileRequest diff --git a/app/src/main/java/com/github/kr328/clash/TileService.kt b/app/src/main/java/com/github/kr328/clash/TileService.kt index 4cae6af..af65447 100644 --- a/app/src/main/java/com/github/kr328/clash/TileService.kt +++ b/app/src/main/java/com/github/kr328/clash/TileService.kt @@ -8,7 +8,7 @@ import android.graphics.drawable.Icon import android.service.quicksettings.Tile import android.service.quicksettings.TileService import com.github.kr328.clash.remote.RemoteUtils -import com.github.kr328.clash.component.ids.Intents +import com.github.kr328.clash.common.ids.Intents import com.github.kr328.clash.utils.startClashService import com.github.kr328.clash.utils.stopClashService diff --git a/app/src/main/java/com/github/kr328/clash/remote/Broadcasts.kt b/app/src/main/java/com/github/kr328/clash/remote/Broadcasts.kt index ca0c527..6fcd3a3 100644 --- a/app/src/main/java/com/github/kr328/clash/remote/Broadcasts.kt +++ b/app/src/main/java/com/github/kr328/clash/remote/Broadcasts.kt @@ -8,7 +8,7 @@ import android.content.IntentFilter import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.ProcessLifecycleOwner -import com.github.kr328.clash.component.ids.Intents +import com.github.kr328.clash.common.ids.Intents object Broadcasts { interface Receiver { diff --git a/app/src/main/java/com/github/kr328/clash/utils/ServiceUtils.kt b/app/src/main/java/com/github/kr328/clash/utils/ServiceUtils.kt index 861b6f4..edada0c 100644 --- a/app/src/main/java/com/github/kr328/clash/utils/ServiceUtils.kt +++ b/app/src/main/java/com/github/kr328/clash/utils/ServiceUtils.kt @@ -5,7 +5,7 @@ import android.content.Intent import android.net.VpnService import com.github.kr328.clash.preference.UiSettings import com.github.kr328.clash.service.ClashService -import com.github.kr328.clash.component.ids.Intents +import com.github.kr328.clash.common.ids.Intents import com.github.kr328.clash.service.TunService import com.github.kr328.clash.service.util.intent import com.github.kr328.clash.service.util.sendBroadcastSelf diff --git a/component/build.gradle.kts b/common/build.gradle.kts similarity index 100% rename from component/build.gradle.kts rename to common/build.gradle.kts diff --git a/component/consumer-rules.pro b/common/consumer-rules.pro similarity index 100% rename from component/consumer-rules.pro rename to common/consumer-rules.pro diff --git a/component/proguard-rules.pro b/common/proguard-rules.pro similarity index 100% rename from component/proguard-rules.pro rename to common/proguard-rules.pro diff --git a/component/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml similarity index 75% rename from component/src/main/AndroidManifest.xml rename to common/src/main/AndroidManifest.xml index cbcc43a..342c636 100644 --- a/component/src/main/AndroidManifest.xml +++ b/common/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="com.github.kr328.clash.common"> diff --git a/component/src/main/java/com/github/kr328/clash/component/ids/Intents.kt b/common/src/main/java/com/github/kr328/clash/common/ids/Intents.kt similarity index 93% rename from component/src/main/java/com/github/kr328/clash/component/ids/Intents.kt rename to common/src/main/java/com/github/kr328/clash/common/ids/Intents.kt index a727ba1..d627ecf 100644 --- a/component/src/main/java/com/github/kr328/clash/component/ids/Intents.kt +++ b/common/src/main/java/com/github/kr328/clash/common/ids/Intents.kt @@ -1,6 +1,6 @@ -package com.github.kr328.clash.component.ids +package com.github.kr328.clash.common.ids -import com.github.kr328.clash.component.BuildConfig +import com.github.kr328.clash.common.BuildConfig object Intents { const val INTENT_ACTION_CLASH_STARTED = diff --git a/component/src/main/java/com/github/kr328/clash/component/ids/NotificationChannels.kt b/common/src/main/java/com/github/kr328/clash/common/ids/NotificationChannels.kt similarity index 65% rename from component/src/main/java/com/github/kr328/clash/component/ids/NotificationChannels.kt rename to common/src/main/java/com/github/kr328/clash/common/ids/NotificationChannels.kt index 69c8322..80ab188 100644 --- a/component/src/main/java/com/github/kr328/clash/component/ids/NotificationChannels.kt +++ b/common/src/main/java/com/github/kr328/clash/common/ids/NotificationChannels.kt @@ -1,4 +1,4 @@ -package com.github.kr328.clash.component.ids +package com.github.kr328.clash.common.ids object NotificationChannels { const val CLASH_STATUS = "clash_status_channel" diff --git a/component/src/main/java/com/github/kr328/clash/component/ids/NotificationIds.kt b/common/src/main/java/com/github/kr328/clash/common/ids/NotificationIds.kt similarity index 65% rename from component/src/main/java/com/github/kr328/clash/component/ids/NotificationIds.kt rename to common/src/main/java/com/github/kr328/clash/common/ids/NotificationIds.kt index aa30d3c..ff54f10 100644 --- a/component/src/main/java/com/github/kr328/clash/component/ids/NotificationIds.kt +++ b/common/src/main/java/com/github/kr328/clash/common/ids/NotificationIds.kt @@ -1,4 +1,4 @@ -package com.github.kr328.clash.component.ids +package com.github.kr328.clash.common.ids object NotificationIds { const val CLASH_STATUS = 1 diff --git a/component/src/main/java/com/github/kr328/clash/component/time/Ticker.kt b/common/src/main/java/com/github/kr328/clash/common/time/Ticker.kt similarity index 95% rename from component/src/main/java/com/github/kr328/clash/component/time/Ticker.kt rename to common/src/main/java/com/github/kr328/clash/common/time/Ticker.kt index 634c90f..ca57fc9 100644 --- a/component/src/main/java/com/github/kr328/clash/component/time/Ticker.kt +++ b/common/src/main/java/com/github/kr328/clash/common/time/Ticker.kt @@ -1,4 +1,4 @@ -package com.github.kr328.clash.component.time +package com.github.kr328.clash.common.time import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 067d9d5..21300bd 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -65,7 +65,7 @@ android { } dependencies { - implementation(project(":component")) + implementation(project(":common")) implementation("androidx.core:core-ktx:$gAndroidKtxVersion") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$gKotlinVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$gKotlinCoroutineVersion") diff --git a/design/build.gradle.kts b/design/build.gradle.kts index c26af87..1d185e3 100644 --- a/design/build.gradle.kts +++ b/design/build.gradle.kts @@ -52,7 +52,7 @@ android { } dependencies { - implementation(project(":component")) + implementation(project(":common")) implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$gKotlinVersion") implementation("androidx.appcompat:appcompat:$gAppCompatVersion") implementation("androidx.core:core-ktx:$gAndroidKtxVersion") diff --git a/service/build.gradle.kts b/service/build.gradle.kts index ae8ac0b..abcfb51 100644 --- a/service/build.gradle.kts +++ b/service/build.gradle.kts @@ -62,7 +62,7 @@ dependencies { kapt("androidx.room:room-compiler:$gRoomVersion") implementation(project(":core")) - implementation(project(":component")) + implementation(project(":common")) implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$gKotlinSerializationVersion") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$gKotlinVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$gKotlinCoroutineVersion") diff --git a/settings.gradle.kts b/settings.gradle.kts index 4ead6cc..b47463e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,6 +2,6 @@ include(":app") include(":core") include(":service") include(":design") -include(":component") +include(":common") rootProject.name = "ClashForAndroid"