N-archive/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
26814 commits 1 branch 0 tags 109 MiB
Commit graph

768 commits

Author SHA1 Message Date
Charles Lombardo
72d9dc9a3f android: Add proper homebrew check 2023-06-09 20:17:51 -04:00
Charles Lombardo
3cce51d25b android: Fix input overlay version check 2023-06-09 15:15:57 -04:00
bunnei
064bad6ddf android: EmulationActivity: Fix orientation on Mi Pad 5. 2023-06-08 17:20:13 -07:00
bunnei
9c6fc44a59
Merge pull request #10650 from qurious-pixel/android_tv 
Android TV banner
 2023-06-07 16:32:25 -07:00
qurious-pixel
45f80f2b06
remove version code declaration 2023-06-07 13:27:51 -07:00
Live session user
9611a9e220 Android TV banner 2023-06-06 11:32:25 -07:00
Narr the Reg
4d61319307 android: Set version code 2023-06-06 12:14:38 -06:00
Abandoned Cart
0968e315f4 android: Improve Gradle build configuration 2023-06-06 12:46:21 -04:00
bunnei
036996429e
Merge pull request #10633 from t895/variable-surface-ratio 
android: Use a custom view for changing emulation aspect ratio
 2023-06-05 20:27:58 -07:00
bunnei
dc2a0b2e50
Merge pull request #10578 from PabloG02/lime-firmware&logs 
Add UI to import firmware and share logs
 2023-06-05 17:41:19 -07:00
bunnei
e1078ec0f4 android: HomeSettingsFragment: Use string resource for "Share log". 2023-06-05 17:40:43 -07:00
Charles Lombardo
c8b91b3a89 android: Use a custom view for changing emulation aspect ratio 
Credit to the Skyline team for the FixedRatioSurfaceView.
 2023-06-05 20:24:36 -04:00
bunnei
71766f3269
Merge pull request #10618 from t895/licenses 
android: Add licenses page
 2023-06-05 17:14:15 -07:00
PabloG02
409ff26f02 Address feedback 2023-06-06 00:07:54 +02:00
Charles Lombardo
cba5865afe android: Create licenses page 2023-06-05 14:34:23 -04:00
bunnei
2f7658bd75
Merge pull request #10613 from t895/settings-changes 
android: String and settings organization changes
 2023-06-04 19:17:42 -07:00
Charles Lombardo
5e58af0616 android: Move settings to debug submenu 2023-06-04 19:53:27 -04:00
Charles Lombardo
0078f97227 android: Load settings at the start of each activity 2023-06-04 19:37:10 -04:00
PabloG02
3733187c14 Attempt to move the unzip coroutine to a ViewModel 2023-06-04 20:52:12 +02:00
PabloG02
72597b8ffe android: update strings 2023-06-04 20:52:12 +02:00
PabloG02
8713c442e9 android: add option to share log 2023-06-04 20:52:12 +02:00
PabloG02
5435f0be5e android: add option to install firmware 2023-06-04 20:52:12 +02:00
PabloG02
19674ec78d android: move unzip function to FileUtil and use SecurityException 2023-06-04 20:50:00 +02:00
Charles Lombardo
5de8c5b5c7 android: Several string changes 2023-06-04 13:30:56 -04:00
Abandoned Cart
00a391ce10 android: Resolve a couple Gradle warnings 2023-06-04 02:06:38 -04:00
Abandoned Cart
cfa8bec5b9 android: Add support for split foldable view 2023-06-03 22:57:28 -04:00
Abandoned Cart
b394a6b937 android: Replace deprecated and Java code 2023-06-03 15:16:25 -04:00
Charles Lombardo
a789046127 android: Fix crash on importing invalid save 2023-06-03 00:06:08 -07:00
Charles Lombardo
f94eb320ff android: Rename "Input Overlay" to "Overlay Options" 2023-06-03 00:06:08 -07:00
Charles Lombardo
c927a30d09 android: Adjust import/export saves dialog 2023-06-03 00:06:08 -07:00
Charles Lombardo
20abd49a21 android: Warning dialogs for key errors 2023-06-03 00:06:08 -07:00
bunnei
4ac9778652 android: EmulationFragment: Remove unnecessary surface destroy on pause. 2023-06-03 00:06:08 -07:00
bunnei
098e2c4077 android: renderer_vulkan: Fix crash with surface recreation. 2023-06-03 00:06:07 -07:00
bunnei
057117f009 android: Fix presentation layout on foldable and tablet devices. 2023-06-03 00:06:07 -07:00
Charles Lombardo
ca4b07a2d7 android: Enable overlay scale/opacity dialog 2023-06-03 00:06:07 -07:00
PabloG02
1957b7e6cc Add image to card_game.xml to preview in the Layout Editor 2023-06-03 00:06:07 -07:00
PabloG02
a7e0a0d5b1 Save the position of buttons as a percentage 2023-06-03 00:06:07 -07:00
Charles Lombardo
8e8627a258 android: Don't crash the app when selecting a zip that causes a SecurityException 2023-06-03 00:06:07 -07:00
bunnei
9ca8687b5f android: ForegroundService: Handle null intent. 2023-06-03 00:06:06 -07:00
bunnei
17ae85e724 android: ImportExportSavesFragment: Cleanup strings. 2023-06-03 00:06:06 -07:00
bunnei
b325ad16bc Update src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.kt 2023-06-03 00:06:06 -07:00
PabloG02
4010764279 Remove ?. 2023-06-03 00:06:06 -07:00
PabloG02
9650c1d02d Check if folder exists before letting the user import/export saves 2023-06-03 00:06:06 -07:00
PabloG02
33d36ded28 Add save import/export in UI 2023-06-03 00:06:06 -07:00
Charles Lombardo
ad9c2356a8 android: Fix FPS text getting cut off by rounded display corners 2023-06-03 00:06:05 -07:00
Charles Lombardo
fdd200d33f android: Prevent deleting the settings file while a game is running 2023-06-03 00:06:05 -07:00
Charles Lombardo
4e87a01db6 android: Fix link text color for base theme dialog 2023-06-03 00:06:05 -07:00
bunnei
ee8caac82f android: Various fixes for CI. 2023-06-03 00:06:05 -07:00
bunnei
17b5ed9baf android: externals: Update libadrenotools, use useLegacyPackaging. 2023-06-03 00:06:05 -07:00
Charles Lombardo
0f9c5b8d6a android: Re-enable service notification 2023-06-03 00:06:05 -07:00
Charles Lombardo
09747ca2d3 android: Ensure keys are loaded before populating games list 2023-06-03 00:06:05 -07:00
Charles Lombardo
897b748895 android: Use dialog fragment for the reset settings dialog 2023-06-03 00:06:05 -07:00
Charles Lombardo
9c1d42342d android: Upgrade AGP to 8.0.2 2023-06-03 00:06:04 -07:00
Charles Lombardo
7de86266fd android: Show notification permission page during setup 2023-06-03 00:06:04 -07:00
Charles Lombardo
419daf770d android: DIsable FPS counter by default 2023-06-03 00:06:04 -07:00
Charles Lombardo
bfb4e3bcaa android: Improve searches with one character 
The Jaccard algorithm is great for searches with 2 or more characters but nothing is returned for searches with one character. To get around this, just search with JaroWinkler for single character searches.
 2023-06-03 00:06:04 -07:00
Charles Lombardo
0cbae33790 android: Stop building x86 packages in APKs 
This was really only meant for building the app to run in an emulator. If this is necessary, just add manually.
 2023-06-03 00:06:04 -07:00
Charles Lombardo
d49eb7faad android: Add FPS toggle 2023-06-03 00:06:04 -07:00
Charles Lombardo
8426e97f45 android: Clean up app build.gradle 
Removes the conflicting declaration of "version" and changes to versionCode that did nothing.
 2023-06-03 00:06:04 -07:00
bunnei
b4725332a2 android: config: Expose VSync as a configurable setting. 2023-06-03 00:06:04 -07:00
bunnei
f0ed20c8a2 android: GPU: Enable async presentation, increase frames in flight. 2023-06-03 00:06:03 -07:00
Charles Lombardo
116e2b5f02 android: Enable onBackInvokedCallback 
For now this enables the ability to see the new Android 13 back gesture animations but later we can create custom animations that follow the back gesture.
 2023-06-03 00:06:03 -07:00
Charles Lombardo
7812de4ade android: Remove deprecated use of onBackPressed() 2023-06-03 00:06:03 -07:00
Charles Lombardo
ffba83d568 android: Add option for touch overlay haptics 
Disabled by default
 2023-06-03 00:06:03 -07:00
Charles Lombardo
5dbf842a46 android: Improve missing game handling 
Previously the app would crash if you selected a game that no longer existed. Now we show an error message and reload the games list to remove any invalid games from the list.
 2023-06-03 00:06:03 -07:00
Charles Lombardo
c11c5b2eb7 android: Clean up dependencies 
Additionally updates material and androidx core libraries
 2023-06-03 00:06:03 -07:00
Charles Lombardo
a10b1c8ef5 android: Delete java code style file 2023-06-03 00:06:03 -07:00
Charles Lombardo
e42c966110 android: Settings UI tweaks 
New spacing and fonts for list items
 2023-06-03 00:06:03 -07:00
Charles Lombardo
412c95e0b0 android: Simplify setup in search and games fragments 2023-06-03 00:06:03 -07:00
Charles Lombardo
aa8a48e94c android: Use collapsing toolbar layout in settings 2023-06-03 00:06:03 -07:00
Charles Lombardo
b31ab11842 android: Remove unnecessary JvmStatic/JvmField annotations 2023-06-03 00:06:02 -07:00
Charles Lombardo
8d3288b6ff android: Fix navigation rail animation in rtl layout 2023-06-03 00:06:02 -07:00
Charles Lombardo
c930b2bad2 android: Use cutout insets on setup fragment 2023-06-03 00:06:02 -07:00
Charles Lombardo
ee57aa83a4 android: Button to reset all settings 2023-06-03 00:06:02 -07:00
Charles Lombardo
0f06e73a7c android: Use proguard file in relWithDebInfo 2023-06-03 00:06:02 -07:00
Charles Lombardo
a0a0703f30 android: Fix background color within inset areas 2023-06-03 00:06:02 -07:00
Charles Lombardo
070d250858 android: Shortcut to settings activity on reselection 2023-06-03 00:06:01 -07:00
Charles Lombardo
c31a37c828 android: Expose custom RTC setting 2023-06-03 00:06:01 -07:00
Charles Lombardo
f7934bdaf7 android: Reset setting on long press 2023-06-03 00:06:01 -07:00
Charles Lombardo
2289f7ad15 android: Fix issues with ea/main icons and version codes 
Now all yuzu icon variants are taken care of and now we have a build variant that uses the versioning we need for the play store.
 2023-06-03 00:06:01 -07:00
Charles Lombardo
5213701e18 android: Move theme options out of advanced settings 2023-06-03 00:06:01 -07:00
Charles Lombardo
bafd4d344f android: Check if cached games are valid 
Fixes bug when you close yuzu, delete games, and reopen to an instant crash.
 2023-06-03 00:06:01 -07:00
german77
aa957df0dc android: Invert rotation to match phone orientation 2023-06-03 00:06:01 -07:00
bunnei
1a424ea6c6 android: config: Use default anisotropic filtering. 2023-06-03 00:06:01 -07:00
Charles Lombardo
41c20f8460 android: Remove top padding from in game menu items 2023-06-03 00:06:00 -07:00
Charles Lombardo
ec81c6cf44 android: Use different icons for mainline/ea 2023-06-03 00:06:00 -07:00
Charles Lombardo
f69bc78dc5 android: Add early access upgrade fragment 
We now have a second build flavor that will determine whether the "Get Early Access" button appears.
 2023-06-03 00:06:00 -07:00
bunnei
6b093224c1 android: settings: Use mailbox vsync by default. 2023-06-03 00:06:00 -07:00
bunnei
8dc7fe0c96 android: video_core: Disable problematic compute shaders. 
- Fixes #104.
 2023-06-03 00:06:00 -07:00
Charles Lombardo
1c9dae7cac android: Update progard to fix settings crash 
R8 full mode was removing important classes from Wini that would cause a crash on saving settings. This keeps the relevant classes and suppresses warnings about irrelevant ones.
 2023-06-03 00:05:59 -07:00
bunnei
117bc2ae6c android: vulkan: Recreate surface after suspension & adapt to async. presentation. 2023-06-03 00:05:59 -07:00
Charles Lombardo
65dc35a1a5 android: Game data cache 2023-06-03 00:05:59 -07:00
Charles Lombardo
b0bef6173a android: Update to Kotlin 1.8.21 2023-06-03 00:05:59 -07:00
Charles Lombardo
c16e663f70 android: Disable jetifier 
We no longer depend on any legacy libraries that required this flag
 2023-06-03 00:05:59 -07:00
Charles Lombardo
d8bacdfc14 android: Update dependencies 2023-06-03 00:05:59 -07:00
Charles Lombardo
56d3711e34 android: Migrate to AGP 8.0.1 2023-06-03 00:05:59 -07:00
Charles Lombardo
48065c7a0e android: Enable non-transitive R classes 
New default going forward for new android projects. Best to follow the new standard.
 2023-06-03 00:05:59 -07:00
bunnei
570c4a2c1b android: config: Enable asynchronous presentation by default on Android. 2023-06-03 00:05:59 -07:00
german77
e5bdb7011b android: fix deadzone calculation 2023-06-03 00:05:58 -07:00
Charles Lombardo
13b29c3f49 android: Fix background color when starting emulation 2023-06-03 00:05:58 -07:00
Charles Lombardo
34b7d58157 android: Persistent scrollbars on home settings fragment 2023-06-03 00:05:58 -07:00
Charles Lombardo
f461465a92 android: Use short build hash 2023-06-03 00:05:58 -07:00
Charles Lombardo
86e395595a android: Use navigation bar shade view 2023-06-03 00:05:58 -07:00
Charles Lombardo
21e8a8277a android: About fragment 2023-06-03 00:05:58 -07:00
Charles Lombardo
09e7b14d0e android: Use x-axis animation for navigation rail 2023-06-03 00:05:58 -07:00
Charles Lombardo
03541703fa android: Sort games alphabetically by default 2023-06-03 00:05:58 -07:00
Charles Lombardo
9f433e281a android: New icons for navigation bar 2023-06-03 00:05:57 -07:00
Charles Lombardo
efc054e47f android: New icons for home settings fragment 2023-06-03 00:05:57 -07:00
Charles Lombardo
9f6f21946c android: Add navigation rail 2023-06-03 00:05:57 -07:00
Charles Lombardo
6df030998a android: Search Fragment 2023-06-03 00:05:57 -07:00
Charles Lombardo
3281dc597e android: Fix potential zip traversal exploit 2023-06-03 00:05:57 -07:00
german77
d1fb7ea58b android: Add dedicated show overlay checkbox 2023-06-03 00:05:57 -07:00
Charles Lombardo
912bf6a0c6 android: Add user directory shortcut 2023-06-03 00:05:57 -07:00
german77
265b9139e0 android: Fix inline keyboard input 2023-06-03 00:05:57 -07:00
Charles Lombardo
7131432037 android: Fix grammatical mistake in video core error message 2023-06-03 00:05:56 -07:00
Charles Lombardo
4bb82e4860 android: Adjust wording on GPU driver install button 2023-06-03 00:05:56 -07:00
Narr the Reg
c46a1da5dc android: Add deadzone to stick input 2023-06-03 00:05:56 -07:00
german77
166bff88b8 android: Move motion listener to emulation activity 2023-06-03 00:05:56 -07:00
Narr the Reg
5c1310dc5d core: hid: Finish linking motion from virtual controllers 2023-06-03 00:05:56 -07:00
Charles Lombardo
d015b0db93 android: Change wording for "Add Games" button (#100) 
Co-authored-by: bunnei <bunneidev@gmail.com>
 2023-06-03 00:05:56 -07:00
Charles Lombardo
0d16805445 android: Scroll shortcut for games list 
If you reselect the "Games" menu item in the bottom navigation menu, the list smoothly scrolls to the top.
 2023-06-03 00:05:56 -07:00
Charles Lombardo
274b2be24f android: Setup screen hotfix 
Added help button link for add games warning and a check for whether a task was completed on a given screen.
 2023-06-03 00:05:56 -07:00
Charles Lombardo
792ce5cb2f android: Swap Default and Install buttons for GPU driver installation dialog 2023-06-03 00:05:56 -07:00
Charles Lombardo
72247a2324 android: Add warnings to setup screens 2023-06-03 00:05:56 -07:00
Charles Lombardo
71667e4d6d android: Allow search bar to scroll offscreen 2023-06-03 00:05:55 -07:00
Charles Lombardo
3b9791d887 android: Update app icon 
Small icon updates from Flam
 2023-06-03 00:05:55 -07:00
Charles Lombardo
c070a588b9 android: Change organization of the settings tab in the home screen 2023-06-03 00:05:55 -07:00
Charles Lombardo
c29f14fa0f android: Properly pop setup fragment from the back stack 2023-06-03 00:05:55 -07:00
Charles Lombardo
f41939b66e android: Vertically scalable setup pages 
Previously the setup pages would remain at a fixed height but now the icon and two text boxes will give up space as a device gets shorter. This eliminates the need for a scrolling view further problems with padding.
 2023-06-03 00:05:55 -07:00
Charles Lombardo
48c506682d android: Fix setup rotation bug 
If you rotated the device at the "Add Games" screen the buttons would disappear until you trigged them from the beginning page swap. Now button state is saved across recreation.
 2023-06-03 00:05:55 -07:00
Charles Lombardo
61e0042633 android: Temporarily switch for a fixed version code for testing 2023-06-03 00:05:55 -07:00
Charles Lombardo
986f858e6f android: Fix alignment of SwipeRefreshLayout 2023-06-03 00:05:55 -07:00
Charles Lombardo
388dc0757f android: Shape/spacing adjustments to game card 
Ripple effect now reaches into rounded corners, icon size changed, company text removed, title font adjusted, and spacing around the card was adjusted as well. Text also doesn't get cut off anymore and instead scrolls indefinitely on one line.
 2023-06-03 00:05:55 -07:00
Charles Lombardo
f984775f12 android: Manual tweaks for dialog colors 
Small fix for Flam
 2023-06-03 00:05:54 -07:00
Charles Lombardo
f2cadc4ce1 android: Fix black backgrounds bug 
Start using a specific night mode check because black backgrounds could apply incorrectly when using the light app mode, dark system mode, and black backgrounds. Launching the settings activity will show light mode colors/navigation bars but with black backgrounds.
 2023-06-03 00:05:54 -07:00
Charles Lombardo
033adb9723 android: Use navigation bar shade view for settings activity 2023-06-03 00:05:54 -07:00
Charles Lombardo
cfa3d73f2f android: Disable editing themes during emulation 2023-06-03 00:05:54 -07:00
Charles Lombardo
62c47011a0 android: Prevent situation where binding is called on a null view 2023-06-03 00:05:54 -07:00
Charles Lombardo
d7178ed16e android: Add black backgrounds toggle 2023-06-03 00:05:54 -07:00
Charles Lombardo
d9684a2010 android: Add theme mode picker 2023-06-03 00:05:54 -07:00
Charles Lombardo
f0ba58f5aa android: Add theme picker 2023-06-03 00:05:54 -07:00
Charles Lombardo
5b26ac9293 android: Prevent potential abstract settings crash 2023-06-03 00:05:54 -07:00
Charles Lombardo
b6f57da70a android: Fix cast for abstract settings 2023-06-03 00:05:54 -07:00
Charles Lombardo
7531641ecc android: Create xml for Material You theme 2023-06-03 00:05:54 -07:00
Charles Lombardo
89593d70bf android: Remove check for API 29 in themes 2023-06-03 00:05:53 -07:00
Charles Lombardo
8cef21a0b0 android: Adjustments to home option card 
Several spacing/color adjustments provided by Flam
 2023-06-03 00:05:53 -07:00
Charles Lombardo
a82f8fe1c1 android: Use different colors for logo in options menu 
Reverting to the official logo colors
 2023-06-03 00:05:53 -07:00
Charles Lombardo
9673974f73 android: New default theme colors 2023-06-03 00:05:53 -07:00
Charles Lombardo
6549348656 android: Use libnx default icon 
Credit to jaames for the original icon
 2023-06-03 00:05:53 -07:00
Liam
8b4c5a9939 android: enable LTO 2023-06-03 00:05:53 -07:00
Charles Lombardo
83dae1739c android: Show error if invalid keys file is selected 
There aren't MIME types specific enough for filtering out files that aren't amiibo or production keys. So here we just check for the extensions "bin" or "keys" where appropriate and stop the process if incorrect. Previously you could select any document and it could cause the app to hang.
 2023-06-03 00:05:53 -07:00
Charles Lombardo
d8c102444c android: Fix first time setup scrolling bug 
If you quickly scrolled from the second page to the first and then back, the next/back buttons would disappear.
 2023-06-03 00:05:53 -07:00
Charles Lombardo
45d81dc6bd android: Fix A button preference key 2023-06-03 00:05:53 -07:00
Charles Lombardo
59525ddbeb android: First time setup screen 2023-06-03 00:05:52 -07:00
Charles Lombardo
766655fa41 android: Prevent editing unsafe settings at runtime 
There currently isn't a visual "disabled" cue for any of the view holders that aren't the switch setting. This will be improved in the future.
 2023-06-03 00:05:52 -07:00
Charles Lombardo
c609847e49 android: Abstract settings 
Previously we could only add settings that would change our ini file. Now we can create abstract settings in our presenter to alter things like shared preferences for theme support!
 2023-06-03 00:05:52 -07:00
german77
6dfe4240ac android: Implement gamepad input 2023-06-03 00:05:52 -07:00
Charles Lombardo
f5c48f92f2 android: Bump minimum version to Android 11 2023-06-03 00:05:52 -07:00
Charles Lombardo
9c9d9131b5 android: Decouple status bar shade from navigation bar visibility 2023-06-03 00:05:52 -07:00
Charles Lombardo
d57ae50f17 android: Enable code minification 2023-06-03 00:05:52 -07:00
Charles Lombardo
921e6dddcc android: Switch from a colored status bar to a custom view 
Allows for smoother transitions with the search bar
 2023-06-03 00:05:52 -07:00
Charles Lombardo
3f2b832371 android: Adjustments to card_game 
Removed a currently unused text view and moved to material text views.
 2023-06-03 00:05:51 -07:00
Charles Lombardo
233ae9ab69 android: MainActivity overhaul 
This moves several parts of the main activity into fragments that manage themselves to react to changes. UI changes like the appearance of a new search view or when the games list changes now gets updated via multiple view models. This also starts a conversion to the androidx navigation component which furthers the goals mentioned previously with more fragment responsibility. This will eventually allow us to use one activity with interchanging fragments and multiple view models that are stored within that central activity.

fdas
 2023-06-03 00:05:51 -07:00
Charles Lombardo
859c40f00e android: Enforce Vulkan 1.1 support as minimum 2023-06-03 00:05:51 -07:00
Charles Lombardo
e5487243d3 android: Update gradle version to 8.1 2023-06-03 00:05:51 -07:00
Charles Lombardo
b1ebc1c395 android: Update app dependencies 2023-06-03 00:05:51 -07:00
Charles Lombardo
ab87f74998 android: Convert gradle scripts to Kotlin DSL 2023-06-03 00:05:51 -07:00
bunnei
d2e55558df android: settings: Add scaling filter & anti-aliasing options. (#66) 2023-06-03 00:05:50 -07:00
bunnei
4006468f73 android: video_core: Add support for disk shader cache. (#64) 2023-06-03 00:05:50 -07:00
bunnei
30bf5d5b07 android: config: Change docked mode and GPU accuracy to favor performance on Android. 2023-06-03 00:05:50 -07:00
german77
f9974f7ef3 android: Initialize account manager 2023-06-03 00:05:50 -07:00
german77
5aec62930c android: Remove unsafe null check 2023-06-03 00:05:50 -07:00
Charles Lombardo
78f02ab9a6 android: Scale input overlay independently of system display scale 2023-06-03 00:05:50 -07:00
Charles Lombardo
aeaddf407b android: Use apply instead of commit for shared preferences 
Previously we were operating on the assumption that apply'd settings wouldn't be visible immediately. This isn't true and settings will be accessible via memory before being stored to disk. This reduces any potential stutters caused by saving to shared preferences.
 2023-06-03 00:05:50 -07:00
Charles Lombardo
fcbf08ca98 android: Add DPad slide toggle 2023-06-03 00:05:50 -07:00
Charles Lombardo
bebc822334 android: Add relative stick center toggle 2023-06-03 00:05:49 -07:00
Charles Lombardo
63819af214 android: Make hash and branch accessible from BuildConfig 2023-06-03 00:05:49 -07:00
Charles Lombardo
f5055ca930 android: Backup shared preferences where applicable 2023-06-03 00:05:49 -07:00
Charles Lombardo
940dbdcff2 android: Enable retaining app data after uninstall 2023-06-03 00:05:49 -07:00
Charles Lombardo
1cc8011355 android: Remove unused doFrame function 2023-06-03 00:05:49 -07:00
Charles Lombardo
4d9011a8f0 android: Convert NativeLibrary to Kotlin 2023-06-03 00:05:49 -07:00
Charles Lombardo
a827486391 android: Remove LocalBroadcastManager 
This causes a couple of minor changes to directory initialization. We don't have a lengthy initialization step so we could spend less time creating state receivers and just run initialization on the main thread. We also don't have a situation where external storage will be a concern so checks are removed in favor of a binary check to see if initialization is ready.

This additionally removes the unused DoFrame callback.
 2023-06-03 00:05:49 -07:00
Charles Lombardo
9d7a60346f android: Remove game database 
The content provider + database solution was excessive and is now replaced with the simple file checks from before but turned into an array list held within a viewmodel.
 2023-06-03 00:05:49 -07:00
Charles Lombardo
4816d5158e android: Adjust game icon loading 2023-06-03 00:05:49 -07:00
Charles Lombardo
730c63df7e android: Remove unused dimensions files 2023-06-03 00:05:48 -07:00
Charles Lombardo
83b1459af5 android: Slightly reduce game card size 2023-06-03 00:05:48 -07:00
Charles Lombardo
ac417a4ffa android: Only show company text view if it has content 2023-06-03 00:05:48 -07:00
Charles Lombardo
c0aa5392b9 android: Fix check for ok text in software keyboard 2023-06-03 00:05:48 -07:00
Narr the Reg
ca4be4283d android: Implement amiibo reading from nfc tag 2023-06-03 00:05:48 -07:00
Charles Lombardo
1ea84854bd android: Add toggle controls option to input overlay 2023-06-03 00:05:48 -07:00
Charles Lombardo
8b99a1e49b android: Do not update FPS text on null view 2023-06-03 00:05:48 -07:00
Charles Lombardo
d30103b69f android: Convert keyboard applet to kotlin and refactor 2023-06-03 00:05:48 -07:00
bunnei
d5ebfc8e21 android: Implement basic software keyboard applet. 2023-06-03 00:05:47 -07:00
bunnei
58ede89c60 android: config: Disable shader cache by default on Android. 2023-06-03 00:05:47 -07:00
german77
a862c33fc4 android: Fix fps counter not showing up 2023-06-03 00:05:47 -07:00
Charles Lombardo
ec048361af android: Prevent showing games on an invalid view 2023-06-03 00:05:47 -07:00
Charles Lombardo
b0a434b99f android: Re-implement overlay editing 2023-06-03 00:05:47 -07:00
Charles Lombardo
5807cf1b4d android: Fix popup menu going out of bounds 2023-06-03 00:05:47 -07:00
Charles Lombardo
3878c6ced1 android: Use autofit grid for games fragment 2023-06-03 00:05:47 -07:00
Charles Lombardo
9cb7e7072d android: Prevent updating empty game list text on invalid view 2023-06-03 00:05:47 -07:00
Charles Lombardo
295ffd4d47 android: Persist settings across configuration changes 
Mostly things get refactored here to remove previous assumptions made about how the activity/fragment lifecycles would operate. The important change for persistence is removing the assumption that the user will be at the first settings fragment on recreation when deciding whether or not to reload settings. Now we check a flag in Settings to know if we loaded the settings within this lifecycle.
 2023-06-03 00:05:47 -07:00
Charles Lombardo
aaefe8a0e0 android: Store settings object in viewmodel 2023-06-03 00:05:47 -07:00
Charles Lombardo
06e58cf088 android: Remove configChanges exceptions 2023-06-03 00:05:46 -07:00
Charles Lombardo
35e9a99452 Android: Enable resizeable activities 2023-06-03 00:05:46 -07:00
Charles Lombardo
89b9285627 android: Fix emulation fragment comments 2023-06-03 00:05:46 -07:00
Charles Lombardo
273e81bb94 android: Use modal navigation drawer as in game menu 2023-06-03 00:05:46 -07:00
Charles Lombardo
1f3b41366c android: Make Game class parcelable 2023-06-03 00:05:46 -07:00
Charles Lombardo
c53e927368 android: Add kotlin parcelize plugin 2023-06-03 00:05:46 -07:00
Charles Lombardo
e2a7143a3d android: Remove deprecated use of onActivityResult 2023-06-03 00:05:46 -07:00
Charles Lombardo
d9e7e71a8e android: Fix RTL layouts 2023-06-03 00:05:46 -07:00
Charles Lombardo
3c9aa8d230 android: Use ellipsis character 2023-06-03 00:05:46 -07:00
Charles Lombardo
16c7afbd46 android: Move all array strings to main strings file 2023-06-03 00:05:46 -07:00
Charles Lombardo
03d9247527 android: Remove unused strings 2023-06-03 00:05:45 -07:00
Charles Lombardo
bf584d85ad android: Remove unused colors 2023-06-03 00:05:45 -07:00
Charles Lombardo
9a842deba5 android: Remove citra date time picker 2023-06-03 00:05:45 -07:00
Charles Lombardo
87211c8aec android: Remove unused premium header layout 2023-06-03 00:05:45 -07:00
Charles Lombardo
1c93ac8e03 android: Remove unused fragment animations 2023-06-03 00:05:45 -07:00
Charles Lombardo
27ec749bdf android: Remove unused string arrays 2023-06-03 00:05:45 -07:00
Charles Lombardo
dafa6dff07 android: Remove unused integer xmls 2023-06-03 00:05:45 -07:00
Charles Lombardo
74653f1e80 android: Refactor ic_launcher.xml to drawables 2023-06-03 00:05:45 -07:00
Charles Lombardo
8a34e58ad6 android: Suppress lint in InsetsHelper 2023-06-03 00:05:45 -07:00
Charles Lombardo
1b40a3df19 android: Add data extraction rules 2023-06-03 00:05:44 -07:00
Charles Lombardo
93d6a1fc9c android: Remove requestLegacyExternalStorage attribute 2023-06-03 00:05:44 -07:00
Charles Lombardo
c803d9e5c7 android: Remove unused permissions 2023-06-03 00:05:44 -07:00
Charles Lombardo
d3c3b69755 android: Inset input overlay based on system cutouts 2023-06-03 00:05:44 -07:00
Charles Lombardo
1634391bff android: Stop updating fps counter when emulation stops 2023-06-03 00:05:44 -07:00
Charles Lombardo
a49a24b079 android: Move driver installation off of main thread 
Additionally creates an indeterminate loading dialog during installation
 2023-06-03 00:05:44 -07:00
Charles Lombardo
72bef4fa95 android: Fix crash when decodeGameIcon creates a null Bitmap 2023-06-03 00:05:44 -07:00
Charles Lombardo
72679c7bae android: Use view binding 2023-06-03 00:05:44 -07:00
Charles Lombardo
e49e6cac7e android: Enable view binding 2023-06-03 00:05:44 -07:00
Charles Lombardo
4de3abdd5a android: Refactor CheckBoxSetting to SwitchSetting 2023-06-03 00:05:44 -07:00
bunnei
b5b4e50c32 android: EmulationActivity: Fix variable shadowing in fragment creation. 2023-06-03 00:05:43 -07:00
bunnei
f45a0b94d6 android: res: fragment_emulation: Ensure FPS counter is shown. 2023-06-03 00:05:43 -07:00
Liam
616cf70a80 build: only enable adrenotools on arm64 2023-06-03 00:05:43 -07:00
Charles Lombardo
515f3deea1 android: Use Skyline's document provider 2023-06-03 00:05:43 -07:00
Charles Lombardo
55e4c2d87b android: Use androidx splash screen 2023-06-03 00:05:43 -07:00
Charles Lombardo
3fcc6b1104 android: Replace Picasso with Coil 2023-06-03 00:05:43 -07:00
Charles Lombardo
37cc94526b android: New swipe to refresh color scheme 2023-06-03 00:05:43 -07:00
Charles Lombardo
352559b83d android: New settings fragment animations 2023-06-03 00:05:43 -07:00
Charles Lombardo
f40059e4ba android: Use edge to edge 2023-06-03 00:05:43 -07:00
Charles Lombardo
5840d60724 android: Use Material 3 components 2023-06-03 00:05:42 -07:00
Charles Lombardo
18f4ef436d android: Modernize theme system 2023-06-03 00:05:42 -07:00
Charles Lombardo
09780c76aa android: Use vector icons 2023-06-03 00:05:42 -07:00
Charles Lombardo
527229c8b3 android: Use adaptive icon 2023-06-03 00:05:42 -07:00
bunnei
c385b2b07b android: settings: Dynamically evaluate valueAsString 
Co-Authored-By: bunnei <bunneidev@gmail.com>
 2023-06-03 00:05:42 -07:00
Charles Lombardo
2d934720f5 android: Add license identifier 2023-06-03 00:05:42 -07:00
Charles Lombardo
95af1b2a23 android: Convert YuzuApplication to Kotlin 2023-06-03 00:05:42 -07:00
Charles Lombardo
1a4de8d213 android: Convert Action1 to Kotlin 2023-06-03 00:05:42 -07:00
Charles Lombardo
7a0d7bb3f3 android: Convert GameViewHolder to Kotlin 2023-06-03 00:05:41 -07:00
Charles Lombardo
8a4eb062e8 android: Remove ThemeUtil 2023-06-03 00:05:41 -07:00
Charles Lombardo
b8eb8bd2b5 android: Convert StartupHandler to Kotlin 2023-06-03 00:05:41 -07:00
Charles Lombardo
de1dff557d android: Convert Log to Kotlin 2023-06-03 00:05:41 -07:00
Charles Lombardo
a05c6deb66 android: Convert GpuDriverMetadata to Kotlin 2023-06-03 00:05:41 -07:00
Charles Lombardo
d2f9cf133d android: Convert GpuDriverHelper to Kotlin 2023-06-03 00:05:41 -07:00
Charles Lombardo
bf0c383024 android: Convert GameIconRequestHandler to Kotlin 2023-06-03 00:05:41 -07:00
Charles Lombardo
5d5233ec32 android: Convert ForegroundService to Kotlin 2023-06-03 00:05:41 -07:00
Charles Lombardo
7b54c2b2e2 android: Convert FileUtil to Kotlin 2023-06-03 00:05:41 -07:00
Charles Lombardo
7fb7f3e83f android: Convert FileBrowserHelper to Kotlin 2023-06-03 00:05:41 -07:00
Charles Lombardo
c9d2d74f1f android: Convert EmulationMenuSettings to Kotlin 2023-06-03 00:05:40 -07:00
Charles Lombardo
2444df2bf4 android: Convert DocumentsTree to Kotlin 2023-06-03 00:05:40 -07:00
Charles Lombardo
711aedeaae android: Convert DirectoryStateReceiver to Kotlin 2023-06-03 00:05:40 -07:00
Charles Lombardo
a8994a57d6 android: Convert DirectoryInitialization to Kotlin 2023-06-03 00:05:40 -07:00
Charles Lombardo
b9f1f70688 android: Convert ControllerMappingHelper to Kotlin 2023-06-03 00:05:40 -07:00
Charles Lombardo
c02a27ebd2 android: Convert BiMap to Kotlin 2023-06-03 00:05:40 -07:00
Charles Lombardo
8710c6e14c android: Convert AddDirectoryHelper to Kotlin 2023-06-03 00:05:40 -07:00
Charles Lombardo
e83de8eefb android: Convert PlatformGamesView to Kotlin 2023-06-03 00:05:40 -07:00
Charles Lombardo
fcce7b898f android: Convert PlatformGamesPresenter to Kotlin 2023-06-03 00:05:40 -07:00
Charles Lombardo
0b2350ad5b android: Convert PlatformGamesFragment to Kotlin 2023-06-03 00:05:40 -07:00
Charles Lombardo
67c2e89d2c android: Convert MainView to Kotlin 2023-06-03 00:05:39 -07:00
Charles Lombardo
0f742b3464 android: Convert MainPresenter to Kotlin 2023-06-03 00:05:39 -07:00
Charles Lombardo
42b3e72e96 android: Convert InputOverlayDrawableJoystick to Kotlin 2023-06-03 00:05:39 -07:00
Charles Lombardo
5c8372a566 android: Convert MainActivity to Kotlin 2023-06-03 00:05:39 -07:00
Charles Lombardo
f4508b255f android: Remove ExampleInstrumentedTest 2023-06-03 00:05:39 -07:00
Charles Lombardo
482d3e0b5f android: Remove TwoPaneOnBackPressedCallback 
Leftover UI code for dolphin's cheat system. Removing for now.
 2023-06-03 00:05:39 -07:00
Charles Lombardo
d85678a80f android: Convert InputOverlayDrawableDpad to Kotlin 2023-06-03 00:05:39 -07:00
Charles Lombardo
0177e908e9 android: Convert InputOverlayDrawableButton to Kotlin 2023-06-03 00:05:39 -07:00
Charles Lombardo
a1c57de466 android: Convert InputOverlay to Kotlin 2023-06-03 00:05:39 -07:00
Charles Lombardo
096cdc57bb android: Remove DividerItemDecoration 
Removed in favor of material components version
 2023-06-03 00:05:39 -07:00
Charles Lombardo
24ade95a13 android: Inherit from Material 3 themes 
Partially breaks the UI for now but is necessary to use new material components.
 2023-06-03 00:05:38 -07:00
Charles Lombardo
b5819594ba android: Convert MinimalDocumentFile to Kotlin 2023-06-03 00:05:38 -07:00
Charles Lombardo
9e8ab499dc android: Convert GameProvider to Kotlin 2023-06-03 00:05:38 -07:00
Charles Lombardo
4ce86a526c android: Convert GameDatabase to Kotlin 2023-06-03 00:05:38 -07:00
Charles Lombardo
bbe5dee9f8 android: Convert Game to Kotlin 2023-06-03 00:05:38 -07:00
Charles Lombardo
66079923ae android: Convert EmulationFragment to Kotlin 2023-06-03 00:05:38 -07:00
Charles Lombardo
0e4256651a android: Convert SettingsFile to Kotlin 2023-06-03 00:05:38 -07:00
Charles Lombardo
a29c615f8d android: Convert SettingsFrameLayout to Kotlin 2023-06-03 00:05:38 -07:00
Charles Lombardo
c39bf17f83 android: Convert SettingsFragmentView to Kotlin 2023-06-03 00:05:38 -07:00
Charles Lombardo
14d156701f android: Convert SettingsFragmentPresenter to Kotlin 2023-06-03 00:05:38 -07:00
Charles Lombardo
1fc66f1b30 android: Convert SettingsFragment to Kotlin 2023-06-03 00:05:37 -07:00
Charles Lombardo
469f0ec019 android: Convert SettingsActivityView to Kotlin 2023-06-03 00:05:37 -07:00
Charles Lombardo
34ce4877bd android: Convert SettingsActivityPresenter to Kotlin 2023-06-03 00:05:37 -07:00
Charles Lombardo
b10e13c090 android: Convert SettingsActivity to Kotlin 2023-06-03 00:05:37 -07:00
Charles Lombardo
ed83650ee4 android: Convert SubmenuViewHolder to Kotlin 2023-06-03 00:05:37 -07:00
Charles Lombardo
6044d924f7 android: Convert SliderViewHolder to Kotlin 2023-06-03 00:05:37 -07:00
Charles Lombardo
fd1801aec4 android: Convert SingleChoiceViewHolder to Kotlin 2023-06-03 00:05:37 -07:00
Charles Lombardo
c42eb92557 android: Convert SettingViewHolder to Kotlin 2023-06-03 00:05:37 -07:00
Charles Lombardo
d472f41580 android: Convert HeaderViewHolder to Kotlin 2023-06-03 00:05:37 -07:00
Charles Lombardo
e02e33826b android: Convert DateTimeViewHolder to Kotlin 2023-06-03 00:05:37 -07:00
Charles Lombardo
3a5b9ecba2 android: Convert CheckBoxSettingViewHolder to Kotlin 2023-06-03 00:05:36 -07:00
Charles Lombardo
f0a9fcf100 android: Convert StringSetting to Kotlin 2023-06-03 00:05:36 -07:00
Charles Lombardo
412ec72d26 android: Convert SettingSection to Kotlin 2023-06-03 00:05:36 -07:00
Charles Lombardo
6f80f9d5b0 android: Convert Setting to Kotlin 2023-06-03 00:05:36 -07:00
Charles Lombardo
6e7fdcb484 android: Convert IntSetting to Kotlin 2023-06-03 00:05:36 -07:00
Charles Lombardo
2439fc8374 android: Convert FloatSetting to Kotlin 2023-06-03 00:05:36 -07:00
Charles Lombardo
88b9d484e8 android: Convert BooleanSetting to Kotlin 2023-06-03 00:05:36 -07:00
Charles Lombardo
b98aaf1635 android: Convert SubmenuSetting to Kotlin 2023-06-03 00:05:36 -07:00
Charles Lombardo
91884976a1 android: Convert StringSingleChoiceSetting to Kotlin 2023-06-03 00:05:36 -07:00
Charles Lombardo
89eed93ce0 android: Convert SliderSetting to Kotlin 2023-06-03 00:05:36 -07:00
Charles Lombardo
a0e91e3a93 android: Convert SingleChoiceSetting to Kotlin 2023-06-03 00:05:35 -07:00
Charles Lombardo
22b44be0b2 android: Convert SettingsItem to Kotlin 2023-06-03 00:05:35 -07:00
Charles Lombardo
537c16d4cf android: Convert HeaderSetting to Kotlin 2023-06-03 00:05:35 -07:00
Charles Lombardo
21841b6520 android: Convert DateTimeSetting to Kotlin 2023-06-03 00:05:35 -07:00
Charles Lombardo
4d9cfc6798 android: Convert CheckBoxSetting to Kotlin 2023-06-03 00:05:35 -07:00
Charles Lombardo
0d044e9f2f android: Convert GameAdapter to Kotlin 2023-06-03 00:05:35 -07:00
Charles Lombardo
87f4c3f105 android: Convert SettingsAdapter to Kotlin 
Update SettingsAdapter.kt
 2023-06-03 00:05:35 -07:00
Charles Lombardo
39a65f8446 android: Convert EmulationActivity to Kotlin 2023-06-03 00:05:35 -07:00
Charles Lombardo
7cd72a7c6d android: Use material slider in settings dialog 2023-06-03 00:05:35 -07:00
Charles Lombardo
fa38c7be4f android: Convert Settings to Kotlin 2023-06-03 00:05:35 -07:00
Charles Lombardo
753a0c6b5d android: Use androidx preferences 2023-06-03 00:05:34 -07:00
bunnei
2dfbfadf82 android: frontend: Add unique error strings for Vulkan initialization errors. 2023-06-03 00:05:34 -07:00
german77
bde568c3c5 android: Use the center of the object and reduce draw calls 2023-06-03 00:05:34 -07:00
german77
7dd02363a3 android: Replace old buttons with vectors 2023-06-03 00:05:34 -07:00
Charles Lombardo
834d53fbbf android: Enable Kotlin support 2023-06-03 00:05:34 -07:00
Charles Lombardo
96ea063b45 android: Upgrade java version to 11 2023-06-03 00:05:33 -07:00
Charles Lombardo
9191ae23ec android: Upgrade dependencies 2023-06-03 00:05:33 -07:00
Charles Lombardo
82dca7e586 android: Upgrade to AGP 7.4.2 2023-06-03 00:05:33 -07:00
Charles Lombardo
fc785972f9 android: Replace lintOptions with lint 2023-06-03 00:05:33 -07:00
Charles Lombardo
9507e99165 android: Move namespace to app module build.gradle 2023-06-03 00:05:33 -07:00
Charles Lombardo
fc0c5fa86f android: bump compile/target sdk to 33 2023-06-03 00:05:33 -07:00
Charles Lombardo
9762646112 android: Upgrade gradle to 8.0.1 2023-06-03 00:05:33 -07:00
liushuyu
19eec22b38 CMake: fix pkg-config behavior when building for Android 2023-06-03 00:05:33 -07:00
liushuyu
1d0329a065 CI: add Android build systems 2023-06-03 00:05:33 -07:00
bunnei
26ee6844c2 android: build.gradle: Cleanup build types. 2023-06-03 00:05:32 -07:00
bunnei
4769d716fc android: frontend: settings: Add graphics debugging. 2023-06-03 00:05:32 -07:00
bunnei
0276197744 android: jni: Ensure system is only initialized once. 
- Fixes likelihood that fastmem allocation succeeds.
 2023-06-03 00:05:32 -07:00
bunnei
dcbf0c43c0 android: frontend: Cleanup framerate counter. 2023-06-03 00:05:32 -07:00
bunnei
8248d69093 android: vulkan: Implement adrenotools turbo mode. 2023-06-03 00:05:32 -07:00
bunnei
b0f8aef057 android: frontend: Add support for GPU driver selection. 2023-06-03 00:05:32 -07:00
bunnei
4c38220a64 android: native: Add support for custom Vulkan driver loading. 2023-06-03 00:05:31 -07:00
bunnei
e9f35d3260 android: EmulationFragment: Always reset overlay. 
- Ensures correct placement until we have better overlay configuration.
 2023-06-03 00:05:31 -07:00
Narr the Reg
f1bb2f3685 android: Add motion sensor 2023-06-03 00:05:30 -07:00
Narr the Reg
92fb7cc4e4 android: Hook jni input properly 2023-06-03 00:05:30 -07:00
Narr the Reg
5b80dee181 android: cleanup touch update loop 2023-06-03 00:05:30 -07:00
Narr the Reg
3be891ea6f android: Clean joystick overlay 2023-06-03 00:05:30 -07:00
Narr the Reg
639a1f885c android: Clean dpad overlay 2023-06-03 00:05:30 -07:00
Narr the Reg
1ab269775d android: Clean button overlay 2023-06-03 00:05:30 -07:00
Narr the Reg
43e43021a3 android: Add all buttons to screen controller 2023-06-03 00:05:30 -07:00
Narr the Reg
58531ecf4f android: Apply clang format 2023-06-03 00:05:30 -07:00
bunnei
0e52d11ede android: frontend: Implement game grid view. (#9) 2023-06-03 00:05:30 -07:00
german77
5ed8d46340 android: Replace notification icon with yuzu 2023-06-03 00:05:30 -07:00
bunnei
7a89c2fe3a android: strings: Refresh key dumping URL. 2023-06-03 00:05:29 -07:00
bunnei
ddf10cdb18 android: frontend: Modify ROM load messaging for invalid keys. 2023-06-03 00:05:29 -07:00
bunnei
93cf8c3090 android: frontend: Integrate key installation for SAF. 2023-06-03 00:05:29 -07:00
bunnei
63a98e3e1c android: jni: Add function to reload keys. 2023-06-03 00:05:29 -07:00
bunnei
f33776af67 android: EmulationActivity: Temporarily disable running notification. 2023-06-03 00:05:29 -07:00
bunnei
ef605f7d8f android: Implement SAF support & migrate to SDK 31. (#4) 2023-06-03 00:05:29 -07:00
bunnei
39ab81a098 android: Harden emulation shutdown when loader fails. 2023-06-03 00:05:29 -07:00
bunnei
e12e1efa40 android: SettingsFragmentPresenter: Fix default renderer backend. 2023-06-03 00:05:29 -07:00
bunnei
d6a41b3290 android: jni: native: Add lock around HaltEmulation, tighten run loop. 2023-06-03 00:05:29 -07:00
bunnei
d553fd4c3a android: jni: native: Refactor locking for is_running. 2023-06-03 00:05:28 -07:00
bunnei
104ff475d2 android: jni: native: Remove unnecessary atomic for is_running. 2023-06-03 00:05:28 -07:00
bunnei
9ba67eab4f android: jni: native: Tighten up emulation start/stop signaling. 2023-06-03 00:05:28 -07:00
bunnei
1e94d16dad android: jni: native: Consolidate emulation state into EmulationSession singleton. 
- Fixes state management issues across multiple boots.
- Fixes crashes related to unsafe access of perf stats.
 2023-06-03 00:05:28 -07:00
bunnei
6cc21a56d9 android: Frontend: Fix rendering aspect ratio & add a setting for it. 2023-06-03 00:05:28 -07:00
bunnei
4f903d8d35 android: Integrate settings frontend with yuzu & remove unused code. 2023-06-03 00:05:28 -07:00
bunnei
5e198d1421 android: Minimize frontend & convert to yuzu. 2023-06-03 00:05:27 -07:00
bunnei
e6d5dbb58e android: Minimal JNI for yuzu. 2023-06-03 00:05:26 -07:00
bunnei
bb2cbbfba3 android: Add Citra frontend. 2023-06-03 00:05:26 -07:00