diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 024a6983..a37b624f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,6 +32,7 @@ This can also be done by using `Ctrl + Alt + L` on Windows, `Ctrl + Shift + Alt
* Member Variables: `camelCase`
* Global Variables: `PascalCase`
* Functions: `PascalCase`
+* Template Parameters: `PascalCase`
* Parameters: `camelCase`
* Files and Directories: `snake_case` except for when they correspond to a HOS structure (EG: Services, Kernel Objects)
@@ -209,6 +210,7 @@ In addition, try to `constexpr` as much as possible including constructors and f
* Global Variables: `PascalCase`
* Functions: `PascalCase`
* Parameters: `camelCase`
+* Generics: `PascalCase`
* Files: `PascalCase`
* Directories: `camelCase`
diff --git a/app/src/main/java/emu/skyline/MainActivity.kt b/app/src/main/java/emu/skyline/MainActivity.kt
index 54e488bd..c4371115 100644
--- a/app/src/main/java/emu/skyline/MainActivity.kt
+++ b/app/src/main/java/emu/skyline/MainActivity.kt
@@ -230,12 +230,15 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, View.OnLongClick
R.id.app_item_linear, R.id.app_item_grid -> {
val tag = view.tag
-
if (tag is AppItem) {
- val intent = Intent(this, EmulationActivity::class.java)
- intent.data = tag.uri
-
- startActivity(intent)
+ if (sharedPreferences.getBoolean("select_action", false)) {
+ val dialog = AppDialog(tag)
+ dialog.show(supportFragmentManager, "game")
+ } else {
+ val intent = Intent(this, EmulationActivity::class.java)
+ intent.data = tag.uri
+ startActivity(intent)
+ }
}
}
}
@@ -248,10 +251,10 @@ class MainActivity : AppCompatActivity(), View.OnClickListener, View.OnLongClick
when (view?.id) {
R.id.app_item_linear, R.id.app_item_grid -> {
val tag = view.tag
-
if (tag is AppItem) {
val dialog = AppDialog(tag)
dialog.show(supportFragmentManager, "game")
+
return true
}
}
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 5df194f0..ae3f6a15 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -12,7 +12,7 @@
Emulator
Search Location
+ Game Container Layout
+ Always Show Game Information
+ Game information will be shown on clicking a game
+ Game information will only be shown on long-clicking a game
Log Level
Compact Logs
Logs will be displayed in a compact form factor
@@ -34,10 +38,6 @@
The system will emulate being in handheld mode
The system will emulate being in docked mode
Theme
- Application Layout
- Audio
- Audio Buffer Size
- The size of the buffer used to store audio samples for ROMs using audren. A lower value will result in less latency but potentially increased audio stutter depending on the performance of the device
Licenses
The license of Skyline (LGPLv3 or later)
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 20de3331..e82bdbfb 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -37,6 +37,12 @@
app:key="layout_type"
app:title="@string/layout_type"
app:useSimpleSummaryProvider="true" />
+
-
-
-