TimeCrafters/TimeCraftersConfigurationTool
1
0
Fork 0
mirror of https://github.com/TimeCrafters/TimeCraftersConfigurationTool.git synced 2025-12-16 05:22:35 +00:00
Code Issues Projects Releases Wiki Activity

Removed unsed SettingsViewModel, made ConfigurationDialog able to refresh configs list

Browse Source
This commit is contained in:
cyberarm
2020-08-24 10:49:16 -05:00
parent 7dcd396c66
commit 32720c4c5f
4 changed files with 7 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/dialogs/ConfigurationDialog.java
View File

@@ -15,6 +15,7 @@ import android.widget.TextView;
import org.timecrafters.TimeCraftersConfigurationTool.R; import org.timecrafters.TimeCraftersConfigurationTool.R;
import org.timecrafters.TimeCraftersConfigurationTool.backend.Backend; import org.timecrafters.TimeCraftersConfigurationTool.backend.Backend;
import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersDialog; import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersDialog;
import org.timecrafters.TimeCraftersConfigurationTool.ui.settings.configurations.ConfigurationsFragment;
public class ConfigurationDialog extends TimeCraftersDialog { public class ConfigurationDialog extends TimeCraftersDialog {
private static final String TAG = "ConfigurationDialog"; private static final String TAG = "ConfigurationDialog";
@@ -84,10 +85,9 @@ public class ConfigurationDialog extends TimeCraftersDialog {
Backend.instance().writeNewConfig(newConfigName); Backend.instance().writeNewConfig(newConfigName);
} }
// Caution
((ConfigurationsFragment)getTargetFragment()).populateConfigFiles();
dismiss(); dismiss();
} else {
// TODO: Show friendly error message
Log.d(TAG, "onClick: InValid");
} }
} }
}); });

9
app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/SettingsFragment.java
View File

@@ -17,12 +17,8 @@ import org.timecrafters.TimeCraftersConfigurationTool.library.TimeCraftersFragme
public class SettingsFragment extends TimeCraftersFragment { public class SettingsFragment extends TimeCraftersFragment {
private SettingsViewModel settingsViewModel;
public View onCreateView(@NonNull LayoutInflater inflater, public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) { ViewGroup container, Bundle savedInstanceState) {
settingsViewModel =
ViewModelProviders.of(this).get(SettingsViewModel.class);
final View root = inflater.inflate(R.layout.fragment_settings, container, false); final View root = inflater.inflate(R.layout.fragment_settings, container, false);
final Button managePresets = root.findViewById(R.id.manage_presets); final Button managePresets = root.findViewById(R.id.manage_presets);
final Button manageConfigurations = root.findViewById(R.id.manage_configurations); final Button manageConfigurations = root.findViewById(R.id.manage_configurations);
@@ -41,11 +37,6 @@ public class SettingsFragment extends TimeCraftersFragment {
} }
}); });
settingsViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
@Override
public void onChanged(@Nullable String s) {
}
});
return root; return root;
} }
} }

19
app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/SettingsViewModel.java
View File

@@ -1,19 +0,0 @@
package org.timecrafters.TimeCraftersConfigurationTool.ui.settings;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.ViewModel;
public class SettingsViewModel extends ViewModel {
private MutableLiveData<String> mText;
public SettingsViewModel() {
mText = new MutableLiveData<>();
mText.setValue("This is settings fragment");
}
public LiveData<String> getText() {
return mText;
}
}

6
app/src/main/java/org/timecrafters/TimeCraftersConfigurationTool/ui/settings/configurations/ConfigurationsFragment.java
View File

@@ -49,7 +49,7 @@ public class ConfigurationsFragment extends TimeCraftersFragment {
return root; return root;
} }
private void populateConfigFiles() { public void populateConfigFiles() {
configsContainer.removeAllViews(); configsContainer.removeAllViews();
int i = 0; int i = 0;
@@ -82,6 +82,7 @@ public class ConfigurationsFragment extends TimeCraftersFragment {
} }
}); });
final ConfigurationsFragment fragment = this;
rename.setOnClickListener(new View.OnClickListener() { rename.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@@ -89,7 +90,8 @@ public class ConfigurationsFragment extends TimeCraftersFragment {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("config_name", configFile); bundle.putString("config_name", configFile);
dialog.setArguments(bundle); dialog.setArguments(bundle);
dialog.show(getFragmentManager(), null); dialog.setTargetFragment(fragment, 0);
dialog.show(getFragmentManager().beginTransaction(), "rename_configuration");
} }
}); });