mirror of
https://github.com/greenart7c3/Amber.git
synced 2026-10-06 03:18:23 +00:00
move color.fromhex to Theme.kt
This commit is contained in:
@@ -8,7 +8,6 @@ import android.content.Intent
|
||||
import android.content.pm.PackageManager
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import android.util.Log
|
||||
import android.widget.Toast
|
||||
import androidx.activity.compose.ManagedActivityResultLauncher
|
||||
import androidx.activity.compose.rememberLauncherForActivityResult
|
||||
@@ -76,7 +75,6 @@ import androidx.compose.ui.text.toUpperCase
|
||||
import androidx.compose.ui.unit.LayoutDirection
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.core.graphics.toColorInt
|
||||
import androidx.core.net.toUri
|
||||
import androidx.lifecycle.compose.LocalLifecycleOwner
|
||||
import androidx.navigation.NavHostController
|
||||
@@ -118,6 +116,7 @@ import com.greenart7c3.nostrsigner.ui.components.AmberTopAppBar
|
||||
import com.greenart7c3.nostrsigner.ui.components.IconRow
|
||||
import com.greenart7c3.nostrsigner.ui.navigation.Route
|
||||
import com.greenart7c3.nostrsigner.ui.navigation.routes
|
||||
import com.greenart7c3.nostrsigner.ui.theme.fromHex
|
||||
import com.vitorpamplona.quartz.nip46RemoteSigner.BunkerResponse
|
||||
import com.vitorpamplona.quartz.utils.TimeUtils
|
||||
import java.io.ByteArrayOutputStream
|
||||
@@ -498,13 +497,6 @@ private fun askNotificationPermission(
|
||||
}
|
||||
}
|
||||
|
||||
fun Color.Companion.fromHex(colorString: String) = try {
|
||||
Color("#$colorString".toColorInt())
|
||||
} catch (e: Exception) {
|
||||
Log.e(Amber.TAG, "Failed to parse color: $colorString", e)
|
||||
Unspecified
|
||||
}
|
||||
|
||||
enum class IntentResultType {
|
||||
REMOVE,
|
||||
ADD,
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.greenart7c3.nostrsigner.ui.theme
|
||||
|
||||
import android.app.Activity
|
||||
import android.os.Build
|
||||
import android.util.Log
|
||||
import androidx.compose.foundation.isSystemInDarkTheme
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
@@ -16,7 +17,9 @@ import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.graphics.toArgb
|
||||
import androidx.compose.ui.platform.LocalView
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.core.graphics.toColorInt
|
||||
import androidx.core.view.WindowCompat
|
||||
import com.greenart7c3.nostrsigner.Amber
|
||||
import com.halilibo.richtext.ui.RichTextStyle
|
||||
import com.halilibo.richtext.ui.resolveDefaults
|
||||
|
||||
@@ -94,3 +97,10 @@ fun NostrSignerTheme(
|
||||
}
|
||||
|
||||
fun Color.light(factor: Float = 0.5f) = this.copy(alpha = this.alpha * factor)
|
||||
|
||||
fun Color.Companion.fromHex(colorString: String) = try {
|
||||
Color("#$colorString".toColorInt())
|
||||
} catch (e: Exception) {
|
||||
Log.e(Amber.TAG, "Failed to parse color: $colorString", e)
|
||||
Unspecified
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user