Skip to content

Commit

Permalink
chore: Updated FileManager to FileUtils and moved in a new module 'co…
Browse files Browse the repository at this point in the history
…mmon'
  • Loading branch information
SyntaxGalaxy committed Aug 20, 2023
1 parent 561b4b7 commit 1358854
Show file tree
Hide file tree
Showing 51 changed files with 198 additions and 51 deletions.
1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,5 @@ dependencies {
implementation project(path:':markdown-viewer')
implementation project(path:':editor')
implementation project(path:':treeview')
implementation project(path: ':common')
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import android.code.editor.R;
import android.code.editor.adapters.viewholders.FileTabAdapter;
import android.code.editor.adapters.viewholders.FileTreeViewHolder;
import android.code.editor.common.utils.FileUtils;
import android.code.editor.databinding.ActivityCodeEditorBinding;
import android.code.editor.files.utils.FileManager;
import android.code.editor.files.utils.FileTypeHandler;
import android.code.editor.utils.LanguageModeHandler;
import android.code.editor.utils.Setting;
Expand Down Expand Up @@ -112,7 +112,7 @@ public void save() {
new EditorListeners() {
@Override
public void onReceviedCode(String code) {
FileManager.writeFile(openedFile.getAbsolutePath(), code);
FileUtils.writeFile(openedFile.getAbsolutePath(), code);
}
};
codeEditor.getCode(listener);
Expand All @@ -132,7 +132,7 @@ public void onReceviedCode(String code) {
new Runnable() {
@Override
public void run() {
FileManager.writeFile(openedFile.getAbsolutePath(), code);
FileUtils.writeFile(openedFile.getAbsolutePath(), code);
runOnUiThread(
new Runnable() {
@Override
Expand Down Expand Up @@ -388,8 +388,8 @@ public void run() {
binding.list.addView(treeView);
}
if (preview != null && openedFile != null) {
if (FileManager.getPathFormat(openedFile.getAbsolutePath()).equals("md")
|| FileManager.getPathFormat(openedFile.getAbsolutePath()).equals("html")) {
if (FileUtils.getPathFormat(openedFile.getAbsolutePath()).equals("md")
|| FileUtils.getPathFormat(openedFile.getAbsolutePath()).equals("html")) {
preview.setVisible(true);
} else {
preview.setVisible(false);
Expand All @@ -413,8 +413,8 @@ public boolean onPrepareOptionsMenu(Menu arg0) {
menu = arg0;
preview = arg0.findItem(R.id.preview);
if (openedFile != null) {
if (FileManager.getPathFormat(openedFile.getAbsolutePath()).equals("md")
|| FileManager.getPathFormat(openedFile.getAbsolutePath()).equals("html")) {
if (FileUtils.getPathFormat(openedFile.getAbsolutePath()).equals("md")
|| FileUtils.getPathFormat(openedFile.getAbsolutePath()).equals("html")) {
preview.setVisible(true);
} else {
preview.setVisible(false);
Expand All @@ -431,12 +431,12 @@ public boolean onOptionsItemSelected(MenuItem arg0) {
save();
if (openedFile != null) {
if (codeEditor != null) {
if (FileManager.getPathFormat(openedFile.getAbsolutePath()).equals("md")) {
if (FileUtils.getPathFormat(openedFile.getAbsolutePath()).equals("md")) {
Intent i = new Intent();
i.setClass(CodeEditorActivity.this, MarkdownViewer.class);
i.putExtra("type", "file");
i.putExtra("style", "github");
i.putExtra("title", FileManager.getLatSegmentOfFilePath(openedFile.getAbsolutePath()));
i.putExtra("title", FileUtils.getLatSegmentOfFilePath(openedFile.getAbsolutePath()));
i.putExtra("data", openedFile.getAbsolutePath());
startActivity(i);
} else {
Expand Down Expand Up @@ -502,8 +502,8 @@ public void onTaskComplete() {
adapter.notifyDataSetChanged();

if (preview != null) {
if (FileManager.getPathFormat(file.getAbsolutePath()).equals("md")
|| FileManager.getPathFormat(file.getAbsolutePath()).equals("html")) {
if (FileUtils.getPathFormat(file.getAbsolutePath()).equals("md")
|| FileUtils.getPathFormat(file.getAbsolutePath()).equals("html")) {
preview.setVisible(true);
} else {
preview.setVisible(false);
Expand All @@ -516,7 +516,7 @@ public void onTaskComplete() {
codeEditor.setVisibility(View.GONE);

openedFile = file;
codeEditor.setCode(FileManager.readFile(file.getAbsolutePath()));
codeEditor.setCode(FileUtils.readFile(file.getAbsolutePath()));

binding.progressbar.setVisibility(View.GONE);
codeEditor.setVisibility(View.VISIBLE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
package android.code.editor.activity;

import android.code.editor.R;
import android.code.editor.common.utils.FileUtils;
import android.code.editor.files.utils.FileIcon;
import android.code.editor.files.utils.FileManager;
import android.code.editor.files.utils.FileTypeHandler;
import android.code.editor.utils.FileManagerActivity.FileCreatorDialog;
import android.code.editor.utils.FileManagerActivity.FolderCreatorDialog;
Expand Down Expand Up @@ -195,8 +195,8 @@ public void run() {
});

// Get file path from intent and list dir in array
FileManager.listDir(path, listString);
FileManager.setUpFileList(listMap, listString);
FileUtils.listDir(path, listString);
FileUtils.setUpFileList(listMap, listString);

runOnUiThread(
new Runnable() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package android.code.editor.activity;

import android.code.editor.R;
import android.code.editor.files.utils.FileManager;
import android.code.editor.common.utils.FileUtils;
import android.os.Bundle;
import android.text.method.LinkMovementMethod;
import android.text.util.Linkify;
Expand Down Expand Up @@ -49,6 +49,6 @@ public void onClick(View arg0) {
licenseText = findViewById(R.id.licenseText);
licenseText.setAutoLinkMask(Linkify.WEB_URLS);
licenseText.setMovementMethod(LinkMovementMethod.getInstance());
licenseText.setText(FileManager.readFileFromAssets(getAssets(), "oos.text"));
licenseText.setText(FileUtils.readFileFromAssets(getAssets(), "oos.text"));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import android.code.editor.R;
import android.code.editor.activity.CodeEditorActivity;
import android.code.editor.files.utils.FileManager;
import android.code.editor.common.utils.FileUtils;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
Expand Down Expand Up @@ -60,7 +60,7 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
public void onBindViewHolder(ViewHolder _holder, final int _position) {
View _view = _holder.itemView;
((TextView) _view.findViewById(R.id.fileName))
.setText(FileManager.getLatSegmentOfFilePath(fileTabData.get(_position).filePath));
.setText(FileUtils.getLatSegmentOfFilePath(fileTabData.get(_position).filePath));
_view
.findViewById(R.id.root)
.setOnClickListener(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

import android.code.editor.R;
import android.code.editor.activity.CodeEditorActivity;
import android.code.editor.common.utils.FileUtils;
import android.code.editor.files.utils.FileIcon;
import android.code.editor.files.utils.FileManager;
import android.code.editor.files.utils.FileTypeHandler;
import android.content.Context;
import android.view.LayoutInflater;
Expand Down Expand Up @@ -127,7 +127,7 @@ public void run() {
}
});
}
path.setText(FileManager.getLatSegmentOfFilePath(file.getAbsolutePath()));
path.setText(FileUtils.getLatSegmentOfFilePath(file.getAbsolutePath()));
return view;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package android.code.editor.files.utils;

import android.code.editor.R;
import android.code.editor.common.utils.FileUtils;
import android.content.Context;
import android.widget.ImageView;
import java.io.File;
Expand All @@ -27,7 +28,7 @@ public static void setUpIcon(Context context, String path, ImageView imageview)
if (new File(path).isDirectory()) {
imageview.setImageResource(R.drawable.ic_folder_black_24dp);
} else if (new File(path).isFile()) {
switch (FileManager.getPathFormat(path)) {
switch (FileUtils.getPathFormat(path)) {
case "java":
imageview.setImageResource(R.drawable.ic_language_java);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import android.code.editor.R;
import android.code.editor.activity.FileManagerActivity;
import android.code.editor.files.utils.FileManager;
import android.code.editor.common.utils.FileUtils;
import android.content.Context;
import android.text.Editable;
import android.text.TextWatcher;
Expand Down Expand Up @@ -96,7 +96,7 @@ public void beforeTextChanged(CharSequence arg0, int arg1, int arg2, int arg3) {
.exists()) {
activity.listMap.clear();
activity.listString.clear();
FileManager.writeFile(
FileUtils.writeFile(
activity.currentDir.concat(File.separator).concat(path.getText().toString()),
getFileTemplate(
new File(
Expand All @@ -119,33 +119,33 @@ public void beforeTextChanged(CharSequence arg0, int arg1, int arg2, int arg3) {
public static String getFileTemplate(File path, Context context) {
String content = "";
String pathToCopyText = "";
switch (FileManager.getPathFormat(path.getAbsolutePath())) {
switch (FileUtils.getPathFormat(path.getAbsolutePath())) {
case "html":
pathToCopyText = "Templates/NewFiles/template_01.html";
content = FileManager.readFileFromAssets(context.getAssets(), pathToCopyText);
content = FileUtils.readFileFromAssets(context.getAssets(), pathToCopyText);
content =
content.replace(
"${Project_Name}",
FileManager.getLatSegmentOfFilePath(path.getParentFile().getAbsolutePath()));
FileUtils.getLatSegmentOfFilePath(path.getParentFile().getAbsolutePath()));
break;
case "css":
pathToCopyText = "Templates/NewFiles/template_02.css";
content = FileManager.readFileFromAssets(context.getAssets(), pathToCopyText);
content = FileUtils.readFileFromAssets(context.getAssets(), pathToCopyText);
break;
case "js":
pathToCopyText = "Templates/NewFiles/template_03.js";
content = FileManager.readFileFromAssets(context.getAssets(), pathToCopyText);
content = FileUtils.readFileFromAssets(context.getAssets(), pathToCopyText);
break;
case "java":
pathToCopyText = "Templates/NewFiles/template_04.java";
content = FileManager.readFileFromAssets(context.getAssets(), pathToCopyText);
content = FileUtils.readFileFromAssets(context.getAssets(), pathToCopyText);
content =
content.replace(
"${Class_Name}",
FileManager.getLatSegmentOfFilePath(path.getAbsolutePath())
FileUtils.getLatSegmentOfFilePath(path.getAbsolutePath())
.substring(
0,
FileManager.getLatSegmentOfFilePath(path.getAbsolutePath()).length() - 5));
FileUtils.getLatSegmentOfFilePath(path.getAbsolutePath()).length() - 5));
break;
}
return content;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import android.code.editor.R;
import android.code.editor.activity.FileManagerActivity;
import android.code.editor.files.utils.FileManager;
import android.code.editor.common.utils.FileUtils;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.ViewGroup;
Expand Down Expand Up @@ -78,7 +78,7 @@ public void beforeTextChanged(CharSequence arg0, int arg1, int arg2, int arg3) {
.exists()) {
activity.listMap.clear();
activity.listString.clear();
FileManager.makeDir(
FileUtils.makeDir(
activity.currentDir.concat(File.separator).concat(path.getText().toString()));
activity.loadFileList(activity.currentDir);
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package android.code.editor.utils.FileManagerActivity;

import android.code.editor.R;
import android.code.editor.files.utils.FileManager;
import android.code.editor.common.utils.FileUtils;
import android.content.Context;
import android.content.res.AssetManager;
import android.text.Editable;
Expand Down Expand Up @@ -146,7 +146,7 @@ public void beforeTextChanged(CharSequence arg0, int arg1, int arg2, int arg3) {
public static void _FindAndReplace(
final String _path, final String _find, final String _replace) {
ArrayList<String> findAndReplace = new ArrayList<String>();
FileManager.listDir(_path, findAndReplace);
FileUtils.listDir(_path, findAndReplace);
try {
JSONArray FindAndReplace = new JSONArray(new Gson().toJson(findAndReplace));
for (int position = 0; position < (int) (FindAndReplace.length()); position++) {
Expand All @@ -159,10 +159,10 @@ public static void _FindAndReplace(
}
_FindAndReplace(FindAndReplace.getString(position), _find, _replace);
} else {
if (FileManager.readFile(FindAndReplace.getString(position)).contains(_find)) {
FileManager.writeFile(
if (FileUtils.readFile(FindAndReplace.getString(position)).contains(_find)) {
FileUtils.writeFile(
FindAndReplace.getString(position),
FileManager.readFile(FindAndReplace.getString(position))
FileUtils.readFile(FindAndReplace.getString(position))
.replace(_find, _replace));
}
if (FindAndReplace.getString(position).contains(_find)) {
Expand Down
18 changes: 9 additions & 9 deletions app/src/main/java/android/code/editor/utils/Setting.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package android.code.editor.utils;

import android.code.editor.activity.WebViewActivity;
import android.code.editor.files.utils.FileManager;
import android.code.editor.common.utils.FileUtils;
import android.code.editor.ui.MaterialColorHelper;
import android.content.Context;
import android.content.pm.PackageInfo;
Expand Down Expand Up @@ -85,17 +85,17 @@ public class SaveInFile {
public static void setSetting(String key, Object value, Context context) {
SettingFilePath = getDataDir(context).concat(File.separator).concat("Settings.json");
initSettingFile(SettingFilePath);
settingData = FileManager.readFile(SettingFilePath);
settingData = FileUtils.readFile(SettingFilePath);
try {
TypeToken<HashMap<String, Object>> tokentype = new TypeToken<>() {};
setting_map = new Gson().fromJson(settingData, tokentype);
if (setting_map != null) {
setting_map.put(key, value);
FileManager.writeFile(SettingFilePath, new Gson().toJson(setting_map));
FileUtils.writeFile(SettingFilePath, new Gson().toJson(setting_map));
} else {
setting_map = new HashMap<>();
setting_map.put(key, value);
FileManager.writeFile(SettingFilePath, new Gson().toJson(setting_map));
FileUtils.writeFile(SettingFilePath, new Gson().toJson(setting_map));
}
} catch (JsonParseException e) {

Expand All @@ -105,15 +105,15 @@ public static void setSetting(String key, Object value, Context context) {
public static void setSetting(String key, int value, Context context) {
SettingFilePath = getDataDir(context).concat(File.separator).concat("Settings.json");
initSettingFile(SettingFilePath);
settingData = FileManager.readFile(SettingFilePath);
settingData = FileUtils.readFile(SettingFilePath);
try {
TypeToken<HashMap<String, Object>> tokentype = new TypeToken<>() {};
setting_map = new Gson().fromJson(settingData, tokentype);
if (setting_map == null) {
setting_map = new HashMap<>();
}
setting_map.put(key, String.valueOf(value));
FileManager.writeFile(SettingFilePath, new Gson().toJson(setting_map));
FileUtils.writeFile(SettingFilePath, new Gson().toJson(setting_map));
} catch (JsonParseException e) {

}
Expand All @@ -122,7 +122,7 @@ public static void setSetting(String key, int value, Context context) {
public static String getSettingString(String key, String defaultValue, Context context) {
SettingFilePath = getDataDir(context).concat(File.separator).concat("Settings.json");
initSettingFile(SettingFilePath);
settingData = FileManager.readFile(SettingFilePath);
settingData = FileUtils.readFile(SettingFilePath);
try {
TypeToken<HashMap<String, Object>> tokentype = new TypeToken<>() {};
setting_map = new Gson().fromJson(settingData, tokentype);
Expand All @@ -143,7 +143,7 @@ public static String getSettingString(String key, String defaultValue, Context c
public static int getSettingInt(String key, int defaultValue, Context context) {
SettingFilePath = getDataDir(context).concat(File.separator).concat("Settings.json");
initSettingFile(SettingFilePath);
settingData = FileManager.readFile(SettingFilePath);
settingData = FileUtils.readFile(SettingFilePath);
try {
TypeToken<HashMap<String, Object>> tokentype = new TypeToken<>() {};
setting_map = new Gson().fromJson(settingData, tokentype);
Expand Down Expand Up @@ -175,7 +175,7 @@ public static String getDataDir(Context context) {

public static void initSettingFile(String path) {
if (!new File(path).exists()) {
FileManager.createNewFile(path);
FileUtils.createNewFile(path);
}
}
}
Expand Down
Loading

0 comments on commit 1358854

Please sign in to comment.