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

Develop #5

Merged
SemvdH merged 62 commits from develop into main 2021-01-14 10:55:23 +00:00
Conversation 0 Commits 62 Files Changed 46 +20 -20
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8740362553 - Show all commits

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

@@ -5,6 +5,7 @@ import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -19,6 +20,7 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import com.a1.nextlocation.MainActivity;
import com.a1.nextlocation.R; import com.a1.nextlocation.R;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -30,7 +32,7 @@ public class SettingsFragment extends Fragment {
private SharedPreferences.Editor editor; private SharedPreferences.Editor editor;
private SwitchCompat fontSwitch; private SwitchCompat fontSwitch;
private SwitchCompat imperialSwitch; private SwitchCompat imperialSwitch;
private SwitchCompat colourblindSwitch; private SwitchCompat colorBlindMode;
private Refreshable refreshable; private Refreshable refreshable;
@Override @Override
@@ -106,28 +108,23 @@ public class SettingsFragment extends Fragment {
editor.commit(); editor.commit();
}); });
//Initialises colourblind mode switchCompat this.colorBlindMode = view.findViewById(R.id.settingsEyesButton);
this.colourblindSwitch = view.findViewById(R.id.colourblindSwitch); this.colorBlindMode.setOnClickListener(view1 -> {
fontSwitch.setChecked(sharedPreferences.getBoolean("colourblindSwitch", false)); editor.putBoolean("colorBlindModeSwitch", imperialSwitch.isChecked());
//Initial check to see what setting was last chosen
if (colourblindSwitch.isChecked()){
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
}else if (!colourblindSwitch.isChecked()){
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
}
colourblindSwitch.setOnClickListener(view1 -> {
if (colourblindSwitch.isChecked()){
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
}else if (!colourblindSwitch.isChecked()){
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
}
editor.putBoolean("colourblindSwitch", colourblindSwitch.isChecked());
editor.apply(); editor.apply();
editor.commit(); editor.commit();
});
if (colorBlindMode.isChecked()){
requireActivity().setTheme(R.style.Theme_NextLocation);
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
System.out.println("AAN");
}else if (!colorBlindMode.isChecked()){
requireActivity().setTheme(R.style.Theme_NextLocationNight);
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
System.out.println("UIT");
}
});
} }
private void initializeLanguageDropdown(View view) { private void initializeLanguageDropdown(View view) {

3
app/src/main/res/values/themes.xml
View File

@@ -26,4 +26,7 @@
<item name="colorPrimaryDark">@color/secondaryColour</item> <item name="colorPrimaryDark">@color/secondaryColour</item>
<item name="android:textSize">24sp</item> <item name="android:textSize">24sp</item>
</style> </style>
</resources> </resources>