kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-09 07:16:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Automata-Development 2017-12-08 12:21:38 -07:00 committed by Isaac Hutt
parent ed24885f72
commit fe3c0b83b7
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/kiwix/kiwixmobile/library/LibraryAdapter.java
View File

@ -53,7 +53,6 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.MissingResourceException;
import java.util.Set; import java.util.Set;
import javax.inject.Inject; import javax.inject.Inject;
@ -432,12 +431,14 @@ public class LibraryAdapter extends BaseAdapter {
public String language; public String language;
public String languageLocalized; public String languageLocalized;
public String languageCode; public String languageCode;
public String languageCodeISO2;
public Boolean active; public Boolean active;
Language(Locale locale, Boolean active) { Language(Locale locale, Boolean active) {
this.language = locale.getDisplayLanguage(); this.language = locale.getDisplayLanguage();
this.languageLocalized = locale.getDisplayLanguage(locale); this.languageLocalized = locale.getDisplayLanguage(locale);
this.languageCode = locale.getISO3Language(); this.languageCode = locale.getISO3Language();
this.languageCodeISO2 = locale.getLanguage();
this.active = active; this.active = active;
} }

5
app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java
View File

@ -23,11 +23,9 @@ import android.app.FragmentManager;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.preference.EditTextPreference; import android.preference.EditTextPreference;
import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceCategory; import android.preference.PreferenceCategory;
import android.preference.PreferenceFragment; import android.preference.PreferenceFragment;
@ -39,7 +37,6 @@ import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.webkit.WebView; import android.webkit.WebView;
import android.widget.BaseAdapter; import android.widget.BaseAdapter;
import android.widget.RelativeLayout;
import android.widget.Toast; import android.widget.Toast;
import org.kiwix.kiwixmobile.BuildConfig; import org.kiwix.kiwixmobile.BuildConfig;
@ -347,7 +344,7 @@ public class KiwixSettingsActivity extends AppCompatActivity {
editor.putString(PREF_LANG, languageCode); editor.putString(PREF_LANG, languageCode);
editor.apply(); editor.apply();
LanguageUtils.handleLocaleChange(getActivity(), languageCode.toString()); LanguageUtils.handleLocaleChange(getActivity(), languageCode);
// Request a restart when the user returns to the Activity, that called this Activity // Request a restart when the user returns to the Activity, that called this Activity
restartActivity(); restartActivity();
})) }))

9
app/src/main/java/org/kiwix/kiwixmobile/views/LanguageSelectDialog.java
View File

@ -14,6 +14,7 @@ import android.widget.Toast;
import org.kiwix.kiwixmobile.R; import org.kiwix.kiwixmobile.R;
import org.kiwix.kiwixmobile.library.LibraryAdapter; import org.kiwix.kiwixmobile.library.LibraryAdapter;
import org.kiwix.kiwixmobile.utils.LanguageUtils;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -57,13 +58,13 @@ public class LanguageSelectDialog extends AlertDialog {
return this; return this;
} }
// Should only be called if setSingleSelect has previously been called with a value of false // Should only be called if setSingleSelect has previously been called with a value of true
public Builder setSelectedLanguage(String languageCode) { public Builder setSelectedLanguage(String languageCode) {
this.selectedLanguage = languageCode; this.selectedLanguage = languageCode;
return this; return this;
} }
// Should only be called if setSingleSelect has previously been called with a value of false // Should only be called if setSingleSelect has previously been called with a value of true
public Builder setOnLanguageSelectedListener(OnLanguageSelectedListener listener) { public Builder setOnLanguageSelectedListener(OnLanguageSelectedListener listener) {
languageSelectedListener = listener; languageSelectedListener = listener;
return this; return this;
@ -161,14 +162,14 @@ public class LanguageSelectDialog extends AlertDialog {
holder.checkBox.setClickable(false); holder.checkBox.setClickable(false);
holder.checkBox.setFocusable(false); holder.checkBox.setFocusable(false);
if (getSelectedLanguage().equalsIgnoreCase(language.languageCode)) { if (getSelectedLanguage().equalsIgnoreCase(language.languageCodeISO2)) {
holder.checkBox.setChecked(true); holder.checkBox.setChecked(true);
} else { } else {
holder.checkBox.setChecked(false); holder.checkBox.setChecked(false);
} }
convertView.setOnClickListener((v -> { convertView.setOnClickListener((v -> {
setSelectedLanguage(language.languageCode); setSelectedLanguage(language.languageCodeISO2);
notifyDataSetChanged(); notifyDataSetChanged();
})); }));
} }