Skip to content

Commit ca9f827

Browse files
jkasdbtjkasdbt
authored
Merge pull request #7 from jkas-dbt/dev
Resource manager update.
2 parents 133705d + da80baa commit ca9f827

File tree

43 files changed

+407
-525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+407
-525
lines changed

‎app/src/main/java/jkas/androidpe/activities/CodeEditorActivity.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
import jkas.androidpe.mainEditorView.FilesManager;
2222
import jkas.androidpe.databinding.ActivityCodeEditorBinding;
2323
import jkas.androidpe.explorer.CodeEditorExplorer;
24-
import jkas.androidpe.projectUtils.current.ProjectsModules;
25-
import jkas.androidpe.resourcesUtils.dataInitializer.DataResInitializer;
24+
import jkas.androidpe.resourcesUtils.dataInitializer.*;
2625
import jkas.androidpe.resourcesUtils.dialog.DialogBottomSheetAttrModifier;
2726
import jkas.androidpe.resourcesUtils.dialog.DialogBuilder;
2827
import jkas.androidpe.resourcesUtils.dialog.DialogProgressIndeterminate;
@@ -168,8 +167,8 @@ else if (id == jkas.androidpe.R.id.save) {
168167

169168
private void loadData() {
170169
final ArrayList<String> listPath = new ArrayList<>();
171-
AMLProjectsData.addProjectIfNotAvialable(ProjectsModules.getInstance().P.getAbsolutePath());
172-
AMLProjectsData.appendNewOpenedFile(ProjectsModules.getInstance().filePathSelected);
170+
AMLProjectsData.addProjectIfNotAvialable(DataRefManager.getInstance().P.getAbsolutePath());
171+
AMLProjectsData.appendNewOpenedFile(DataRefManager.getInstance().filePathSelected);
173172
listPath.addAll(AMLProjectsData.getOpenedFiles());
174173

175174
boolean verif = false;
@@ -179,25 +178,25 @@ private void loadData() {
179178
AMLProjectsData.fileClosed(path);
180179
continue;
181180
}
182-
if (path.equals(ProjectsModules.getInstance().filePathSelected)) {
181+
if (path.equals(DataRefManager.getInstance().filePathSelected)) {
183182
verif = true;
184183
break;
185184
}
186185
position++;
187186
}
188187
if (verif) listPath.remove(position);
189-
if (ProjectsModules.getInstance().filePathSelected != null) {
190-
listPath.add(0, ProjectsModules.getInstance().filePathSelected);
188+
if (DataRefManager.getInstance().filePathSelected != null) {
189+
listPath.add(0, DataRefManager.getInstance().filePathSelected);
191190
}
192191

193-
ProjectsModules.getInstance().filePathSelected = null;
192+
DataRefManager.getInstance().filePathSelected = null;
194193
filesManager.parseListOpenFile(listPath);
195194
alert.dismiss();
196195
}
197196

198197
private void loadDefaultValues() {
199198
binding.leftDrawer.addView(CEE.getView());
200-
binding.toolBar.setSubtitle(ProjectsModules.getInstance().P.getFolderName());
199+
binding.toolBar.setSubtitle(DataRefManager.getInstance().P.getFolderName());
201200

202201
binding.toolBar.getMenu().findItem(jkas.androidpe.R.id.undo).setVisible(false);
203202
binding.toolBar.getMenu().findItem(jkas.androidpe.R.id.redo).setVisible(false);

‎app/src/main/java/jkas/androidpe/activities/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
import java.lang.annotation.RetentionPolicy;
2727
import java.lang.annotation.Target;
2828
import jkas.androidpe.logger.Logger;
29-
import jkas.androidpe.projectUtils.current.ProjectsModules;
3029
import jkas.androidpe.databinding.ActivityMainBinding;
3130
import jkas.androidpe.projectAnalyzer.NewProject;
3231
import jkas.androidpe.projectAnalyzer.ProjectView;
3332
import jkas.androidpe.resources.R;
3433
import jkas.androidpe.explorer.SelectFF;
3534
import jkas.androidpe.project.Project;
3635
import jkas.androidpe.projectAnalyzer.SearchingProjects;
36+
import jkas.androidpe.resourcesUtils.dataInitializer.DataRefManager;
3737
import jkas.androidpe.resourcesUtils.utils.ResourcesValuesFixer;
3838
import jkas.codeUtil.CodeUtil;
3939
import jkas.codeUtil.Files;
@@ -229,7 +229,7 @@ private void openProject(String data) {
229229
p.setPackageName("...");
230230
p.setPackageName(SearchingProjects.tryFindPkg(p));
231231
new ProjectView(C, p);
232-
ProjectsModules.getInstance().P = p;
232+
DataRefManager.getInstance().P = p;
233233
CodeUtil.startActivity(C, ProjectEditorActivity.class);
234234
}
235235

‎app/src/main/java/jkas/androidpe/activities/ProjectEditorActivity.java

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
import jkas.androidpe.logger.LogMsg;
2424
import jkas.androidpe.logger.Logger;
2525
import jkas.androidpe.logger.LoggerLayoutUI;
26-
import jkas.androidpe.projectUtils.current.ProjectsModules;
2726
import jkas.androidpe.fragments.projectEditor.ExplorerFragment;
2827
import jkas.androidpe.fragments.projectEditor.MainFragment;
2928
import jkas.androidpe.fragments.projectEditor.ManagerFragment;
3029
import jkas.androidpe.project.Project;
3130
import jkas.androidpe.projectUtils.utils.ProjectsUtils;
3231
import jkas.androidpe.resources.R;
3332
import jkas.androidpe.databinding.ActivityProjectEditorBinding;
33+
import jkas.androidpe.resourcesUtils.dataInitializer.DataRefManager;
3434
import jkas.androidpe.resourcesUtils.dialog.DialogBuilder;
3535
import jkas.codeUtil.CodeUtil;
3636
import jkas.codeUtil.Files;
@@ -69,10 +69,10 @@ protected void onPause() {
6969
@CallSuper
7070
protected void onSaveInstanceState(Bundle savedIS) {
7171
super.onSaveInstanceState(savedIS);
72-
savedIS.putString("projectDir", ProjectsModules.getInstance().P.getProjectDir());
73-
savedIS.putString("folderName", ProjectsModules.getInstance().P.getFolderName());
74-
savedIS.putString("packageName", ProjectsModules.getInstance().P.getPackageName());
75-
savedIS.putString("iconPath", ProjectsModules.getInstance().P.getIconPath());
72+
savedIS.putString("projectDir", DataRefManager.getInstance().P.getProjectDir());
73+
savedIS.putString("folderName", DataRefManager.getInstance().P.getFolderName());
74+
savedIS.putString("packageName", DataRefManager.getInstance().P.getPackageName());
75+
savedIS.putString("iconPath", DataRefManager.getInstance().P.getIconPath());
7676
}
7777

7878
@Override
@@ -114,9 +114,9 @@ protected void onCreate(Bundle savedInstanceState) {
114114
}
115115

116116
private void cleanAll() {
117-
ProjectsModules.getInstance().P = null;
118-
ProjectsModules.getInstance().currentAndroidModule = null;
119-
ProjectsModules.getInstance().listOfAllAndroidModule.clear();
117+
DataRefManager.getInstance().P = null;
118+
DataRefManager.getInstance().currentAndroidModule = null;
119+
DataRefManager.getInstance().listAndroidModule.clear();
120120
}
121121

122122
private void events() {
@@ -134,31 +134,32 @@ public void onPageSelected(int i) {
134134
.setOnModuleSelected(
135135
(modulePosition) -> {
136136
binding.btnAllModule.setText("('~') : Modules");
137-
ProjectsModules.getInstance().currentAndroidModule =
138-
ProjectsModules.getInstance()
139-
.listOfAllAndroidModule
137+
DataRefManager.getInstance().currentAndroidModule =
138+
DataRefManager.getInstance()
139+
.listAndroidModule
140140
.get(modulePosition);
141-
iniDataModules();
141+
initDataModules();
142142
refreshFrag();
143143
});
144144
});
145145
binding.btnSync.setOnClickListener((v) -> refreshAllModules());
146146
binding.btnNewModule.setOnClickListener(
147147
(v) -> {
148-
new DialogNewModuleCreator(C, ProjectsModules.getInstance().P.getAbsolutePath())
148+
new DialogNewModuleCreator(C, DataRefManager.getInstance().P.getAbsolutePath())
149149
.setOnSaveListener(() -> refreshAllModules());
150150
});
151151
}
152152

153-
private void iniDataModules() {
154-
if (ProjectsModules.getInstance().currentAndroidModule == null)
155-
if (ProjectsModules.getInstance().listOfAllAndroidModule.size() > 0)
156-
ProjectsModules.getInstance().currentAndroidModule =
157-
ProjectsModules.getInstance().listOfAllAndroidModule.get(0);
153+
private void initDataModules() {
154+
if (DataRefManager.getInstance().currentAndroidModule == null)
155+
if (DataRefManager.getInstance().listAndroidModule.size() > 0)
156+
DataRefManager.getInstance().currentAndroidModule =
157+
DataRefManager.getInstance().listAndroidModule.get(0);
158158
else return;
159159

160-
String path = ProjectsModules.getInstance().currentAndroidModule.getPath();
160+
String path = DataRefManager.getInstance().currentAndroidModule.getPath();
161161
binding.btnAllModule.setText(path);
162+
DataRefManager.getInstance().setCurrentModuleRes(path);
162163
}
163164

164165
private void refreshFrag() {
@@ -170,12 +171,12 @@ private void refreshFrag() {
170171
private void refreshAllModules() {
171172
Logger.addLogListener(logListener);
172173
loadModulesFirst();
173-
iniDataModules();
174+
initDataModules();
174175
refreshFrag();
175176
}
176177

177178
private boolean checkIfProjectValide() {
178-
if (ProjectsUtils.getProjectStatus(ProjectsModules.getInstance().P) == ProjectsUtils.NAP) {
179+
if (ProjectsUtils.getProjectStatus(DataRefManager.getInstance().P) == ProjectsUtils.NAP) {
179180
new MaterialAlertDialogBuilder(C)
180181
.setCancelable(false)
181182
.setTitle(getString(R.string.warning))
@@ -188,8 +189,8 @@ private boolean checkIfProjectValide() {
188189
.show();
189190
return false;
190191
}
191-
binding.tvFolderName.setText(ProjectsModules.getInstance().P.getFolderName());
192-
binding.tvPackageName.setText(ProjectsModules.getInstance().P.getPackageName());
192+
binding.tvFolderName.setText(DataRefManager.getInstance().P.getFolderName());
193+
binding.tvPackageName.setText(DataRefManager.getInstance().P.getPackageName());
193194
return true;
194195
}
195196

@@ -198,17 +199,17 @@ private void loadBottomSheet() {
198199
}
199200

200201
private void loadData() {
201-
binding.tvFolderName.setText(ProjectsModules.getInstance().P.getFolderName());
202-
binding.tvPackageName.setText(ProjectsModules.getInstance().P.getPackageName());
203-
Images.setImageFromDir(ProjectsModules.getInstance().P.getIconPath(), binding.icIcon);
202+
binding.tvFolderName.setText(DataRefManager.getInstance().P.getFolderName());
203+
binding.tvPackageName.setText(DataRefManager.getInstance().P.getPackageName());
204+
Images.setImageFromDir(DataRefManager.getInstance().P.getIconPath(), binding.icIcon);
204205

205206
MF = new MainFragment();
206207
EF = new ExplorerFragment();
207208
MGF = new ManagerFragment();
208209

209210
loadModulesFirst();
210211
loadListener();
211-
iniDataModules();
212+
initDataModules();
212213

213214
final ViewPagersAdapter adapter =
214215
new ViewPagersAdapter(getSupportFragmentManager(), getLifecycle());
@@ -227,7 +228,7 @@ private void loadListener() {
227228

228229
@Override
229230
public void onRefresh() {
230-
if (!Files.isDirectory(ProjectsModules.getInstance().P.getAbsolutePath())) {
231+
if (!Files.isDirectory(DataRefManager.getInstance().P.getAbsolutePath())) {
231232
DialogBuilder.getDialogBuilder(
232233
C,
233234
C.getString(R.string.warning),
@@ -246,9 +247,9 @@ public void onRefresh() {
246247

247248
@Override
248249
public void onPathChanged(String path) {
249-
for (var module : ProjectsModules.getInstance().listOfAllAndroidModule) {
250+
for (var module : DataRefManager.getInstance().listAndroidModule) {
250251
if (module.getProjectAbsolutePath().equals(path)) {
251-
ProjectsModules.getInstance().currentAndroidModule = module;
252+
DataRefManager.getInstance().currentAndroidModule = module;
252253
binding.btnAllModule.setText(module.getPath());
253254
return;
254255
}
@@ -288,10 +289,10 @@ private void appendLog(LogMsg logMsg) {
288289
private void iniProject(Bundle savedIS) {
289290
if (savedIS != null) {
290291
binding.linBottomSheet.removeAllViews();
291-
ProjectsModules.getInstance().P =
292+
DataRefManager.getInstance().P =
292293
new Project(savedIS.getString("projectDir"), savedIS.getString("folderName"));
293-
ProjectsModules.getInstance().P.setPackageName(savedIS.getString("packageName"));
294-
ProjectsModules.getInstance().P.setIconPath(savedIS.getString("iconPath"));
294+
DataRefManager.getInstance().P.setPackageName(savedIS.getString("packageName"));
295+
DataRefManager.getInstance().P.setIconPath(savedIS.getString("iconPath"));
295296
}
296297
Logger.info = 0;
297298
Logger.warn = 0;

‎app/src/main/java/jkas/androidpe/dialog/StringTranslaterDialog.java

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,28 @@
11
package jkas.androidpe.dialog;
22

33
import android.content.Context;
4-
import android.graphics.Typeface;
54
import android.view.Gravity;
65
import android.view.LayoutInflater;
76
import android.view.View;
8-
import android.widget.CheckBox;
9-
import android.widget.CompoundButton;
10-
import android.widget.GridLayout;
11-
import android.widget.LinearLayout;
127
import android.widget.TextView;
138
import android.widget.Toast;
149
import androidx.appcompat.app.AppCompatActivity;
1510
import androidx.core.text.HtmlCompat;
16-
import androidx.core.util.Pair;
17-
import com.google.android.material.chip.ChipGroup;
1811
import java.util.ArrayList;
19-
import java.util.List;
20-
import java.util.concurrent.CompletableFuture;
21-
import java.util.concurrent.ScheduledExecutorService;
22-
import java.util.concurrent.TimeUnit;
2312
import jkas.androidpe.layoutUiDesigner.utils.Utils;
24-
import jkas.androidpe.projectUtils.utils.ProjectsUtils;
25-
import jkas.androidpe.projectUtils.utils.ValuesTools;
2613
import jkas.androidpe.resources.R;
2714
import com.google.android.material.bottomsheet.BottomSheetBehavior;
2815
import com.google.android.material.bottomsheet.BottomSheetDialog;
29-
import com.google.android.material.checkbox.MaterialCheckBox;
3016
import com.google.android.material.chip.Chip;
31-
import com.google.android.material.elevation.SurfaceColors;
3217
import java.util.HashMap;
3318
import java.util.Map;
3419
import java.util.concurrent.ExecutorService;
3520
import java.util.concurrent.Executors;
3621
import jkas.androidpe.constants.LanguageTranslate;
3722
import jkas.androidpe.databinding.DialogStringTranslaterBinding;
38-
import jkas.androidpe.projectUtils.current.ProjectsModules;
23+
import jkas.androidpe.resourcesUtils.dataInitializer.DataRefManager;
3924
import jkas.androidpe.resourcesUtils.dialog.DialogBuilder;
4025
import jkas.androidpe.resourcesUtils.utils.ProjectsPathUtils;
41-
import jkas.androidpe.resourcesUtils.utils.ResCodeUtils;
42-
import jkas.androidpe.resourcesUtils.utils.ResourcesValuesFixer;
43-
import jkas.androidpe.resourcesUtils.utils.ViewUtils;
4426
import jkas.androidpe.translater.TranslateAPI;
4527
import jkas.codeUtil.CodeUtil;
4628
import jkas.codeUtil.Files;
@@ -73,12 +55,12 @@ public void show() {
7355
BSD.show();
7456
return;
7557
}
76-
if (ProjectsModules.getInstance().currentAndroidModule == null) {
58+
if (DataRefManager.getInstance().currentAndroidModule == null) {
7759
Toast.makeText(C, R.string.no_module_is_selected, Toast.LENGTH_SHORT).show();
7860
return;
7961
}
8062
absolutePathToResValuesFolder =
81-
ProjectsModules.getInstance().currentAndroidModule.getProjectAbsolutePath()
63+
DataRefManager.getInstance().currentAndroidModule.getProjectAbsolutePath()
8264
+ ProjectsPathUtils.VALUES_PATH;
8365
if (!Files.isDirectory(absolutePathToResValuesFolder)) {
8466
Toast.makeText(
@@ -88,12 +70,12 @@ public void show() {
8870
.show();
8971
return;
9072
}
91-
binding.tvModule.setText(ProjectsModules.getInstance().currentAndroidModule.getPath());
73+
binding.tvModule.setText(DataRefManager.getInstance().currentAndroidModule.getPath());
9274
loadData();
9375
BSD.show();
9476
ArrayList<String> list =
9577
Files.listDir(
96-
ProjectsModules.getInstance().currentAndroidModule.getProjectAbsolutePath()
78+
DataRefManager.getInstance().currentAndroidModule.getProjectAbsolutePath()
9779
+ ProjectsPathUtils.RES_PATH);
9880
for (var chip : listChip) {
9981
String path =

0 commit comments

Comments
 (0)