diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java index c4570b2c1..ecd81a740 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java @@ -185,6 +185,7 @@ public class ShowConversationActivity extends BaseActivity implements OnRetriev intent.putExtras(b); finish(); startActivity(intent); + overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); } }); action_unhide.setOnClickListener(new View.OnClickListener() { @@ -211,6 +212,8 @@ public class ShowConversationActivity extends BaseActivity implements OnRetriev intent.putExtras(b); finish(); startActivity(intent); + overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); + } }); @@ -292,6 +295,7 @@ public class ShowConversationActivity extends BaseActivity implements OnRetriev intent.putExtras(b); finish(); startActivity(intent); + overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); } }); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java index f7dba9ce8..74107cc02 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java @@ -157,6 +157,7 @@ import fr.gouv.etalab.mastodon.sqlite.StatusStoredDAO; import static fr.gouv.etalab.mastodon.helper.Helper.HOME_TIMELINE_INTENT; import static fr.gouv.etalab.mastodon.helper.Helper.INTENT_ACTION; import static fr.gouv.etalab.mastodon.helper.Helper.THEME_LIGHT; +import static fr.gouv.etalab.mastodon.helper.Helper.changeButtonTextColor; import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor; import static fr.gouv.etalab.mastodon.helper.Helper.convertDpToPixel; @@ -761,6 +762,8 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface, displayPollPopup(); } }); + + toot_space_left.setText(String.valueOf(toot_content.length())); } @Override @@ -2881,8 +2884,6 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface, Toasty.error(getApplicationContext(), getString(R.string.toast_error), Toast.LENGTH_LONG).show(); } } - - private void changeColor(){ final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); @@ -2896,6 +2897,13 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface, changeDrawableColor(TootActivity.this, R.drawable.ic_skip_next, R.color.dark_text); changeDrawableColor(TootActivity.this, R.drawable.ic_check, R.color.dark_text); changeDrawableColor(TootActivity.this, R.drawable.emoji_one_category_smileysandpeople, R.color.dark_text); + //bottom action + changeDrawableColor(TootActivity.this, findViewById(R.id.toot_picture), R.color.dark_text); + changeDrawableColor(TootActivity.this, findViewById(R.id.poll_action), R.color.dark_text); + changeDrawableColor(TootActivity.this, findViewById(R.id.toot_visibility), R.color.dark_text); + changeDrawableColor(TootActivity.this, findViewById(R.id.toot_emoji), R.color.dark_text); + changeButtonTextColor(TootActivity.this, findViewById(R.id.toot_cw), R.color.dark_text); + }else { changeDrawableColor(TootActivity.this, R.drawable.ic_public_toot, R.color.white); changeDrawableColor(TootActivity.this, R.drawable.ic_lock_open_toot, R.color.white); @@ -2906,6 +2914,13 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface, changeDrawableColor(TootActivity.this, R.drawable.ic_skip_next, R.color.white); changeDrawableColor(TootActivity.this, R.drawable.ic_check, R.color.white); changeDrawableColor(TootActivity.this, R.drawable.emoji_one_category_smileysandpeople, R.color.black); + //bottom action + changeDrawableColor(TootActivity.this, findViewById(R.id.toot_picture), R.color.black); + changeDrawableColor(TootActivity.this, findViewById(R.id.poll_action), R.color.black); + changeDrawableColor(TootActivity.this, findViewById(R.id.toot_visibility), R.color.black); + changeDrawableColor(TootActivity.this, findViewById(R.id.toot_emoji), R.color.black); + changeButtonTextColor(TootActivity.this, findViewById(R.id.toot_cw), R.color.black); + } } 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 1ed494625..ffb938ac1 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 @@ -95,6 +95,7 @@ import android.webkit.MimeTypeMap; import android.webkit.URLUtil; import android.webkit.WebSettings; import android.webkit.WebView; +import android.widget.Button; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; @@ -2303,6 +2304,14 @@ public class Helper { imageButton.setColorFilter(context.getResources().getColor(hexaColor)); } + /** + * change color of a drawable + * @param button int the button + * @param hexaColor example 0xffff00 + */ + public static void changeButtonTextColor(Context context, Button button, int hexaColor){ + button.setTextColor(context.getResources().getColor(hexaColor)); + } /** * Returns the current locale of the device * @param context Context diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/SquareButton.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/SquareButton.java new file mode 100644 index 000000000..7854124bf --- /dev/null +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/SquareButton.java @@ -0,0 +1,28 @@ +package fr.gouv.etalab.mastodon.helper; + +import android.content.Context; +import android.util.AttributeSet; + +public class SquareButton extends android.support.v7.widget.AppCompatButton { + + public SquareButton(Context context) { + super(context); + } + + public SquareButton(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public SquareButton(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + int height = MeasureSpec.getSize(heightMeasureSpec); + super.onMeasure( + MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY), + MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)); + } +} diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/SquareImageButton.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/SquareImageButton.java new file mode 100644 index 000000000..0ba7e8aaa --- /dev/null +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/SquareImageButton.java @@ -0,0 +1,28 @@ +package fr.gouv.etalab.mastodon.helper; + +import android.content.Context; +import android.util.AttributeSet; +import android.widget.ImageButton; + +public class SquareImageButton extends android.support.v7.widget.AppCompatImageButton { + public SquareImageButton(Context context) { + super(context); + } + + public SquareImageButton(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public SquareImageButton(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + int height = MeasureSpec.getSize(heightMeasureSpec); + super.onMeasure( + MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY), + MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)); + } +} diff --git a/app/src/main/res/drawable-anydpi/ic_public.xml b/app/src/main/res/drawable-anydpi/ic_public.xml index d976b4244..e2bc72fd7 100644 --- a/app/src/main/res/drawable-anydpi/ic_public.xml +++ b/app/src/main/res/drawable-anydpi/ic_public.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_emoji_selector.png b/app/src/main/res/drawable/ic_emoji_selector.png new file mode 100644 index 000000000..e3c71797c Binary files /dev/null and b/app/src/main/res/drawable/ic_emoji_selector.png differ diff --git a/app/src/main/res/layout-sw600dp/activity_toot.xml b/app/src/main/res/layout-sw600dp/activity_toot.xml index aa2a49629..546eb435a 100644 --- a/app/src/main/res/layout-sw600dp/activity_toot.xml +++ b/app/src/main/res/layout-sw600dp/activity_toot.xml @@ -98,16 +98,22 @@