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

Commit

Permalink
Fix multiple important bugs
Browse files Browse the repository at this point in the history 
Signed-off-by: PranavPurwar <[email protected]>
  • Loading branch information
@PranavPurwar
PranavPurwar committed Jul 20, 2023
1 parent ffd13d8 commit 21eb898
Show file tree
Hide file tree
Showing 17 changed files with 295 additions and 478 deletions.
9 changes: 7 additions & 2 deletions app/src/main/kotlin/org/cosmicide/rewrite/adapter/EditorAdapter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@ class EditorAdapter(val fragment: Fragment, val fileViewModel: FileViewModel) :
}

override fun createFragment(position: Int): Fragment {
val fragment = CodeEditorFragment(fileViewModel.files.value!![position])
val fragment = CodeEditorFragment().apply {
arguments = Bundle().apply {
putSerializable("file", fileViewModel.files.value!![position])
}
}
fragments.add(fragment)
return fragment
}
Expand All @@ -74,11 +78,12 @@ class EditorAdapter(val fragment: Fragment, val fileViewModel: FileViewModel) :
fragments.forEach { it.save() }
}

class CodeEditorFragment(val file: File) : Fragment() {
class CodeEditorFragment : Fragment() {

private lateinit var eventReceiver: SubscriptionReceipt<ContentChangeEvent>
private lateinit var binding: EditorFragmentBinding
lateinit var editor: IdeEditor
val file by lazy { requireArguments().getSerializable("file") as File }

override fun onCreateView(
inflater: LayoutInflater,
Expand Down
188 changes: 136 additions & 52 deletions app/src/main/kotlin/org/cosmicide/rewrite/fragment/EditorFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import androidx.fragment.app.activityViewModels
import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.snackbar.Snackbar
import com.google.android.material.tabs.TabLayout
import com.google.android.material.tabs.TabLayoutMediator
Expand All @@ -31,29 +32,29 @@ import kotlinx.coroutines.launch
import org.cosmic.ide.dependency.resolver.getArtifact
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.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.formatter.GoogleJavaFormat
import org.cosmicide.rewrite.editor.formatter.ktfmtFormatter
import org.cosmicide.rewrite.model.FileViewModel
import org.cosmicide.rewrite.treeview.FileSet
import org.cosmicide.rewrite.util.FileFactoryProvider
import org.cosmicide.rewrite.util.FileIndex
import org.cosmicide.rewrite.util.ProjectHandler
import org.jetbrains.kotlin.psi.KtFile
import java.io.File

class EditorFragment(
private val project: Project
) : BaseBindingFragment<FragmentEditorBinding>() {
class EditorFragment : BaseBindingFragment<FragmentEditorBinding>() {
private lateinit var fileIndex: FileIndex
private val fileViewModel by activityViewModels<FileViewModel>()
private lateinit var editorAdapter: EditorAdapter
private val project by lazy { requireArguments().getSerializable("project") as Project }

override fun getViewBinding() = FragmentEditorBinding.inflate(layoutInflater)

Expand Down Expand Up @@ -97,34 +98,31 @@ class EditorFragment(
}
}

requireActivity().onBackPressedDispatcher.addCallback(
object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
binding.apply {
val fragment =
parentFragmentManager.findFragmentById(R.id.fragment_container)
if (fragment !is EditorFragment) {
parentFragmentManager.popBackStack()
return
}
if (drawer.isOpen) {
drawer.close()
} else {
editorAdapter.saveAll()
requireActivity().onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
binding.apply {
val fragment = parentFragmentManager.findFragmentById(R.id.fragment_container)
if (fragment !is EditorFragment) {
parentFragmentManager.popBackStack()
return
}
if (drawer.isOpen) {
drawer.close()
} else {
editorAdapter.saveAll()

fileIndex.putFiles(
binding.pager.currentItem,
fileViewModel.files.value!!
)
fileIndex.putFiles(
binding.pager.currentItem, fileViewModel.files.value!!
)

fileViewModel.removeAll()
fileViewModel.files.removeObservers(viewLifecycleOwner)
fileViewModel.removeAll()
fileViewModel.files.removeObservers(viewLifecycleOwner)

parentFragmentManager.popBackStack()
}
parentFragmentManager.popBackStack()
}
}
})
}
})

TabLayoutMediator(binding.tabLayout, binding.pager, true, true) { tab, position ->
tab.text = fileViewModel.files.value!![position].name
Expand Down Expand Up @@ -170,7 +168,7 @@ class EditorFragment(
}

override fun onItemLongClick(v: View, position: Int) {
showMenu(v, R.menu.treeview_menu, position)
showTreeViewMenu(v, nodes.get(position).value)
}
})
}
Expand Down Expand Up @@ -337,11 +335,11 @@ class EditorFragment(
}
}

val psiFile =
if (language == Language.Kotlin)
FileFactoryProvider.getKtPsiFile(editor.file.name, editor.editor.text.toString())
else
FileFactoryProvider.getPsiJavaFile(editor.file.name, editor.editor.text.toString())
val psiFile = if (language == Language.Kotlin) FileFactoryProvider.getKtPsiFile(
editor.file.name,
editor.editor.text.toString()
)
else FileFactoryProvider.getPsiJavaFile(editor.file.name, editor.editor.text.toString())

val classes = psiFile.classes
if (classes.isEmpty() && language == Language.Java) {
Expand Down Expand Up @@ -452,23 +450,6 @@ class EditorFragment(
}.commit()
}

private fun traverseDirectory(dir: File): Set<FileSet> {
val set = mutableSetOf<FileSet>()
val files = dir.listFiles() ?: return set
for (file in files) {
when {
file.isFile -> set.add(FileSet(file))
file.isDirectory -> {
val tempSet = mutableSetOf<FileSet>().apply {
addAll(traverseDirectory(file))
}
set.add(FileSet(file, tempSet))
}
}
}
return set
}

private fun showMenu(v: View, @MenuRes menuRes: Int, position: Int) {
val popup = PopupMenu(requireContext(), v)
popup.menuInflater.inflate(menuRes, popup.menu)
Expand All @@ -477,15 +458,118 @@ class EditorFragment(
when (it.itemId) {
R.id.close_tab -> {
fileViewModel.removeFile(position)

}

R.id.close_all_tab -> fileViewModel.removeAll()
R.id.close_left_tab -> fileViewModel.removeLeft(position)
R.id.close_right_tab -> fileViewModel.removeRight(position)
R.id.close_left_tab -> fileViewModel.removeLeft(position - 1)
R.id.close_right_tab -> fileViewModel.removeRight(position - 1)
R.id.close_other_tab -> fileViewModel.removeOthers(fileViewModel.currentFile!!)
}
true
}
popup.show()
}

private fun showTreeViewMenu(v: View, file: File) {
val popup = PopupMenu(v.context, v)
popup.menuInflater.inflate(R.menu.treeview_menu, popup.menu)

if (file.isDirectory) {
popup.menu.removeItem(R.id.open_external)
} else {
popup.menu.removeItem(R.id.create_kotlin_class)
popup.menu.removeItem(R.id.create_java_class)
popup.menu.removeItem(R.id.create_folder)
}

popup.setOnMenuItemClickListener {
when (it.itemId) {
R.id.create_kotlin_class -> {
val binding = TreeviewContextActionDialogItemBinding.inflate(layoutInflater)
binding.textInputLayout.suffixText = ".kt"
MaterialAlertDialogBuilder(v.context).setTitle("Create kotlin class")
.setView(binding.root).setPositiveButton("Create") { _, _ ->
var name = binding.edittext.text.toString()
name = name.replace("\\.", "")
file.resolve("$name.kt").createNewFile()
initTreeView()
}.setNegativeButton("Cancel") { dialog, _ ->
dialog.dismiss()
}.show()
}

R.id.create_java_class -> {
val binding = TreeviewContextActionDialogItemBinding.inflate(layoutInflater)
binding.textInputLayout.suffixText = ".java"
MaterialAlertDialogBuilder(v.context).setTitle("Create java class")
.setView(binding.root).setPositiveButton("Create") { _, _ ->
var name = binding.edittext.text.toString()
name = name.replace("\\.", "")
file.resolve("$name.java").createNewFile()
initTreeView()
}.setNegativeButton("Cancel") { dialog, _ ->
dialog.dismiss()
}.show()
}

R.id.create_folder -> {
val binding = TreeviewContextActionDialogItemBinding.inflate(layoutInflater)
MaterialAlertDialogBuilder(v.context).setTitle("Create folder")
.setView(binding.root).setPositiveButton("Create") { _, _ ->
var name = binding.edittext.text.toString()
name = name.replace("\\.", "")
file.resolve(name).mkdirs()
initTreeView()
}.setNegativeButton("Cancel") { dialog, _ ->
dialog.dismiss()
}.show()
}

R.id.create_file -> {
val binding = TreeviewContextActionDialogItemBinding.inflate(layoutInflater)
MaterialAlertDialogBuilder(v.context).setTitle("Create file")
.setView(binding.root).setPositiveButton("Create") { _, _ ->
var name = binding.edittext.text.toString()
name = name.replace("\\.", "")
file.resolve(name).createNewFile()
initTreeView()
}.setNegativeButton("Cancel") { dialog, _ ->
dialog.dismiss()
}.show()
}

R.id.rename -> {
val binding = TreeviewContextActionDialogItemBinding.inflate(layoutInflater)
binding.edittext.setText(file.name)
MaterialAlertDialogBuilder(v.context).setTitle("Rename").setView(binding.root)
.setPositiveButton("Create") { _, _ ->
var name = binding.edittext.text.toString()
name = name.replace("\\.", "")
file.renameTo(file.parentFile!!.resolve(name))
initTreeView()
}.setNegativeButton("Cancel") { dialog, _ ->
dialog.dismiss()
}.show()
}

R.id.delete -> {
MaterialAlertDialogBuilder(v.context).setTitle("Delete")
.setMessage("Are you sure you want to delete this file")
.setPositiveButton("Create") { _, _ ->
file.deleteRecursively()
initTreeView()
}.setNegativeButton("Cancel") { dialog, _ ->
dialog.dismiss()
}.show()
}

R.id.open_external -> {
openFileWithExternalApp(v.context, file)
}
}
true
}
popup.show()
}
}
49 changes: 34 additions & 15 deletions app/src/main/kotlin/org/cosmicide/rewrite/fragment/InstallResourcesFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@

package org.cosmicide.rewrite.fragment

import android.annotation.SuppressLint
import android.os.Bundle
import android.view.View
import androidx.lifecycle.lifecycleScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.cosmicide.rewrite.R
import org.cosmicide.rewrite.common.BaseBindingFragment
import org.cosmicide.rewrite.databinding.InstallResourcesFragmentBinding
Expand All @@ -24,20 +26,25 @@ class InstallResourcesFragment : BaseBindingFragment<InstallResourcesFragmentBin
val rawUrl = "https://github.com/Cosmic-Ide/binaries/raw/main/"
override fun getViewBinding() = InstallResourcesFragmentBinding.inflate(layoutInflater)

@SuppressLint("SetTextI18n")
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
binding.installResourcesButton.setOnClickListener {
binding.installResourcesButton.visibility = View.GONE

lifecycleScope.launch(Dispatchers.IO) {
for (res in ResourceUtil.missingResources()) {
lifecycleScope.launch(Dispatchers.Main) {
binding.installResourcesText.text = "Preparing resource $res"
withContext(Dispatchers.Main) {
binding.installResourcesText.text = "Preparing to download resource $res"
}
if (installResource(res).not()) {
return@launch
}
installResource(res)
lifecycleScope.launch(Dispatchers.Main) {
withContext(Dispatchers.Main) {
binding.installResourcesText.text = "Downloaded resource $res"
}
}
lifecycleScope.launch(Dispatchers.Main) {
withContext(Dispatchers.Main) {
parentFragmentManager.beginTransaction().apply {
replace(R.id.fragment_container, ProjectFragment())
setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_FADE)
Expand All @@ -47,16 +54,28 @@ class InstallResourcesFragment : BaseBindingFragment<InstallResourcesFragmentBin
}
}

fun installResource(res: String) {
val url = rawUrl + res.substringAfterLast('/')
val file = FileUtil.dataDir.resolve(res)
file.parentFile!!.mkdirs()
file.createNewFile()
Download(url) {
lifecycleScope.launch(Dispatchers.Main) {
binding.installResourcesProgressText.text = "$it%"
binding.installResourcesProgress.progress = it
@SuppressLint("SetTextI18n")
suspend fun installResource(res: String): Boolean {
try {
val url = rawUrl + res.substringAfterLast('/')
val file = FileUtil.dataDir.resolve(res)
file.parentFile!!.mkdirs()
file.createNewFile()
Download(url) {
lifecycleScope.launch(Dispatchers.Main) {
binding.installResourcesProgressText.text = "$it%"
binding.installResourcesProgress.progress = it
}
}.start(file)
return true
} catch (e: Exception) {
e.printStackTrace()
withContext(Dispatchers.Main) {
binding.installResourcesText.text =
"Failed to download resource $res: ${e.stackTraceToString()}"
binding.installResourcesButton.visibility = View.VISIBLE
}
}.start(file)
return false
}
}
}
6 changes: 5 additions & 1 deletion app/src/main/kotlin/org/cosmicide/rewrite/fragment/NewProjectFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,11 @@ class NewProjectFragment : BaseBindingFragment<FragmentNewProjectBinding>() {

private fun navigateToEditorFragment(project: Project) {
parentFragmentManager.beginTransaction().apply {
add(R.id.fragment_container, EditorFragment(project))
add(R.id.fragment_container, EditorFragment().apply {
arguments = Bundle().apply {
putSerializable("project", project)
}
})
addToBackStack(null)
setTransition(androidx.fragment.app.FragmentTransaction.TRANSIT_FRAGMENT_FADE)
}.commit()
Expand Down
Loading

0 comments on commit 21eb898

Please sign in to comment.