Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: frontend: game_list: Move add directory button to top bar.

Browse Source
This commit is contained in:
bunnei 2020-03-09 21:11:24 -04:00
parent 716df842e4
commit afb23572b5
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/android/app/src/main/java/org/citra/citra_android/ui/main/MainActivity.java
View File

@ -33,7 +33,6 @@ public final class MainActivity extends AppCompatActivity implements MainView {
private Toolbar mToolbar;
private int mFrameLayoutId;
private PlatformGamesFragment mPlatformGamesFragment;
private FloatingActionButton mFab;
private MainPresenter mPresenter = new MainPresenter(this);
@ -47,13 +46,6 @@ public final class MainActivity extends AppCompatActivity implements MainView {
setSupportActionBar(mToolbar);
mFrameLayoutId = R.id.games_platform_frame;
mFab.setOnClickListener(view -> {
if (PermissionsHandler.hasWriteAccess(this)) {
mPresenter.onFabClick();
} else {
PermissionsHandler.checkWritePermission(this);
}
});
mPresenter.onCreate();
if (savedInstanceState == null) {
@ -86,7 +78,6 @@ public final class MainActivity extends AppCompatActivity implements MainView {
// TODO: Replace with a ButterKnife injection.
private void findViews() {
mToolbar = findViewById(R.id.toolbar_main);
mFab = findViewById(R.id.button_add_directory);
}
@Override

11
src/android/app/src/main/res/layout/activity_main.xml
View File

@ -25,15 +25,4 @@
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/button_add_directory"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:src="@drawable/ic_add"
app:borderWidth="0dp"
app:layout_anchor="@+id/games_platform_frame"
app:layout_anchorGravity="bottom|right|end"
app:rippleColor="?android:colorPrimary" />
</android.support.design.widget.CoordinatorLayout>

7
src/android/app/src/main/res/menu/menu_game_grid.xml
View File

@ -2,10 +2,15 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/button_add_directory"
android:title="@string/add_directory_title"
android:icon="@drawable/ic_add"
app:showAsAction="always"/>
<item
android:id="@+id/menu_settings_core"
android:title="@string/grid_menu_core_settings"
android:icon="@drawable/ic_settings_core"
app:showAsAction="ifRoom"/>
app:showAsAction="always"/>
</menu>