diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 56ccc7e1..cd4cb347 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,9 +6,6 @@ plugins { alias(libs.plugins.kotlinAndroid) } -val appVersionName = "1.1.0" -val appVersionCode = 7 - android { namespace = "me.rhunk.snapenhance" compileSdk = 33 @@ -22,9 +19,6 @@ android { minSdk = 28 //noinspection OldTargetApi targetSdk = 33 - - versionCode = appVersionCode - versionName = appVersionName multiDexEnabled = true } @@ -66,7 +60,7 @@ android { applicationVariants.all { outputs.map { it as BaseVariantOutputImpl }.forEach { variant -> - variant.outputFileName = "app-${appVersionName}-${variant.name}.apk" + variant.outputFileName = "app-${rootProject.ext["appVersionName"]}-${variant.name}.apk" } } @@ -81,24 +75,8 @@ android { } dependencies { - compileOnly(files("libs/LSPosed-api-1.0-SNAPSHOT.jar")) - implementation(libs.coroutines) - implementation(libs.kotlin.reflect) - implementation(libs.recyclerview) - implementation(libs.gson) - implementation(libs.ffmpeg.kit) - implementation(libs.osmdroid.android) - implementation(libs.okhttp) - implementation(libs.androidx.documentfile) - - implementation(project(":mapper")) -} - -tasks.register("getVersion") { - doLast { - val versionFile = File("app/build/version.txt") - versionFile.writeText(android.defaultConfig.versionName.toString()) - } + implementation(project(":core")) + implementation(libs.androidx.activity.ktx) } afterEvaluate { diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/manager/MainActivity.kt b/app/src/main/kotlin/me/rhunk/snapenhance/manager/MainActivity.kt new file mode 100644 index 00000000..1f284bc1 --- /dev/null +++ b/app/src/main/kotlin/me/rhunk/snapenhance/manager/MainActivity.kt @@ -0,0 +1,10 @@ +package me.rhunk.snapenhance.manager + +import android.os.Bundle +import androidx.activity.ComponentActivity + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + } +} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index fd8ca944..3f0d75e4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,4 +5,7 @@ plugins { alias(libs.plugins.kotlinAndroid) apply false } +rootProject.ext.set("appVersionName", "1.1.0") +rootProject.ext.set("appVersionCode", 7) + true // Needed to make the Suppress annotation work for the plugins block \ No newline at end of file diff --git a/core/.gitignore b/core/.gitignore new file mode 100644 index 00000000..c9db3d0b --- /dev/null +++ b/core/.gitignore @@ -0,0 +1,16 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +/.idea/ +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/core/build.gradle.kts b/core/build.gradle.kts new file mode 100644 index 00000000..8de69a2d --- /dev/null +++ b/core/build.gradle.kts @@ -0,0 +1,44 @@ +@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +plugins { + id("com.android.library") + alias(libs.plugins.kotlinAndroid) +} +android { + namespace = "me.rhunk.snapenhance.core" + compileSdk = 33 + + buildFeatures { + aidl = true + } + + defaultConfig { + minSdk = 28 + buildConfigField("String", "VERSION_NAME", "\"${rootProject.ext["appVersionName"]}\"") + buildConfigField("int", "VERSION_CODE", "${rootProject.ext["appVersionCode"]}") + } + + kotlinOptions { + jvmTarget = "1.8" + } +} + +tasks.register("getVersion") { + doLast { + val versionFile = File("app/build/version.txt") + versionFile.writeText(android.defaultConfig.versionName.toString()) + } +} + +dependencies { + compileOnly(files("libs/LSPosed-api-1.0-SNAPSHOT.jar")) + implementation(libs.coroutines) + implementation(libs.kotlin.reflect) + implementation(libs.recyclerview) + implementation(libs.gson) + implementation(libs.ffmpeg.kit) + implementation(libs.osmdroid.android) + implementation(libs.okhttp) + implementation(libs.androidx.documentfile) + + implementation(project(":mapper")) +} \ No newline at end of file diff --git a/app/libs/LSPosed-api-1.0-SNAPSHOT-javadoc.jar b/core/libs/LSPosed-api-1.0-SNAPSHOT-javadoc.jar similarity index 100% rename from app/libs/LSPosed-api-1.0-SNAPSHOT-javadoc.jar rename to core/libs/LSPosed-api-1.0-SNAPSHOT-javadoc.jar diff --git a/app/libs/LSPosed-api-1.0-SNAPSHOT-sources.jar b/core/libs/LSPosed-api-1.0-SNAPSHOT-sources.jar similarity index 100% rename from app/libs/LSPosed-api-1.0-SNAPSHOT-sources.jar rename to core/libs/LSPosed-api-1.0-SNAPSHOT-sources.jar diff --git a/app/libs/LSPosed-api-1.0-SNAPSHOT.jar b/core/libs/LSPosed-api-1.0-SNAPSHOT.jar similarity index 100% rename from app/libs/LSPosed-api-1.0-SNAPSHOT.jar rename to core/libs/LSPosed-api-1.0-SNAPSHOT.jar diff --git a/app/src/main/aidl/me/rhunk/snapenhance/bridge/BridgeInterface.aidl b/core/src/main/aidl/me/rhunk/snapenhance/bridge/BridgeInterface.aidl similarity index 100% rename from app/src/main/aidl/me/rhunk/snapenhance/bridge/BridgeInterface.aidl rename to core/src/main/aidl/me/rhunk/snapenhance/bridge/BridgeInterface.aidl diff --git a/app/src/main/aidl/me/rhunk/snapenhance/bridge/DownloadCallback.aidl b/core/src/main/aidl/me/rhunk/snapenhance/bridge/DownloadCallback.aidl similarity index 100% rename from app/src/main/aidl/me/rhunk/snapenhance/bridge/DownloadCallback.aidl rename to core/src/main/aidl/me/rhunk/snapenhance/bridge/DownloadCallback.aidl diff --git a/app/src/main/assets/lang/ar_SA.json b/core/src/main/assets/lang/ar_SA.json similarity index 100% rename from app/src/main/assets/lang/ar_SA.json rename to core/src/main/assets/lang/ar_SA.json diff --git a/app/src/main/assets/lang/en_US.json b/core/src/main/assets/lang/en_US.json similarity index 100% rename from app/src/main/assets/lang/en_US.json rename to core/src/main/assets/lang/en_US.json diff --git a/app/src/main/assets/lang/fr_FR.json b/core/src/main/assets/lang/fr_FR.json similarity index 100% rename from app/src/main/assets/lang/fr_FR.json rename to core/src/main/assets/lang/fr_FR.json diff --git a/app/src/main/assets/lang/hi_IN.json b/core/src/main/assets/lang/hi_IN.json similarity index 100% rename from app/src/main/assets/lang/hi_IN.json rename to core/src/main/assets/lang/hi_IN.json diff --git a/app/src/main/assets/web/export_template.html b/core/src/main/assets/web/export_template.html similarity index 100% rename from app/src/main/assets/web/export_template.html rename to core/src/main/assets/web/export_template.html diff --git a/app/src/main/assets/web/rawinflate.js b/core/src/main/assets/web/rawinflate.js similarity index 100% rename from app/src/main/assets/web/rawinflate.js rename to core/src/main/assets/web/rawinflate.js diff --git a/app/src/main/assets/xposed_init b/core/src/main/assets/xposed_init similarity index 100% rename from app/src/main/assets/xposed_init rename to core/src/main/assets/xposed_init diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/Constants.kt b/core/src/main/kotlin/me/rhunk/snapenhance/Constants.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/Constants.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/Constants.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/Logger.kt b/core/src/main/kotlin/me/rhunk/snapenhance/Logger.kt similarity index 95% rename from app/src/main/kotlin/me/rhunk/snapenhance/Logger.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/Logger.kt index 8b7c9c8a..9fcdf474 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/Logger.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/Logger.kt @@ -2,6 +2,7 @@ package me.rhunk.snapenhance import android.util.Log import de.robv.android.xposed.XposedBridge +import me.rhunk.snapenhance.core.BuildConfig object Logger { private const val TAG = "SnapEnhance" diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ModContext.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ModContext.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/ModContext.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ModContext.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/SharedContext.kt b/core/src/main/kotlin/me/rhunk/snapenhance/SharedContext.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/SharedContext.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/SharedContext.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/SnapEnhance.kt b/core/src/main/kotlin/me/rhunk/snapenhance/SnapEnhance.kt similarity index 97% rename from app/src/main/kotlin/me/rhunk/snapenhance/SnapEnhance.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/SnapEnhance.kt index b818d165..e4fe79a4 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/SnapEnhance.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/SnapEnhance.kt @@ -7,6 +7,7 @@ import android.content.pm.PackageManager import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext import me.rhunk.snapenhance.bridge.BridgeClient +import me.rhunk.snapenhance.core.BuildConfig import me.rhunk.snapenhance.data.SnapClassCache import me.rhunk.snapenhance.hook.HookStage import me.rhunk.snapenhance.hook.Hooker @@ -34,7 +35,7 @@ class SnapEnhance { //for lspatch builds, we need to check if the service is correctly installed runCatching { - appContext.androidContext.packageManager.getApplicationInfoCompat(BuildConfig.APPLICATION_ID, PackageManager.GET_META_DATA) + appContext.androidContext.packageManager.getApplicationInfoCompat(BuildConfig.LIBRARY_PACKAGE_NAME, PackageManager.GET_META_DATA) }.onFailure { appContext.crash("SnapEnhance bridge service is not installed. Please download stable version from https://github.com/rhunk/SnapEnhance/releases") return@hook diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/XposedLoader.kt b/core/src/main/kotlin/me/rhunk/snapenhance/XposedLoader.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/XposedLoader.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/XposedLoader.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/action/AbstractAction.kt b/core/src/main/kotlin/me/rhunk/snapenhance/action/AbstractAction.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/action/AbstractAction.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/action/AbstractAction.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/action/impl/CheckForUpdates.kt b/core/src/main/kotlin/me/rhunk/snapenhance/action/impl/CheckForUpdates.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/action/impl/CheckForUpdates.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/action/impl/CheckForUpdates.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/action/impl/CleanCache.kt b/core/src/main/kotlin/me/rhunk/snapenhance/action/impl/CleanCache.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/action/impl/CleanCache.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/action/impl/CleanCache.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/action/impl/ClearMessageLogger.kt b/core/src/main/kotlin/me/rhunk/snapenhance/action/impl/ClearMessageLogger.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/action/impl/ClearMessageLogger.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/action/impl/ClearMessageLogger.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/action/impl/ExportChatMessages.kt b/core/src/main/kotlin/me/rhunk/snapenhance/action/impl/ExportChatMessages.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/action/impl/ExportChatMessages.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/action/impl/ExportChatMessages.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/action/impl/OpenMap.kt b/core/src/main/kotlin/me/rhunk/snapenhance/action/impl/OpenMap.kt similarity index 84% rename from app/src/main/kotlin/me/rhunk/snapenhance/action/impl/OpenMap.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/action/impl/OpenMap.kt index 9ba340ca..0909ce16 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/action/impl/OpenMap.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/action/impl/OpenMap.kt @@ -2,16 +2,16 @@ package me.rhunk.snapenhance.action.impl import android.content.Intent import android.os.Bundle -import me.rhunk.snapenhance.BuildConfig import me.rhunk.snapenhance.action.AbstractAction import me.rhunk.snapenhance.config.ConfigProperty +import me.rhunk.snapenhance.core.BuildConfig import me.rhunk.snapenhance.ui.map.MapActivity class OpenMap: AbstractAction("action.open_map", dependsOnProperty = ConfigProperty.LOCATION_SPOOF) { override fun run() { context.runOnUiThread { val mapActivityIntent = Intent() - mapActivityIntent.setClassName(BuildConfig.APPLICATION_ID, MapActivity::class.java.name) + mapActivityIntent.setClassName(BuildConfig.LIBRARY_PACKAGE_NAME, MapActivity::class.java.name) mapActivityIntent.putExtra("location", Bundle().apply { putDouble("latitude", context.config.string(ConfigProperty.LATITUDE).toDouble()) putDouble("longitude", context.config.string(ConfigProperty.LONGITUDE).toDouble()) diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/action/impl/RefreshMappings.kt b/core/src/main/kotlin/me/rhunk/snapenhance/action/impl/RefreshMappings.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/action/impl/RefreshMappings.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/action/impl/RefreshMappings.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/bridge/BridgeClient.kt b/core/src/main/kotlin/me/rhunk/snapenhance/bridge/BridgeClient.kt similarity index 94% rename from app/src/main/kotlin/me/rhunk/snapenhance/bridge/BridgeClient.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/bridge/BridgeClient.kt index 7885d926..5e98c81d 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/bridge/BridgeClient.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/bridge/BridgeClient.kt @@ -10,7 +10,7 @@ import android.os.Handler import android.os.HandlerThread import android.os.IBinder import de.robv.android.xposed.XposedHelpers -import me.rhunk.snapenhance.BuildConfig +import me.rhunk.snapenhance.core.BuildConfig import me.rhunk.snapenhance.Logger.xposedLog import me.rhunk.snapenhance.ModContext import me.rhunk.snapenhance.bridge.types.BridgeFileType @@ -32,12 +32,12 @@ class BridgeClient( with(context.androidContext) { //ensure the remote process is running startActivity(Intent() - .setClassName(BuildConfig.APPLICATION_ID, ForceStartActivity::class.java.name) + .setClassName(BuildConfig.LIBRARY_PACKAGE_NAME, ForceStartActivity::class.java.name) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_MULTIPLE_TASK) ) val intent = Intent() - .setClassName(BuildConfig.APPLICATION_ID, BridgeService::class.java.name) + .setClassName(BuildConfig.LIBRARY_PACKAGE_NAME, BridgeService::class.java.name) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { bindService( intent, diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/bridge/BridgeService.kt b/core/src/main/kotlin/me/rhunk/snapenhance/bridge/BridgeService.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/bridge/BridgeService.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/bridge/BridgeService.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/bridge/ForceStartActivity.kt b/core/src/main/kotlin/me/rhunk/snapenhance/bridge/ForceStartActivity.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/bridge/ForceStartActivity.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/bridge/ForceStartActivity.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/bridge/types/BridgeFileType.kt b/core/src/main/kotlin/me/rhunk/snapenhance/bridge/types/BridgeFileType.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/bridge/types/BridgeFileType.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/bridge/types/BridgeFileType.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/bridge/wrapper/ConfigWrapper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/bridge/wrapper/ConfigWrapper.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/bridge/wrapper/ConfigWrapper.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/bridge/wrapper/ConfigWrapper.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/bridge/wrapper/MessageLoggerWrapper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/bridge/wrapper/MessageLoggerWrapper.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/bridge/wrapper/MessageLoggerWrapper.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/bridge/wrapper/MessageLoggerWrapper.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/bridge/wrapper/TranslationWrapper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/bridge/wrapper/TranslationWrapper.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/bridge/wrapper/TranslationWrapper.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/bridge/wrapper/TranslationWrapper.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/config/ConfigAccessor.kt b/core/src/main/kotlin/me/rhunk/snapenhance/config/ConfigAccessor.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/config/ConfigAccessor.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/config/ConfigAccessor.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/config/ConfigCategory.kt b/core/src/main/kotlin/me/rhunk/snapenhance/config/ConfigCategory.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/config/ConfigCategory.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/config/ConfigCategory.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/config/ConfigProperty.kt b/core/src/main/kotlin/me/rhunk/snapenhance/config/ConfigProperty.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/config/ConfigProperty.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/config/ConfigProperty.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/config/ConfigValue.kt b/core/src/main/kotlin/me/rhunk/snapenhance/config/ConfigValue.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/config/ConfigValue.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/config/ConfigValue.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigIntegerValue.kt b/core/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigIntegerValue.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigIntegerValue.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigIntegerValue.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigStateListValue.kt b/core/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigStateListValue.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigStateListValue.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigStateListValue.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigStateSelection.kt b/core/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigStateSelection.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigStateSelection.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigStateSelection.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigStateValue.kt b/core/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigStateValue.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigStateValue.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigStateValue.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigStringValue.kt b/core/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigStringValue.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigStringValue.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/config/impl/ConfigStringValue.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/FileType.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/FileType.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/FileType.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/FileType.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/LocalePair.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/LocalePair.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/LocalePair.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/LocalePair.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/MessageSender.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/MessageSender.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/MessageSender.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/MessageSender.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/SnapClassCache.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/SnapClassCache.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/SnapClassCache.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/SnapClassCache.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/SnapEnums.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/SnapEnums.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/SnapEnums.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/SnapEnums.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/AbstractWrapper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/AbstractWrapper.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/AbstractWrapper.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/AbstractWrapper.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/FriendActionButton.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/FriendActionButton.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/FriendActionButton.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/FriendActionButton.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/Message.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/Message.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/Message.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/Message.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageContent.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageContent.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageContent.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageContent.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageDescriptor.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageDescriptor.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageDescriptor.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageDescriptor.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageDestinations.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageDestinations.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageDestinations.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageDestinations.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageMetadata.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageMetadata.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageMetadata.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/MessageMetadata.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/ScSize.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/ScSize.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/ScSize.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/ScSize.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/SnapUUID.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/SnapUUID.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/SnapUUID.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/SnapUUID.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/UserIdToReaction.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/UserIdToReaction.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/UserIdToReaction.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/UserIdToReaction.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/EncryptionWrapper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/EncryptionWrapper.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/EncryptionWrapper.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/EncryptionWrapper.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/MediaInfo.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/MediaInfo.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/MediaInfo.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/MediaInfo.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/dash/LongformVideoPlaylistItem.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/dash/LongformVideoPlaylistItem.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/dash/LongformVideoPlaylistItem.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/dash/LongformVideoPlaylistItem.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/dash/SnapChapter.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/dash/SnapChapter.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/dash/SnapChapter.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/dash/SnapChapter.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/dash/SnapPlaylistItem.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/dash/SnapPlaylistItem.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/dash/SnapPlaylistItem.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/dash/SnapPlaylistItem.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/Layer.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/Layer.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/Layer.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/Layer.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/LayerController.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/LayerController.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/LayerController.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/LayerController.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/ParamMap.kt b/core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/ParamMap.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/ParamMap.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/data/wrapper/impl/media/opera/ParamMap.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/database/DatabaseAccess.kt b/core/src/main/kotlin/me/rhunk/snapenhance/database/DatabaseAccess.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/database/DatabaseAccess.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/database/DatabaseAccess.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/database/DatabaseObject.kt b/core/src/main/kotlin/me/rhunk/snapenhance/database/DatabaseObject.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/database/DatabaseObject.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/database/DatabaseObject.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/database/objects/ConversationMessage.kt b/core/src/main/kotlin/me/rhunk/snapenhance/database/objects/ConversationMessage.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/database/objects/ConversationMessage.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/database/objects/ConversationMessage.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/database/objects/FriendFeedInfo.kt b/core/src/main/kotlin/me/rhunk/snapenhance/database/objects/FriendFeedInfo.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/database/objects/FriendFeedInfo.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/database/objects/FriendFeedInfo.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/database/objects/FriendInfo.kt b/core/src/main/kotlin/me/rhunk/snapenhance/database/objects/FriendInfo.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/database/objects/FriendInfo.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/database/objects/FriendInfo.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/database/objects/StoryEntry.kt b/core/src/main/kotlin/me/rhunk/snapenhance/database/objects/StoryEntry.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/database/objects/StoryEntry.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/database/objects/StoryEntry.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/database/objects/UserConversationLink.kt b/core/src/main/kotlin/me/rhunk/snapenhance/database/objects/UserConversationLink.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/database/objects/UserConversationLink.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/database/objects/UserConversationLink.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/download/DownloadManagerClient.kt b/core/src/main/kotlin/me/rhunk/snapenhance/download/DownloadManagerClient.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/download/DownloadManagerClient.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/download/DownloadManagerClient.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/download/DownloadProcessor.kt b/core/src/main/kotlin/me/rhunk/snapenhance/download/DownloadProcessor.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/download/DownloadProcessor.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/download/DownloadProcessor.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/download/DownloadTaskManager.kt b/core/src/main/kotlin/me/rhunk/snapenhance/download/DownloadTaskManager.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/download/DownloadTaskManager.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/download/DownloadTaskManager.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/download/data/DownloadMetadata.kt b/core/src/main/kotlin/me/rhunk/snapenhance/download/data/DownloadMetadata.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/download/data/DownloadMetadata.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/download/data/DownloadMetadata.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/download/data/DownloadRequest.kt b/core/src/main/kotlin/me/rhunk/snapenhance/download/data/DownloadRequest.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/download/data/DownloadRequest.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/download/data/DownloadRequest.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/download/data/MediaEncryptionKeyPair.kt b/core/src/main/kotlin/me/rhunk/snapenhance/download/data/MediaEncryptionKeyPair.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/download/data/MediaEncryptionKeyPair.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/download/data/MediaEncryptionKeyPair.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/download/data/PendingDownload.kt b/core/src/main/kotlin/me/rhunk/snapenhance/download/data/PendingDownload.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/download/data/PendingDownload.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/download/data/PendingDownload.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/download/data/SplitMediaAssetType.kt b/core/src/main/kotlin/me/rhunk/snapenhance/download/data/SplitMediaAssetType.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/download/data/SplitMediaAssetType.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/download/data/SplitMediaAssetType.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/download/enums/DownloadMediaType.kt b/core/src/main/kotlin/me/rhunk/snapenhance/download/enums/DownloadMediaType.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/download/enums/DownloadMediaType.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/download/enums/DownloadMediaType.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/download/enums/DownloadStage.kt b/core/src/main/kotlin/me/rhunk/snapenhance/download/enums/DownloadStage.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/download/enums/DownloadStage.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/download/enums/DownloadStage.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/event/EventBus.kt b/core/src/main/kotlin/me/rhunk/snapenhance/event/EventBus.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/event/EventBus.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/event/EventBus.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/event/Events.kt b/core/src/main/kotlin/me/rhunk/snapenhance/event/Events.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/event/Events.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/event/Events.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/BridgeFileFeature.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/BridgeFileFeature.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/BridgeFileFeature.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/BridgeFileFeature.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/Feature.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/Feature.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/Feature.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/Feature.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/FeatureLoadParams.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/FeatureLoadParams.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/FeatureLoadParams.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/FeatureLoadParams.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/AutoUpdater.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/AutoUpdater.kt similarity index 99% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/AutoUpdater.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/AutoUpdater.kt index 7e6996e3..c92ac590 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/AutoUpdater.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/AutoUpdater.kt @@ -9,7 +9,7 @@ import android.content.Intent import android.content.IntentFilter import android.net.Uri import android.os.Environment -import me.rhunk.snapenhance.BuildConfig +import me.rhunk.snapenhance.core.BuildConfig import me.rhunk.snapenhance.Logger import me.rhunk.snapenhance.config.ConfigProperty import me.rhunk.snapenhance.features.Feature diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/ConfigEnumKeys.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ConfigEnumKeys.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/ConfigEnumKeys.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ConfigEnumKeys.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/Messaging.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/Messaging.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/Messaging.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/Messaging.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/AntiAutoDownload.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/AntiAutoDownload.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/AntiAutoDownload.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/AntiAutoDownload.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/MediaDownloader.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/MediaDownloader.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/MediaDownloader.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/downloader/MediaDownloader.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/AmoledDarkMode.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/AmoledDarkMode.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/AmoledDarkMode.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/AmoledDarkMode.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/AppPasscode.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/AppPasscode.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/AppPasscode.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/AppPasscode.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/DeviceSpooferHook.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/DeviceSpooferHook.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/DeviceSpooferHook.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/DeviceSpooferHook.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/InfiniteStoryBoost.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/InfiniteStoryBoost.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/InfiniteStoryBoost.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/InfiniteStoryBoost.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/MeoPasscodeBypass.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/MeoPasscodeBypass.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/MeoPasscodeBypass.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/MeoPasscodeBypass.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/UnlimitedMultiSnap.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/UnlimitedMultiSnap.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/UnlimitedMultiSnap.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/experiments/UnlimitedMultiSnap.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/privacy/DisableMetrics.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/privacy/DisableMetrics.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/privacy/DisableMetrics.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/privacy/DisableMetrics.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/privacy/PreventMessageSending.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/privacy/PreventMessageSending.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/privacy/PreventMessageSending.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/privacy/PreventMessageSending.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/AnonymousStoryViewing.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/AnonymousStoryViewing.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/AnonymousStoryViewing.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/AnonymousStoryViewing.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/MessageLogger.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/MessageLogger.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/MessageLogger.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/MessageLogger.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/PreventReadReceipts.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/PreventReadReceipts.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/PreventReadReceipts.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/PreventReadReceipts.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/StealthMode.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/StealthMode.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/StealthMode.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/spying/StealthMode.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/AntiAutoSave.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/AntiAutoSave.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/AntiAutoSave.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/AntiAutoSave.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/AutoSave.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/AutoSave.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/AutoSave.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/AutoSave.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/CameraTweaks.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/CameraTweaks.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/CameraTweaks.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/CameraTweaks.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/DisableVideoLengthRestriction.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/DisableVideoLengthRestriction.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/DisableVideoLengthRestriction.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/DisableVideoLengthRestriction.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/GalleryMediaSendOverride.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/GalleryMediaSendOverride.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/GalleryMediaSendOverride.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/GalleryMediaSendOverride.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/GooglePlayServicesDialogs.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/GooglePlayServicesDialogs.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/GooglePlayServicesDialogs.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/GooglePlayServicesDialogs.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/LocationSpoofer.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/LocationSpoofer.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/LocationSpoofer.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/LocationSpoofer.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/MediaQualityLevelOverride.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/MediaQualityLevelOverride.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/MediaQualityLevelOverride.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/MediaQualityLevelOverride.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/Notifications.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/Notifications.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/Notifications.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/Notifications.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/SnapchatPlus.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/SnapchatPlus.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/SnapchatPlus.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/SnapchatPlus.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/UnlimitedSnapViewTime.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/UnlimitedSnapViewTime.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/UnlimitedSnapViewTime.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/tweaks/UnlimitedSnapViewTime.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/PinConversations.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/PinConversations.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/PinConversations.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/PinConversations.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/StartupPageOverride.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/StartupPageOverride.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/StartupPageOverride.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/StartupPageOverride.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/UITweaks.kt b/core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/UITweaks.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/UITweaks.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/features/impl/ui/UITweaks.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/hook/HookAdapter.kt b/core/src/main/kotlin/me/rhunk/snapenhance/hook/HookAdapter.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/hook/HookAdapter.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/hook/HookAdapter.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/hook/HookStage.kt b/core/src/main/kotlin/me/rhunk/snapenhance/hook/HookStage.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/hook/HookStage.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/hook/HookStage.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/hook/Hooker.kt b/core/src/main/kotlin/me/rhunk/snapenhance/hook/Hooker.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/hook/Hooker.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/hook/Hooker.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/manager/Manager.kt b/core/src/main/kotlin/me/rhunk/snapenhance/manager/Manager.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/manager/Manager.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/manager/Manager.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/manager/impl/ActionManager.kt b/core/src/main/kotlin/me/rhunk/snapenhance/manager/impl/ActionManager.kt similarity index 96% rename from app/src/main/kotlin/me/rhunk/snapenhance/manager/impl/ActionManager.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/manager/impl/ActionManager.kt index 0c7ed9ce..4dfc3415 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/manager/impl/ActionManager.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/manager/impl/ActionManager.kt @@ -1,6 +1,6 @@ package me.rhunk.snapenhance.manager.impl -import me.rhunk.snapenhance.BuildConfig +import me.rhunk.snapenhance.core.BuildConfig import me.rhunk.snapenhance.ModContext import me.rhunk.snapenhance.action.AbstractAction import me.rhunk.snapenhance.action.impl.CheckForUpdates diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/manager/impl/ConfigManager.kt b/core/src/main/kotlin/me/rhunk/snapenhance/manager/impl/ConfigManager.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/manager/impl/ConfigManager.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/manager/impl/ConfigManager.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/manager/impl/FeatureManager.kt b/core/src/main/kotlin/me/rhunk/snapenhance/manager/impl/FeatureManager.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/manager/impl/FeatureManager.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/manager/impl/FeatureManager.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/manager/impl/MappingManager.kt b/core/src/main/kotlin/me/rhunk/snapenhance/manager/impl/MappingManager.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/manager/impl/MappingManager.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/manager/impl/MappingManager.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/ItemHelper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/ItemHelper.kt similarity index 98% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/ItemHelper.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ui/ItemHelper.kt index c78ae4b2..c47437ff 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/ItemHelper.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/ui/ItemHelper.kt @@ -7,7 +7,7 @@ import android.content.Intent import android.widget.EditText import android.widget.TextView import android.widget.Toast -import me.rhunk.snapenhance.R +import me.rhunk.snapenhance.core.R import me.rhunk.snapenhance.SharedContext import me.rhunk.snapenhance.config.ConfigProperty import me.rhunk.snapenhance.util.ActivityResultCallback diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/ViewAppearanceHelper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/ViewAppearanceHelper.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/ViewAppearanceHelper.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ui/ViewAppearanceHelper.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/config/ConfigActivity.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/config/ConfigActivity.kt similarity index 99% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/config/ConfigActivity.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ui/config/ConfigActivity.kt index 0f6093a6..7a47c87a 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/config/ConfigActivity.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/ui/config/ConfigActivity.kt @@ -13,8 +13,8 @@ import android.widget.ImageButton import android.widget.Switch import android.widget.TextView import android.widget.Toast -import me.rhunk.snapenhance.BuildConfig -import me.rhunk.snapenhance.R +import me.rhunk.snapenhance.core.BuildConfig +import me.rhunk.snapenhance.core.R import me.rhunk.snapenhance.SharedContext import me.rhunk.snapenhance.config.ConfigCategory import me.rhunk.snapenhance.config.ConfigProperty diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/download/DebugSettingsLayoutInflater.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/download/DebugSettingsLayoutInflater.kt similarity index 99% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/download/DebugSettingsLayoutInflater.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ui/download/DebugSettingsLayoutInflater.kt index 40493870..888eb96d 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/download/DebugSettingsLayoutInflater.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/ui/download/DebugSettingsLayoutInflater.kt @@ -9,7 +9,7 @@ import android.widget.ImageButton import android.widget.ListView import android.widget.TextView import android.widget.Toast -import me.rhunk.snapenhance.R +import me.rhunk.snapenhance.core.R import me.rhunk.snapenhance.SharedContext import me.rhunk.snapenhance.bridge.types.BridgeFileType import me.rhunk.snapenhance.ui.config.ConfigActivity diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/download/DownloadListAdapter.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/download/DownloadListAdapter.kt similarity index 99% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/download/DownloadListAdapter.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ui/download/DownloadListAdapter.kt index e250db9a..d7351d3e 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/download/DownloadListAdapter.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/ui/download/DownloadListAdapter.kt @@ -23,7 +23,7 @@ import kotlinx.coroutines.job import kotlinx.coroutines.launch import kotlinx.coroutines.withTimeout import me.rhunk.snapenhance.Logger -import me.rhunk.snapenhance.R +import me.rhunk.snapenhance.core.R import me.rhunk.snapenhance.SharedContext import me.rhunk.snapenhance.data.FileType import me.rhunk.snapenhance.download.data.PendingDownload diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/download/DownloadManagerActivity.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/download/DownloadManagerActivity.kt similarity index 99% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/download/DownloadManagerActivity.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ui/download/DownloadManagerActivity.kt index 2ba92310..1472afd0 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/download/DownloadManagerActivity.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/ui/download/DownloadManagerActivity.kt @@ -15,8 +15,8 @@ import android.widget.ImageButton import android.widget.TextView import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView -import me.rhunk.snapenhance.BuildConfig -import me.rhunk.snapenhance.R +import me.rhunk.snapenhance.core.BuildConfig +import me.rhunk.snapenhance.core.R import me.rhunk.snapenhance.SharedContext import me.rhunk.snapenhance.bridge.wrapper.TranslationWrapper import me.rhunk.snapenhance.download.data.PendingDownload diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/download/MediaFilter.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/download/MediaFilter.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/download/MediaFilter.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ui/download/MediaFilter.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/map/MapActivity.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/map/MapActivity.kt similarity index 99% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/map/MapActivity.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ui/map/MapActivity.kt index 80beea01..af0a9f9d 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/map/MapActivity.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/ui/map/MapActivity.kt @@ -8,7 +8,7 @@ import android.os.Bundle import android.view.MotionEvent import android.widget.Button import android.widget.EditText -import me.rhunk.snapenhance.R +import me.rhunk.snapenhance.core.R import org.osmdroid.config.Configuration import org.osmdroid.tileprovider.tilesource.TileSourceFactory import org.osmdroid.util.GeoPoint diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/menu/AbstractMenu.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/AbstractMenu.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/menu/AbstractMenu.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/AbstractMenu.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/ChatActionMenu.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/ChatActionMenu.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/ChatActionMenu.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/ChatActionMenu.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/FriendFeedInfoMenu.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/FriendFeedInfoMenu.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/FriendFeedInfoMenu.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/FriendFeedInfoMenu.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/MenuViewInjector.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/MenuViewInjector.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/MenuViewInjector.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/MenuViewInjector.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/OperaContextActionMenu.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/OperaContextActionMenu.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/OperaContextActionMenu.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/OperaContextActionMenu.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/SettingsGearInjector.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/SettingsGearInjector.kt similarity index 95% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/SettingsGearInjector.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/SettingsGearInjector.kt index c96683c2..a904e2c0 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/SettingsGearInjector.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/SettingsGearInjector.kt @@ -6,7 +6,7 @@ import android.view.View import android.view.ViewGroup import android.widget.FrameLayout import android.widget.ImageView -import me.rhunk.snapenhance.BuildConfig +import me.rhunk.snapenhance.core.BuildConfig import me.rhunk.snapenhance.Constants import me.rhunk.snapenhance.ui.config.ConfigActivity import me.rhunk.snapenhance.ui.menu.AbstractMenu @@ -48,7 +48,7 @@ class SettingsGearInjector : AbstractMenu() { setOnClickListener { val intent = Intent().apply { - setClassName(BuildConfig.APPLICATION_ID, ConfigActivity::class.java.name) + setClassName(BuildConfig.LIBRARY_PACKAGE_NAME, ConfigActivity::class.java.name) } intent.putExtra("lspatched", File(context.cacheDir, "lspatch/origin").exists()) context.startActivity(intent) diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/SettingsMenu.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/SettingsMenu.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/SettingsMenu.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ui/menu/impl/SettingsMenu.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/ui/spoof/DeviceSpooferActivity.kt b/core/src/main/kotlin/me/rhunk/snapenhance/ui/spoof/DeviceSpooferActivity.kt similarity index 99% rename from app/src/main/kotlin/me/rhunk/snapenhance/ui/spoof/DeviceSpooferActivity.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/ui/spoof/DeviceSpooferActivity.kt index 32cc5db0..c6b61abf 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/ui/spoof/DeviceSpooferActivity.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/ui/spoof/DeviceSpooferActivity.kt @@ -9,7 +9,7 @@ import android.view.ViewGroup import android.widget.ImageButton import android.widget.Switch import android.widget.TextView -import me.rhunk.snapenhance.R +import me.rhunk.snapenhance.core.R import me.rhunk.snapenhance.SharedContext import me.rhunk.snapenhance.config.ConfigCategory import me.rhunk.snapenhance.config.impl.ConfigIntegerValue diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/util/ActivityResultCallback.kt b/core/src/main/kotlin/me/rhunk/snapenhance/util/ActivityResultCallback.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/util/ActivityResultCallback.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/util/ActivityResultCallback.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/util/AndroidCompatExtensions.kt b/core/src/main/kotlin/me/rhunk/snapenhance/util/AndroidCompatExtensions.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/util/AndroidCompatExtensions.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/util/AndroidCompatExtensions.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/util/CallbackBuilder.kt b/core/src/main/kotlin/me/rhunk/snapenhance/util/CallbackBuilder.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/util/CallbackBuilder.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/util/CallbackBuilder.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/util/ReflectionHelper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/util/ReflectionHelper.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/util/ReflectionHelper.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/util/ReflectionHelper.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/util/SQLiteDatabaseHelper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/util/SQLiteDatabaseHelper.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/util/SQLiteDatabaseHelper.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/util/SQLiteDatabaseHelper.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/util/XposedHelperMacros.kt b/core/src/main/kotlin/me/rhunk/snapenhance/util/XposedHelperMacros.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/util/XposedHelperMacros.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/util/XposedHelperMacros.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/util/download/DownloadServer.kt b/core/src/main/kotlin/me/rhunk/snapenhance/util/download/DownloadServer.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/util/download/DownloadServer.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/util/download/DownloadServer.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/util/download/RemoteMediaResolver.kt b/core/src/main/kotlin/me/rhunk/snapenhance/util/download/RemoteMediaResolver.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/util/download/RemoteMediaResolver.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/util/download/RemoteMediaResolver.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/util/export/MessageExporter.kt b/core/src/main/kotlin/me/rhunk/snapenhance/util/export/MessageExporter.kt similarity index 99% rename from app/src/main/kotlin/me/rhunk/snapenhance/util/export/MessageExporter.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/util/export/MessageExporter.kt index d397e21a..56675bef 100644 --- a/app/src/main/kotlin/me/rhunk/snapenhance/util/export/MessageExporter.kt +++ b/core/src/main/kotlin/me/rhunk/snapenhance/util/export/MessageExporter.kt @@ -10,7 +10,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll import kotlinx.coroutines.withContext -import me.rhunk.snapenhance.BuildConfig +import me.rhunk.snapenhance.core.BuildConfig import me.rhunk.snapenhance.Logger import me.rhunk.snapenhance.ModContext import me.rhunk.snapenhance.data.ContentType @@ -191,7 +191,7 @@ class MessageExporter( runCatching { ZipFile( - context.androidContext.packageManager.getApplicationInfoCompat(BuildConfig.APPLICATION_ID, PackageManager.GET_META_DATA).publicSourceDir + context.androidContext.packageManager.getApplicationInfoCompat(BuildConfig.LIBRARY_PACKAGE_NAME, PackageManager.GET_META_DATA).publicSourceDir ).use { apkFile -> //export rawinflate.js apkFile.getEntry("assets/web/rawinflate.js").let { entry -> diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoEditor.kt b/core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoEditor.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoEditor.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoEditor.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoReader.kt b/core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoReader.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoReader.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoReader.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoWriter.kt b/core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoWriter.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoWriter.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/util/protobuf/ProtoWriter.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/util/snap/BitmojiSelfie.kt b/core/src/main/kotlin/me/rhunk/snapenhance/util/snap/BitmojiSelfie.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/util/snap/BitmojiSelfie.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/util/snap/BitmojiSelfie.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/util/snap/EncryptionHelper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/util/snap/EncryptionHelper.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/util/snap/EncryptionHelper.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/util/snap/EncryptionHelper.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/util/snap/MediaDownloaderHelper.kt b/core/src/main/kotlin/me/rhunk/snapenhance/util/snap/MediaDownloaderHelper.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/util/snap/MediaDownloaderHelper.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/util/snap/MediaDownloaderHelper.kt diff --git a/app/src/main/kotlin/me/rhunk/snapenhance/util/snap/PreviewUtils.kt b/core/src/main/kotlin/me/rhunk/snapenhance/util/snap/PreviewUtils.kt similarity index 100% rename from app/src/main/kotlin/me/rhunk/snapenhance/util/snap/PreviewUtils.kt rename to core/src/main/kotlin/me/rhunk/snapenhance/util/snap/PreviewUtils.kt diff --git a/app/src/main/res/drawable/action_button_cancel.xml b/core/src/main/res/drawable/action_button_cancel.xml similarity index 100% rename from app/src/main/res/drawable/action_button_cancel.xml rename to core/src/main/res/drawable/action_button_cancel.xml diff --git a/app/src/main/res/drawable/action_button_success.xml b/core/src/main/res/drawable/action_button_success.xml similarity index 100% rename from app/src/main/res/drawable/action_button_success.xml rename to core/src/main/res/drawable/action_button_success.xml diff --git a/app/src/main/res/drawable/back_arrow.xml b/core/src/main/res/drawable/back_arrow.xml similarity index 100% rename from app/src/main/res/drawable/back_arrow.xml rename to core/src/main/res/drawable/back_arrow.xml diff --git a/app/src/main/res/drawable/bitmoji_blank.xml b/core/src/main/res/drawable/bitmoji_blank.xml similarity index 100% rename from app/src/main/res/drawable/bitmoji_blank.xml rename to core/src/main/res/drawable/bitmoji_blank.xml diff --git a/app/src/main/res/drawable/debug_settings_icon.xml b/core/src/main/res/drawable/debug_settings_icon.xml similarity index 100% rename from app/src/main/res/drawable/debug_settings_icon.xml rename to core/src/main/res/drawable/debug_settings_icon.xml diff --git a/app/src/main/res/drawable/download_manager_item_background.xml b/core/src/main/res/drawable/download_manager_item_background.xml similarity index 100% rename from app/src/main/res/drawable/download_manager_item_background.xml rename to core/src/main/res/drawable/download_manager_item_background.xml diff --git a/app/src/main/res/drawable/settings_icon.xml b/core/src/main/res/drawable/settings_icon.xml similarity index 100% rename from app/src/main/res/drawable/settings_icon.xml rename to core/src/main/res/drawable/settings_icon.xml diff --git a/app/src/main/res/font/avenir_next_bold.ttf b/core/src/main/res/font/avenir_next_bold.ttf similarity index 100% rename from app/src/main/res/font/avenir_next_bold.ttf rename to core/src/main/res/font/avenir_next_bold.ttf diff --git a/app/src/main/res/font/avenir_next_medium.ttf b/core/src/main/res/font/avenir_next_medium.ttf similarity index 100% rename from app/src/main/res/font/avenir_next_medium.ttf rename to core/src/main/res/font/avenir_next_medium.ttf diff --git a/app/src/main/res/layout/activity_default_header.xml b/core/src/main/res/layout/activity_default_header.xml similarity index 100% rename from app/src/main/res/layout/activity_default_header.xml rename to core/src/main/res/layout/activity_default_header.xml diff --git a/app/src/main/res/layout/config_activity.xml b/core/src/main/res/layout/config_activity.xml similarity index 100% rename from app/src/main/res/layout/config_activity.xml rename to core/src/main/res/layout/config_activity.xml diff --git a/app/src/main/res/layout/config_activity_debug_item.xml b/core/src/main/res/layout/config_activity_debug_item.xml similarity index 100% rename from app/src/main/res/layout/config_activity_debug_item.xml rename to core/src/main/res/layout/config_activity_debug_item.xml diff --git a/app/src/main/res/layout/config_activity_item.xml b/core/src/main/res/layout/config_activity_item.xml similarity index 100% rename from app/src/main/res/layout/config_activity_item.xml rename to core/src/main/res/layout/config_activity_item.xml diff --git a/app/src/main/res/layout/debug_setting_item.xml b/core/src/main/res/layout/debug_setting_item.xml similarity index 100% rename from app/src/main/res/layout/debug_setting_item.xml rename to core/src/main/res/layout/debug_setting_item.xml diff --git a/app/src/main/res/layout/debug_settings_page.xml b/core/src/main/res/layout/debug_settings_page.xml similarity index 100% rename from app/src/main/res/layout/debug_settings_page.xml rename to core/src/main/res/layout/debug_settings_page.xml diff --git a/app/src/main/res/layout/device_spoofer_activity.xml b/core/src/main/res/layout/device_spoofer_activity.xml similarity index 100% rename from app/src/main/res/layout/device_spoofer_activity.xml rename to core/src/main/res/layout/device_spoofer_activity.xml diff --git a/app/src/main/res/layout/download_manager_activity.xml b/core/src/main/res/layout/download_manager_activity.xml similarity index 100% rename from app/src/main/res/layout/download_manager_activity.xml rename to core/src/main/res/layout/download_manager_activity.xml diff --git a/app/src/main/res/layout/download_manager_item.xml b/core/src/main/res/layout/download_manager_item.xml similarity index 100% rename from app/src/main/res/layout/download_manager_item.xml rename to core/src/main/res/layout/download_manager_item.xml diff --git a/app/src/main/res/layout/map.xml b/core/src/main/res/layout/map.xml similarity index 100% rename from app/src/main/res/layout/map.xml rename to core/src/main/res/layout/map.xml diff --git a/app/src/main/res/layout/precise_location_dialog.xml b/core/src/main/res/layout/precise_location_dialog.xml similarity index 100% rename from app/src/main/res/layout/precise_location_dialog.xml rename to core/src/main/res/layout/precise_location_dialog.xml diff --git a/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml b/core/src/main/res/mipmap-anydpi-v26/launcher_icon.xml similarity index 100% rename from app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml rename to core/src/main/res/mipmap-anydpi-v26/launcher_icon.xml diff --git a/app/src/main/res/mipmap-anydpi-v26/launcher_icon_round.xml b/core/src/main/res/mipmap-anydpi-v26/launcher_icon_round.xml similarity index 100% rename from app/src/main/res/mipmap-anydpi-v26/launcher_icon_round.xml rename to core/src/main/res/mipmap-anydpi-v26/launcher_icon_round.xml diff --git a/app/src/main/res/mipmap-hdpi/launcher_icon_foreground.png b/core/src/main/res/mipmap-hdpi/launcher_icon_foreground.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/launcher_icon_foreground.png rename to core/src/main/res/mipmap-hdpi/launcher_icon_foreground.png diff --git a/app/src/main/res/mipmap-hdpi/launcher_icon_round.png b/core/src/main/res/mipmap-hdpi/launcher_icon_round.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/launcher_icon_round.png rename to core/src/main/res/mipmap-hdpi/launcher_icon_round.png diff --git a/app/src/main/res/mipmap-mdpi/launcher_icon_foreground.png b/core/src/main/res/mipmap-mdpi/launcher_icon_foreground.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/launcher_icon_foreground.png rename to core/src/main/res/mipmap-mdpi/launcher_icon_foreground.png diff --git a/app/src/main/res/mipmap-mdpi/launcher_icon_round.png b/core/src/main/res/mipmap-mdpi/launcher_icon_round.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/launcher_icon_round.png rename to core/src/main/res/mipmap-mdpi/launcher_icon_round.png diff --git a/app/src/main/res/mipmap-xhdpi/launcher_icon_foreground.png b/core/src/main/res/mipmap-xhdpi/launcher_icon_foreground.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/launcher_icon_foreground.png rename to core/src/main/res/mipmap-xhdpi/launcher_icon_foreground.png diff --git a/app/src/main/res/mipmap-xhdpi/launcher_icon_round.png b/core/src/main/res/mipmap-xhdpi/launcher_icon_round.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/launcher_icon_round.png rename to core/src/main/res/mipmap-xhdpi/launcher_icon_round.png diff --git a/app/src/main/res/mipmap-xxhdpi/launcher_icon_foreground.png b/core/src/main/res/mipmap-xxhdpi/launcher_icon_foreground.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/launcher_icon_foreground.png rename to core/src/main/res/mipmap-xxhdpi/launcher_icon_foreground.png diff --git a/app/src/main/res/mipmap-xxhdpi/launcher_icon_round.png b/core/src/main/res/mipmap-xxhdpi/launcher_icon_round.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/launcher_icon_round.png rename to core/src/main/res/mipmap-xxhdpi/launcher_icon_round.png diff --git a/app/src/main/res/mipmap-xxxhdpi/launcher_icon_foreground.png b/core/src/main/res/mipmap-xxxhdpi/launcher_icon_foreground.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/launcher_icon_foreground.png rename to core/src/main/res/mipmap-xxxhdpi/launcher_icon_foreground.png diff --git a/app/src/main/res/mipmap-xxxhdpi/launcher_icon_round.png b/core/src/main/res/mipmap-xxxhdpi/launcher_icon_round.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/launcher_icon_round.png rename to core/src/main/res/mipmap-xxxhdpi/launcher_icon_round.png diff --git a/app/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml similarity index 100% rename from app/src/main/res/values/arrays.xml rename to core/src/main/res/values/arrays.xml diff --git a/app/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml similarity index 100% rename from app/src/main/res/values/colors.xml rename to core/src/main/res/values/colors.xml diff --git a/app/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml similarity index 100% rename from app/src/main/res/values/dimens.xml rename to core/src/main/res/values/dimens.xml diff --git a/app/src/main/res/values/launcher_icon_background.xml b/core/src/main/res/values/launcher_icon_background.xml similarity index 100% rename from app/src/main/res/values/launcher_icon_background.xml rename to core/src/main/res/values/launcher_icon_background.xml diff --git a/app/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml similarity index 100% rename from app/src/main/res/values/strings.xml rename to core/src/main/res/values/strings.xml diff --git a/app/src/main/res/values/themes.xml b/core/src/main/res/values/themes.xml similarity index 100% rename from app/src/main/res/values/themes.xml rename to core/src/main/res/values/themes.xml diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e7e7f3b5..a45e52a0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,6 +11,7 @@ osmdroid-android = "6.1.16" okhttp = "5.0.0-alpha.11" dexlib2 = "2.5.2" androidx-documentfile = "1.1.0-alpha01" +activity-ktx = "1.7.2" [libraries] @@ -24,6 +25,7 @@ osmdroid-android = { group = "org.osmdroid", name = "osmdroid-android", version. okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" } dexlib2 = { group = "org.smali", name = "dexlib2", version.ref = "dexlib2" } androidx-documentfile = { group = "androidx.documentfile", name = "documentfile", version.ref = "androidx-documentfile" } +androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "activity-ktx" } [plugins] diff --git a/settings.gradle.kts b/settings.gradle.kts index ee241784..c62f1ff7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,6 +15,8 @@ dependencyResolutionManagement { } } + rootProject.name = "SnapEnhance" +include(":core") include(":app") include(":mapper") \ No newline at end of file