diff options
| author | Mai <mathew1800@gmail.com> | 2022-12-04 09:14:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-04 09:14:53 +0000 |
| commit | 2aa25c03df7982d6e9e24f9dcec17c34b36d829b (patch) | |
| tree | 865d34cf6280029c23a2eba3b14604afcbce8601 /Source/Android/app/src/main/java | |
| parent | af5596720f85a0a260ba73c93996baa6e0a7420d (diff) | |
| parent | 64733b2504f55d14000e1b321c13fcc736043b91 (diff) | |
Merge pull request #11318 from t895/expanded-fab
Android: Use expanding Extended FAB
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java | 11 | ||||
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InsetsHelper.java | 4 |
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) -> { |