piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12866 from JosJuice/android-log-types-sorting

Browse Source 
Android: Replace log type names map with array
This commit is contained in:
JosJuice
2025-03-15 16:01:33 +01:00
committed by GitHub
parent 1f087473aa ea7928b3cd
commit e637a05707
7 changed files with 49 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
View File

@ -12,6 +12,7 @@ import android.view.Surface;
import android.widget.Toast;
import androidx.annotation.Keep;
import androidx.core.util.Pair;
import androidx.fragment.app.FragmentManager;
import org.dolphinemu.dolphinemu.activities.EmulationActivity;
@ -20,7 +21,6 @@ import org.dolphinemu.dolphinemu.utils.CompressCallback;
import org.dolphinemu.dolphinemu.utils.Log;
import java.lang.ref.WeakReference;
import java.util.LinkedHashMap;
import java.util.concurrent.Semaphore;
/**
@ -411,7 +411,7 @@ public final class NativeLibrary
*/
public static native void RefreshWiimotes();
public static native LinkedHashMap<String, String> GetLogTypeNames();
public static native Pair<String, String>[] GetLogTypeNames();
public static native void ReloadLoggerConfig();

8
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
View File

@ -1972,8 +1972,8 @@ class SettingsFragmentPresenter(
) { SettingsAdapter.clearLog() })
sl.add(HeaderSetting(context, R.string.log_types, 0))
for ((key, value) in LOG_TYPE_NAMES) {
sl.add(LogSwitchSetting(key, value, ""))
for (logType in LOG_TYPE_NAMES) {
sl.add(LogSwitchSetting(logType.first, logType.second, ""))
}
}
@ -2504,11 +2504,11 @@ class SettingsFragmentPresenter(
fun setAllLogTypes(value: Boolean) {
val settings = fragmentView.settings
for ((key) in LOG_TYPE_NAMES) {
for (logType in LOG_TYPE_NAMES) {
AdHocBooleanSetting(
Settings.FILE_LOGGER,
Settings.SECTION_LOGGER_LOGS,
key,
logType.first,
false
).setBoolean(settings!!, value)
}