diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png index 4670ce24a..5cb6f52b3 100644 Binary files a/app/src/main/ic_launcher-web.png and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java index aef1c780b..1a0ed78d1 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/LoginActivity.java @@ -49,6 +49,7 @@ import fr.gouv.etalab.mastodon.helper.Helper; import mastodon.etalab.gouv.fr.mastodon.R; import static fr.gouv.etalab.mastodon.helper.Helper.USER_AGENT; +import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor; /** @@ -63,7 +64,6 @@ public class LoginActivity extends AppCompatActivity { private TextView login_two_step; private static boolean client_id_for_webview = false; private String instance; - private boolean addAccount = false; private EditText login_instance; @Override @@ -78,6 +78,11 @@ public class LoginActivity extends AppCompatActivity { } setContentView(R.layout.activity_login); + if( theme == Helper.THEME_DARK) { + changeDrawableColor(getApplicationContext(), R.drawable.mastodon_icon, R.color.colorAccentD); + }else { + changeDrawableColor(getApplicationContext(), R.drawable.mastodon_icon, R.color.colorAccent); + } final Button connectionButton = (Button) findViewById(R.id.login_button); login_instance = (EditText) findViewById(R.id.login_instance); connectionButton.setEnabled(false); @@ -92,58 +97,26 @@ public class LoginActivity extends AppCompatActivity { } }); - //For other instances - TextView other_instance = (TextView) findViewById(R.id.other_instance); - other_instance.setPaintFlags(other_instance.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); - other_instance.setOnClickListener(new View.OnClickListener() { + login_instance.setOnFocusChangeListener(new View.OnFocusChangeListener() { @Override - public void onClick(View v) { - Intent intent = new Intent(LoginActivity.this, LoginActivity.class); - intent.putExtra("addAccount", true); - startActivity(intent); - finish(); + public void onFocusChange(View v, boolean hasFocus) { + connectionButton.setEnabled(false); + login_two_step.setVisibility(View.INVISIBLE); + if (!hasFocus) { + retrievesClientId(); + } } }); - - Bundle b = getIntent().getExtras(); - if(b != null) - addAccount = b.getBoolean("addAccount", false); - - if( addAccount ) - login_instance.setVisibility(View.VISIBLE); - - if( addAccount) { - login_instance.setOnFocusChangeListener(new View.OnFocusChangeListener() { - @Override - public void onFocusChange(View v, boolean hasFocus) { - connectionButton.setEnabled(false); - login_two_step.setVisibility(View.INVISIBLE); - if (!hasFocus) { - retrievesClientId(); - } - } - }); - } - if( addAccount) - other_instance.setVisibility(View.GONE); } @Override protected void onResume(){ super.onResume(); Button connectionButton = (Button) findViewById(R.id.login_button); - if( !addAccount ) { - if (client_id_for_webview || !connectionButton.isEnabled()) { - connectionButton.setEnabled(false); - client_id_for_webview = false; - retrievesClientId(); - } - }else { - if (login_instance.getText() != null && login_instance.getText().toString().length() > 0 && client_id_for_webview) { - connectionButton.setEnabled(false); - client_id_for_webview = false; - retrievesClientId(); - } + if (login_instance.getText() != null && login_instance.getText().toString().length() > 0 && client_id_for_webview) { + connectionButton.setEnabled(false); + client_id_for_webview = false; + retrievesClientId(); } } @@ -156,7 +129,7 @@ public class LoginActivity extends AppCompatActivity { String action = "/api/v1/apps"; RequestParams parameters = new RequestParams(); - parameters.add(Helper.CLIENT_NAME, Helper.OAUTH_REDIRECT_HOST); + parameters.add(Helper.CLIENT_NAME, Helper.CLIENT_NAME_VALUE); parameters.add(Helper.REDIRECT_URIS, client_id_for_webview?Helper.REDIRECT_CONTENT_WEB:Helper.REDIRECT_CONTENT); parameters.add(Helper.SCOPES, Helper.OAUTH_SCOPES); parameters.add(Helper.WEBSITE,"https://" + Helper.getLiveInstance(getApplicationContext())); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index ae6a5c854..4150da8fe 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -28,8 +28,6 @@ import android.os.Build; import android.os.Bundle; import android.support.v4.content.ContextCompat; import android.text.Html; -import android.text.method.LinkMovementMethod; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -141,6 +139,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf holder.status_account_displayname = (TextView) convertView.findViewById(R.id.status_account_displayname); holder.status_account_profile = (ImageView) convertView.findViewById(R.id.status_account_profile); holder.status_account_profile_boost = (ImageView) convertView.findViewById(R.id.status_account_profile_boost); + holder.status_account_profile_boost_by = (ImageView) convertView.findViewById(R.id.status_account_profile_boost_by); holder.status_favorite_count = (TextView) convertView.findViewById(R.id.status_favorite_count); holder.status_reblog_count = (TextView) convertView.findViewById(R.id.status_reblog_count); holder.status_toot_date = (TextView) convertView.findViewById(R.id.status_toot_date); @@ -161,7 +160,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf holder.status_prev4_container = (RelativeLayout) convertView.findViewById(R.id.status_prev4_container); holder.status_reply = (ImageView) convertView.findViewById(R.id.status_reply); holder.status_privacy = (ImageView) convertView.findViewById(R.id.status_privacy); - holder.status_translate = (ImageView) convertView.findViewById(R.id.status_translate); + holder.status_translate = (Button) convertView.findViewById(R.id.status_translate); holder.status_content_translated_container = (LinearLayout) convertView.findViewById(R.id.status_content_translated_container); holder.main_container = (LinearLayout) convertView.findViewById(R.id.main_container); holder.status_spoiler_container = (LinearLayout) convertView.findViewById(R.id.status_spoiler_container); @@ -357,12 +356,18 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf holder.status_reblog_count.setText(String.valueOf(status.getReblogs_count())); holder.status_toot_date.setText(Helper.dateDiff(context, status.getCreated_at())); - imageLoader.displayImage(ppurl, holder.status_account_profile, options); + if( status.getReblog() != null) { - imageLoader.displayImage(status.getAccount().getAvatar(), holder.status_account_profile_boost, options); + imageLoader.displayImage(ppurl, holder.status_account_profile_boost, options); + imageLoader.displayImage(status.getAccount().getAvatar(), holder.status_account_profile_boost_by, options); holder.status_account_profile_boost.setVisibility(View.VISIBLE); + holder.status_account_profile_boost_by.setVisibility(View.VISIBLE); + holder.status_account_profile.setVisibility(View.GONE); }else{ + imageLoader.displayImage(ppurl, holder.status_account_profile, options); holder.status_account_profile_boost.setVisibility(View.GONE); + holder.status_account_profile_boost_by.setVisibility(View.GONE); + holder.status_account_profile.setVisibility(View.VISIBLE); } if( status.getReblog() == null) { if (status.getMedia_attachments().size() < 1) { @@ -487,10 +492,18 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf public void onClick(View v) { Intent intent = new Intent(context, ShowAccountActivity.class); Bundle b = new Bundle(); - if( status.getReblog() == null) - b.putString("accountId", status.getAccount().getId()); - else - b.putString("accountId", status.getReblog().getAccount().getId()); + b.putString("accountId", status.getAccount().getId()); + intent.putExtras(b); + context.startActivity(intent); + } + }); + + holder.status_account_profile_boost.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(context, ShowAccountActivity.class); + Bundle b = new Bundle(); + b.putString("accountId", status.getReblog().getAccount().getId()); intent.putExtras(b); context.startActivity(intent); } @@ -673,6 +686,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf TextView status_account_displayname; ImageView status_account_profile; ImageView status_account_profile_boost; + ImageView status_account_profile_boost_by; TextView status_favorite_count; TextView status_reblog_count; TextView status_toot_date; @@ -692,7 +706,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf RelativeLayout status_prev4_container; ImageView status_reply; ImageView status_privacy; - ImageView status_translate; + Button status_translate; LinearLayout status_container2; LinearLayout status_container3; LinearLayout main_container; 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 d7b690b23..c57055b1d 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 @@ -26,7 +26,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Resources; -import android.content.res.TypedArray; import android.database.sqlite.SQLiteDatabase; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -42,7 +41,6 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; import android.os.Environment; -import android.support.annotation.ColorInt; import android.support.design.widget.NavigationView; import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationManagerCompat; @@ -54,8 +52,6 @@ import android.text.TextPaint; import android.text.method.LinkMovementMethod; import android.text.style.ClickableSpan; import android.util.DisplayMetrics; -import android.util.Log; -import android.util.TypedValue; import android.view.MenuItem; import android.view.SubMenu; import android.view.View; @@ -132,7 +128,7 @@ public class Helper { @SuppressWarnings("unused") public static final String TAG = "mastodon_etalab"; - public static final String OAUTH_REDIRECT_HOST = "fr.gouv.etalab.mastodon"; + public static final String CLIENT_NAME_VALUE = "Mastalab"; public static final String INSTANCE = "mastodon.etalab.gouv.fr"; public static final String OAUTH_SCOPES = "read write follow"; public static final String PREF_KEY_OAUTH_TOKEN = "oauth_token"; diff --git a/app/src/main/res/drawable-hdpi-v11/notification_icon.png b/app/src/main/res/drawable-hdpi-v11/notification_icon.png index 07ad40657..6101d016f 100644 Binary files a/app/src/main/res/drawable-hdpi-v11/notification_icon.png and b/app/src/main/res/drawable-hdpi-v11/notification_icon.png differ diff --git a/app/src/main/res/drawable-hdpi-v9/notification_icon.png b/app/src/main/res/drawable-hdpi-v9/notification_icon.png index af20f7240..113b5daf4 100644 Binary files a/app/src/main/res/drawable-hdpi-v9/notification_icon.png and b/app/src/main/res/drawable-hdpi-v9/notification_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_g_translate.png b/app/src/main/res/drawable-hdpi/ic_g_translate.png new file mode 100644 index 000000000..857418ff8 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_g_translate.png differ diff --git a/app/src/main/res/drawable-hdpi/notification_icon.png b/app/src/main/res/drawable-hdpi/notification_icon.png index 4737c6d71..7e7c1d644 100644 Binary files a/app/src/main/res/drawable-hdpi/notification_icon.png and b/app/src/main/res/drawable-hdpi/notification_icon.png differ diff --git a/app/src/main/res/drawable-ldpi/ic_g_translate.png b/app/src/main/res/drawable-ldpi/ic_g_translate.png new file mode 100644 index 000000000..e19363c59 Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_g_translate.png differ diff --git a/app/src/main/res/drawable-mdpi-v11/notification_icon.png b/app/src/main/res/drawable-mdpi-v11/notification_icon.png index 59d8a8af9..af17ced8f 100644 Binary files a/app/src/main/res/drawable-mdpi-v11/notification_icon.png and b/app/src/main/res/drawable-mdpi-v11/notification_icon.png differ diff --git a/app/src/main/res/drawable-mdpi-v9/notification_icon.png b/app/src/main/res/drawable-mdpi-v9/notification_icon.png index 221ecd751..b42dbc67c 100644 Binary files a/app/src/main/res/drawable-mdpi-v9/notification_icon.png and b/app/src/main/res/drawable-mdpi-v9/notification_icon.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_g_translate.png b/app/src/main/res/drawable-mdpi/ic_g_translate.png new file mode 100644 index 000000000..cea69475c Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_g_translate.png differ diff --git a/app/src/main/res/drawable-mdpi/notification_icon.png b/app/src/main/res/drawable-mdpi/notification_icon.png index e8b774a9e..a133f0ad1 100644 Binary files a/app/src/main/res/drawable-mdpi/notification_icon.png and b/app/src/main/res/drawable-mdpi/notification_icon.png differ diff --git a/app/src/main/res/drawable-xhdpi-v11/notification_icon.png b/app/src/main/res/drawable-xhdpi-v11/notification_icon.png index 1d2eb3988..a8d3ec889 100644 Binary files a/app/src/main/res/drawable-xhdpi-v11/notification_icon.png and b/app/src/main/res/drawable-xhdpi-v11/notification_icon.png differ diff --git a/app/src/main/res/drawable-xhdpi-v9/notification_icon.png b/app/src/main/res/drawable-xhdpi-v9/notification_icon.png index a8f08407c..175c697f3 100644 Binary files a/app/src/main/res/drawable-xhdpi-v9/notification_icon.png and b/app/src/main/res/drawable-xhdpi-v9/notification_icon.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_g_translate.png b/app/src/main/res/drawable-xhdpi/ic_g_translate.png new file mode 100644 index 000000000..e5bb40459 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_g_translate.png differ diff --git a/app/src/main/res/drawable-xhdpi/notification_icon.png b/app/src/main/res/drawable-xhdpi/notification_icon.png index d237fbc95..f67de817a 100644 Binary files a/app/src/main/res/drawable-xhdpi/notification_icon.png and b/app/src/main/res/drawable-xhdpi/notification_icon.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v11/notification_icon.png b/app/src/main/res/drawable-xxhdpi-v11/notification_icon.png index c107bbdd5..bc3f8add1 100644 Binary files a/app/src/main/res/drawable-xxhdpi-v11/notification_icon.png and b/app/src/main/res/drawable-xxhdpi-v11/notification_icon.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v9/notification_icon.png b/app/src/main/res/drawable-xxhdpi-v9/notification_icon.png index 07e6b5dd9..e13d3477f 100644 Binary files a/app/src/main/res/drawable-xxhdpi-v9/notification_icon.png and b/app/src/main/res/drawable-xxhdpi-v9/notification_icon.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_g_translate.png b/app/src/main/res/drawable-xxhdpi/ic_g_translate.png new file mode 100644 index 000000000..75328d007 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_g_translate.png differ diff --git a/app/src/main/res/drawable-xxhdpi/notification_icon.png b/app/src/main/res/drawable-xxhdpi/notification_icon.png index e822ba7a7..54a25836a 100644 Binary files a/app/src/main/res/drawable-xxhdpi/notification_icon.png and b/app/src/main/res/drawable-xxhdpi/notification_icon.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_g_translate.png b/app/src/main/res/drawable-xxxhdpi/ic_g_translate.png new file mode 100644 index 000000000..69ba150df Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_g_translate.png differ diff --git a/app/src/main/res/drawable/background_splash.xml b/app/src/main/res/drawable/background_splash.xml index 1204da0ab..2e5929437 100644 --- a/app/src/main/res/drawable/background_splash.xml +++ b/app/src/main/res/drawable/background_splash.xml @@ -18,7 +18,7 @@ + android:drawable="?attr/colorPrimary"/> + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 15c4bf863..32278450b 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -28,10 +28,10 @@ > - + > + +