diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7f3fdd6c..72b3f3aa 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -15,16 +15,16 @@ plugins { } android { - namespace = "org.cosmicide.rewrite" + namespace = "org.cosmicide" compileSdk = 34 defaultConfig { val commit = getGitCommit() - applicationId = "org.cosmicide.rewrite" + applicationId = "org.cosmicide" minSdk = 26 targetSdk = 34 - versionCode = 1 - versionName = "1.0-$commit" + versionCode = 20 + versionName = "2.0" buildConfigField("String", "GIT_COMMIT", "\"$commit\"") } diff --git a/app/google-services.json b/app/google-services.json index da305d2e..4b041f3f 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -5,6 +5,25 @@ "storage_bucket": "rewrite-41cf5.appspot.com" }, "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:542725065106:android:39543c54d9a91b43d6594b", + "android_client_info": { + "package_name": "org.cosmicide" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyBCiJcjNDBlSXJoECELMBQ7WtZwOYPYvP4" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + }, { "client_info": { "mobilesdk_app_id": "1:542725065106:android:174f153f22bc54d0d6594b", diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 42a5f4dc..f9a06225 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -31,7 +31,7 @@ tools:ignore="ProtectedPermissions" /> diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/App.kt b/app/src/main/kotlin/org/cosmicide/App.kt similarity index 92% rename from app/src/main/kotlin/org/cosmicide/rewrite/App.kt rename to app/src/main/kotlin/org/cosmicide/App.kt index 3c193bd5..eecc51ab 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/App.kt +++ b/app/src/main/kotlin/org/cosmicide/App.kt @@ -1,3 +1,10 @@ +/* + * This file is part of Cosmic IDE. + * Cosmic IDE is a free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * Cosmic IDE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * You should have received a copy of the GNU General Public License along with Cosmic IDE. If not, see . + */ + /* * This file is part of Cosmic IDE. * Cosmic IDE is a free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. @@ -5,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite +package org.cosmicide import android.app.Application import android.app.UiModeManager @@ -23,14 +30,14 @@ import io.github.rosemoe.sora.langs.textmate.registry.GrammarRegistry import io.github.rosemoe.sora.langs.textmate.registry.ThemeRegistry import io.github.rosemoe.sora.langs.textmate.registry.model.ThemeModel import io.github.rosemoe.sora.langs.textmate.registry.provider.AssetsFileResolver +import org.cosmicide.fragment.PluginsFragment import org.cosmicide.rewrite.common.Analytics import org.cosmicide.rewrite.common.Prefs -import org.cosmicide.rewrite.fragment.PluginsFragment import org.cosmicide.rewrite.plugin.api.Hook import org.cosmicide.rewrite.plugin.api.HookManager import org.cosmicide.rewrite.plugin.api.PluginLoader -import org.cosmicide.rewrite.util.CommonUtils import org.cosmicide.rewrite.util.FileUtil +import org.cosmicide.util.CommonUtils import org.eclipse.tm4e.core.registry.IThemeSource import org.lsposed.hiddenapibypass.HiddenApiBypass import rikka.sui.Sui diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/FileProvider.kt b/app/src/main/kotlin/org/cosmicide/FileProvider.kt similarity index 98% rename from app/src/main/kotlin/org/cosmicide/rewrite/FileProvider.kt rename to app/src/main/kotlin/org/cosmicide/FileProvider.kt index 9da06544..e74062f5 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/FileProvider.kt +++ b/app/src/main/kotlin/org/cosmicide/FileProvider.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite +package org.cosmicide import android.content.Context import android.content.Intent diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/MainActivity.kt b/app/src/main/kotlin/org/cosmicide/MainActivity.kt similarity index 82% rename from app/src/main/kotlin/org/cosmicide/rewrite/MainActivity.kt rename to app/src/main/kotlin/org/cosmicide/MainActivity.kt index b85cdb1d..7fb32765 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/MainActivity.kt +++ b/app/src/main/kotlin/org/cosmicide/MainActivity.kt @@ -1,3 +1,10 @@ +/* + * This file is part of Cosmic IDE. + * Cosmic IDE is a free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * Cosmic IDE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * You should have received a copy of the GNU General Public License along with Cosmic IDE. If not, see . + */ + /* * This file is part of Cosmic IDE. * Cosmic IDE is a free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. @@ -5,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite +package org.cosmicide import android.content.Context import android.content.pm.PackageManager @@ -26,11 +33,11 @@ import com.kieronquinn.app.darq.utils.extensions.awaitBinderReceived import com.kieronquinn.app.darq.utils.extensions.isShizukuInstalled import kotlinx.coroutines.launch import org.cosmicide.rewrite.common.Prefs -import org.cosmicide.rewrite.databinding.ActivityMainBinding -import org.cosmicide.rewrite.fragment.InstallResourcesFragment -import org.cosmicide.rewrite.fragment.ProjectFragment -import org.cosmicide.rewrite.util.CommonUtils -import org.cosmicide.rewrite.util.ResourceUtil +import org.cosmicide.databinding.ActivityMainBinding +import org.cosmicide.fragment.InstallResourcesFragment +import org.cosmicide.fragment.ProjectFragment +import org.cosmicide.util.CommonUtils +import org.cosmicide.util.ResourceUtil import rikka.shizuku.Shizuku import rikka.shizuku.Shizuku.OnRequestPermissionResultListener import rikka.shizuku.ShizukuProvider @@ -48,8 +55,8 @@ class MainActivity : AppCompatActivity() { attrs: AttributeSet ): View? { val accent = Prefs.appAccent - themeInt = CommonUtils.getAccent(accent) - setTheme(themeInt) + themeInt = CommonUtils.getAccent(accent) + setTheme(themeInt) DynamicColors.applyToActivityIfAvailable(this) enableEdgeToEdge() return super.onCreateView(parent, name, context, attrs) diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/AvailablePluginAdapter.kt b/app/src/main/kotlin/org/cosmicide/adapter/AvailablePluginAdapter.kt similarity index 97% rename from app/src/main/kotlin/org/cosmicide/rewrite/adapter/AvailablePluginAdapter.kt rename to app/src/main/kotlin/org/cosmicide/adapter/AvailablePluginAdapter.kt index 2a8d0216..46fcf2b1 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/AvailablePluginAdapter.kt +++ b/app/src/main/kotlin/org/cosmicide/adapter/AvailablePluginAdapter.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.adapter +package org.cosmicide.adapter /* * This file is part of Cosmic IDE. * Cosmic IDE is a free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. @@ -18,7 +18,7 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import org.cosmicide.rewrite.databinding.NewPluginItemBinding +import org.cosmicide.databinding.NewPluginItemBinding import org.cosmicide.rewrite.plugin.api.Plugin import kotlin.properties.Delegates diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/BindableViewHolder.kt b/app/src/main/kotlin/org/cosmicide/adapter/BindableViewHolder.kt similarity index 97% rename from app/src/main/kotlin/org/cosmicide/rewrite/adapter/BindableViewHolder.kt rename to app/src/main/kotlin/org/cosmicide/adapter/BindableViewHolder.kt index 26ff6ab3..9b7099fa 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/BindableViewHolder.kt +++ b/app/src/main/kotlin/org/cosmicide/adapter/BindableViewHolder.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.adapter +package org.cosmicide.adapter import androidx.recyclerview.widget.RecyclerView import androidx.viewbinding.ViewBinding diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/ConversationAdapter.kt b/app/src/main/kotlin/org/cosmicide/adapter/ConversationAdapter.kt similarity index 94% rename from app/src/main/kotlin/org/cosmicide/rewrite/adapter/ConversationAdapter.kt rename to app/src/main/kotlin/org/cosmicide/adapter/ConversationAdapter.kt index 49a581ef..ee5effc5 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/ConversationAdapter.kt +++ b/app/src/main/kotlin/org/cosmicide/adapter/ConversationAdapter.kt @@ -5,15 +5,15 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.adapter +package org.cosmicide.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.pkslow.ai.domain.Answer -import org.cosmicide.rewrite.databinding.ConversationItemReceivedBinding -import org.cosmicide.rewrite.databinding.ConversationItemSentBinding -import org.cosmicide.rewrite.util.CommonUtils +import org.cosmicide.databinding.ConversationItemReceivedBinding +import org.cosmicide.databinding.ConversationItemSentBinding +import org.cosmicide.util.CommonUtils class ConversationAdapter : RecyclerView.Adapter>() { diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/EditorAdapter.kt b/app/src/main/kotlin/org/cosmicide/adapter/EditorAdapter.kt similarity index 95% rename from app/src/main/kotlin/org/cosmicide/rewrite/adapter/EditorAdapter.kt rename to app/src/main/kotlin/org/cosmicide/adapter/EditorAdapter.kt index 60046b71..75135801 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/EditorAdapter.kt +++ b/app/src/main/kotlin/org/cosmicide/adapter/EditorAdapter.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.adapter +package org.cosmicide.adapter import android.content.res.Configuration import android.os.Bundle @@ -27,14 +27,14 @@ import io.github.rosemoe.sora.widget.subscribeEvent import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import org.cosmicide.build.Javap +import org.cosmicide.databinding.EditorFragmentBinding +import org.cosmicide.editor.IdeEditor import org.cosmicide.editor.analyzers.EditorDiagnosticsMarker -import org.cosmicide.rewrite.databinding.EditorFragmentBinding -import org.cosmicide.rewrite.editor.IdeEditor -import org.cosmicide.rewrite.editor.language.KotlinLanguage -import org.cosmicide.rewrite.editor.language.TsLanguageJava -import org.cosmicide.rewrite.extension.setFont -import org.cosmicide.rewrite.model.FileViewModel -import org.cosmicide.rewrite.util.ProjectHandler +import org.cosmicide.editor.language.KotlinLanguage +import org.cosmicide.editor.language.TsLanguageJava +import org.cosmicide.extension.setFont +import org.cosmicide.model.FileViewModel +import org.cosmicide.util.ProjectHandler import java.io.File import kotlin.properties.Delegates diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/GitAdapter.kt b/app/src/main/kotlin/org/cosmicide/adapter/GitAdapter.kt similarity index 97% rename from app/src/main/kotlin/org/cosmicide/rewrite/adapter/GitAdapter.kt rename to app/src/main/kotlin/org/cosmicide/adapter/GitAdapter.kt index 765a2231..730afe7a 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/GitAdapter.kt +++ b/app/src/main/kotlin/org/cosmicide/adapter/GitAdapter.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.adapter +package org.cosmicide.adapter import android.annotation.SuppressLint import android.view.ViewGroup diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/NavAdapter.kt b/app/src/main/kotlin/org/cosmicide/adapter/NavAdapter.kt similarity index 98% rename from app/src/main/kotlin/org/cosmicide/rewrite/adapter/NavAdapter.kt rename to app/src/main/kotlin/org/cosmicide/adapter/NavAdapter.kt index 8a41f63b..7d731ba7 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/NavAdapter.kt +++ b/app/src/main/kotlin/org/cosmicide/adapter/NavAdapter.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.adapter +package org.cosmicide.adapter import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/PluginAdapter.kt b/app/src/main/kotlin/org/cosmicide/adapter/PluginAdapter.kt similarity index 99% rename from app/src/main/kotlin/org/cosmicide/rewrite/adapter/PluginAdapter.kt rename to app/src/main/kotlin/org/cosmicide/adapter/PluginAdapter.kt index ccf9059d..72260d24 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/PluginAdapter.kt +++ b/app/src/main/kotlin/org/cosmicide/adapter/PluginAdapter.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.adapter +package org.cosmicide.adapter import android.view.LayoutInflater import android.view.ViewGroup diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/ProjectAdapter.kt b/app/src/main/kotlin/org/cosmicide/adapter/ProjectAdapter.kt similarity index 97% rename from app/src/main/kotlin/org/cosmicide/rewrite/adapter/ProjectAdapter.kt rename to app/src/main/kotlin/org/cosmicide/adapter/ProjectAdapter.kt index 16049057..342437d6 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/ProjectAdapter.kt +++ b/app/src/main/kotlin/org/cosmicide/adapter/ProjectAdapter.kt @@ -5,14 +5,14 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.adapter +package org.cosmicide.adapter import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView import org.cosmicide.project.Project -import org.cosmicide.rewrite.databinding.ProjectItemBinding +import org.cosmicide.databinding.ProjectItemBinding import kotlin.properties.Delegates /** diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/StagingAdapter.kt b/app/src/main/kotlin/org/cosmicide/adapter/StagingAdapter.kt similarity index 98% rename from app/src/main/kotlin/org/cosmicide/rewrite/adapter/StagingAdapter.kt rename to app/src/main/kotlin/org/cosmicide/adapter/StagingAdapter.kt index ca0de89c..332245e2 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/adapter/StagingAdapter.kt +++ b/app/src/main/kotlin/org/cosmicide/adapter/StagingAdapter.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.adapter +package org.cosmicide.adapter import android.graphics.Color import android.view.ViewGroup diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/chat/ChatProvider.kt b/app/src/main/kotlin/org/cosmicide/chat/ChatProvider.kt similarity index 98% rename from app/src/main/kotlin/org/cosmicide/rewrite/chat/ChatProvider.kt rename to app/src/main/kotlin/org/cosmicide/chat/ChatProvider.kt index c5e6c142..9c64b80a 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/chat/ChatProvider.kt +++ b/app/src/main/kotlin/org/cosmicide/chat/ChatProvider.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.chat +package org.cosmicide.chat import android.util.Log import com.google.gson.Gson diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/compile/Compiler.kt b/app/src/main/kotlin/org/cosmicide/compile/Compiler.kt similarity index 97% rename from app/src/main/kotlin/org/cosmicide/rewrite/compile/Compiler.kt rename to app/src/main/kotlin/org/cosmicide/compile/Compiler.kt index 2995df29..6bdc32a6 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/compile/Compiler.kt +++ b/app/src/main/kotlin/org/cosmicide/compile/Compiler.kt @@ -5,8 +5,10 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.compile +package org.cosmicide.compile +import org.cosmicide.App +import org.cosmicide.R import org.cosmicide.build.BuildReporter import org.cosmicide.build.Task import org.cosmicide.build.dex.D8Task @@ -14,8 +16,6 @@ import org.cosmicide.build.java.JarTask import org.cosmicide.build.java.JavaCompileTask import org.cosmicide.build.kotlin.KotlinCompiler import org.cosmicide.project.Project -import org.cosmicide.rewrite.App -import org.cosmicide.rewrite.R import org.cosmicide.rewrite.common.Prefs /** diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/compile/CompilerCache.kt b/app/src/main/kotlin/org/cosmicide/compile/CompilerCache.kt similarity index 96% rename from app/src/main/kotlin/org/cosmicide/rewrite/compile/CompilerCache.kt rename to app/src/main/kotlin/org/cosmicide/compile/CompilerCache.kt index d6d4e022..64c96f86 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/compile/CompilerCache.kt +++ b/app/src/main/kotlin/org/cosmicide/compile/CompilerCache.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.compile +package org.cosmicide.compile import org.cosmicide.build.Task diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/DefaultVInitializer.kt b/app/src/main/kotlin/org/cosmicide/compile/ssvm/DefaultVInitializer.kt similarity index 74% rename from app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/DefaultVInitializer.kt rename to app/src/main/kotlin/org/cosmicide/compile/ssvm/DefaultVInitializer.kt index 4d43f447..6da663c5 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/DefaultVInitializer.kt +++ b/app/src/main/kotlin/org/cosmicide/compile/ssvm/DefaultVInitializer.kt @@ -5,19 +5,19 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.compile.ssvm +package org.cosmicide.compile.ssvm import dev.xdark.ssvm.VMInitializer import dev.xdark.ssvm.VirtualMachine -import org.cosmicide.rewrite.compile.ssvm.native.FileChannelImplNatives -import org.cosmicide.rewrite.compile.ssvm.native.FileDescriptorNatives -import org.cosmicide.rewrite.compile.ssvm.native.OldFileSystemNativesEx -import org.cosmicide.rewrite.compile.ssvm.native.RandomAccessFileNatives -import org.cosmicide.rewrite.compile.ssvm.native.SunFileDispatcherNatives -import org.cosmicide.rewrite.compile.ssvm.native.SunFileKeyNatives -import org.cosmicide.rewrite.compile.ssvm.native.SunIOUtilNatives -import org.cosmicide.rewrite.compile.ssvm.native.SunNativeThreadNatives -import org.cosmicide.rewrite.compile.ssvm.native.SunSharedFileLockTableNatives +import org.cosmicide.compile.ssvm.native.FileChannelImplNatives +import org.cosmicide.compile.ssvm.native.FileDescriptorNatives +import org.cosmicide.compile.ssvm.native.OldFileSystemNativesEx +import org.cosmicide.compile.ssvm.native.RandomAccessFileNatives +import org.cosmicide.compile.ssvm.native.SunFileDispatcherNatives +import org.cosmicide.compile.ssvm.native.SunFileKeyNatives +import org.cosmicide.compile.ssvm.native.SunIOUtilNatives +import org.cosmicide.compile.ssvm.native.SunNativeThreadNatives +import org.cosmicide.compile.ssvm.native.SunSharedFileLockTableNatives class DefaultVMInitializer : VMInitializer { diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/SSVM.kt b/app/src/main/kotlin/org/cosmicide/compile/ssvm/SSVM.kt similarity index 99% rename from app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/SSVM.kt rename to app/src/main/kotlin/org/cosmicide/compile/ssvm/SSVM.kt index 08ec39cb..697d2b42 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/SSVM.kt +++ b/app/src/main/kotlin/org/cosmicide/compile/ssvm/SSVM.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.compile.ssvm +package org.cosmicide.compile.ssvm import android.util.Log import com.android.tools.r8.ByteDataView diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/FileChannelImplNatives.kt b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/FileChannelImplNatives.kt similarity index 96% rename from app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/FileChannelImplNatives.kt rename to app/src/main/kotlin/org/cosmicide/compile/ssvm/native/FileChannelImplNatives.kt index d81710da..7fe4561b 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/FileChannelImplNatives.kt +++ b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/FileChannelImplNatives.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.compile.ssvm.native +package org.cosmicide.compile.ssvm.native import dev.xdark.ssvm.VirtualMachine import dev.xdark.ssvm.execution.Result diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/FileDescriptorNatives.kt b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/FileDescriptorNatives.kt similarity index 95% rename from app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/FileDescriptorNatives.kt rename to app/src/main/kotlin/org/cosmicide/compile/ssvm/native/FileDescriptorNatives.kt index 23bfa20d..f7346aa3 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/FileDescriptorNatives.kt +++ b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/FileDescriptorNatives.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.compile.ssvm.native +package org.cosmicide.compile.ssvm.native import dev.xdark.ssvm.VirtualMachine import dev.xdark.ssvm.api.MethodInvoker diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/NativeInitializer.kt b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/NativeInitializer.kt similarity index 93% rename from app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/NativeInitializer.kt rename to app/src/main/kotlin/org/cosmicide/compile/ssvm/native/NativeInitializer.kt index 3e5468d1..9ab04e3a 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/NativeInitializer.kt +++ b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/NativeInitializer.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.compile.ssvm.native +package org.cosmicide.compile.ssvm.native import dev.xdark.ssvm.VirtualMachine diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/OldFileSystemNativesEx.kt b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/OldFileSystemNativesEx.kt similarity index 98% rename from app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/OldFileSystemNativesEx.kt rename to app/src/main/kotlin/org/cosmicide/compile/ssvm/native/OldFileSystemNativesEx.kt index acf66b2f..5aaf9a81 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/OldFileSystemNativesEx.kt +++ b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/OldFileSystemNativesEx.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.compile.ssvm.native +package org.cosmicide.compile.ssvm.native import dev.xdark.ssvm.VirtualMachine diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/RandomAccessFileNatives.kt b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/RandomAccessFileNatives.kt similarity index 97% rename from app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/RandomAccessFileNatives.kt rename to app/src/main/kotlin/org/cosmicide/compile/ssvm/native/RandomAccessFileNatives.kt index 6606d5ad..012cca60 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/RandomAccessFileNatives.kt +++ b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/RandomAccessFileNatives.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.compile.ssvm.native +package org.cosmicide.compile.ssvm.native import dev.xdark.ssvm.VirtualMachine diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/SunFileDispatcherNatives.kt b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/SunFileDispatcherNatives.kt similarity index 97% rename from app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/SunFileDispatcherNatives.kt rename to app/src/main/kotlin/org/cosmicide/compile/ssvm/native/SunFileDispatcherNatives.kt index dd61dab2..43061114 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/SunFileDispatcherNatives.kt +++ b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/SunFileDispatcherNatives.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.compile.ssvm.native +package org.cosmicide.compile.ssvm.native import dev.xdark.ssvm.VirtualMachine diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/SunFileKeyNatives.kt b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/SunFileKeyNatives.kt similarity index 96% rename from app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/SunFileKeyNatives.kt rename to app/src/main/kotlin/org/cosmicide/compile/ssvm/native/SunFileKeyNatives.kt index 35473858..7e9e1987 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/SunFileKeyNatives.kt +++ b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/SunFileKeyNatives.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.compile.ssvm.native +package org.cosmicide.compile.ssvm.native import dev.xdark.ssvm.VirtualMachine import dev.xdark.ssvm.api.MethodInvoker diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/SunIOUtilNatives.kt b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/SunIOUtilNatives.kt similarity index 96% rename from app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/SunIOUtilNatives.kt rename to app/src/main/kotlin/org/cosmicide/compile/ssvm/native/SunIOUtilNatives.kt index 3bbc50fa..7c4c6c94 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/SunIOUtilNatives.kt +++ b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/SunIOUtilNatives.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.compile.ssvm.native +package org.cosmicide.compile.ssvm.native import dev.xdark.ssvm.VirtualMachine import dev.xdark.ssvm.api.MethodInvoker diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/SunNativeThreadNatives.kt b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/SunNativeThreadNatives.kt similarity index 96% rename from app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/SunNativeThreadNatives.kt rename to app/src/main/kotlin/org/cosmicide/compile/ssvm/native/SunNativeThreadNatives.kt index b56b550a..afe391d6 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/SunNativeThreadNatives.kt +++ b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/SunNativeThreadNatives.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.compile.ssvm.native +package org.cosmicide.compile.ssvm.native import dev.xdark.ssvm.VirtualMachine diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/SunSharedFileLockTableNatives.kt b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/SunSharedFileLockTableNatives.kt similarity index 96% rename from app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/SunSharedFileLockTableNatives.kt rename to app/src/main/kotlin/org/cosmicide/compile/ssvm/native/SunSharedFileLockTableNatives.kt index b8515e6e..de024926 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/compile/ssvm/native/SunSharedFileLockTableNatives.kt +++ b/app/src/main/kotlin/org/cosmicide/compile/ssvm/native/SunSharedFileLockTableNatives.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.compile.ssvm.native +package org.cosmicide.compile.ssvm.native import dev.xdark.ssvm.VirtualMachine diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/editor/EditorInputStream.kt b/app/src/main/kotlin/org/cosmicide/editor/EditorInputStream.kt similarity index 98% rename from app/src/main/kotlin/org/cosmicide/rewrite/editor/EditorInputStream.kt rename to app/src/main/kotlin/org/cosmicide/editor/EditorInputStream.kt index fe0ac156..c9266f3b 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/editor/EditorInputStream.kt +++ b/app/src/main/kotlin/org/cosmicide/editor/EditorInputStream.kt @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.editor +package org.cosmicide.editor import android.util.Log import io.github.rosemoe.sora.widget.CodeEditor diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/editor/IdeEditor.kt b/app/src/main/kotlin/org/cosmicide/editor/IdeEditor.kt similarity index 96% rename from app/src/main/kotlin/org/cosmicide/rewrite/editor/IdeEditor.kt rename to app/src/main/kotlin/org/cosmicide/editor/IdeEditor.kt index 74913f73..f9c17b4f 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/editor/IdeEditor.kt +++ b/app/src/main/kotlin/org/cosmicide/editor/IdeEditor.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.editor +package org.cosmicide.editor import android.content.Context import android.util.AttributeSet @@ -17,8 +17,8 @@ import io.github.rosemoe.sora.widget.CodeEditor import io.github.rosemoe.sora.widget.component.EditorDiagnosticTooltipWindow import io.github.rosemoe.sora.widget.schemes.EditorColorScheme import org.cosmicide.rewrite.common.Prefs -import org.cosmicide.rewrite.extension.setCompletionLayout -import org.cosmicide.rewrite.extension.setFont +import org.cosmicide.extension.setCompletionLayout +import org.cosmicide.extension.setFont class IdeEditor @JvmOverloads constructor( context: Context, diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/editor/completion/CompletionItemAdapter.kt b/app/src/main/kotlin/org/cosmicide/editor/completion/CompletionItemAdapter.kt similarity index 94% rename from app/src/main/kotlin/org/cosmicide/rewrite/editor/completion/CompletionItemAdapter.kt rename to app/src/main/kotlin/org/cosmicide/editor/completion/CompletionItemAdapter.kt index c35c60ee..32829d79 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/editor/completion/CompletionItemAdapter.kt +++ b/app/src/main/kotlin/org/cosmicide/editor/completion/CompletionItemAdapter.kt @@ -5,14 +5,14 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.editor.completion +package org.cosmicide.editor.completion import android.util.TypedValue import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import io.github.rosemoe.sora.widget.component.EditorCompletionAdapter -import org.cosmicide.rewrite.databinding.CompletionResultBinding +import org.cosmicide.databinding.CompletionResultBinding import org.cosmicide.rewrite.editor.EditorCompletionItem class CustomCompletionItemAdapter : EditorCompletionAdapter() { diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/editor/completion/CompletionLayout.kt b/app/src/main/kotlin/org/cosmicide/editor/completion/CompletionLayout.kt similarity index 96% rename from app/src/main/kotlin/org/cosmicide/rewrite/editor/completion/CompletionLayout.kt rename to app/src/main/kotlin/org/cosmicide/editor/completion/CompletionLayout.kt index 75abd7e1..9911cab9 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/editor/completion/CompletionLayout.kt +++ b/app/src/main/kotlin/org/cosmicide/editor/completion/CompletionLayout.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.editor.completion +package org.cosmicide.editor.completion import android.content.res.Configuration import android.content.res.Resources @@ -15,7 +15,7 @@ import android.view.ViewGroup import androidx.appcompat.app.AppCompatDelegate import io.github.rosemoe.sora.widget.component.DefaultCompletionLayout import io.github.rosemoe.sora.widget.schemes.EditorColorScheme -import org.cosmicide.rewrite.App +import org.cosmicide.App import org.cosmicide.rewrite.common.Prefs class CustomCompletionLayout : DefaultCompletionLayout() { diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/editor/formatter/GoogleJavaFormat.kt b/app/src/main/kotlin/org/cosmicide/editor/formatter/GoogleJavaFormat.kt similarity index 97% rename from app/src/main/kotlin/org/cosmicide/rewrite/editor/formatter/GoogleJavaFormat.kt rename to app/src/main/kotlin/org/cosmicide/editor/formatter/GoogleJavaFormat.kt index 226f0aef..a3700b08 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/editor/formatter/GoogleJavaFormat.kt +++ b/app/src/main/kotlin/org/cosmicide/editor/formatter/GoogleJavaFormat.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.editor.formatter +package org.cosmicide.editor.formatter import com.google.googlejavaformat.java.Main import org.cosmicide.rewrite.common.Prefs diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/editor/formatter/KtfmtFormatter.kt b/app/src/main/kotlin/org/cosmicide/editor/formatter/KtfmtFormatter.kt similarity index 96% rename from app/src/main/kotlin/org/cosmicide/rewrite/editor/formatter/KtfmtFormatter.kt rename to app/src/main/kotlin/org/cosmicide/editor/formatter/KtfmtFormatter.kt index 2b753b6b..a64cd4b2 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/editor/formatter/KtfmtFormatter.kt +++ b/app/src/main/kotlin/org/cosmicide/editor/formatter/KtfmtFormatter.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.editor.formatter +package org.cosmicide.editor.formatter import com.facebook.ktfmt.cli.Main import org.cosmicide.rewrite.common.Prefs diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/editor/language/KotlinLanguage.kt b/app/src/main/kotlin/org/cosmicide/editor/language/KotlinLanguage.kt similarity index 99% rename from app/src/main/kotlin/org/cosmicide/rewrite/editor/language/KotlinLanguage.kt rename to app/src/main/kotlin/org/cosmicide/editor/language/KotlinLanguage.kt index be5b56d2..e2c6c184 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/editor/language/KotlinLanguage.kt +++ b/app/src/main/kotlin/org/cosmicide/editor/language/KotlinLanguage.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.editor.language +package org.cosmicide.editor.language import android.os.Bundle import android.util.Log diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/editor/language/TsLanguageJava.kt b/app/src/main/kotlin/org/cosmicide/editor/language/TsLanguageJava.kt similarity index 99% rename from app/src/main/kotlin/org/cosmicide/rewrite/editor/language/TsLanguageJava.kt rename to app/src/main/kotlin/org/cosmicide/editor/language/TsLanguageJava.kt index 757c6571..dd3fe9df 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/editor/language/TsLanguageJava.kt +++ b/app/src/main/kotlin/org/cosmicide/editor/language/TsLanguageJava.kt @@ -1,4 +1,4 @@ -package org.cosmicide.rewrite.editor.language +package org.cosmicide.editor.language import android.os.Bundle import android.util.Log diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/editor/language/Util.kt b/app/src/main/kotlin/org/cosmicide/editor/language/Util.kt similarity index 98% rename from app/src/main/kotlin/org/cosmicide/rewrite/editor/language/Util.kt rename to app/src/main/kotlin/org/cosmicide/editor/language/Util.kt index 33c0ae61..671697c8 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/editor/language/Util.kt +++ b/app/src/main/kotlin/org/cosmicide/editor/language/Util.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.editor.language +package org.cosmicide.editor.language import android.content.res.AssetManager import com.itsaky.androidide.treesitter.TSLanguage diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/extension/context.kt b/app/src/main/kotlin/org/cosmicide/extension/context.kt similarity index 92% rename from app/src/main/kotlin/org/cosmicide/rewrite/extension/context.kt rename to app/src/main/kotlin/org/cosmicide/extension/context.kt index 53c44e4d..37194e9c 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/extension/context.kt +++ b/app/src/main/kotlin/org/cosmicide/extension/context.kt @@ -1,4 +1,4 @@ -package org.cosmicide.rewrite.extension +package org.cosmicide.extension import android.content.ClipData import android.content.ClipboardManager diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/extension/editor.kt b/app/src/main/kotlin/org/cosmicide/extension/editor.kt similarity index 86% rename from app/src/main/kotlin/org/cosmicide/rewrite/extension/editor.kt rename to app/src/main/kotlin/org/cosmicide/extension/editor.kt index db1d7daa..db6b909c 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/extension/editor.kt +++ b/app/src/main/kotlin/org/cosmicide/extension/editor.kt @@ -5,16 +5,16 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.extension +package org.cosmicide.extension import android.graphics.Typeface import androidx.core.content.res.ResourcesCompat import io.github.rosemoe.sora.widget.CodeEditor import io.github.rosemoe.sora.widget.component.EditorAutoCompletion -import org.cosmicide.rewrite.R +import org.cosmicide.R +import org.cosmicide.editor.completion.CustomCompletionItemAdapter +import org.cosmicide.editor.completion.CustomCompletionLayout import org.cosmicide.rewrite.common.Prefs -import org.cosmicide.rewrite.editor.completion.CustomCompletionItemAdapter -import org.cosmicide.rewrite.editor.completion.CustomCompletionLayout /** * Sets the font and enables highlighting of the current line for the code editor. diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/ChatFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/ChatFragment.kt similarity index 96% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/ChatFragment.kt rename to app/src/main/kotlin/org/cosmicide/fragment/ChatFragment.kt index 522bda42..581b8cc1 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/ChatFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/ChatFragment.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment +package org.cosmicide.fragment import android.content.Context import android.content.res.ColorStateList @@ -24,12 +24,12 @@ import com.pkslow.ai.GoogleBardClient import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.cosmicide.rewrite.R -import org.cosmicide.rewrite.adapter.ConversationAdapter -import org.cosmicide.rewrite.chat.ChatProvider +import org.cosmicide.R +import org.cosmicide.adapter.ConversationAdapter +import org.cosmicide.chat.ChatProvider +import org.cosmicide.databinding.FragmentChatBinding +import org.cosmicide.extension.getDip import org.cosmicide.rewrite.common.BaseBindingFragment -import org.cosmicide.rewrite.databinding.FragmentChatBinding -import org.cosmicide.rewrite.extension.getDip import java.time.Duration class ChatFragment : BaseBindingFragment() { diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/CompileInfoFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/CompileInfoFragment.kt similarity index 93% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/CompileInfoFragment.kt rename to app/src/main/kotlin/org/cosmicide/fragment/CompileInfoFragment.kt index a39edf0b..308a9525 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/CompileInfoFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/CompileInfoFragment.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment +package org.cosmicide.fragment import android.os.Bundle import android.view.View @@ -15,13 +15,13 @@ import io.github.rosemoe.sora.langs.textmate.TextMateLanguage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import org.cosmicide.R import org.cosmicide.build.BuildReporter +import org.cosmicide.compile.Compiler +import org.cosmicide.databinding.FragmentCompileInfoBinding import org.cosmicide.project.Project -import org.cosmicide.rewrite.R import org.cosmicide.rewrite.common.BaseBindingFragment -import org.cosmicide.rewrite.compile.Compiler -import org.cosmicide.rewrite.databinding.FragmentCompileInfoBinding -import org.cosmicide.rewrite.util.ProjectHandler +import org.cosmicide.util.ProjectHandler /** * A fragment for displaying information about the compilation process. diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/EditorFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/EditorFragment.kt similarity index 96% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/EditorFragment.kt rename to app/src/main/kotlin/org/cosmicide/fragment/EditorFragment.kt index 9fcd218a..dd384313 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/EditorFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/EditorFragment.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment +package org.cosmicide.fragment import android.os.Bundle import android.util.Log @@ -31,27 +31,27 @@ import dev.pranav.navigation.NavigationProvider import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import org.cosmic.ide.dependency.resolver.getArtifact +import org.cosmicide.FileProvider.openFileWithExternalApp +import org.cosmicide.R +import org.cosmicide.adapter.EditorAdapter +import org.cosmicide.adapter.NavAdapter +import org.cosmicide.databinding.FragmentEditorBinding +import org.cosmicide.databinding.NavigationElementsBinding +import org.cosmicide.databinding.NewDependencyBinding +import org.cosmicide.databinding.TreeviewContextActionDialogItemBinding +import org.cosmicide.editor.IdeEditor +import org.cosmicide.editor.formatter.GoogleJavaFormat +import org.cosmicide.editor.formatter.ktfmtFormatter +import org.cosmicide.editor.language.KotlinLanguage +import org.cosmicide.model.FileViewModel import org.cosmicide.project.Language import org.cosmicide.project.Project -import org.cosmicide.rewrite.FileProvider.openFileWithExternalApp -import org.cosmicide.rewrite.R -import org.cosmicide.rewrite.adapter.EditorAdapter -import org.cosmicide.rewrite.adapter.NavAdapter import org.cosmicide.rewrite.common.BaseBindingFragment import org.cosmicide.rewrite.common.Prefs -import org.cosmicide.rewrite.databinding.FragmentEditorBinding -import org.cosmicide.rewrite.databinding.NavigationElementsBinding -import org.cosmicide.rewrite.databinding.NewDependencyBinding -import org.cosmicide.rewrite.databinding.TreeviewContextActionDialogItemBinding -import org.cosmicide.rewrite.editor.IdeEditor -import org.cosmicide.rewrite.editor.formatter.GoogleJavaFormat -import org.cosmicide.rewrite.editor.formatter.ktfmtFormatter -import org.cosmicide.rewrite.editor.language.KotlinLanguage -import org.cosmicide.rewrite.model.FileViewModel -import org.cosmicide.rewrite.util.CommonUtils -import org.cosmicide.rewrite.util.FileFactoryProvider -import org.cosmicide.rewrite.util.FileIndex -import org.cosmicide.rewrite.util.ProjectHandler +import org.cosmicide.util.CommonUtils +import org.cosmicide.util.FileFactoryProvider +import org.cosmicide.util.FileIndex +import org.cosmicide.util.ProjectHandler import java.io.File diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/GitFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/GitFragment.kt similarity index 96% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/GitFragment.kt rename to app/src/main/kotlin/org/cosmicide/fragment/GitFragment.kt index b950aab5..266934a2 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/GitFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/GitFragment.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment +package org.cosmicide.fragment import android.os.Bundle import android.util.Log @@ -25,14 +25,14 @@ import dev.pranav.jgit.tasks.toRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.cosmicide.rewrite.R -import org.cosmicide.rewrite.adapter.GitAdapter -import org.cosmicide.rewrite.adapter.StagingAdapter +import org.cosmicide.R +import org.cosmicide.adapter.GitAdapter +import org.cosmicide.adapter.StagingAdapter import org.cosmicide.rewrite.common.BaseBindingFragment import org.cosmicide.rewrite.common.Prefs -import org.cosmicide.rewrite.databinding.FragmentGitBinding -import org.cosmicide.rewrite.databinding.GitCommandBinding -import org.cosmicide.rewrite.util.ProjectHandler +import org.cosmicide.databinding.FragmentGitBinding +import org.cosmicide.databinding.GitCommandBinding +import org.cosmicide.util.ProjectHandler import java.io.OutputStream import java.io.OutputStreamWriter import java.io.PrintStream diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/InstallResourcesFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/InstallResourcesFragment.kt similarity index 94% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/InstallResourcesFragment.kt rename to app/src/main/kotlin/org/cosmicide/fragment/InstallResourcesFragment.kt index 42db4f4c..c29c2e3a 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/InstallResourcesFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/InstallResourcesFragment.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment +package org.cosmicide.fragment import android.annotation.SuppressLint import android.os.Bundle @@ -15,12 +15,12 @@ import androidx.lifecycle.lifecycleScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.cosmicide.rewrite.R +import org.cosmicide.R import org.cosmicide.rewrite.common.BaseBindingFragment -import org.cosmicide.rewrite.databinding.InstallResourcesFragmentBinding -import org.cosmicide.rewrite.util.Download +import org.cosmicide.databinding.InstallResourcesFragmentBinding +import org.cosmicide.util.Download import org.cosmicide.rewrite.util.FileUtil -import org.cosmicide.rewrite.util.ResourceUtil +import org.cosmicide.util.ResourceUtil class InstallResourcesFragment : BaseBindingFragment() { diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/NewProjectFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/NewProjectFragment.kt similarity index 95% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/NewProjectFragment.kt rename to app/src/main/kotlin/org/cosmicide/fragment/NewProjectFragment.kt index 6dd724de..eb36a432 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/NewProjectFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/NewProjectFragment.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment +package org.cosmicide.fragment import android.os.Bundle import android.view.View @@ -14,10 +14,10 @@ import androidx.fragment.app.commit import com.google.android.material.snackbar.Snackbar import org.cosmicide.project.Language import org.cosmicide.project.Project -import org.cosmicide.rewrite.R +import org.cosmicide.R import org.cosmicide.rewrite.common.BaseBindingFragment -import org.cosmicide.rewrite.databinding.FragmentNewProjectBinding -import org.cosmicide.rewrite.model.ProjectViewModel +import org.cosmicide.databinding.FragmentNewProjectBinding +import org.cosmicide.model.ProjectViewModel import org.cosmicide.rewrite.util.FileUtil import java.io.File import java.io.IOException diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/PluginListFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/PluginListFragment.kt similarity index 95% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/PluginListFragment.kt rename to app/src/main/kotlin/org/cosmicide/fragment/PluginListFragment.kt index 41f11ff9..61ad1f16 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/PluginListFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/PluginListFragment.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment +package org.cosmicide.fragment import android.os.Bundle import android.util.Log @@ -19,15 +19,15 @@ import com.google.gson.reflect.TypeToken import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.cosmicide.rewrite.adapter.AvailablePluginAdapter -import org.cosmicide.rewrite.adapter.PluginAdapter +import org.cosmicide.adapter.AvailablePluginAdapter +import org.cosmicide.adapter.PluginAdapter import org.cosmicide.rewrite.common.BaseBindingFragment import org.cosmicide.rewrite.common.Prefs -import org.cosmicide.rewrite.databinding.FragmentPluginListBinding +import org.cosmicide.databinding.FragmentPluginListBinding import org.cosmicide.rewrite.databinding.PluginInfoBinding import org.cosmicide.rewrite.plugin.api.Plugin -import org.cosmicide.rewrite.util.CommonUtils -import org.cosmicide.rewrite.util.CommonUtils.showSnackbarError +import org.cosmicide.util.CommonUtils +import org.cosmicide.util.CommonUtils.showSnackbarError import org.cosmicide.rewrite.util.FileUtil import java.net.URL diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/PluginsFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/PluginsFragment.kt similarity index 96% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/PluginsFragment.kt rename to app/src/main/kotlin/org/cosmicide/fragment/PluginsFragment.kt index cdabe628..83a60cbc 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/PluginsFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/PluginsFragment.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment +package org.cosmicide.fragment import android.os.Bundle import android.view.View @@ -13,13 +13,13 @@ import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import org.cosmicide.rewrite.adapter.PluginAdapter +import org.cosmicide.adapter.PluginAdapter import org.cosmicide.rewrite.common.BaseBindingFragment -import org.cosmicide.rewrite.databinding.FragmentPluginsBinding +import org.cosmicide.databinding.FragmentPluginsBinding import org.cosmicide.rewrite.databinding.PluginInfoBinding import org.cosmicide.rewrite.plugin.api.Plugin import org.cosmicide.rewrite.plugin.api.PluginLoader -import org.cosmicide.rewrite.util.CommonUtils +import org.cosmicide.util.CommonUtils import org.cosmicide.rewrite.util.FileUtil class PluginsFragment : BaseBindingFragment() { diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/ProjectFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/ProjectFragment.kt similarity index 97% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/ProjectFragment.kt rename to app/src/main/kotlin/org/cosmicide/fragment/ProjectFragment.kt index 4888bf96..c6cd0e80 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/ProjectFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/ProjectFragment.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment +package org.cosmicide.fragment import android.app.Activity import android.content.Intent @@ -31,14 +31,14 @@ import dev.pranav.jgit.tasks.cloneRepository import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import org.cosmicide.project.Project -import org.cosmicide.rewrite.R -import org.cosmicide.rewrite.adapter.ProjectAdapter +import org.cosmicide.R +import org.cosmicide.adapter.ProjectAdapter import org.cosmicide.rewrite.common.Analytics import org.cosmicide.rewrite.common.BaseBindingFragment import org.cosmicide.rewrite.common.Prefs -import org.cosmicide.rewrite.databinding.FragmentProjectBinding -import org.cosmicide.rewrite.model.ProjectViewModel -import org.cosmicide.rewrite.util.CommonUtils +import org.cosmicide.databinding.FragmentProjectBinding +import org.cosmicide.model.ProjectViewModel +import org.cosmicide.util.CommonUtils import org.cosmicide.rewrite.util.FileUtil import org.cosmicide.rewrite.util.unzip import java.io.OutputStream diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/ProjectOutputFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/ProjectOutputFragment.kt similarity index 97% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/ProjectOutputFragment.kt rename to app/src/main/kotlin/org/cosmicide/fragment/ProjectOutputFragment.kt index 5b8d0361..03c52b4a 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/ProjectOutputFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/ProjectOutputFragment.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment +package org.cosmicide.fragment import android.os.Bundle import android.view.View @@ -20,15 +20,15 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import org.cosmicide.project.Project -import org.cosmicide.rewrite.R +import org.cosmicide.R import org.cosmicide.rewrite.common.BaseBindingFragment import org.cosmicide.rewrite.common.Prefs -import org.cosmicide.rewrite.compile.ssvm.SSVM -import org.cosmicide.rewrite.databinding.FragmentCompileInfoBinding -import org.cosmicide.rewrite.editor.EditorInputStream +import org.cosmicide.compile.ssvm.SSVM +import org.cosmicide.databinding.FragmentCompileInfoBinding +import org.cosmicide.editor.EditorInputStream import org.cosmicide.rewrite.util.FileUtil import org.cosmicide.rewrite.util.MultipleDexClassLoader -import org.cosmicide.rewrite.util.ProjectHandler +import org.cosmicide.util.ProjectHandler import java.io.OutputStream import java.io.PrintStream import java.lang.reflect.Modifier diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/SettingsFragment.kt b/app/src/main/kotlin/org/cosmicide/fragment/SettingsFragment.kt similarity index 89% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/SettingsFragment.kt rename to app/src/main/kotlin/org/cosmicide/fragment/SettingsFragment.kt index 6f663903..d8e3b8af 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/SettingsFragment.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/SettingsFragment.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment +package org.cosmicide.fragment import android.os.Bundle import android.view.View @@ -16,16 +16,16 @@ import de.Maxr1998.modernpreferences.Preference import de.Maxr1998.modernpreferences.PreferencesAdapter import de.Maxr1998.modernpreferences.helpers.screen import de.Maxr1998.modernpreferences.helpers.subScreen -import org.cosmicide.rewrite.MainActivity +import org.cosmicide.MainActivity import org.cosmicide.rewrite.common.BaseBindingFragment -import org.cosmicide.rewrite.databinding.FragmentSettingsBinding -import org.cosmicide.rewrite.fragment.settings.AboutSettings -import org.cosmicide.rewrite.fragment.settings.AppearanceSettings -import org.cosmicide.rewrite.fragment.settings.CompilerSettings -import org.cosmicide.rewrite.fragment.settings.EditorSettings -import org.cosmicide.rewrite.fragment.settings.FormatterSettings -import org.cosmicide.rewrite.fragment.settings.GitSettings -import org.cosmicide.rewrite.fragment.settings.PluginSettingsProvider +import org.cosmicide.databinding.FragmentSettingsBinding +import org.cosmicide.fragment.settings.AboutSettings +import org.cosmicide.fragment.settings.AppearanceSettings +import org.cosmicide.fragment.settings.CompilerSettings +import org.cosmicide.fragment.settings.EditorSettings +import org.cosmicide.fragment.settings.FormatterSettings +import org.cosmicide.fragment.settings.GitSettings +import org.cosmicide.fragment.settings.PluginSettingsProvider /** * Fragment for displaying settings screen. diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/AboutSettings.kt b/app/src/main/kotlin/org/cosmicide/fragment/settings/AboutSettings.kt similarity index 96% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/AboutSettings.kt rename to app/src/main/kotlin/org/cosmicide/fragment/settings/AboutSettings.kt index 24cd6943..2f80ba8d 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/AboutSettings.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/settings/AboutSettings.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment.settings +package org.cosmicide.fragment.settings import android.content.Intent import android.net.Uri @@ -26,13 +26,13 @@ import de.Maxr1998.modernpreferences.helpers.pref import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.cosmicide.rewrite.BuildConfig -import org.cosmicide.rewrite.R -import org.cosmicide.rewrite.extension.copyToClipboard -import org.cosmicide.rewrite.fragment.InstallResourcesFragment -import org.cosmicide.rewrite.util.CommonUtils.isShizukuGranted +import org.cosmicide.BuildConfig +import org.cosmicide.R +import org.cosmicide.extension.copyToClipboard +import org.cosmicide.fragment.InstallResourcesFragment import org.cosmicide.rewrite.util.FileUtil -import org.cosmicide.rewrite.util.ResourceUtil +import org.cosmicide.util.CommonUtils.isShizukuGranted +import org.cosmicide.util.ResourceUtil import rikka.shizuku.Shizuku import rikka.shizuku.ShizukuRemoteProcess @@ -67,7 +67,7 @@ class AboutSettings(private val activity: FragmentActivity) : SettingsProvider { activity.startActivity( Intent( Intent.ACTION_VIEW, - Uri.parse("https://github.com/Cosmic-IDE/rewrite") + Uri.parse("https://github.com/Cosmic-IDE/Cosmic-IDE") ) ) true diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/AppearanceSettings.kt b/app/src/main/kotlin/org/cosmicide/fragment/settings/AppearanceSettings.kt similarity index 95% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/AppearanceSettings.kt rename to app/src/main/kotlin/org/cosmicide/fragment/settings/AppearanceSettings.kt index 720dd11f..88bfbca6 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/AppearanceSettings.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/settings/AppearanceSettings.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment.settings +package org.cosmicide.fragment.settings import android.app.UiModeManager import android.content.Intent @@ -17,10 +17,10 @@ import de.Maxr1998.modernpreferences.PreferenceScreen import de.Maxr1998.modernpreferences.helpers.defaultOnSelectionChange import de.Maxr1998.modernpreferences.helpers.singleChoice import de.Maxr1998.modernpreferences.preferences.choice.SelectionItem -import org.cosmicide.rewrite.MainActivity -import org.cosmicide.rewrite.R -import org.cosmicide.rewrite.util.CommonUtils -import org.cosmicide.rewrite.util.PreferenceKeys +import org.cosmicide.MainActivity +import org.cosmicide.R +import org.cosmicide.util.CommonUtils +import org.cosmicide.util.PreferenceKeys class AppearanceSettings(private val activity: MainActivity) : SettingsProvider { diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/CompilerSettings.kt b/app/src/main/kotlin/org/cosmicide/fragment/settings/CompilerSettings.kt similarity index 96% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/CompilerSettings.kt rename to app/src/main/kotlin/org/cosmicide/fragment/settings/CompilerSettings.kt index 211ed0da..da7196e7 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/CompilerSettings.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/settings/CompilerSettings.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment.settings +package org.cosmicide.fragment.settings import androidx.core.content.res.ResourcesCompat import androidx.fragment.app.FragmentActivity @@ -14,8 +14,8 @@ import de.Maxr1998.modernpreferences.helpers.editText import de.Maxr1998.modernpreferences.helpers.singleChoice import de.Maxr1998.modernpreferences.helpers.switch import de.Maxr1998.modernpreferences.preferences.choice.SelectionItem -import org.cosmicide.rewrite.R -import org.cosmicide.rewrite.util.PreferenceKeys +import org.cosmicide.R +import org.cosmicide.util.PreferenceKeys import org.jetbrains.kotlin.config.LanguageVersion class CompilerSettings(private val activity: FragmentActivity) : SettingsProvider { diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/EditorSettings.kt b/app/src/main/kotlin/org/cosmicide/fragment/settings/EditorSettings.kt similarity index 97% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/EditorSettings.kt rename to app/src/main/kotlin/org/cosmicide/fragment/settings/EditorSettings.kt index dee0a36d..e35128e8 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/EditorSettings.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/settings/EditorSettings.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment.settings +package org.cosmicide.fragment.settings import androidx.core.content.res.ResourcesCompat import androidx.fragment.app.FragmentActivity @@ -13,8 +13,8 @@ import de.Maxr1998.modernpreferences.PreferenceScreen import de.Maxr1998.modernpreferences.helpers.editText import de.Maxr1998.modernpreferences.helpers.seekBar import de.Maxr1998.modernpreferences.helpers.switch -import org.cosmicide.rewrite.R -import org.cosmicide.rewrite.util.PreferenceKeys +import org.cosmicide.R +import org.cosmicide.util.PreferenceKeys class EditorSettings(private val activity: FragmentActivity) : SettingsProvider { diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/FormatterSettings.kt b/app/src/main/kotlin/org/cosmicide/fragment/settings/FormatterSettings.kt similarity index 95% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/FormatterSettings.kt rename to app/src/main/kotlin/org/cosmicide/fragment/settings/FormatterSettings.kt index afe19fb5..542de452 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/FormatterSettings.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/settings/FormatterSettings.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment.settings +package org.cosmicide.fragment.settings import androidx.core.content.res.ResourcesCompat import androidx.fragment.app.FragmentActivity @@ -13,8 +13,8 @@ import de.Maxr1998.modernpreferences.PreferenceScreen import de.Maxr1998.modernpreferences.helpers.multiChoice import de.Maxr1998.modernpreferences.helpers.singleChoice import de.Maxr1998.modernpreferences.preferences.choice.SelectionItem -import org.cosmicide.rewrite.R -import org.cosmicide.rewrite.util.PreferenceKeys +import org.cosmicide.R +import org.cosmicide.util.PreferenceKeys class FormatterSettings(private val activity: FragmentActivity) : SettingsProvider { diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/GitSettings.kt b/app/src/main/kotlin/org/cosmicide/fragment/settings/GitSettings.kt similarity index 94% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/GitSettings.kt rename to app/src/main/kotlin/org/cosmicide/fragment/settings/GitSettings.kt index 6d68fab8..ac24e57e 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/GitSettings.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/settings/GitSettings.kt @@ -5,11 +5,11 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment.settings +package org.cosmicide.fragment.settings import de.Maxr1998.modernpreferences.PreferenceScreen import de.Maxr1998.modernpreferences.helpers.editText -import org.cosmicide.rewrite.util.PreferenceKeys +import org.cosmicide.util.PreferenceKeys class GitSettings : SettingsProvider { diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/PluginSettingsProvider.kt b/app/src/main/kotlin/org/cosmicide/fragment/settings/PluginSettingsProvider.kt similarity index 92% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/PluginSettingsProvider.kt rename to app/src/main/kotlin/org/cosmicide/fragment/settings/PluginSettingsProvider.kt index 9ada02c9..5024e1c0 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/PluginSettingsProvider.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/settings/PluginSettingsProvider.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment.settings +package org.cosmicide.fragment.settings import androidx.core.content.res.ResourcesCompat import androidx.fragment.app.FragmentActivity @@ -16,12 +16,12 @@ import de.Maxr1998.modernpreferences.helpers.categoryHeader import de.Maxr1998.modernpreferences.helpers.editText import de.Maxr1998.modernpreferences.helpers.onClick import de.Maxr1998.modernpreferences.helpers.pref -import org.cosmicide.rewrite.R +import org.cosmicide.R import org.cosmicide.rewrite.common.Prefs -import org.cosmicide.rewrite.fragment.PluginListFragment -import org.cosmicide.rewrite.fragment.PluginsFragment +import org.cosmicide.fragment.PluginListFragment +import org.cosmicide.fragment.PluginsFragment import org.cosmicide.rewrite.plugin.api.PluginLoader -import org.cosmicide.rewrite.util.PreferenceKeys +import org.cosmicide.util.PreferenceKeys class PluginSettingsProvider(private val activity: FragmentActivity) : SettingsProvider { diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/SettingsProvider.kt b/app/src/main/kotlin/org/cosmicide/fragment/settings/SettingsProvider.kt similarity index 95% rename from app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/SettingsProvider.kt rename to app/src/main/kotlin/org/cosmicide/fragment/settings/SettingsProvider.kt index 7c17fa6d..b9f0a3be 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/fragment/settings/SettingsProvider.kt +++ b/app/src/main/kotlin/org/cosmicide/fragment/settings/SettingsProvider.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.fragment.settings +package org.cosmicide.fragment.settings import de.Maxr1998.modernpreferences.PreferenceScreen diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/model/FileViewModel.kt b/app/src/main/kotlin/org/cosmicide/model/FileViewModel.kt similarity index 99% rename from app/src/main/kotlin/org/cosmicide/rewrite/model/FileViewModel.kt rename to app/src/main/kotlin/org/cosmicide/model/FileViewModel.kt index 99e11979..1b5b1397 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/model/FileViewModel.kt +++ b/app/src/main/kotlin/org/cosmicide/model/FileViewModel.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.model +package org.cosmicide.model import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/model/ProjectViewModel.kt b/app/src/main/kotlin/org/cosmicide/model/ProjectViewModel.kt similarity index 98% rename from app/src/main/kotlin/org/cosmicide/rewrite/model/ProjectViewModel.kt rename to app/src/main/kotlin/org/cosmicide/model/ProjectViewModel.kt index 496d8197..01cf7f95 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/model/ProjectViewModel.kt +++ b/app/src/main/kotlin/org/cosmicide/model/ProjectViewModel.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.model +package org.cosmicide.model import android.util.Log import androidx.lifecycle.LiveData diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/startup/DebugInitializer.kt b/app/src/main/kotlin/org/cosmicide/startup/DebugInitializer.kt similarity index 94% rename from app/src/main/kotlin/org/cosmicide/rewrite/startup/DebugInitializer.kt rename to app/src/main/kotlin/org/cosmicide/startup/DebugInitializer.kt index e30e83d5..1e040881 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/startup/DebugInitializer.kt +++ b/app/src/main/kotlin/org/cosmicide/startup/DebugInitializer.kt @@ -1,11 +1,11 @@ -package org.cosmicide.rewrite.startup +package org.cosmicide.startup import android.content.Context import android.os.Build import android.os.StrictMode import android.util.Log import androidx.startup.Initializer -import org.cosmicide.rewrite.BuildConfig +import org.cosmicide.BuildConfig import java.util.concurrent.Executors class DebugInitializer : Initializer { diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/startup/MainInitializer.kt b/app/src/main/kotlin/org/cosmicide/startup/MainInitializer.kt similarity index 90% rename from app/src/main/kotlin/org/cosmicide/rewrite/startup/MainInitializer.kt rename to app/src/main/kotlin/org/cosmicide/startup/MainInitializer.kt index d0b95ccc..2123f80c 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/startup/MainInitializer.kt +++ b/app/src/main/kotlin/org/cosmicide/startup/MainInitializer.kt @@ -1,4 +1,4 @@ -package org.cosmicide.rewrite.startup +package org.cosmicide.startup import android.content.Context import androidx.startup.Initializer diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/startup/PreferencesInitializer.kt b/app/src/main/kotlin/org/cosmicide/startup/PreferencesInitializer.kt similarity index 92% rename from app/src/main/kotlin/org/cosmicide/rewrite/startup/PreferencesInitializer.kt rename to app/src/main/kotlin/org/cosmicide/startup/PreferencesInitializer.kt index 751f8e17..bfe55a4e 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/startup/PreferencesInitializer.kt +++ b/app/src/main/kotlin/org/cosmicide/startup/PreferencesInitializer.kt @@ -1,4 +1,4 @@ -package org.cosmicide.rewrite.startup +package org.cosmicide.startup import android.content.Context import androidx.startup.Initializer diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/util/CommonUtils.kt b/app/src/main/kotlin/org/cosmicide/util/CommonUtils.kt similarity index 97% rename from app/src/main/kotlin/org/cosmicide/rewrite/util/CommonUtils.kt rename to app/src/main/kotlin/org/cosmicide/util/CommonUtils.kt index e2b04bf9..5b11ddaf 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/util/CommonUtils.kt +++ b/app/src/main/kotlin/org/cosmicide/util/CommonUtils.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.util +package org.cosmicide.util import android.app.Activity import android.content.pm.PackageManager @@ -23,8 +23,8 @@ import io.noties.markwon.linkify.LinkifyPlugin import io.noties.markwon.movement.MovementMethodPlugin import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import org.cosmicide.rewrite.App -import org.cosmicide.rewrite.R +import org.cosmicide.App +import org.cosmicide.R import rikka.shizuku.Shizuku import rikka.shizuku.ShizukuProvider diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/util/DownloadUtil.kt b/app/src/main/kotlin/org/cosmicide/util/DownloadUtil.kt similarity index 98% rename from app/src/main/kotlin/org/cosmicide/rewrite/util/DownloadUtil.kt rename to app/src/main/kotlin/org/cosmicide/util/DownloadUtil.kt index f634b5dc..0c949edc 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/util/DownloadUtil.kt +++ b/app/src/main/kotlin/org/cosmicide/util/DownloadUtil.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.util +package org.cosmicide.util import android.util.Log import java.io.File diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/util/FileExt.kt b/app/src/main/kotlin/org/cosmicide/util/FileExt.kt similarity index 97% rename from app/src/main/kotlin/org/cosmicide/rewrite/util/FileExt.kt rename to app/src/main/kotlin/org/cosmicide/util/FileExt.kt index 0a949ff8..78efcdcf 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/util/FileExt.kt +++ b/app/src/main/kotlin/org/cosmicide/util/FileExt.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.util +package org.cosmicide.util import android.os.Build import androidx.fragment.app.Fragment diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/util/FileFactoryProvider.kt b/app/src/main/kotlin/org/cosmicide/util/FileFactoryProvider.kt similarity index 99% rename from app/src/main/kotlin/org/cosmicide/rewrite/util/FileFactoryProvider.kt rename to app/src/main/kotlin/org/cosmicide/util/FileFactoryProvider.kt index 986e4d08..deff3f13 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/util/FileFactoryProvider.kt +++ b/app/src/main/kotlin/org/cosmicide/util/FileFactoryProvider.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.util +package org.cosmicide.util import android.util.Log import com.intellij.core.JavaCoreApplicationEnvironment diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/util/FileIndex.kt b/app/src/main/kotlin/org/cosmicide/util/FileIndex.kt similarity index 98% rename from app/src/main/kotlin/org/cosmicide/rewrite/util/FileIndex.kt rename to app/src/main/kotlin/org/cosmicide/util/FileIndex.kt index 5bbf6d6c..9f44a536 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/util/FileIndex.kt +++ b/app/src/main/kotlin/org/cosmicide/util/FileIndex.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.util +package org.cosmicide.util import android.util.Log import com.google.gson.Gson diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/util/PreferenceKeys.kt b/app/src/main/kotlin/org/cosmicide/util/PreferenceKeys.kt similarity index 98% rename from app/src/main/kotlin/org/cosmicide/rewrite/util/PreferenceKeys.kt rename to app/src/main/kotlin/org/cosmicide/util/PreferenceKeys.kt index 09109dfe..9e47add9 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/util/PreferenceKeys.kt +++ b/app/src/main/kotlin/org/cosmicide/util/PreferenceKeys.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.util +package org.cosmicide.util object PreferenceKeys { diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/util/ProjectHandler.kt b/app/src/main/kotlin/org/cosmicide/util/ProjectHandler.kt similarity index 95% rename from app/src/main/kotlin/org/cosmicide/rewrite/util/ProjectHandler.kt rename to app/src/main/kotlin/org/cosmicide/util/ProjectHandler.kt index daea7731..a74767e4 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/util/ProjectHandler.kt +++ b/app/src/main/kotlin/org/cosmicide/util/ProjectHandler.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.util +package org.cosmicide.util import org.cosmicide.project.Project @@ -36,7 +36,7 @@ class ProjectHandler { */ @JvmStatic fun setProject(project: Project) { - this.project = project + Companion.project = project } } } \ No newline at end of file diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/util/ResourceUtil.kt b/app/src/main/kotlin/org/cosmicide/util/ResourceUtil.kt similarity index 96% rename from app/src/main/kotlin/org/cosmicide/rewrite/util/ResourceUtil.kt rename to app/src/main/kotlin/org/cosmicide/util/ResourceUtil.kt index c0f59036..fb6ef251 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/util/ResourceUtil.kt +++ b/app/src/main/kotlin/org/cosmicide/util/ResourceUtil.kt @@ -12,7 +12,9 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.util +package org.cosmicide.util + +import org.cosmicide.rewrite.util.FileUtil object ResourceUtil { diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/util/ShizukuExt.kt b/app/src/main/kotlin/org/cosmicide/util/ShizukuExt.kt similarity index 100% rename from app/src/main/kotlin/org/cosmicide/rewrite/util/ShizukuExt.kt rename to app/src/main/kotlin/org/cosmicide/util/ShizukuExt.kt diff --git a/app/src/main/kotlin/org/cosmicide/rewrite/util/ext.kt b/app/src/main/kotlin/org/cosmicide/util/ext.kt similarity index 95% rename from app/src/main/kotlin/org/cosmicide/rewrite/util/ext.kt rename to app/src/main/kotlin/org/cosmicide/util/ext.kt index 6daa85df..db70570f 100644 --- a/app/src/main/kotlin/org/cosmicide/rewrite/util/ext.kt +++ b/app/src/main/kotlin/org/cosmicide/util/ext.kt @@ -5,7 +5,7 @@ * You should have received a copy of the GNU General Public License along with Foobar. If not, see . */ -package org.cosmicide.rewrite.util +package org.cosmicide.util import org.jetbrains.kotlin.utils.addToStdlib.ifTrue diff --git a/app/src/main/res/layout/editor_fragment.xml b/app/src/main/res/layout/editor_fragment.xml index 708669b0..87badd74 100644 --- a/app/src/main/res/layout/editor_fragment.xml +++ b/app/src/main/res/layout/editor_fragment.xml @@ -11,7 +11,7 @@ android:layout_height="match_parent" android:background="?android:attr/colorBackground"> - + tools:context="org.cosmicide.fragment.CompileInfoFragment"> - + tools:context="org.cosmicide.fragment.NewProjectFragment"> + tools:context="org.cosmicide.fragment.PluginsFragment"> + tools:context="org.cosmicide.fragment.ProjectFragment"> + tools:context="org.cosmicide.fragment.SettingsFragment"> -