The open source OpenXR runtime
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

targets/android: Bump ktfmt to 0.53 and reformat it

Signed-off-by: utzcoz <utzcoz@outlook.com>
Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2382>

authored by

utzcoz and committed by
korejan
ab48d417 b04fbb67

+12 -12
+1 -1
src/xrt/targets/android_common/build.gradle
··· 28 28 kotlin { 29 29 target 'src/main/java/**/*.kt' 30 30 // Use ktfmt(https://github.com/facebook/ktfmt) as the default Kotlin formatter. . 31 - ktfmt('0.43').kotlinlangStyle() 31 + ktfmt("$ktfmtVersion").kotlinlangStyle() 32 32 } 33 33 } 34 34
+3 -3
src/xrt/targets/android_common/src/main/java/org/freedesktop/monado/android_common/DisplayOverOtherAppsStatusFragment.kt
··· 30 30 override fun onCreateView( 31 31 inflater: LayoutInflater, 32 32 container: ViewGroup?, 33 - savedInstanceState: Bundle? 33 + savedInstanceState: Bundle?, 34 34 ): View? { 35 35 val view = 36 36 inflater.inflate(R.layout.fragment_display_over_other_app_status, container, false) ··· 50 50 getString( 51 51 R.string.msg_display_over_other_apps, 52 52 if (displayOverOtherAppsEnabled) getString(R.string.enabled) 53 - else getString(R.string.disabled) 53 + else getString(R.string.disabled), 54 54 ) 55 55 tv.text = Html.fromHtml(msg, Html.FROM_HTML_MODE_LEGACY) 56 56 } ··· 62 62 val intent = 63 63 Intent( 64 64 Settings.ACTION_MANAGE_OVERLAY_PERMISSION, 65 - Uri.parse("package:" + context!!.packageName) 65 + Uri.parse("package:" + context!!.packageName), 66 66 ) 67 67 startActivityForResult(intent, REQUEST_CODE_DISPLAY_OVER_OTHER_APPS) 68 68 }
+6 -6
src/xrt/targets/android_common/src/main/java/org/freedesktop/monado/android_common/ServiceNotificationImpl.kt
··· 51 51 NotificationChannel( 52 52 CHANNEL_ID, 53 53 nameAndLogoProvider.getLocalizedRuntimeName(), 54 - NotificationManager.IMPORTANCE_LOW 54 + NotificationManager.IMPORTANCE_LOW, 55 55 ) 56 56 notificationChannel.description = 57 57 context.getString( 58 58 R.string.channel_desc, 59 - nameAndLogoProvider.getLocalizedRuntimeName() 59 + nameAndLogoProvider.getLocalizedRuntimeName(), 60 60 ) 61 61 notificationChannel.setShowBadge(false) 62 62 notificationChannel.enableLights(false) ··· 72 72 */ 73 73 override fun buildNotification( 74 74 context: Context, 75 - pendingShutdownIntent: PendingIntent 75 + pendingShutdownIntent: PendingIntent, 76 76 ): Notification { 77 77 createChannel(context) 78 78 ··· 80 80 Notification.Action.Builder( 81 81 Icon.createWithResource(context, R.drawable.ic_feathericons_x), 82 82 context.getString(R.string.notifExitRuntime), 83 - pendingShutdownIntent 83 + pendingShutdownIntent, 84 84 ) 85 85 .build() 86 86 // Make a notification for our foreground service ··· 92 92 .setContentText( 93 93 context.getString( 94 94 R.string.notif_text, 95 - nameAndLogoProvider.getLocalizedRuntimeName() 95 + nameAndLogoProvider.getLocalizedRuntimeName(), 96 96 ) 97 97 ) 98 98 .setShowWhen(false) ··· 108 108 Notification.Action.Builder( 109 109 Icon.createWithResource(context, R.drawable.ic_feathericons_settings), 110 110 context.getString(R.string.notifConfigure), 111 - pendingIntent 111 + pendingIntent, 112 112 ) 113 113 .build() 114 114 builder.addAction(configureAction)
+1 -1
src/xrt/targets/openxr_android/build.gradle
··· 30 30 kotlin { 31 31 target 'src/main/java/**/*.kt' 32 32 // Use ktfmt(https://github.com/facebook/ktfmt) as the default Kotlin formatter. 33 - ktfmt('0.43').kotlinlangStyle() 33 + ktfmt("$ktfmtVersion").kotlinlangStyle() 34 34 } 35 35 } 36 36
+1 -1
src/xrt/targets/openxr_android/src/main/java/org/freedesktop/monado/openxr_runtime/MonadoOpenXrUiProvider.kt
··· 38 38 Intent.makeMainActivity( 39 39 ComponentName.createRelative(context, AboutActivity::class.qualifiedName!!) 40 40 ), 41 - flags 41 + flags, 42 42 ) 43 43 } 44 44 }