TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-16 08:05:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Redesign control flows a bit

Browse Source
This commit is contained in:
artdeell 2022-03-20 20:32:49 +03:00
parent 3aa561567c
commit 5f94f25663
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java
View File

@ -115,12 +115,12 @@ public abstract class BaseLauncherActivity extends BaseActivity {
versionId + "/" + versionId + ".json"); versionId + "/" + versionId + ".json");
if (verJsonFile.exists()) { if (verJsonFile.exists()) {
mTask.onPostExecute(null); mTask.onPostExecute(null);
} else { return;
Tools.dialogOnUiThread(this,
getString(R.string.global_error),
getString(R.string.mcl_launch_error_localmode)
);
} }
Tools.dialogOnUiThread(this,
getString(R.string.global_error),
getString(R.string.mcl_launch_error_localmode)
);
}else { }else {
mTask.execute(getVersionId(prof.lastVersionId)); mTask.execute(getVersionId(prof.lastVersionId));
} }
@ -158,9 +158,9 @@ public abstract class BaseLauncherActivity extends BaseActivity {
adapter.setDropDownViewResource(android.R.layout.simple_list_item_single_choice); adapter.setDropDownViewResource(android.R.layout.simple_list_item_single_choice);
mVersionSelector.setAdapter(adapter); mVersionSelector.setAdapter(adapter);
mVersionSelector.setSelection(RefreshVersionListTask.selectAt(value, defaultSelection)); mVersionSelector.setSelection(RefreshVersionListTask.selectAt(value, defaultSelection));
} else { return;
mVersionSelector.setSelection(RefreshVersionListTask.selectAt(PojavLauncherActivity.basicVersionList, defaultSelection));
} }
mVersionSelector.setSelection(RefreshVersionListTask.selectAt(PojavLauncherActivity.basicVersionList, defaultSelection));
} }
@Override @Override
protected void onResume(){ protected void onResume(){

19
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java
View File

@ -214,17 +214,18 @@ public class PojavLauncherActivity extends BaseLauncherActivity
if(profileName.equals(ProfileAdapter.CREATE_PROFILE_MAGIC)) { if(profileName.equals(ProfileAdapter.CREATE_PROFILE_MAGIC)) {
profileEditor.show(profileName); profileEditor.show(profileName);
mVersionSelector.setSelection(0); mVersionSelector.setSelection(0);
}else { return;
mProfile.selectedProfile = p1.getItemAtPosition(p3).toString(); }
PojavProfile.setCurrentProfile(PojavLauncherActivity.this, mProfile); mProfile.selectedProfile = p1.getItemAtPosition(p3).toString();
if (PojavProfile.isFileType(PojavLauncherActivity.this)) { PojavProfile.setCurrentProfile(PojavLauncherActivity.this, mProfile);
try { if (PojavProfile.isFileType(PojavLauncherActivity.this)) {
PojavProfile.setCurrentProfile(PojavLauncherActivity.this, mProfile.save()); try {
} catch (IOException e) { PojavProfile.setCurrentProfile(PojavLauncherActivity.this, mProfile.save());
Tools.showError(PojavLauncherActivity.this, e); } catch (IOException e) {
} Tools.showError(PojavLauncherActivity.this, e);
} }
} }
} }
@Override @Override
public void onNothingSelected(AdapterView<?> p1) public void onNothingSelected(AdapterView<?> p1)