Skip to content
This repository has been archived by the owner on Sep 17, 2023. It is now read-only.

Commit

Permalink
Fix lint warnings, crash
Browse files Browse the repository at this point in the history
Signed-off-by: PranavPurwar <[email protected]>
  • Loading branch information
PranavPurwar committed Aug 23, 2023
1 parent 7310e01 commit df79540
Show file tree
Hide file tree
Showing 16 changed files with 41 additions and 79 deletions.
2 changes: 2 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ android {
enable = true
}

lint.abortOnError = false

configurations.configureEach {
exclude(group = "javax.inject", module = "javax.inject")
exclude(group = "org.jetbrains", module = "annotations-java5")
Expand Down
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
tools:ignore="ScopedStorage" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission
android:name="android.permission.QUERY_ALL_PACKAGES"
tools:ignore="QueryAllPackagesPermission" />
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/kotlin/org/cosmicide/rewrite/App.kt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import org.cosmicide.rewrite.plugin.api.PluginLoader
import org.cosmicide.rewrite.util.CommonUtils
import org.cosmicide.rewrite.util.FileUtil
import org.eclipse.tm4e.core.registry.IThemeSource
import org.jetbrains.kotlin.utils.addToStdlib.ifTrue
import org.lsposed.hiddenapibypass.HiddenApiBypass
import rikka.sui.Sui
import java.io.File
Expand Down Expand Up @@ -60,11 +59,15 @@ class App : Application() {

override fun onCreate() {
super.onCreate()

if (FileUtil.isInitialized.not()) return

Sui.init(packageName)
instance = WeakReference(this)
HookManager.context = WeakReference(this)

setupHooks()

loadPlugins()

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/kotlin/org/cosmicide/rewrite/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import androidx.core.view.WindowInsetsCompat
import androidx.core.view.updateLayoutParams
import androidx.fragment.app.commit
import androidx.lifecycle.lifecycleScope
import com.google.android.material.color.DynamicColors
import com.kieronquinn.app.darq.utils.extensions.awaitBinderReceived
import com.kieronquinn.app.darq.utils.extensions.isShizukuInstalled
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -49,6 +50,7 @@ class MainActivity : AppCompatActivity() {
val accent = Prefs.appAccent
themeInt = CommonUtils.getAccent(accent)
setTheme(themeInt)
DynamicColors.applyToActivityIfAvailable(this)
enableEdgeToEdge()
return super.onCreateView(parent, name, context, attrs)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

package org.cosmicide.rewrite.adapter

import android.annotation.SuppressLint
import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
Expand Down Expand Up @@ -42,9 +43,10 @@ class GitAdapter : RecyclerView.Adapter<GitAdapter.ViewHolder>() {
val textView: TextView
) : RecyclerView.ViewHolder(textView) {

@SuppressLint("SetTextI18n")
fun bind(commit: RevCommit) {
textView.textSize = 16f
textView.text = commit.authorIdent.name + " - " + commit.shortMessage
textView.text = "${commit.authorIdent.name}-${commit.shortMessage}"
}
}
}
17 changes: 0 additions & 17 deletions app/src/main/res/drawable/round_insert_drive_file_24.xml

This file was deleted.

2 changes: 1 addition & 1 deletion app/src/main/res/layout/new_plugin_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Install"
android:text="@string/install"
app:layout_constraintStart_toEndOf="@id/name"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/menu/chat_menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<item
android:id="@+id/clear"
android:icon="@drawable/baseline_close_24"
android:title="Clear"
android:title="@string/clear"
app:showAsAction="always" />

<item
Expand Down
10 changes: 6 additions & 4 deletions app/src/main/res/menu/menu_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
-->

<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">

<item
android:id="@+id/nav_items"
android:icon="@drawable/nav_icon"
android:title="Navigation Elements"
android:title="@string/navigation_elements"
app:showAsAction="always" />

<item
Expand All @@ -30,7 +31,8 @@
android:id="@+id/redo"
android:icon="@drawable/baseline_redo_24"
android:title="@string/redo"
app:showAsAction="always" />
app:showAsAction="always"
tools:ignore="AlwaysShowAction" />


<item
Expand All @@ -40,7 +42,7 @@

<item
android:id="@+id/action_format"
android:title="Format"
android:title="@string/format"
app:showAsAction="never" />

<item
Expand All @@ -53,6 +55,6 @@

<item
android:id="@+id/action_git"
android:title="Git" />
android:title="@string/git" />

</menu>
10 changes: 5 additions & 5 deletions app/src/main/res/menu/tab_menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@

<item
android:id="@+id/close_tab"
android:title="Close Tab" />
android:title="@string/close_tab" />
<item
android:id="@+id/close_left_tab"
android:title="Close Left Tab" />
android:title="@string/close_left_tab" />
<item
android:id="@+id/close_right_tab"
android:title="Close Right Tab" />
android:title="@string/close_right_tab" />
<item
android:id="@+id/close_other_tab"
android:title="Close Other Tabs" />
android:title="@string/close_other_tabs" />
<item
android:id="@+id/close_all_tab"
android:title="Close All Tabs" />
android:title="@string/close_all_tabs" />
</menu>
15 changes: 0 additions & 15 deletions app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,17 @@
<string name="app_name">Cosmic IDE Rewrite</string>
<string name="action_settings">Настройки</string>
<!-- Строки, используемые для фрагментов для навигации -->
<string name="next">Следующее</string>

<string name="import_project">Импортировать проект</string>
<string name="app_theme">Тема приложения</string>

<string name="projects">Проекты</string>
<string name="new_project">Новый проект</string>
<string name="use_kotlin_template">Использовать шаблон для Kotlin</string>
<string name="enter_project_name">Введите имя проекта</string>
<string name="project_name">Имя проекта</string>
<string name="editor">Редактор</string>
<string name="enter_package_name">Введите имя пакета (package)</string>

<string name="create_project">Создать проект</string>
<string name="project_path">Путь к проекту</string>
<string name="action_compile">Скомпилировать</string>
<string name="compile_info">Информация о компилировании</string>
<string name="project_output">Вывод проекта</string>
<string name="reload">Перезагрузить</string>
<string name="cancel">Отменить</string>
<string name="pref_theme_auto">Тема системы</string>
Expand All @@ -35,17 +28,9 @@
<string name="undo">Отменить</string>
<string name="redo">Вернуть</string>
<string name="dependency_manager">Менеджер зависимостей</string>
<string name="expand_collapse">Свернуть/Развернуть</string>
<string name="accept">Принять</string>
<string name="decline">Отклонить</string>
<string name="type_a_message">Введите сообщение</string>
<string name="send">Отправить</string>
<string name="action_chat">Чат с нейросетью</string>
<string name="author">автор</string>
<string name="view_drafts">Просмотр черновиков</string>
<string name="draft_1">Черновик 1</string>
<string name="draft_3">Черновик 3</string>
<string name="draft_2">Черновик 2</string>
<string name="completion_type">Тип завершения</string>
<string name="enter_something">Введите что-нибудь…</string>
<string name="fast_jar_fs">Быстрая реализация для Jar FS</string>
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/res/values-uk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,14 @@
<resources>
<string name="app_name">Cosmic IDE Rewrite</string>
<string name="action_settings">Налаштування</string>
<string name="next">Про нас</string>
<string name="import_project">Імпортний проект</string>
<string name="projects">Проект</string>
<string name="new_project">Новий проект</string>
<string name="use_kotlin_template">Використовуйте Котлін шаблон</string>
<string name="enter_project_name">Назва проекту</string>
<string name="project_name">Назва проекту</string>
<string name="editor">Головна</string>
<string name="enter_package_name">Імя пакета</string>
<string name="create_project">Створити проект</string>
<string name="project_path">Шлях проекту</string>
<string name="action_compile">Компіляція</string>
<string name="compile_info">Інформація</string>
<string name="project_output">Вихід проекту</string>
<string name="reload">Перевантаження</string>
<string name="cancel">Зареєструватися</string>
</resources>
10 changes: 0 additions & 10 deletions app/src/main/res/values/dimens.xml

This file was deleted.

27 changes: 10 additions & 17 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,21 @@
~ You should have received a copy of the GNU General Public License along with Foobar. If not, see <https://www.gnu.org/licenses/>.
-->

<resources>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<string name="app_name">Cosmic IDE Rewrite</string>
<string name="action_settings">Settings</string>
<!-- Strings used for fragments for navigation -->
<string name="next">Next</string>

<string name="import_project">Import Project</string>
<string name="app_theme">App theme</string>

<string name="projects">Projects</string>
<string name="new_project">New Project</string>
<string name="use_kotlin_template">Use Kotlin Template</string>
<string name="enter_project_name">Enter project name</string>
<string name="project_name">Project Name</string>
<string name="editor">Editor</string>
<string name="enter_package_name">Enter package name</string>

<string name="create_project">Create project</string>
<string name="project_path">Project path</string>
<string name="action_compile">Compile</string>
<string name="compile_info">Compile info</string>
<string name="project_output">Project output</string>
<string name="reload">Reload</string>
<string name="cancel">Cancel</string>
<string name="analytics_permission_title">Improve Your Experience</string>
Expand All @@ -38,17 +31,9 @@
<string name="undo">Undo</string>
<string name="redo">Redo</string>
<string name="dependency_manager">Dependency Manager</string>
<string name="expand_collapse">Expand/Collapse</string>
<string name="accept">Accept</string>
<string name="decline">Decline</string>
<string name="type_a_message">Type a message</string>
<string name="send">Send</string>
<string name="action_chat">Chat with AI</string>
<string name="author">author</string>
<string name="view_drafts">View Drafts</string>
<string name="draft_1">Draft 1</string>
<string name="draft_3">Draft 3</string>
<string name="draft_2">Draft 2</string>
<string name="completion_type">Completion type</string>
<string name="enter_something">Enter something…</string>
<string name="fast_jar_fs">Fast implementation for Jar FS</string>
Expand Down Expand Up @@ -82,7 +67,6 @@
<string name="no_open_files_desc">Try opening the file with a file manager</string>
<string name="commit_message">Commit Message</string>
<string name="commit">Commit</string>
<string name="push">Push</string>
<string name="remote_repository_url">Remote Repository URL</string>
<string name="format_group_artifact_version">Format: group:artifact:version</string>
<string name="enter_dependency">Enter Dependency</string>
Expand All @@ -105,4 +89,13 @@
<string name="resource_description">This will download and configure the following resources: \n• android.jar (Required for compilation)\n• core-lambdas-stubs.jar (Required for using lambdas in java)\n• rt.jar (Required for SSVM)\n• index.json (Required for Java code completion)</string>
<string name="install">Install</string>
<string name="navigation_item_kind">Navigation Item Kind</string>
<string name="clear">Clear</string>
<string name="git">Git</string>
<string name="format">Format</string>
<string name="navigation_elements">Navigation Elements</string>
<string name="close_tab">Close Tab</string>
<string name="close_all_tabs">Close All Tabs</string>
<string name="close_other_tabs">Close Other Tabs</string>
<string name="close_left_tab">Close Left Tab</string>
<string name="close_right_tab">Close Right Tab</string>
</resources>
4 changes: 3 additions & 1 deletion feature/java-completion/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ android {
}
dependencies {
implementation("com.github.javaparser:javaparser-core:3.25.4")
implementation("com.github.javaparser:javaparser-symbol-solver-core:3.25.4")
implementation("com.github.javaparser:javaparser-symbol-solver-core:3.25.4") {
exclude(group = "com.google.guava", module = "guava")
}
implementation("org.javassist:javassist:3.29.2-GA")
implementation("io.github.itsaky:nb-javac-android:17.0.0.3")
implementation(projects.feature.project)
Expand Down
3 changes: 3 additions & 0 deletions util/src/main/java/org/cosmicide/rewrite/util/FileUtil.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import java.io.File

object FileUtil {

val isInitialized
get() = ::dataDir.isInitialized

@JvmStatic
lateinit var dataDir: File

Expand Down

0 comments on commit df79540

Please sign in to comment.