diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 968e2e13f..72d3b2012 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -127,6 +127,11 @@
android:label="@string/app_name"
android:theme="@style/AppTheme_NoActionBar"
/>
+
. */
+package fr.gouv.etalab.mastodon.activities;
+
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.database.sqlite.SQLiteDatabase;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.text.Editable;
+import android.text.Html;
+import android.text.TextWatcher;
+import android.util.Base64;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiskCache;
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
+import com.nostra13.universalimageloader.core.assist.FailReason;
+import com.nostra13.universalimageloader.core.display.SimpleBitmapDisplayer;
+import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import fr.gouv.etalab.mastodon.asynctasks.RetrieveAccountInfoAsyncTask;
+import fr.gouv.etalab.mastodon.asynctasks.UpdateCredentialAsyncTask;
+import fr.gouv.etalab.mastodon.client.APIResponse;
+import fr.gouv.etalab.mastodon.client.Entities.Account;
+import fr.gouv.etalab.mastodon.client.Entities.Error;
+import fr.gouv.etalab.mastodon.client.PatchBaseImageDownloader;
+import fr.gouv.etalab.mastodon.helper.Helper;
+import fr.gouv.etalab.mastodon.interfaces.OnRetrieveAccountInterface;
+import fr.gouv.etalab.mastodon.interfaces.OnUpdateCredentialInterface;
+import fr.gouv.etalab.mastodon.sqlite.AccountDAO;
+import fr.gouv.etalab.mastodon.sqlite.Sqlite;
+import mastodon.etalab.gouv.fr.mastodon.R;
+
+
+
+/**
+ * Created by Thomas on 27/08/2017.
+ * Edit profile activity
+ */
+
+public class EditProfileActivity extends AppCompatActivity implements OnRetrieveAccountInterface, OnUpdateCredentialInterface {
+
+
+
+ private EditText set_profile_name, set_profile_description;
+ private ImageView set_profile_picture, set_header_picture;
+ private Button set_change_profile_picture, set_change_header_picture, set_profile_save;
+ private TextView set_header_picture_overlay;
+ private ImageLoader imageLoader;
+ private DisplayImageOptions options;
+ private static final int PICK_IMAGE_HEADER = 4565;
+ private static final int PICK_IMAGE_PROFILE = 6545;
+ private String profile_picture, header_picture, profile_username, profile_note;
+ private Bitmap profile_picture_bmp, profile_header_bmp;
+ private TextView title;
+ private ImageView pp_actionBar;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
+ int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
+ if( theme == Helper.THEME_LIGHT){
+ setTheme(R.style.AppTheme);
+ }else {
+ setTheme(R.style.AppThemeDark);
+ }
+ setContentView(R.layout.activity_edit_profile);
+
+ ActionBar actionBar = getSupportActionBar();
+ if( actionBar != null) {
+ LayoutInflater inflater = (LayoutInflater) this.getSystemService(android.content.Context.LAYOUT_INFLATER_SERVICE);
+ View view = inflater.inflate(R.layout.conversation_action_bar, null);
+ actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+ actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+ title = (TextView) actionBar.getCustomView().findViewById(R.id.toolbar_title);
+ pp_actionBar = (ImageView) actionBar.getCustomView().findViewById(R.id.pp_actionBar);
+ title.setText(R.string.settings_title_profile);
+ ImageView close_conversation = (ImageView) actionBar.getCustomView().findViewById(R.id.close_conversation);
+ if( close_conversation != null){
+ close_conversation.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ finish();
+ }
+ });
+ }
+ }else{
+ setTitle(R.string.settings_title_profile);
+ }
+ SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
+ String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
+ Account account = new AccountDAO(getApplicationContext(),db).getAccountByID(userId);
+ String url = account.getAvatar();
+ if( url.startsWith("/") ){
+ url = "https://" + Helper.getLiveInstance(getApplicationContext()) + account.getAvatar();
+ }
+ ImageLoader imageLoader = ImageLoader.getInstance();
+ File cacheDir = new File(getCacheDir(), getString(R.string.app_name));
+ ImageLoaderConfiguration configImg = new ImageLoaderConfiguration.Builder(this)
+ .imageDownloader(new PatchBaseImageDownloader(getApplicationContext()))
+ .threadPoolSize(5)
+ .threadPriority(Thread.MIN_PRIORITY + 3)
+ .denyCacheImageMultipleSizesInMemory()
+ .diskCache(new UnlimitedDiskCache(cacheDir))
+ .build();
+
+ this.imageLoader = ImageLoader.getInstance();
+ this.options = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false)
+ .cacheOnDisk(true).resetViewBeforeLoading(true).build();
+
+ imageLoader.init(configImg);
+ DisplayImageOptions options = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false)
+ .cacheOnDisk(true).resetViewBeforeLoading(true).build();
+ imageLoader.loadImage(url, options, new SimpleImageLoadingListener(){
+ @Override
+ public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
+ super.onLoadingComplete(imageUri, view, loadedImage);
+ BitmapDrawable ppDrawable = new BitmapDrawable(getResources(), Bitmap.createScaledBitmap(loadedImage, (int) Helper.convertDpToPixel(25, getApplicationContext()), (int) Helper.convertDpToPixel(25, getApplicationContext()), true));
+ if( pp_actionBar != null){
+ pp_actionBar.setImageDrawable(ppDrawable);
+ } else if( getSupportActionBar() != null){
+
+ getSupportActionBar().setIcon(ppDrawable);
+ getSupportActionBar().setDisplayShowHomeEnabled(true);
+ }
+ }
+ @Override
+ public void onLoadingFailed(java.lang.String imageUri, android.view.View view, FailReason failReason){
+
+ }});
+
+ set_profile_name = (EditText) findViewById(R.id.set_profile_name);
+ set_profile_description = (EditText) findViewById(R.id.set_profile_description);
+ set_profile_picture = (ImageView) findViewById(R.id.set_profile_picture);
+ set_header_picture = (ImageView) findViewById(R.id.set_header_picture);
+ set_change_profile_picture = (Button) findViewById(R.id.set_change_profile_picture);
+ set_change_header_picture = (Button) findViewById(R.id.set_change_header_picture);
+ set_profile_save = (Button) findViewById(R.id.set_profile_save);
+ set_header_picture_overlay = (TextView) findViewById(R.id.set_header_picture_overlay);
+
+ set_profile_save.setEnabled(false);
+ set_change_header_picture.setEnabled(false);
+ set_change_profile_picture.setEnabled(false);
+ set_profile_name.setEnabled(false);
+ set_profile_description.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
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case android.R.id.home:
+ finish();
+ return true;
+ default:
+ return super.onOptionsItemSelected(item);
+ }
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ // Inflate the menu; this adds items to the action bar if it is present.
+ getMenuInflater().inflate(R.menu.main_media, menu);
+ return true;
+ }
+
+ @Override
+ public void onRetrieveAccount(Account account, Error error) {
+ if( error != null ){
+ Toast.makeText(getApplicationContext(),R.string.toast_error, Toast.LENGTH_LONG).show();
+ return;
+ }
+ set_profile_name.setText(account.getDisplay_name());
+
+ final String content;
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+ content = Html.fromHtml(account.getNote(), Html.FROM_HTML_MODE_LEGACY).toString();
+ else
+ //noinspection deprecation
+ content = Html.fromHtml(account.getNote()).toString();
+ set_profile_description.setText(content);
+
+ set_profile_save.setEnabled(true);
+ set_change_header_picture.setEnabled(true);
+ set_change_profile_picture.setEnabled(true);
+ set_profile_name.setEnabled(true);
+ set_profile_description.setEnabled(true);
+
+ set_profile_description.addTextChangedListener(new TextWatcher() {
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {}
+ @Override
+ public void afterTextChanged(Editable s) {
+ if( s.length() > 160){
+ String content = s.toString().substring(0,160);
+ set_profile_description.setText(content);
+ set_profile_description.setSelection(set_profile_description.getText().length());
+ Toast.makeText(getApplicationContext(),R.string.note_no_space,Toast.LENGTH_LONG).show();
+ }
+ }
+ });
+
+ set_profile_name.addTextChangedListener(new TextWatcher() {
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {}
+ @Override
+ public void afterTextChanged(Editable s) {
+ if( s.length() > 30){
+ String content = s.toString().substring(0,30);
+ set_profile_name.setText(content);
+ set_profile_name.setSelection(set_profile_name.getText().length());
+ Toast.makeText(getApplicationContext(),R.string.username_no_space,Toast.LENGTH_LONG).show();
+ }
+ }
+ });
+
+
+ set_change_header_picture.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent getIntent = new Intent(Intent.ACTION_GET_CONTENT);
+ getIntent.setType("image/*");
+
+ Intent pickIntent = new Intent(Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+ pickIntent.setType("image/*");
+
+ Intent chooserIntent = Intent.createChooser(getIntent, getString(R.string.toot_select_image));
+ chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] {pickIntent});
+ startActivityForResult(chooserIntent, PICK_IMAGE_HEADER);
+ }
+ });
+
+ set_change_profile_picture.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent getIntent = new Intent(Intent.ACTION_GET_CONTENT);
+ getIntent.setType("image/*");
+
+ Intent pickIntent = new Intent(Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+ pickIntent.setType("image/*");
+
+ Intent chooserIntent = Intent.createChooser(getIntent, getString(R.string.toot_select_image));
+ chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, new Intent[] {pickIntent});
+ startActivityForResult(chooserIntent, PICK_IMAGE_PROFILE);
+ }
+ });
+
+ imageLoader.displayImage(account.getAvatar(), set_profile_picture, options);
+ imageLoader.displayImage(account.getHeader(), set_header_picture, options);
+
+ if( account.getHeader() == null || account.getHeader().contains("missing.png"))
+ set_header_picture_overlay.setVisibility(View.VISIBLE);
+
+
+ set_profile_save.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if(set_profile_name.getText() != null && !set_profile_name.getText().toString().equals(set_profile_name.getHint()))
+ profile_username = set_profile_name.getText().toString().trim();
+ else
+ profile_username = null;
+
+ if(set_profile_description.getText() != null && !set_profile_description.getText().toString().equals(set_profile_description.getHint()))
+ profile_note = set_profile_description.getText().toString().trim();
+ else
+ profile_note = null;
+
+ AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(EditProfileActivity.this);
+ LayoutInflater inflater = EditProfileActivity.this.getLayoutInflater();
+ @SuppressLint("InflateParams") View dialogView = inflater.inflate(R.layout.dialog_profile, null);
+ dialogBuilder.setView(dialogView);
+
+ ImageView back_ground_image = (ImageView) dialogView.findViewById(R.id.back_ground_image);
+ ImageView dialog_profile_picture = (ImageView) dialogView.findViewById(R.id.dialog_profile_picture);
+ TextView dialog_profile_name = (TextView) dialogView.findViewById(R.id.dialog_profile_name);
+ TextView dialog_profile_description = (TextView) dialogView.findViewById(R.id.dialog_profile_description);
+
+ if( profile_username != null)
+ dialog_profile_name.setText(profile_username);
+ if( profile_note != null)
+ dialog_profile_description.setText(profile_note);
+ if( profile_header_bmp != null) {
+ BitmapDrawable background = new BitmapDrawable(getApplicationContext().getResources(), profile_header_bmp);
+ if(Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
+ //noinspection deprecation
+ back_ground_image.setBackgroundDrawable(background);
+ } else {
+ back_ground_image.setBackground(background);
+ }
+ }else {
+ if(Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
+ //noinspection deprecation
+ back_ground_image.setBackgroundDrawable(set_header_picture.getDrawable());
+ } else {
+ back_ground_image.setBackground(set_header_picture.getDrawable());
+ }
+ }
+ if( profile_picture_bmp != null) {
+ BitmapDrawable background = new BitmapDrawable(getApplicationContext().getResources(), profile_picture_bmp);
+ if(Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
+ //noinspection deprecation
+ dialog_profile_picture.setBackgroundDrawable(background);
+ } else {
+ dialog_profile_picture.setBackground(background);
+ }
+ }else {
+ if(Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
+ //noinspection deprecation
+ dialog_profile_picture.setBackgroundDrawable(set_profile_picture.getDrawable());
+ } else {
+ dialog_profile_picture.setBackground(set_profile_picture.getDrawable());
+ }
+ }
+ dialogBuilder.setPositiveButton(R.string.save, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int id) {
+ set_profile_save.setEnabled(false);
+ new UpdateCredentialAsyncTask(getApplicationContext(), profile_username, profile_note, profile_picture, header_picture, EditProfileActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+ }
+ });
+ dialogBuilder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int id) {
+ dialog.dismiss();
+ }
+ });
+ AlertDialog alertDialog = dialogBuilder.create();
+ alertDialog.show();
+
+ }
+ });
+ }
+
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == PICK_IMAGE_HEADER && resultCode == Activity.RESULT_OK) {
+ if (data == null) {
+ Toast.makeText(getApplicationContext(),R.string.toot_select_image_error,Toast.LENGTH_LONG).show();
+ return;
+ }
+ try {
+ InputStream inputStream = getApplicationContext().getContentResolver().openInputStream(data.getData());
+ BufferedInputStream bufferedInputStream;
+ if (inputStream != null) {
+ bufferedInputStream = new BufferedInputStream(inputStream);
+ }else {
+ Toast.makeText(getApplicationContext(),R.string.toot_select_image_error,Toast.LENGTH_LONG).show();
+ return;
+ }
+ Bitmap bmp = BitmapFactory.decodeStream(bufferedInputStream);
+ profile_header_bmp = Bitmap.createScaledBitmap(bmp, 700, 335, true);
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ profile_header_bmp.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream);
+ set_header_picture.setImageBitmap(profile_header_bmp);
+ byte[] byteArray = byteArrayOutputStream .toByteArray();
+ header_picture = "data:image/png;base64, " + Base64.encodeToString(byteArray, Base64.DEFAULT);
+
+ } catch (FileNotFoundException e) {
+ Toast.makeText(getApplicationContext(),R.string.toot_select_image_error,Toast.LENGTH_LONG).show();
+ e.printStackTrace();
+ }
+ }else if(requestCode == PICK_IMAGE_PROFILE && resultCode == Activity.RESULT_OK) {
+ if (data == null) {
+ Toast.makeText(getApplicationContext(),R.string.toot_select_image_error,Toast.LENGTH_LONG).show();
+ return;
+ }
+ try {
+ InputStream inputStream = getApplicationContext().getContentResolver().openInputStream(data.getData());
+ BufferedInputStream bufferedInputStream;
+ if (inputStream != null) {
+ bufferedInputStream = new BufferedInputStream(inputStream);
+ }else {
+ Toast.makeText(getApplicationContext(),R.string.toot_select_image_error,Toast.LENGTH_LONG).show();
+ return;
+ }
+ Bitmap bmp = BitmapFactory.decodeStream(bufferedInputStream);
+ profile_picture_bmp = Bitmap.createScaledBitmap(bmp, 120, 120, true);
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ profile_picture_bmp.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream);
+ set_profile_picture.setImageBitmap(profile_picture_bmp);
+ byte[] byteArray = byteArrayOutputStream .toByteArray();
+ profile_picture = "data:image/png;base64, " + Base64.encodeToString(byteArray, Base64.DEFAULT);
+ } catch (FileNotFoundException e) {
+ Toast.makeText(getApplicationContext(),R.string.toot_select_image_error,Toast.LENGTH_LONG).show();
+ e.printStackTrace();
+ }
+ }
+ }
+
+ @Override
+ public void onUpdateCredential(APIResponse apiResponse) {
+ if( apiResponse.getError() != null){
+ Toast.makeText(getApplicationContext(), R.string.toast_error, Toast.LENGTH_LONG).show();
+ return;
+ }
+ Toast.makeText(getApplicationContext(), R.string.toast_update_credential_ok, Toast.LENGTH_LONG).show();
+ set_profile_save.setEnabled(true);
+ }
+
+}
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index 4c9281d39..97d89f078 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -116,6 +116,7 @@ import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import fr.gouv.etalab.mastodon.activities.EditProfileActivity;
import fr.gouv.etalab.mastodon.activities.HashTagActivity;
import fr.gouv.etalab.mastodon.activities.LoginActivity;
import fr.gouv.etalab.mastodon.activities.MainActivity;
@@ -961,6 +962,8 @@ public class Helper {
TextView ownerStatus = (TextView) headerLayout.findViewById(R.id.owner_status);
TextView ownerFollowing = (TextView) headerLayout.findViewById(R.id.owner_following);
TextView ownerFollowers = (TextView) headerLayout.findViewById(R.id.owner_followers);
+ ImageView header_edit_profile = (ImageView) headerLayout.findViewById(R.id.header_edit_profile);
+ header_edit_profile.setOnClickListener(null);
if( account == null ) {
Helper.logout(activity);
Intent myIntent = new Intent(activity, LoginActivity.class);
@@ -1010,6 +1013,13 @@ public class Helper {
}
});
}
+ header_edit_profile.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent(activity, EditProfileActivity.class);
+ activity.startActivity(intent);
+ }
+ });
}
profilePicture.setOnClickListener(null);
profilePicture.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml
new file mode 100644
index 000000000..e26b56698
--- /dev/null
+++ b/app/src/main/res/layout/activity_edit_profile.xml
@@ -0,0 +1,138 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/edit_profile_action_bar.xml b/app/src/main/res/layout/edit_profile_action_bar.xml
new file mode 100644
index 000000000..2ac6a39d3
--- /dev/null
+++ b/app/src/main/res/layout/edit_profile_action_bar.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
\ No newline at end of file