diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b181c67ae..144a65db5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -182,6 +182,11 @@
android:label="@string/app_name"
android:launchMode="singleTask"
/>
+
. */
+package fr.gouv.etalab.mastodon.activities;
+
+import android.annotation.SuppressLint;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import es.dmoral.toasty.Toasty;
+import fr.gouv.etalab.mastodon.R;
+import fr.gouv.etalab.mastodon.asynctasks.RetrieveRelationshipAsyncTask;
+import fr.gouv.etalab.mastodon.asynctasks.RetrieveRemoteDataAsyncTask;
+import fr.gouv.etalab.mastodon.client.Entities.Account;
+import fr.gouv.etalab.mastodon.client.Entities.Error;
+import fr.gouv.etalab.mastodon.client.Entities.Relationship;
+import fr.gouv.etalab.mastodon.client.Entities.Results;
+import fr.gouv.etalab.mastodon.drawers.AccountSearchDevAdapter;
+import fr.gouv.etalab.mastodon.helper.ExpandableHeightListView;
+import fr.gouv.etalab.mastodon.helper.Helper;
+import fr.gouv.etalab.mastodon.interfaces.OnRetrieveRelationshipInterface;
+import fr.gouv.etalab.mastodon.interfaces.OnRetrieveRemoteAccountInterface;
+
+import static fr.gouv.etalab.mastodon.helper.Helper.THEME_LIGHT;
+
+
+/**
+ * Created by Thomas on 22/12/2018.
+ * Language activity
+ */
+
+public class LanguageActivity extends BaseActivity implements OnRetrieveRemoteAccountInterface, OnRetrieveRelationshipInterface {
+
+ private List translators = new ArrayList<>();
+
+ private AccountSearchDevAdapter translatorManager;
+ private int count2 = 0;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+ int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
+ switch (theme){
+ case Helper.THEME_LIGHT:
+ setTheme(R.style.AppTheme);
+ break;
+ case Helper.THEME_DARK:
+ setTheme(R.style.AppThemeDark);
+ break;
+ case Helper.THEME_BLACK:
+ setTheme(R.style.AppThemeBlack);
+ break;
+ default:
+ setTheme(R.style.AppThemeDark);
+ }
+
+ if( getSupportActionBar() != null)
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ ActionBar actionBar = getSupportActionBar();
+ if( actionBar != null ) {
+ LayoutInflater inflater = (LayoutInflater) this.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ assert inflater != null;
+ @SuppressLint("InflateParams") View view = inflater.inflate(R.layout.simple_bar, null);
+ actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+ actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+ ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
+ TextView toolbar_title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
+ toolbar_close.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
+ toolbar_title.setText(R.string.languages);
+ if (theme == THEME_LIGHT){
+ Toolbar toolbar = actionBar.getCustomView().findViewById(R.id.toolbar);
+ Helper.colorizeToolbar(toolbar, R.color.black, LanguageActivity.this);
+ }
+ }
+ setContentView(R.layout.activity_language);
+
+
+
+ Button about_translation = findViewById(R.id.about_translation);
+
+
+ about_translation.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://crowdin.com/project/mastalab"));
+ startActivity(browserIntent);
+ }
+ });
+
+ ExpandableHeightListView lv_translator_manager = findViewById(R.id.lv_translator_manager);
+
+ setTitle(R.string.languages);
+ lv_translator_manager.setExpanded(true);
+
+ translatorManager = new AccountSearchDevAdapter(LanguageActivity.this, translators);
+ lv_translator_manager.setAdapter(translatorManager);
+
+
+ new RetrieveRemoteDataAsyncTask(getApplicationContext(), "ButterflyOfFire", "mstdn.fr", LanguageActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+
+
+
+ String currentLanguage = sharedpreferences.getString(Helper.SET_DEFAULT_LOCALE_NEW, Helper.localeToStringStorage(Locale.getDefault()));
+ Locale currentLocale = Helper.restoreLocaleFromString(currentLanguage);
+ final Spinner set_change_locale = findViewById(R.id.set_change_locale);
+ ArrayAdapter adapterLocale = new ArrayAdapter<>(LanguageActivity.this,
+ android.R.layout.simple_spinner_dropdown_item, Helper.getLocales(getApplicationContext()));
+
+ set_change_locale.setAdapter(adapterLocale);
+
+ int positionSpinnerLanguage = Helper.languageSpinnerPosition(getApplicationContext());
+ set_change_locale.setSelection(positionSpinnerLanguage);
+ set_change_locale.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView> parent, View view, int position, long id) {
+ if( count2 > 0 ) {
+ SharedPreferences.Editor editor = sharedpreferences.edit();
+ switch (position) {
+ case 0:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, Locale.getDefault().getLanguage());
+ editor.commit();
+ break;
+ case 1:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "en");
+ editor.commit();
+ break;
+ case 2:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "fr");
+ editor.commit();
+ break;
+ case 3:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "de");
+ editor.commit();
+ break;
+ case 4:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "it");
+ editor.commit();
+ break;
+ case 5:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "ja");
+ editor.commit();
+ break;
+ case 6:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW,"zh-TW");
+ editor.commit();
+ break;
+ case 7:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "zh-CN");
+ editor.commit();
+ break;
+ case 8:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "eu");
+ editor.commit();
+ break;
+ case 9:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "ar");
+ editor.commit();
+ break;
+ case 10:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "nl");
+ editor.commit();
+ break;
+ case 11:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "gl");
+ editor.commit();
+ break;
+ case 12:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "el");
+ editor.commit();
+ break;
+ case 13:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "pt");
+ editor.commit();
+ break;
+ case 14:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "es");
+ editor.commit();
+ break;
+ case 15:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "pl");
+ editor.commit();
+ break;
+ case 16:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "sr");
+ editor.commit();
+ break;
+ case 17:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "uk");
+ editor.commit();
+ case 18:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "ru");
+ editor.commit();
+ case 19:
+ editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "no");
+ editor.commit();
+ break;
+ }
+
+ PackageManager packageManager = getPackageManager();
+ Intent intent = packageManager.getLaunchIntentForPackage(getPackageName());
+ assert intent != null;
+ ComponentName componentName = intent.getComponent();
+ Intent mainIntent = Intent.makeRestartActivityTask(componentName);
+ startActivity(mainIntent);
+ Runtime.getRuntime().exit(0);
+ }
+ count2++;
+ }
+ @Override
+ public void onNothingSelected(AdapterView> parent) {
+
+ }
+ });
+
+ }
+
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case android.R.id.home:
+ finish();
+ return true;
+ default:
+ return super.onOptionsItemSelected(item);
+ }
+ }
+
+
+ @Override
+ public void onRetrieveRemoteAccount(Results results) {
+ SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+ if( results == null){
+ Toasty.error(getApplicationContext(), getString(R.string.toast_error),Toast.LENGTH_LONG).show();
+ return;
+ }
+ List accounts = results.getAccounts();
+ Account account;
+ if( accounts != null && accounts.size() > 0){
+ account = accounts.get(0);
+ account.setFollowing(true);
+ switch (account.getUsername()) {
+ case "ButterflyOfFire":
+ translators.add(account);
+ translatorManager.notifyDataSetChanged();
+ break;
+ }
+ new RetrieveRelationshipAsyncTask(getApplicationContext(), account.getId(),LanguageActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+ }
+ }
+
+
+ @Override
+ public void onResume(){
+ super.onResume();
+ if( translators != null){
+ for(Account account: translators){
+ new RetrieveRelationshipAsyncTask(getApplicationContext(), account.getId(),LanguageActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+ }
+ }
+
+ }
+
+ @Override
+ public void onRetrieveRelationship(Relationship relationship, Error error) {
+ SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+ String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, "");
+ if( error != null){
+ return;
+ }
+ for( int i = 0 ; i < translators.size() ; i++){
+ if( translators.get(i).getId() != null && translators.get(i).getId().equals(relationship.getId())){
+ translators.get(i).setFollowing(relationship.isFollowing() || userId.trim().equals(relationship.getId()));
+ translatorManager.notifyDataSetChanged();
+ break;
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
index a5aa6cd89..417cd744d 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
@@ -16,13 +16,11 @@ package fr.gouv.etalab.mastodon.fragments;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
-import android.content.ComponentName;
import android.content.ContentUris;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
@@ -52,8 +50,6 @@ import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
-import java.util.Locale;
-
import es.dmoral.toasty.Toasty;
import fr.gouv.etalab.mastodon.R;
import fr.gouv.etalab.mastodon.activities.MainActivity;
@@ -636,117 +632,6 @@ public class SettingsFragment extends Fragment {
});
- String currentLanguage = sharedpreferences.getString(Helper.SET_DEFAULT_LOCALE_NEW, Helper.localeToStringStorage(Locale.getDefault()));
- Locale currentLocale = Helper.restoreLocaleFromString(currentLanguage);
- final Spinner set_change_locale = rootView.findViewById(R.id.set_change_locale);
- ArrayAdapter adapterLocale = new ArrayAdapter<>(context,
- android.R.layout.simple_spinner_dropdown_item, Helper.getLocales(context));
-
- set_change_locale.setAdapter(adapterLocale);
-
- int positionSpinnerLanguage = Helper.languageSpinnerPosition(context);
- set_change_locale.setSelection(positionSpinnerLanguage);
- set_change_locale.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
- @Override
- public void onItemSelected(AdapterView> parent, View view, int position, long id) {
- if( count2 > 0 ) {
- SharedPreferences.Editor editor = sharedpreferences.edit();
- switch (position) {
- case 0:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, Locale.getDefault().getLanguage());
- editor.commit();
- break;
- case 1:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "en");
- editor.commit();
- break;
- case 2:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "fr");
- editor.commit();
- break;
- case 3:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "de");
- editor.commit();
- break;
- case 4:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "it");
- editor.commit();
- break;
- case 5:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "ja");
- editor.commit();
- break;
- case 6:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW,"zh-TW");
- editor.commit();
- break;
- case 7:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "zh-CN");
- editor.commit();
- break;
- case 8:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "eu");
- editor.commit();
- break;
- case 9:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "ar");
- editor.commit();
- break;
- case 10:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "nl");
- editor.commit();
- break;
- case 11:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "gl");
- editor.commit();
- break;
- case 12:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "el");
- editor.commit();
- break;
- case 13:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "pt");
- editor.commit();
- break;
- case 14:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "es");
- editor.commit();
- break;
- case 15:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "pl");
- editor.commit();
- break;
- case 16:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "sr");
- editor.commit();
- break;
- case 17:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "uk");
- editor.commit();
- case 18:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "ru");
- editor.commit();
- case 19:
- editor.putString(Helper.SET_DEFAULT_LOCALE_NEW, "no");
- editor.commit();
- break;
- }
-
- PackageManager packageManager = context.getPackageManager();
- Intent intent = packageManager.getLaunchIntentForPackage(context.getPackageName());
- assert intent != null;
- ComponentName componentName = intent.getComponent();
- Intent mainIntent = Intent.makeRestartActivityTask(componentName);
- context.startActivity(mainIntent);
- Runtime.getRuntime().exit(0);
- }
- count2++;
- }
- @Override
- public void onNothingSelected(AdapterView> parent) {
-
- }
- });
// NSFW Timeout
SeekBar nsfwTimeoutSeekBar = rootView.findViewById(R.id.set_nsfw_timeout);
diff --git a/app/src/main/res/drawable-anydpi/ic_translate_menu.xml b/app/src/main/res/drawable-anydpi/ic_translate_menu.xml
new file mode 100644
index 000000000..108415117
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_translate_menu.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml
index 6ae59572b..0b7dd42ee 100644
--- a/app/src/main/res/layout-sw600dp/fragment_settings.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml
@@ -239,24 +239,6 @@
android:layout_height="wrap_content" />
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 2b40167eb..c6e46d530 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -237,23 +237,7 @@
android:layout_height="wrap_content" />
-
-
-
-
-
+
+ android:id="@+id/nav_language"
+ android:icon="@drawable/ic_translate_menu"
+ android:title="@string/languages" />
@@ -87,6 +87,10 @@
android:id="@+id/nav_main_info">