Bug fix for the fork
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
package at.torch.android
|
||||
|
||||
import at.torch.auxiliary.compose.AuxApp
|
||||
import at.torch.auxiliary.compose.AuxGlobal
|
||||
import at.torch.compose.PlatformContext
|
||||
import android.content.Intent
|
||||
import android.nfc.NfcAdapter
|
||||
@@ -10,6 +8,8 @@ import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.activity.enableEdgeToEdge
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import at.torch.compose.TorchApp
|
||||
import at.torch.compose.TorchGlobal
|
||||
import com.machankura.compose.ui.composable.widgets.nfc.NfcState
|
||||
import com.machankura.compose.ui.composable.widgets.nfc.NfcStateRepository
|
||||
import fr.acinq.phoenix.PhoenixGlobal
|
||||
@@ -26,9 +26,9 @@ class MainActivity : ComponentActivity() {
|
||||
setContent {
|
||||
val navController = rememberNavController()
|
||||
|
||||
AuxApp(
|
||||
TorchApp(
|
||||
navController = navController,
|
||||
auxGlobal = AuxGlobal(
|
||||
torchGlobal = TorchGlobal(
|
||||
platformContext = PlatformContext(
|
||||
applicationContext = applicationContext
|
||||
)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package at.torch.compose
|
||||
|
||||
import at.torch.auxiliary.android.BuildConfig
|
||||
import at.torch.android.BuildConfig
|
||||
|
||||
actual object AppVersion {
|
||||
actual val versionName: String
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package at.torch.compose.ui.view.model
|
||||
|
||||
import at.torch.android.TorchApplication
|
||||
import at.torch.auxiliary.compose.AppVersion
|
||||
import at.torch.compose.AppVersion
|
||||
import co.touchlab.kermit.Logger
|
||||
import fr.acinq.bitcoin.MnemonicCode
|
||||
import fr.acinq.lightning.crypto.LocalKeyManager
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
package fr.acinq.phoenix.android
|
||||
|
||||
import at.torch.android.TorchApplication
|
||||
import at.torch.auxiliary.compose.AppVersion
|
||||
import at.torch.auxiliary.compose.ui.composable.widgets.wallet.WalletAvatars
|
||||
import at.torch.compose.AppVersion
|
||||
import at.torch.compose.ui.composable.widgets.wallet.WalletAvatars
|
||||
import android.content.Context
|
||||
import android.text.format.DateUtils
|
||||
import fr.acinq.lightning.LiquidityEvents
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
package fr.acinq.phoenix.android.services
|
||||
|
||||
import at.torch.auxiliary.android.BuildConfig
|
||||
import at.torch.android.BuildConfig
|
||||
import android.content.Context
|
||||
import androidx.work.CoroutineWorker
|
||||
import androidx.work.ExistingPeriodicWorkPolicy
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
package fr.acinq.phoenix.android.services
|
||||
|
||||
import at.torch.auxiliary.android.BuildConfig
|
||||
import at.torch.android.BuildConfig
|
||||
import android.content.Context
|
||||
import androidx.work.CoroutineWorker
|
||||
import androidx.work.ExistingPeriodicWorkPolicy
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
package fr.acinq.phoenix.android.services
|
||||
|
||||
import at.torch.auxiliary.android.BuildConfig
|
||||
import at.torch.android.BuildConfig
|
||||
import android.content.Context
|
||||
import androidx.work.CoroutineWorker
|
||||
import androidx.work.ExistingPeriodicWorkPolicy
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
package fr.acinq.phoenix.android.services
|
||||
|
||||
import at.torch.auxiliary.android.BuildConfig
|
||||
import at.torch.android.BuildConfig
|
||||
import at.torch.android.TorchApplication
|
||||
import android.content.Context
|
||||
import android.os.Build
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package fr.acinq.phoenix.android.services
|
||||
|
||||
import at.torch.auxiliary.android.BuildConfig
|
||||
import at.torch.android.BuildConfig
|
||||
import at.torch.android.TorchApplication
|
||||
import android.app.Service
|
||||
import android.content.Intent
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package fr.acinq.phoenix.utils
|
||||
|
||||
import at.torch.auxiliary.android.BuildConfig
|
||||
import at.torch.android.BuildConfig
|
||||
import android.content.Context
|
||||
import android.graphics.Bitmap
|
||||
import android.graphics.BitmapFactory
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
|
||||
package fr.acinq.phoenix.utils
|
||||
|
||||
import at.torch.auxiliary.android.BuildConfig
|
||||
import at.torch.android.BuildConfig
|
||||
import at.torch.android.MainActivity
|
||||
import at.torch.auxiliary.android.R
|
||||
import at.torch.android.R
|
||||
import android.Manifest
|
||||
import android.app.Notification
|
||||
import android.app.NotificationManager
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<resources>a
|
||||
<string name="app_name">Aux</string>
|
||||
<string name="app_name">Torch</string>
|
||||
|
||||
<string name="notification_channels_watcher_title">Channels watcher</string>
|
||||
<string name="notification_channels_watcher_desc">Shows up when you need to start Phoenix.</string>
|
||||
|
||||
Reference in New Issue
Block a user