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 +7 -1
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d018b83490 - Show all commits

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

@@ -55,7 +55,7 @@ public class SettingsFragment extends Fragment {
private void initializeLanguageDropdown(View view) { private void initializeLanguageDropdown(View view) {
Spinner languageDropdown = view.findViewById(R.id.dropdown_menu_Settings); Spinner languageDropdown = view.findViewById(R.id.dropdown_menu_Settings);
String[] items = new String[]{"Nederlands", "Engels", "Chinees"}; String[] items = new String[]{getResources().getString(R.string.Dutch), getResources().getString(R.string.English), getResources().getString(R.string.Chinese)};
ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_spinner_dropdown_item, items); ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_spinner_dropdown_item, items);
languageDropdown.setAdapter(arrayAdapter); languageDropdown.setAdapter(arrayAdapter);

3
app/src/main/res/values-nl/strings.xml
View File

@@ -20,4 +20,7 @@
<string name="activate">activeren</string> <string name="activate">activeren</string>
<string name="done">Klaar</string> <string name="done">Klaar</string>
<string name="cancel">annuleren</string> <string name="cancel">annuleren</string>
<string name="English">Engels</string>
<string name="Dutch">Nederlands</string>
<string name="Chinese">Chinees</string>
</resources> </resources>

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

@@ -18,4 +18,7 @@
<string name="activate">activate</string> <string name="activate">activate</string>
<string name="done">Done</string> <string name="done">Done</string>
<string name="cancel">cancel</string> <string name="cancel">cancel</string>
<string name="Dutch">Dutch</string>
<string name="English">English</string>
<string name="Chinese">Chinese</string>
</resources> </resources>