sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
Conversation 6 Commits 297 Files Changed 143 +4
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 615401c0d3 - Show all commits

4
app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
View File

@@ -59,18 +59,22 @@ public class SettingsFragment extends Fragment {
((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit(); ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, homeFragment).addToBackStack(null).commit();
}); });
//Initialises 65+ switchCompat
this.fontChanger = view.findViewById(R.id.BigFont); this.fontChanger = view.findViewById(R.id.BigFont);
//Initialises sharedpreference to save state of 65+ mode
SharedPreferences sharedPreferences = requireActivity().getSharedPreferences("com.a1.nextlocation",0); SharedPreferences sharedPreferences = requireActivity().getSharedPreferences("com.a1.nextlocation",0);
SharedPreferences.Editor editor = sharedPreferences.edit(); SharedPreferences.Editor editor = sharedPreferences.edit();
fontChanger.setChecked(sharedPreferences.getBoolean("switch", false)); fontChanger.setChecked(sharedPreferences.getBoolean("switch", false));
//Initial check to see what setting was last chosen
if (fontChanger.isChecked()){ if (fontChanger.isChecked()){
requireActivity().setTheme(R.style.Theme_NextLocationBig); requireActivity().setTheme(R.style.Theme_NextLocationBig);
}else if (!fontChanger.isChecked()){ }else if (!fontChanger.isChecked()){
requireActivity().setTheme(R.style.Theme_NextLocation); requireActivity().setTheme(R.style.Theme_NextLocation);
} }
//Changes the font settings depending on the state of the toggle
fontChanger.setOnClickListener(view1 -> { fontChanger.setOnClickListener(view1 -> {
if(fontChanger.isChecked()) if(fontChanger.isChecked())
{ {