Floating actions menu #2335

Dominaezzz · 2018-06-03T01:26:55Z

signed-off-by: Dominic Fischer dominicfischer7@gmail.com

…yout.

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Dominaezzz · 2018-06-03T01:35:06Z

#2096

bmarty

Thanks a lot for this PR, the result looks great. I've done several comments. I'll test the PR on a real phone in a second time

Please let me know if you have any questions

Benoît

bmarty · 2018-06-04T08:27:37Z

vector/build.gradle

@@ -167,6 +167,7 @@ dependencies {

    // UI
    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation 'com.getbase:floatingactionbutton:1.10.1'


Can you credit this library in the file open_source_licenses.html please? There is already a section for Apache 2.0 license

I have credited the library as requested.

bmarty · 2018-06-04T08:30:54Z

vector/src/main/java/im/vector/activity/VectorHomeActivity.java

            } else {
-                mFloatingActionButton.show();
+                mFloatingActionsMenu.collapse();
+                mFloatingActionsMenu.setVisibility(View.VISIBLE);


show() display the button with an animation. Is the animation still there with setVisibility() on a FloatingActionsMenu?

Implemented animations.

bmarty · 2018-06-04T08:31:24Z

vector/src/main/java/im/vector/activity/VectorHomeActivity.java

+
+        Class menuClass = FloatingActionsMenu.class;
+        try {
+            Field normal = menuClass.getDeclaredField("mAddButtonColorNormal");


Are you obliged to do that? Isn't it possible using styles?

Styles could be used but only for a one time setup.
Since the color changes at runtime, reflection was the easiest way.

bmarty · 2018-06-04T08:34:21Z

vector/src/main/java/im/vector/activity/VectorHomeActivity.java

+                public void onMenuCollapsed() {
+                    touchGuard.setAlpha(0);
+
+                    touchGuard.setOnClickListener(null);


This will not remove the interception of click event, so the user will be stuck :)
You also have to call setClickable(false)

I think this is still bugged. You have to call setClickable() AFTER setOnClickListener(). Look in setOnClickListener implementation

bmarty · 2018-06-04T08:35:32Z

vector/src/main/java/im/vector/activity/VectorHomeActivity.java

+            mFabCreateRoom.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    mFloatingActionsMenu.collapse();


The two other cases does not call collapse(). So if it is necessary, add the 2 missing calls and if it is not, remove this one :)

Added missing calls.

bmarty · 2018-06-04T08:36:07Z

vector/src/main/java/im/vector/activity/VectorHomeActivity.java

-
+                if (null != mFloatingActionsMenu) {
+//                    mFloatingActionButton.hide();
+                    mFloatingActionsMenu.setVisibility(View.GONE);


Same question about FAB animation

Implemented the animation.

bmarty · 2018-06-04T08:38:44Z

vector/src/main/java/im/vector/activity/VectorHomeActivity.java

@@ -1310,7 +1423,7 @@ public void run() {
     * @return fab view
     */
    public FloatingActionButton getFloatingActionButton() {
-        return mFloatingActionButton;
+        return null;


This remove a feature: the FAB is automatically hidden during a few seconds when the user scroll the page.

I gracefully swapped it out for a View. Since only the 'Top' of the button is queried for.

bmarty · 2018-06-04T08:40:25Z

vector/src/main/res/layout/activity_home.xml

+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="bottom"
+            app:constraint_referenced_ids="listView_pending_callview"/>


A Barrier is used to reference several ids. There is only one here, so I do not think this barrier is necessary. Maybe for code clarity?

I added a barrier for clarity, I felt directly referencing the call view was clumsy but I've removed barrier as it is doing nothing.

bmarty · 2018-06-04T08:46:13Z

vector/src/main/java/im/vector/activity/VectorHomeActivity.java


-                    if (!(fragment instanceof AbsHomeFragment) || !((AbsHomeFragment) fragment).onFabClick()) {
-                        onFloatingButtonClick();


Please remove onFloatingButtonClick() method then?

I think mFabDialog member can also be removed then

bmarty · 2018-06-05T11:56:33Z

It also fixes #1446

…yout.

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

…larity. Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Set clickable to false by default and toggle when appropriate. Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Remove worker thread usage in favour of handler with less allocations. Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

…ting_actions_menu # Conflicts: # vector/src/main/java/im/vector/activity/VectorHomeActivity.java # vector/src/main/res/layout/activity_home.xml

…_actions_menu # Conflicts: # vector/src/main/java/im/vector/activity/VectorHomeActivity.java

t3chguy · 2018-06-09T21:39:32Z

@bmarty this is ready for another look
edit: it is for real this time

t3chguy · 2018-06-10T17:45:03Z

remaining test failure is the same as in /develop/ due to merge of new forbidden_strings_in_code without first fixing or otherwise the offending code.
e.g https://travis-ci.org/vector-im/riot-android/builds/389625128

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

bmarty · 2018-06-11T13:38:33Z

Hi @Dominaezzz and @t3chguy ,
Thanks for update and merge fix (and ok for Travis failure reason, my bad).
There is still one issue before I can merge this PR. The UI is still locked when the user close the menu.
Benoît

Dominaezzz · 2018-06-11T13:44:36Z

Hey @bmarty, I've resolved the issues you mentioned.

bmarty

Hi @Dominaezzz @t3chguy ,

Thank for the quick fix. Making more tests, I've noticed that the touch guard is not working on pre21, which is a bit annoying. Is it possible to do better? I've put some ideas in the inlined comments.
I've also detect a potential issue on the color used for the sub FABs, but is is maybe intended?

Also feel free to add your name in the AUTHORS.rst file and to add an entry in CHANGES.rst

Benoît

bmarty · 2018-06-11T14:12:16Z

vector/src/main/java/im/vector/activity/VectorHomeActivity.java

+
+        }
+
+        mFabJoinRoom.setColorNormal(secondaryColor);


Is it intended to exchange primary and secondary color for the 3 small FABs (regarding the colors for the main FAB)? It is more visible on the "Contact" tab

bmarty · 2018-06-11T14:13:21Z

vector/src/main/res/layout/activity_home.xml

+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:clickable="false"
+            android:elevation="10dp"


The touch guard does not work on Pre-Lollipop which is a bit annoying. Maybe the touch guard can be placed before in the XML file to be displayed under the FAB menu

bmarty · 2018-06-11T14:14:01Z

vector/src/main/res/layout/activity_home.xml

+            app:fab_labelStyle="@style/Floating_Actions_Menu"
+            app:backgroundTint="@color/vector_fuchsia_color"
+            app:borderWidth="0dp"
+            app:elevation="4dp">


So is the desired elevation 4dp or 12dp? I think the 2 values should be identical.

bmarty · 2018-06-11T14:16:04Z

vector/src/main/java/im/vector/activity/VectorHomeActivity.java

+
+        // Pre-Lollipop does not support elevation so cannot have touch guard
+        // above bottomNavigationView.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {


The touch guard is not shown on PreLollipop, it is a bit annoying. If there is no elevation before API 21, I think this is not a problem to show the touchguard.

The only reason why I've disabled the touch guard pre-lollipop is because the touch guard shows up behind the Bottom Navigation View. No matter the order of views in the constraint layout, the Bottom Navigation View shows up on top of everything.
Would it be okay to have the Bottom Navigation View not be covered by the touch guard?

Ok, so it means that the Bottom Navigation View is able to use elevation, maybe by using app: namespace. If it is not possible to do better, yes, I think it is better to have the touch guard in all cases

bmarty · 2018-07-02T12:34:06Z

Hi @Dominaezzz ,

I wish your work to be in the next release, so I merge it in a branch I own and will fix the very last issue by myself.

Thanks again for this PR

Benoît

Update matrix-sdk.aar lib - build 1875 - Revision: ccf12449b8f09b06a7a8f501b9d7a382270b2305 Last rebase was performed June 1 2018. Here is the list of changes from vector-im/riot-android changes: Changes in Riot 0.8.XX (2018-08-24) =================================================== Features: - Manage server quota notices (#2440) Improvements: - Do not ask permission to write external storage at startup (#2483) - Update settings icon and transparent logo for notifications and navigation drawer (#2492) - URL previews are no longer requested from the server when displaying URL previews is disabled (PR #2514) - Fix some plural and puzzle strings, and remove other unused ones (#2444) - Manage System Alerts in a dedicated section Other changes: - Upgrade olm-sdk.aar from version 2.2.2 to version 2.3.0 - move PieFractionView from the SDK to the client (#2525) Bugfix: - Fix media sharing (#2530) - Fix notification sound issue in settings (#2524) - Disable app icon badge for "listen for event" notification (#2104) Changes in Riot 0.8.13 (2018-08-09) =================================================== Features: - Resurrect performance metrics (#2391) - Telemetry to report incidence of UISIs (#2330) - Add a previewer for previewing media before sending it into the room (#1742|#2445) - Implements ReplyTo feature (#2390) - Add auto completion for slash commands (#2384) - Support Room Versioning (#2441) Improvements: - Update matrix-sdk.aar lib (v0.9.7). - Piwik: Update the way how stats are reported (#2402) - Improve BugReport screen: display a preview of the screenshot (#2318) - In the settings, move theme settings just below "language" (#2439) - Improve the display of the sources of the message in the dialog (#2348) - Improve the display of the buttons and the reason in the room preview (#2352) - In the flair section on settings, notify the user when he has no flair (#2430) - Improve GDPR consent webview management (#2491) - Support external keyboard to send messages for recent devices (#220, #1279) - When user ignores or un-ignores someone, notify that the app will restart (#2437) Other changes: - Remove dependency to `android-gif-drawable` lib and use Glide to animate logo on Splashscreen (#2421) - Keep only Room.getState() method and remove Room.getLiveState() because they are similar (matrix-org/matrix-android-sdk#310) Bugfix: - Fix issue on incoming call screen when "Do not disturb mode" is active (#2417) - Fix issue when selecting sound for notifications in the settings - Fix issue when changing device name in the settings (#2416) - Fix issue on verifying device, update the wording of the description message (#1067) - Messages with code blocks show other HTML as plain text (#2280) - Message with <p> was sometimes not properly formatted (#2275) - Fix notification issue when Riot is not started (#2451) - Fix Unable to add Matrix apps (#2466) - Riot auto joined a public room (#2472) - Remove last traces of Firebase analytics (#2481) - code blocks are escaped and therefore hard readable (#2484) - Restore the navigation of the back button in the public rooms preview header (#2473) - Fix issue on preference screen: device lists was not displayed (#2409) - Ensure notification has a title (#2242) Changes in Riot 0.8.12 (2018-07-06) =================================================== Bugfix: - Fix issue on vanished favorite and low priority room (#2413) Changes in Riot 0.8.11 (2018-07-03) =================================================== Features: - Re-request keys manually for encrypted events (#2319) - Add option to send voice message to a room, using a third application to record message. To enable in the Labs settings (PR #1762) Improvements: - Update matrix-sdk.aar lib (v0.9.6). - New Floating Action Menu in Home screen (PR #2335) - Add spacing to device keys (#2314) - use apply() instead of commit() to save shared prefs (#2231) - Do not ring if "Do Not Disturb" is active (#1072) - Manage the "consent not given" error when declining a room invite Other changes: - Remove "Matrix application" activation from the Lab section in the settings (#2341) Bugfix: - Remove black borders on 18:9 phone (#2063) - Auto dismiss the join/reject room notification when user select an action (#2354) - Fix some crashes reported by the PlayStore (#2380, #2382, #2383, #2395) - Fix issues in UrlPreviews (#2312) Translations: - Galician thanks to Miguel Branco Build: - Add script to check code quality - Travis will now check if CHANGES.rst has been modified for each PR ------ Merge commit '94b7925a57b800db62b5ec87966d994ff53392b4' into develop # Conflicts: # vector/src/main/java/im/vector/activity/VectorRoomActivity.java # vector/src/main/java/im/vector/adapters/VectorMediasViewerAdapter.java # vector/src/main/java/im/vector/db/VectorContentProvider.java # vector/src/main/java/im/vector/dialogs/ConsentNotGivenHelper.kt # vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.kt # vector/src/main/res/values/strings.xml # vector/src/main/res/values/styles.xml

Dominaezzz added 2 commits June 2, 2018 21:14

Migrate RelativeLayouts in activity_home.xml to a single ConstraintLa…

0d48801

…yout.

Migrate AlertDialog for VectorHomeActivity to use a FloatingActionMenu.

b60c6c6

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

bmarty suggested changes Jun 4, 2018

View reviewed changes

Dominaezzz and others added 15 commits June 8, 2018 20:16

Migrate RelativeLayouts in activity_home.xml to a single ConstraintLa…

c738e96

…yout.

Migrate AlertDialog for VectorHomeActivity to use a FloatingActionMenu.

8f00609

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Add credit to the library "FloatingActionMenu".

d5043fc

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Rename and create new methods handling the Floating Action Menu for c…

e965e19

…larity. Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Make Floating Action Menu collapse after selection.

7511580

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Remove unnecessary comment.

7a7186b

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Remove previous FloatingActionButton onClick() handler.

5f7489d

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Get main Floating Action Button only once.

603e4ef

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Better handling of touch guard.

9a0de73

Set clickable to false by default and toggle when appropriate. Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Remove old click listener.

958e425

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Remove unnecessary barrier.

d396dd3

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Use existing tinting utility.

e3cb8ae

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Improve on hiding Floating Action Button on scroll.

329a813

Remove worker thread usage in favour of handler with less allocations. Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Merge remote-tracking branch 'origin/floating_actions_menu' into floa…

1f7310f

…ting_actions_menu # Conflicts: # vector/src/main/java/im/vector/activity/VectorHomeActivity.java # vector/src/main/res/layout/activity_home.xml

Merge remote-tracking branch 'remotes/upstream/develop' into floating…

b0c1905

…_actions_menu # Conflicts: # vector/src/main/java/im/vector/activity/VectorHomeActivity.java

t3chguy added 2 commits June 10, 2018 18:24

post-merge fix

b1a038d

fix merge-broken indentation and split intermediate variable for linter

dc8a80c

Dominaezzz added 2 commits June 11, 2018 14:32

Fix touchGuard to not be clickable when floating action menu is closed.

e95b4b4

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

Remove unused 'mFabDialog' member variable.

83e2a85

Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>

bmarty suggested changes Jun 11, 2018

View reviewed changes

bmarty changed the base branch from develop to feature/new_fab July 2, 2018 12:32

bmarty merged commit 1f2e335 into element-hq:feature/new_fab Jul 2, 2018

This was referenced Jul 2, 2018

Implement FAB menu #2404

Merged

Add the "ok" option on the pop-up that opens via the floating action button #2096

Closed

Improve FAB management #1446

Closed

Dominaezzz deleted the floating_actions_menu branch July 2, 2019 20:56


		if (!(fragment instanceof AbsHomeFragment) \|\| !((AbsHomeFragment) fragment).onFabClick()) {
		onFloatingButtonClick();

Floating actions menu #2335

Floating actions menu #2335

Conversation

Dominaezzz commented Jun 3, 2018

Dominaezzz commented Jun 3, 2018

bmarty left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bmarty commented Jun 5, 2018

t3chguy commented Jun 9, 2018 • edited Loading

t3chguy commented Jun 10, 2018 • edited Loading

bmarty commented Jun 11, 2018

Dominaezzz commented Jun 11, 2018

bmarty left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bmarty commented Jul 2, 2018

t3chguy commented Jun 9, 2018 •

edited

Loading

t3chguy commented Jun 10, 2018 •

edited

Loading