settings loading

This commit is contained in:
Nicolás Sánchez 2024-12-11 16:07:29 -03:00
parent 67ce7a3987
commit 1f32370f61
2 changed files with 22 additions and 2 deletions

View File

@ -2,6 +2,7 @@ package com.example.dcav2gui;//package com.example.dcav2gui;
import android.view.MenuItem; import android.view.MenuItem;
import androidx.lifecycle.ViewModelProvider;
import androidx.navigation.NavController; import androidx.navigation.NavController;
import androidx.navigation.Navigation;// import androidx.navigation.Navigation;//
import android.os.Bundle; import android.os.Bundle;
@ -9,6 +10,8 @@ import android.view.View;
import android.view.Menu; import android.view.Menu;
import android.widget.Toast; import android.widget.Toast;
import com.example.dcav2gui.ui.settings.SettingsData;
import com.example.dcav2gui.ui.settings.SettingsViewModel;
import com.google.android.material.snackbar.Snackbar; import com.google.android.material.snackbar.Snackbar;
import com.google.android.material.navigation.NavigationView; import com.google.android.material.navigation.NavigationView;
@ -25,6 +28,7 @@ public class MainActivity extends AppCompatActivity {
private AppBarConfiguration mAppBarConfiguration; private AppBarConfiguration mAppBarConfiguration;
private ActivityMainBinding binding; private ActivityMainBinding binding;
private static SettingsData globalSettings;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -60,11 +64,25 @@ public class MainActivity extends AppCompatActivity {
NavigationUI.setupActionBarWithNavController(this, navController, mAppBarConfiguration); NavigationUI.setupActionBarWithNavController(this, navController, mAppBarConfiguration);
NavigationUI.setupWithNavController(navigationView, navController); NavigationUI.setupWithNavController(navigationView, navController);
// Check for settings file // Check for settings file
if (!isSettingsFileExists()) { // if (!isSettingsFileExists()) {
// Toast.makeText(this, "Please enter your credentials in the settings menu", Toast.LENGTH_LONG).show();
// }
// Load settings
SettingsViewModel settingsViewModel = new ViewModelProvider(this).get(SettingsViewModel.class);
globalSettings = settingsViewModel.loadSettings(this);
if (globalSettings==null) {
Toast.makeText(this, "Please enter your credentials in the settings menu", Toast.LENGTH_LONG).show(); Toast.makeText(this, "Please enter your credentials in the settings menu", Toast.LENGTH_LONG).show();
} }
}
public static SettingsData getGlobalSettings() {
return globalSettings;
} }
@Override @Override

View File

@ -14,6 +14,7 @@ import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import com.example.dcav2gui.MainActivity;
import com.example.dcav2gui.R; import com.example.dcav2gui.R;
public class SettingsFragment extends Fragment { public class SettingsFragment extends Fragment {
@ -39,7 +40,8 @@ public class SettingsFragment extends Fragment {
Button buttonSaveSettings = root.findViewById(R.id.buttonSaveSettings); Button buttonSaveSettings = root.findViewById(R.id.buttonSaveSettings);
//Load settings if settings.json exists //Load settings if settings.json exists
SettingsData settingsData = settingsViewModel.loadSettings(getContext()); //SettingsData settingsData = settingsViewModel.loadSettings(getContext());
SettingsData settingsData = MainActivity.getGlobalSettings();
if (settingsData != null) { if (settingsData != null) {
editProfileName.setText(settingsData.profileName); editProfileName.setText(settingsData.profileName);