diff options
Diffstat (limited to 'app/src/main/java/fr/gouv/etalab/mastodon/activities/EditProfileActivity.java')
| -rw-r--r-- | app/src/main/java/fr/gouv/etalab/mastodon/activities/EditProfileActivity.java | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/EditProfileActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/EditProfileActivity.java index 98d2378fe..121ae725c 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/EditProfileActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/EditProfileActivity.java @@ -39,6 +39,7 @@ import android.support.v4.app.ActivityCompat; import android.support.v4.content.ContextCompat; import android.support.v7.app.ActionBar; import android.support.v7.app.AlertDialog; +import android.support.v7.widget.Toolbar; import android.text.Editable; import android.text.Html; import android.text.TextWatcher; @@ -81,7 +82,7 @@ import fr.gouv.etalab.mastodon.interfaces.OnUpdateCredentialInterface; import fr.gouv.etalab.mastodon.sqlite.AccountDAO; import fr.gouv.etalab.mastodon.sqlite.Sqlite; - +import static fr.gouv.etalab.mastodon.helper.Helper.THEME_LIGHT; /** @@ -108,7 +109,6 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou private final int MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE_HEADER = 754; private final int MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE_PICTURE = 755; private String avatarName, headerName; - private HashMap<String, String> fields; @Override protected void onCreate(Bundle savedInstanceState) { @@ -151,6 +151,10 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou } }); } + if (theme == THEME_LIGHT){ + Toolbar toolbar = actionBar.getCustomView().findViewById(R.id.toolbar); + Helper.colorizeToolbar(toolbar, R.color.black, EditProfileActivity.this); + } }else{ setTitle(R.string.settings_title_profile); } @@ -207,9 +211,7 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou set_lock_account.setEnabled(false); new RetrieveAccountInfoAsyncTask(getApplicationContext(), EditProfileActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - if( theme == Helper.THEME_LIGHT) { - set_profile_save.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.white)); - } + } @Override @@ -267,7 +269,7 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou } }); if ( account.getFields() != null && account.getFields().size() > 0){ - fields = account.getFields(); + HashMap<String, String> fields = account.getFields(); Iterator it = fields.entrySet().iterator(); int i = 1; while (it.hasNext()) { @@ -385,7 +387,8 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou if( account.getHeader() == null || account.getHeader().contains("missing.png")) set_header_picture_overlay.setVisibility(View.VISIBLE); - + SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE); + int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); set_profile_save.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -398,8 +401,15 @@ public class EditProfileActivity extends BaseActivity implements OnRetrieveAccou profile_note = set_profile_description.getText().toString().trim(); else profile_note = null; - - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(EditProfileActivity.this); + int style; + if (theme == Helper.THEME_DARK) { + style = R.style.DialogDark; + } else if (theme == Helper.THEME_BLACK){ + style = R.style.DialogBlack; + }else { + style = R.style.Dialog; + } + AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(EditProfileActivity.this, style); LayoutInflater inflater = EditProfileActivity.this.getLayoutInflater(); @SuppressLint("InflateParams") View dialogView = inflater.inflate(R.layout.dialog_profile, null); dialogBuilder.setView(dialogView); |