From e798707fdf7d2653a7a2bdd0fb92ccfd1d190670 Mon Sep 17 00:00:00 2001 From: Len Chan Date: Wed, 27 Mar 2019 16:18:26 +0800 Subject: [PATCH 01/10] change refresh/extend animation to fade-out/fade-in in ShowConversationActivity --- .../etalab/mastodon/activities/ShowConversationActivity.java | 4 ++++ 1 file changed, 4 insertions(+) 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); } }); From 404f06def51cbee96a0ac824ecf7d12d0efa7c15 Mon Sep 17 00:00:00 2001 From: Len Chan Date: Wed, 27 Mar 2019 16:38:49 +0800 Subject: [PATCH 02/10] fix shared content's length shows 0. --- .../java/fr/gouv/etalab/mastodon/activities/TootActivity.java | 2 ++ 1 file changed, 2 insertions(+) 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..da19bd4ac 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 @@ -761,6 +761,8 @@ public class TootActivity extends BaseActivity implements OnPostActionInterface, displayPollPopup(); } }); + + toot_space_left.setText(String.valueOf(toot_content.length())); } @Override From 2fc18589fc9900ffd56a2faf677a450b8b1656b3 Mon Sep 17 00:00:00 2001 From: Len Chan Date: Wed, 27 Mar 2019 17:54:07 +0800 Subject: [PATCH 03/10] update bottom buttons style on ToolActivity --- .../main/res/drawable-anydpi/ic_public.xml | 2 +- .../main/res/drawable/ic_emoji_selector.png | Bin 0 -> 8893 bytes app/src/main/res/drawable/rounded_shape.xml | 13 +++++ app/src/main/res/layout/activity_toot.xml | 55 ++++++++++-------- app/src/main/res/values/styles.xml | 4 +- 5 files changed, 47 insertions(+), 27 deletions(-) create mode 100644 app/src/main/res/drawable/ic_emoji_selector.png create mode 100644 app/src/main/res/drawable/rounded_shape.xml 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 0000000000000000000000000000000000000000..e3c71797c68bda76c0523fc9639cce685f29ee9f GIT binary patch literal 8893 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 + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_toot.xml b/app/src/main/res/layout/activity_toot.xml index f59cd8680..52f58b0dc 100644 --- a/app/src/main/res/layout/activity_toot.xml +++ b/app/src/main/res/layout/activity_toot.xml @@ -98,49 +98,53 @@ android:layout_height="wrap_content">