From 7d39ed9bcc7e4e6e0597167b09e74ccb856ba0ae Mon Sep 17 00:00:00 2001
From: Ryan Meredith <rwm@udel.edu>
Date: Mon, 31 Aug 2020 06:49:10 -0400
Subject: [PATCH 1/2] Android: res cleanup

---
 .../animator-ldrtl/menu_slide_out_to_end.xml  |  4 +--
 .../main/res/animator/button_elevation.xml    | 22 --------------
 .../res/animator/menu_slide_out_to_end.xml    | 30 +++++++++----------
 .../res/layout-port/fragment_emulation.xml    |  1 -
 .../layout-television/activity_emulation.xml  |  3 +-
 .../res/layout/activity_add_directory.xml     | 27 -----------------
 .../res/layout/list_item_settings_header.xml  |  4 +--
 .../app/src/main/res/layout/tv_title.xml      |  4 +--
 .../src/main/res/menu/menu_add_directory.xml  | 11 -------
 .../app/src/main/res/values/dimens.xml        |  3 --
 .../app/src/main/res/values/strings.xml       |  6 +---
 11 files changed, 24 insertions(+), 91 deletions(-)
 delete mode 100644 Source/Android/app/src/main/res/animator/button_elevation.xml
 delete mode 100644 Source/Android/app/src/main/res/layout/activity_add_directory.xml
 delete mode 100644 Source/Android/app/src/main/res/menu/menu_add_directory.xml

diff --git a/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_end.xml b/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_end.xml
index eadf33156c..ede4eb37cb 100644
--- a/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_end.xml
+++ b/Source/Android/app/src/main/res/animator-ldrtl/menu_slide_out_to_end.xml
@@ -2,7 +2,7 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- This animation is used ONLY when a submenu is replaced. -->
-    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    <objectAnimator
         android:propertyName="translationX"
         android:valueType="floatType"
         android:valueFrom="0"
@@ -10,7 +10,7 @@
         android:interpolator="@android:interpolator/decelerate_quad"
         android:duration="200"/>
 
-    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+    <objectAnimator
         android:propertyName="alpha"
         android:valueType="floatType"
         android:valueFrom="1"
diff --git a/Source/Android/app/src/main/res/animator/button_elevation.xml b/Source/Android/app/src/main/res/animator/button_elevation.xml
deleted file mode 100644
index b6a0974a09..0000000000
--- a/Source/Android/app/src/main/res/animator/button_elevation.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true">
-        <objectAnimator
-            android:propertyName="translationZ"
-            android:duration="@android:integer/config_shortAnimTime"
-            android:valueFrom="@dimen/elevation_low"
-            android:valueTo="@dimen/elevation_high"
-            android:valueType="floatType"/>
-    </item>
-
-    <item>
-        <objectAnimator
-            android:propertyName="translationZ"
-            android:duration="@android:integer/config_shortAnimTime"
-            android:valueFrom="@dimen/elevation_high"
-            android:valueTo="@dimen/elevation_low"
-            android:valueType="floatType"/>
-    </item>
-
-</set>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/animator/menu_slide_out_to_end.xml b/Source/Android/app/src/main/res/animator/menu_slide_out_to_end.xml
index 5c38a06fd8..d650237d6f 100644
--- a/Source/Android/app/src/main/res/animator/menu_slide_out_to_end.xml
+++ b/Source/Android/app/src/main/res/animator/menu_slide_out_to_end.xml
@@ -2,20 +2,20 @@
 <set xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- This animation is used ONLY when a submenu is replaced. -->
-    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:propertyName="translationX"
-                    android:valueType="floatType"
-                    android:valueFrom="0"
-                    android:valueTo="1280dp"
-                    android:interpolator="@android:interpolator/decelerate_quad"
-                    android:duration="200"/>
+    <objectAnimator
+        android:propertyName="translationX"
+        android:valueType="floatType"
+        android:valueFrom="0"
+        android:valueTo="1280dp"
+        android:interpolator="@android:interpolator/decelerate_quad"
+        android:duration="200"/>
 
-    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:propertyName="alpha"
-                    android:valueType="floatType"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:interpolator="@android:interpolator/decelerate_quad"
-                    android:duration="200"/>
+    <objectAnimator
+        android:propertyName="alpha"
+        android:valueType="floatType"
+        android:valueFrom="1"
+        android:valueTo="0"
+        android:interpolator="@android:interpolator/decelerate_quad"
+        android:duration="200"/>
 
-</set>
\ No newline at end of file
+</set>
diff --git a/Source/Android/app/src/main/res/layout-port/fragment_emulation.xml b/Source/Android/app/src/main/res/layout-port/fragment_emulation.xml
index 4f54974a5b..64d27bdf12 100644
--- a/Source/Android/app/src/main/res/layout-port/fragment_emulation.xml
+++ b/Source/Android/app/src/main/res/layout-port/fragment_emulation.xml
@@ -7,7 +7,6 @@
 
     <!-- Places the emulation surface to the top half of the screen -->
     <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
diff --git a/Source/Android/app/src/main/res/layout-television/activity_emulation.xml b/Source/Android/app/src/main/res/layout-television/activity_emulation.xml
index abe99bfb40..5e516d04ad 100644
--- a/Source/Android/app/src/main/res/layout-television/activity_emulation.xml
+++ b/Source/Android/app/src/main/res/layout-television/activity_emulation.xml
@@ -17,7 +17,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:baselineAligned="false">
 
         <FrameLayout
             android:id="@+id/frame_menu"
diff --git a/Source/Android/app/src/main/res/layout/activity_add_directory.xml b/Source/Android/app/src/main/res/layout/activity_add_directory.xml
deleted file mode 100644
index 151d307c51..0000000000
--- a/Source/Android/app/src/main/res/layout/activity_add_directory.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar_folder_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/dolphin_blue"
-        android:minHeight="?android:attr/actionBarSize"
-        android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar"
-        android:elevation="6dp"/>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/list_files"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
-        tools:listitem="@layout/list_item_file"
-        android:elevation="4dp"
-        android:background="@android:color/white"/>
-
-</LinearLayout>
diff --git a/Source/Android/app/src/main/res/layout/list_item_settings_header.xml b/Source/Android/app/src/main/res/layout/list_item_settings_header.xml
index 1c0cd336c3..58850ca801 100644
--- a/Source/Android/app/src/main/res/layout/list_item_settings_header.xml
+++ b/Source/Android/app/src/main/res/layout/list_item_settings_header.xml
@@ -14,6 +14,6 @@
         android:layout_marginBottom="@dimen/spacing_small"
         android:textColor="?android:colorAccent"
         android:textStyle="bold"
-        android:layout_gravity="left|bottom"/>
+        android:layout_gravity="start|bottom"/>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/Source/Android/app/src/main/res/layout/tv_title.xml b/Source/Android/app/src/main/res/layout/tv_title.xml
index 49dd2969ee..9980b6b6e3 100644
--- a/Source/Android/app/src/main/res/layout/tv_title.xml
+++ b/Source/Android/app/src/main/res/layout/tv_title.xml
@@ -12,7 +12,7 @@
             android:visibility="gone"
             android:layout_alignTop="@+id/badge"
             android:layout_alignBottom="@+id/badge"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:id="@+id/title"
             android:gravity="center_vertical"
             android:layout_width="wrap_content"
@@ -21,7 +21,7 @@
 
         <ImageView
             android:visibility="gone"
-            android:layout_toLeftOf="@id/title"
+            android:layout_toStartOf="@id/title"
             android:id="@+id/badge"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/Source/Android/app/src/main/res/menu/menu_add_directory.xml b/Source/Android/app/src/main/res/menu/menu_add_directory.xml
deleted file mode 100644
index 9a1f7c863b..0000000000
--- a/Source/Android/app/src/main/res/menu/menu_add_directory.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <!-- TODO Please give me an icon! -->
-    <item
-        android:id="@+id/menu_up_one_level"
-        android:title="@string/add_directory_up_one_level"
-        app:showAsAction="ifRoom|withText"/>
-
-</menu>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values/dimens.xml b/Source/Android/app/src/main/res/values/dimens.xml
index 0798c90a96..e0e16c895e 100644
--- a/Source/Android/app/src/main/res/values/dimens.xml
+++ b/Source/Android/app/src/main/res/values/dimens.xml
@@ -2,9 +2,6 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
 
-    <dimen name="elevation_low">1dp</dimen>
-    <dimen name="elevation_high">4dp</dimen>
-
     <dimen name="spacing_small">4dp</dimen>
     <dimen name="spacing_medlarge">12dp</dimen>
     <dimen name="spacing_large">16dp</dimen>
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index e72828590a..ba8377e099 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -302,6 +302,7 @@
     <string name="other">Other</string>
 
     <!-- Game Grid Screen-->
+    <string name="add_directory_title">Add Folder to Library</string>
     <string name="grid_menu_config">Config</string>
     <string name="grid_menu_graphics_settings">Graphics Settings</string>
     <string name="grid_menu_gcpad_settings">GameCube Input</string>
@@ -312,11 +313,6 @@
     <string name="wad_install_success">Successfully installed this title to the NAND.</string>
     <string name="wad_install_failure">Failed to install this title to the NAND.</string>
 
-    <!-- Add Directory Screen-->
-    <string name="add_directory_title">Add Folder to Library</string>
-    <string name="add_directory_up_one_level">Up one level</string>
-    <string name="add_directory_empty_folder">That folder is empty.</string>
-
     <!-- Preferences Screen -->
     <string name="preferences_save_exit">Save and Exit</string>
     <string name="preferences_settings">Settings</string>

From 05f3c4d579e9352311e90cf97b444a25cd8f4b72 Mon Sep 17 00:00:00 2001
From: Ryan Meredith <rwm@udel.edu>
Date: Mon, 31 Aug 2020 11:42:27 -0400
Subject: [PATCH 2/2] Android: Remove unused files

---
 .../ui/input/gamecube/ControllerFragment.java |  6 ----
 .../gamecube/ControllerFragmentPresenter.java |  6 ----
 .../gamecube/ControllerFragmentView.java      |  6 ----
 .../dolphinemu/utils/Animations.java          | 29 ----------------
 .../viewholders/FileViewHolder.java           | 31 -----------------
 .../main/res/drawable/oval_ripple_grey.xml    |  8 -----
 .../src/main/res/layout/list_item_file.xml    | 33 -------------------
 .../app/src/main/res/values/colors.xml        |  4 +--
 8 files changed, 1 insertion(+), 122 deletions(-)
 delete mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragment.java
 delete mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragmentPresenter.java
 delete mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragmentView.java
 delete mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Animations.java
 delete mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/FileViewHolder.java
 delete mode 100644 Source/Android/app/src/main/res/drawable/oval_ripple_grey.xml
 delete mode 100644 Source/Android/app/src/main/res/layout/list_item_file.xml

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragment.java
deleted file mode 100644
index 346a16741d..0000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragment.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.dolphinemu.dolphinemu.ui.input.gamecube;
-
-
-public class ControllerFragment
-{
-}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragmentPresenter.java
deleted file mode 100644
index d8916ccf08..0000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragmentPresenter.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.dolphinemu.dolphinemu.ui.input.gamecube;
-
-
-public class ControllerFragmentPresenter
-{
-}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragmentView.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragmentView.java
deleted file mode 100644
index 77c8b7b3a7..0000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/input/gamecube/ControllerFragmentView.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.dolphinemu.dolphinemu.ui.input.gamecube;
-
-
-public interface ControllerFragmentView
-{
-}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Animations.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Animations.java
deleted file mode 100644
index 64df6228d5..0000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Animations.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.dolphinemu.dolphinemu.utils;
-
-import android.view.View;
-import android.view.ViewPropertyAnimator;
-
-public final class Animations
-{
-  private Animations()
-  {
-  }
-
-  public static ViewPropertyAnimator fadeViewIn(View view)
-  {
-    view.setVisibility(View.VISIBLE);
-
-    return view.animate()
-            .withLayer()
-            .setDuration(100)
-            .alpha(1.0f);
-  }
-
-  public static ViewPropertyAnimator fadeViewOut(View view)
-  {
-    return view.animate()
-            .withLayer()
-            .setDuration(300)
-            .alpha(0.0f);
-  }
-}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/FileViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/FileViewHolder.java
deleted file mode 100644
index af854fa763..0000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/FileViewHolder.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.dolphinemu.dolphinemu.viewholders;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import org.dolphinemu.dolphinemu.R;
-
-/**
- * A simple class that stores references to views so that the FileAdapter doesn't need to
- * keep calling findViewById(), which is expensive.
- */
-public class FileViewHolder extends RecyclerView.ViewHolder
-{
-  public View itemView;
-
-  public TextView textFileName;
-  public ImageView imageType;
-
-  public FileViewHolder(View itemView)
-  {
-    super(itemView);
-
-    this.itemView = itemView;
-
-    textFileName = (TextView) itemView.findViewById(R.id.text_file_name);
-    imageType = (ImageView) itemView.findViewById(R.id.image_type);
-  }
-}
diff --git a/Source/Android/app/src/main/res/drawable/oval_ripple_grey.xml b/Source/Android/app/src/main/res/drawable/oval_ripple_grey.xml
deleted file mode 100644
index 31f064c0ac..0000000000
--- a/Source/Android/app/src/main/res/drawable/oval_ripple_grey.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="?android:colorControlHighlight">
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="@color/circle_grey"/>
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/list_item_file.xml b/Source/Android/app/src/main/res/layout/list_item_file.xml
deleted file mode 100644
index 16140c5994..0000000000
--- a/Source/Android/app/src/main/res/layout/list_item_file.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="56dp"
-              android:background="?android:attr/selectableItemBackground"
-              android:focusable="true"
-              android:clickable="true"
-              android:orientation="horizontal">
-
-    <ImageView
-        android:id="@+id/image_type"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:background="@drawable/oval_ripple_grey"
-        android:padding="4dp"
-        tools:src="@drawable/ic_wii"/>
-
-    <TextView
-        android:id="@+id/text_file_name"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_weight="1"
-        android:textSize="16sp"
-        tools:text="File Name"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values/colors.xml b/Source/Android/app/src/main/res/values/colors.xml
index 33df0fc245..b62030758e 100644
--- a/Source/Android/app/src/main/res/values/colors.xml
+++ b/Source/Android/app/src/main/res/values/colors.xml
@@ -9,8 +9,6 @@
     <color name="dolphin_accent_wiiware">#2979ff</color>
     <color name="dolphin_accent_gamecube">#651fff</color>
 
-    <color name="circle_grey">#bdbdbd</color>
-
     <color name="tv_card_unselected">#444444</color>
 
-</resources>
\ No newline at end of file
+</resources>