Change package name to org.cosmicide

Signed-off-by: PranavPurwar <[email protected]>
Cosmic-Ide · Aug 23, 2023 · a6b8487 · a6b8487
1 parent df79540
commit a6b8487
Show file tree

Hide file tree

Showing 87 changed files with 258 additions and 220 deletions.
diff --git 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
@@ -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
@@ -31,7 +31,7 @@
         tools:ignore="ProtectedPermissions" />
 
     <application
-        android:name=".App"
+        android:name="org.cosmicide.App"
         android:allowBackup="true"
         android:allowClearUserData="false"
         android:appCategory="productivity"
@@ -60,7 +60,7 @@
             android:exported="false"
             tools:node="merge">
             <meta-data
-                android:name="org.cosmicide.rewrite.startup.MainInitializer"
+                android:name="org.cosmicide.startup.MainInitializer"
                 android:value="androidx.startup" />
         </provider>
 

diff --git a/.../main/kotlin/org/cosmicide/rewrite/App.kt → app/src/main/kotlin/org/cosmicide/App.kt b/.../main/kotlin/org/cosmicide/rewrite/App.kt → app/src/main/kotlin/org/cosmicide/App.kt
@@ -1,11 +1,18 @@
+/*
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
 /*
  * 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 Foobar. If not, see <https://www.gnu.org/licenses/>.
  */
 
-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/...lin/org/cosmicide/rewrite/FileProvider.kt → ...main/kotlin/org/cosmicide/FileProvider.kt b/...lin/org/cosmicide/rewrite/FileProvider.kt → ...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 <https://www.gnu.org/licenses/>.
  */
 
-package org.cosmicide.rewrite
+package org.cosmicide
 
 import android.content.Context
 import android.content.Intent

diff --git a/...lin/org/cosmicide/rewrite/MainActivity.kt → ...main/kotlin/org/cosmicide/MainActivity.kt b/...lin/org/cosmicide/rewrite/MainActivity.kt → ...main/kotlin/org/cosmicide/MainActivity.kt
@@ -1,11 +1,18 @@
+/*
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
 /*
  * 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 Foobar. If not, see <https://www.gnu.org/licenses/>.
  */
 
-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/...rewrite/adapter/AvailablePluginAdapter.kt → ...smicide/adapter/AvailablePluginAdapter.kt b/...rewrite/adapter/AvailablePluginAdapter.kt → ...smicide/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 <https://www.gnu.org/licenses/>.
  */
 
-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/...ide/rewrite/adapter/BindableViewHolder.kt → ...g/cosmicide/adapter/BindableViewHolder.kt b/...ide/rewrite/adapter/BindableViewHolder.kt → ...g/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 <https://www.gnu.org/licenses/>.
  */
 
-package org.cosmicide.rewrite.adapter
+package org.cosmicide.adapter
 
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding

diff --git a/...de/rewrite/adapter/ConversationAdapter.kt → .../cosmicide/adapter/ConversationAdapter.kt b/...de/rewrite/adapter/ConversationAdapter.kt → .../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 <https://www.gnu.org/licenses/>.
  */
 
-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<BindableViewHolder<ConversationAdapter.Conversation, *>>() {

diff --git a/...osmicide/rewrite/adapter/EditorAdapter.kt → ...in/org/cosmicide/adapter/EditorAdapter.kt b/...osmicide/rewrite/adapter/EditorAdapter.kt → ...in/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 <https://www.gnu.org/licenses/>.
  */
 
-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/...g/cosmicide/rewrite/adapter/GitAdapter.kt → ...otlin/org/cosmicide/adapter/GitAdapter.kt b/...g/cosmicide/rewrite/adapter/GitAdapter.kt → ...otlin/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 <https://www.gnu.org/licenses/>.
  */
 
-package org.cosmicide.rewrite.adapter
+package org.cosmicide.adapter
 
 import android.annotation.SuppressLint
 import android.view.ViewGroup

diff --git a/...g/cosmicide/rewrite/adapter/NavAdapter.kt → ...otlin/org/cosmicide/adapter/NavAdapter.kt b/...g/cosmicide/rewrite/adapter/NavAdapter.kt → ...otlin/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 <https://www.gnu.org/licenses/>.
  */
 
-package org.cosmicide.rewrite.adapter
+package org.cosmicide.adapter
 
 import android.annotation.SuppressLint
 import android.content.Context

diff --git a/...osmicide/rewrite/adapter/PluginAdapter.kt → ...in/org/cosmicide/adapter/PluginAdapter.kt b/...osmicide/rewrite/adapter/PluginAdapter.kt → ...in/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 <https://www.gnu.org/licenses/>.
  */
 
-package org.cosmicide.rewrite.adapter
+package org.cosmicide.adapter
 
 import android.view.LayoutInflater
 import android.view.ViewGroup

diff --git a/...smicide/rewrite/adapter/ProjectAdapter.kt → ...n/org/cosmicide/adapter/ProjectAdapter.kt b/...smicide/rewrite/adapter/ProjectAdapter.kt → ...n/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 <https://www.gnu.org/licenses/>.
  */
 
-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/...smicide/rewrite/adapter/StagingAdapter.kt → ...n/org/cosmicide/adapter/StagingAdapter.kt b/...smicide/rewrite/adapter/StagingAdapter.kt → ...n/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 <https://www.gnu.org/licenses/>.
  */
 
-package org.cosmicide.rewrite.adapter
+package org.cosmicide.adapter
 
 import android.graphics.Color
 import android.view.ViewGroup

diff --git a/...rg/cosmicide/rewrite/chat/ChatProvider.kt → ...kotlin/org/cosmicide/chat/ChatProvider.kt b/...rg/cosmicide/rewrite/chat/ChatProvider.kt → ...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 <https://www.gnu.org/licenses/>.
  */
 
-package org.cosmicide.rewrite.chat
+package org.cosmicide.chat
 
 import android.util.Log
 import com.google.gson.Gson

diff --git a/...org/cosmicide/rewrite/compile/Compiler.kt → .../kotlin/org/cosmicide/compile/Compiler.kt b/...org/cosmicide/rewrite/compile/Compiler.kt → .../kotlin/org/cosmicide/compile/Compiler.kt
@@ -5,17 +5,17 @@
  * You should have received a copy of the GNU General Public License along with Foobar. If not, see <https://www.gnu.org/licenses/>.
  */
 
-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
 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/...osmicide/rewrite/compile/CompilerCache.kt → ...in/org/cosmicide/compile/CompilerCache.kt b/...osmicide/rewrite/compile/CompilerCache.kt → ...in/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 <https://www.gnu.org/licenses/>.
  */
 
-package org.cosmicide.rewrite.compile
+package org.cosmicide.compile
 
 import org.cosmicide.build.Task
 

diff --git a/...write/compile/ssvm/DefaultVInitializer.kt → ...icide/compile/ssvm/DefaultVInitializer.kt b/...write/compile/ssvm/DefaultVInitializer.kt → ...icide/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 <https://www.gnu.org/licenses/>.
  */
 
-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/...rg/cosmicide/rewrite/compile/ssvm/SSVM.kt → ...kotlin/org/cosmicide/compile/ssvm/SSVM.kt b/...rg/cosmicide/rewrite/compile/ssvm/SSVM.kt → ...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 <https://www.gnu.org/licenses/>.
  */
 
-package org.cosmicide.rewrite.compile.ssvm
+package org.cosmicide.compile.ssvm
 
 import android.util.Log
 import com.android.tools.r8.ByteDataView

diff --git a/...ile/ssvm/native/FileChannelImplNatives.kt → ...ile/ssvm/native/FileChannelImplNatives.kt b/...ile/ssvm/native/FileChannelImplNatives.kt → ...ile/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 <https://www.gnu.org/licenses/>.
  */
 
-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/...pile/ssvm/native/FileDescriptorNatives.kt → ...pile/ssvm/native/FileDescriptorNatives.kt b/...pile/ssvm/native/FileDescriptorNatives.kt → ...pile/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 <https://www.gnu.org/licenses/>.
  */
 
-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/.../compile/ssvm/native/NativeInitializer.kt → .../compile/ssvm/native/NativeInitializer.kt b/.../compile/ssvm/native/NativeInitializer.kt → .../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 <https://www.gnu.org/licenses/>.
  */
 
-package org.cosmicide.rewrite.compile.ssvm.native
+package org.cosmicide.compile.ssvm.native
 
 import dev.xdark.ssvm.VirtualMachine