summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorCharles Lombardo <clombardo169@gmail.com>2022-12-02 22:12:33 -0500
committerCharles Lombardo <clombardo169@gmail.com>2022-12-02 22:12:33 -0500
commit64733b2504f55d14000e1b321c13fcc736043b91 (patch)
tree865d34cf6280029c23a2eba3b14604afcbce8601 /Source/Android/app/src/main/java
parentaf5596720f85a0a260ba73c93996baa6e0a7420d (diff)
Android: Use expanding Extended FAB
This adds text to the FAB when expanded and shrinks the FAB on scroll. The text will return when scrolling up as well.
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java11
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InsetsHelper.java4
2 files changed, 13 insertions, 2 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
index 2a0512e3ac..0e97ee2181 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
@@ -76,6 +76,17 @@ public final class MainActivity extends AppCompatActivity
// Set up the FAB.
mBinding.buttonAddDirectory.setOnClickListener(view -> mPresenter.onFabClick());
+ mBinding.appbarMain.addOnOffsetChangedListener((appBarLayout, verticalOffset) ->
+ {
+ if (verticalOffset == 0)
+ {
+ mBinding.buttonAddDirectory.extend();
+ }
+ else if (appBarLayout.getTotalScrollRange() == -verticalOffset)
+ {
+ mBinding.buttonAddDirectory.shrink();
+ }
+ });
mPresenter.onCreate();
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InsetsHelper.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InsetsHelper.java
index 7b98528667..311e16b10a 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InsetsHelper.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InsetsHelper.java
@@ -20,7 +20,7 @@ import androidx.viewpager.widget.ViewPager;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.color.MaterialColors;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
import org.dolphinemu.dolphinemu.R;
@@ -73,7 +73,7 @@ public class InsetsHelper
}
public static void setUpMainLayout(AppCompatActivity activity, AppBarLayout appBarLayout,
- FloatingActionButton fab, ViewPager viewPager, View workaroundView)
+ ExtendedFloatingActionButton fab, ViewPager viewPager, View workaroundView)
{
ViewCompat.setOnApplyWindowInsetsListener(appBarLayout, (v, windowInsets) ->
{