Skip to content

Commit 148d342

Browse files
authored
Merge pull request #249 from synonymdev/feat/shop-map
Feat/shop map
2 parents b9e5356 + 0065a02 commit 148d342

File tree

11 files changed

+625
-379
lines changed

11 files changed

+625
-379
lines changed

app/src/main/java/to/bitkit/env/Env.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ internal object Env {
181181
const val PLAY_STORE_URL = "https://play.google.com/store/apps/details?id=to.bitkit"
182182
const val EXCHANGES_URL = "https://bitcoin.org/en/exchanges#international"
183183
const val BIT_REFILL_URL = "https://embed.bitrefill.com"
184+
const val BTC_MAP_URL = "https://btcmap.org/map"
184185
private const val BITREFILL_REF = "AL6dyZYt"
185186
private const val BITREFILL_PAYMENT_METHOD = "bitcoin" // Payment method "bitcoin" gives a unified invoice
186187
private const val BITREFILL_APP_NAME = "Bitkit"

app/src/main/java/to/bitkit/ui/ContentView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ import to.bitkit.ui.screens.profile.CreateProfileScreen
4545
import to.bitkit.ui.screens.profile.ProfileIntroScreen
4646
import to.bitkit.ui.screens.scanner.QrScanningScreen
4747
import to.bitkit.ui.screens.scanner.SCAN_REQUEST_KEY
48-
import to.bitkit.ui.screens.shop.ShopDiscoverScreen
48+
import to.bitkit.ui.screens.shop.shopDiscover.ShopDiscoverScreen
4949
import to.bitkit.ui.screens.shop.ShopIntroScreen
50-
import to.bitkit.ui.screens.shop.ShopWebViewScreen
50+
import to.bitkit.ui.screens.shop.shopWebView.ShopWebViewScreen
5151
import to.bitkit.ui.screens.transfer.FundingAdvancedScreen
5252
import to.bitkit.ui.screens.transfer.FundingScreen
5353
import to.bitkit.ui.screens.transfer.LiquidityScreen

app/src/main/java/to/bitkit/ui/screens/shop/ShopDiscoverScreen.kt

Lines changed: 0 additions & 179 deletions
This file was deleted.

app/src/main/java/to/bitkit/ui/screens/shop/ShopWebViewScreen.kt

Lines changed: 0 additions & 198 deletions
This file was deleted.

0 commit comments

Comments
 (0)