Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f419e851 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Fix deprecation errors in EasterEgg. 

These errors block an upgrade to Kotlin 2.1.

Bug: 399463072
Flag: EXEMPT minor refactor
Test: m EasterEgg
Change-Id: I8d1c4d299af5621ea27161f5015ab9526332ea39
Merged-In: I8d1c4d299af5621ea27161f5015ab9526332ea39
parent a80655b5

packages/EasterEgg/src/com/android/egg/landroid/Autopilot.kt

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ class Autopilot(val ship: Spacecraft, val universe: Universe) : Entity { 
        get() =

            listOf(

                    "---- AUTOPILOT ENGAGED ----",

                    "TGT: " + (target?.name?.toUpperCase() ?: "SELECTING..."),

                    "TGT: " + (target?.name?.uppercase() ?: "SELECTING..."),

                    "EXE: $strategy" + if (debug.isNotEmpty()) " ($debug)" else "",

                )

                .joinToString("\n")

packages/EasterEgg/src/com/android/egg/landroid/MainActivity.kt

+1 −2
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ import androidx.compose.ui.input.pointer.pointerInput 
import androidx.compose.ui.text.TextStyle

import androidx.compose.ui.text.font.FontFamily

import androidx.compose.ui.text.font.FontWeight

import androidx.compose.ui.text.toUpperCase

import androidx.compose.ui.tooling.preview.Devices

import androidx.compose.ui.tooling.preview.Preview

import androidx.compose.ui.unit.dp
@@ -226,7 +225,7 @@ fun Telemetry(universe: VisibleUniverse) { 
                            val distToClosest = ((closest.pos - pos).mag() - closest.radius).toInt()

                            listOfNotNull(

                                    landing?.let {

                                        "LND: ${it.planet.name.toUpperCase()}\nJOB: ${it.text}"

                                        "LND: ${it.planet.name.uppercase()}\nJOB: ${it.text}"

                                    }

                                        ?: if (distToClosest < 10_000) {

                                            "ALT: $distToClosest"

packages/EasterEgg/src/com/android/egg/landroid/Namer.kt

+1 −1
Original line number Diff line number Diff line
@@ -121,6 +121,6 @@ class Namer(resources: Resources) { 
                    else -> "unknown template tag: ${it.groupValues[0]}"

                }

            }

            .toUpperCase()

            .uppercase()

    }

}