diff --git a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java index 9bd6d6ee7..5852a78b6 100644 --- a/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java +++ b/src/pandroid/app/src/main/java/com/panda3ds/pandroid/app/game/DrawerFragment.java @@ -16,7 +16,6 @@ import com.google.android.material.navigation.NavigationView; import com.panda3ds.pandroid.AlberDriver; import com.panda3ds.pandroid.R; -import com.panda3ds.pandroid.app.BaseActivity; import com.panda3ds.pandroid.data.game.GameMetadata; import com.panda3ds.pandroid.utils.GameUtils; import com.panda3ds.pandroid.view.gamesgrid.GameIconView; @@ -27,7 +26,7 @@ public class DrawerFragment extends Fragment implements DrawerLayout.DrawerListe @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - drawerContainer = ((BaseActivity)requireActivity()).findViewById(R.id.drawer_container); + drawerContainer = requireActivity().findViewById(R.id.drawer_container); drawerContainer.removeDrawerListener(this); drawerContainer.addDrawerListener(this); drawerContainer.setScrimColor(Color.argb(160, 0,0,0)); @@ -48,8 +47,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat ((AppCompatTextView)view.findViewById(R.id.game_publisher)).setText(game.getPublisher()); ((NavigationView)view.findViewById(R.id.action_navigation)).setNavigationItemSelectedListener(this); - - open(); } @Override @@ -74,9 +71,7 @@ public void open(){ } @Override - public void onDrawerSlide(@NonNull View drawerView, float slideOffset) { - - } + public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {} @Override public void onDrawerOpened(@NonNull View drawerView) { @@ -90,9 +85,7 @@ public void onDrawerClosed(@NonNull View drawerView) { } @Override - public void onDrawerStateChanged(int newState) { - - } + public void onDrawerStateChanged(int newState) {} @Override public boolean onNavigationItemSelected(@NonNull MenuItem item) { diff --git a/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml b/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml index edf9144f9..2da6b9c8e 100644 --- a/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml +++ b/src/pandroid/app/src/main/res/layout/fragment_game_drawer.xml @@ -10,23 +10,25 @@ + android:layout_width="90dp" + android:layout_height="90dp" + app:cardCornerRadius="10dp" + android:layout_marginTop="20dp" + android:layout_marginBottom="20dp"> + android:background="?colorSurface"/> @@ -34,23 +36,27 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:layout_marginStart="10dp"> + android:gravity="center" + android:layout_marginBottom="20dp"> + android:paddingBottom="4dp" + android:gravity="center" + android:textStyle="bold" + android:textSize="19sp"/> + android:textSize="14sp"/> @@ -69,7 +75,7 @@ + android:title="@string/resume"/> + android:title="@string/exit"/> \ No newline at end of file diff --git a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml index e57feab59..d3966e18e 100644 --- a/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml +++ b/src/pandroid/app/src/main/res/values-pt-rBR/strings.xml @@ -24,4 +24,7 @@ Claro Escuro Preto + Ações + Sair + Continuar \ No newline at end of file diff --git a/src/pandroid/app/src/main/res/values/strings.xml b/src/pandroid/app/src/main/res/values/strings.xml index 973e7acb4..13db91522 100644 --- a/src/pandroid/app/src/main/res/values/strings.xml +++ b/src/pandroid/app/src/main/res/values/strings.xml @@ -25,4 +25,7 @@ Light Dark Black + Actions + Exit + Resume \ No newline at end of file