From 8b0624f53e7c2636ffb71155128a0c5a13ac0ccd Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Wed, 27 Oct 2021 19:24:34 +0200
Subject: [PATCH] Android: Show SD root path in Riivolution activity

---
 .../ui/RiivolutionBootActivity.java           |  6 ++++
 .../res/layout/activity_riivolution_boot.xml  | 29 +++++++++++++++++--
 .../app/src/main/res/values/strings.xml       |  1 +
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
index 37921c4af8..26016a800f 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.java
@@ -6,6 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.widget.Button;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
@@ -16,6 +17,7 @@ import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.activities.EmulationActivity;
 import org.dolphinemu.dolphinemu.features.riivolution.model.RiivolutionPatches;
 import org.dolphinemu.dolphinemu.ui.DividerItemDecoration;
+import org.dolphinemu.dolphinemu.utils.DirectoryInitialization;
 
 public class RiivolutionBootActivity extends AppCompatActivity
 {
@@ -51,6 +53,10 @@ public class RiivolutionBootActivity extends AppCompatActivity
     int revision = intent.getIntExtra(ARG_REVISION, -1);
     int discNumber = intent.getIntExtra(ARG_DISC_NUMBER, -1);
 
+    TextView textSdRoot = findViewById(R.id.text_sd_root);
+    String riivolutionPath = DirectoryInitialization.getUserDirectory() + "/Load/Riivolution";
+    textSdRoot.setText(getString(R.string.riivolution_sd_root, riivolutionPath));
+
     Button buttonStart = findViewById(R.id.button_start);
     buttonStart.setOnClickListener((v) ->
     {
diff --git a/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml b/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
index 3d136367d5..4cabdc846c 100644
--- a/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
+++ b/Source/Android/app/src/main/res/layout/activity_riivolution_boot.xml
@@ -1,25 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <TextView
+        android:id="@+id/text_sd_root"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/spacing_large"
+        tools:text="@string/riivolution_sd_root"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/divider" />
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:background="#1F000000"
+        android:layout_marginHorizontal="@dimen/spacing_large"
+        android:layout_marginVertical="@dimen/spacing_small"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/text_sd_root"
+        app:layout_constraintBottom_toTopOf="@id/scroll_view" />
+
     <ScrollView
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/divider"
         app:layout_constraintBottom_toTopOf="@id/button_start">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginTop="@dimen/spacing_medlarge" />
+            android:layout_height="0dp" />
 
     </ScrollView>
 
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index 56feb15e21..efcdf82bd4 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -482,6 +482,7 @@ It can efficiently compress both junk data and encrypted Wii data.
     </string>
 
     <!-- Riivolution Boot Screen -->
+    <string name="riivolution_sd_root">SD Root: %1$s</string>
     <string name="riivolution_disabled">Disabled</string>
     <string name="riivolution_start">Start</string>