Skip to content

Commit

Permalink
release
Browse files Browse the repository at this point in the history
  • Loading branch information
@DenisDemyanko
DenisDemyanko committed Sep 3, 2021
1 parent 6144b9d commit ab8c836
Show file tree
Hide file tree
Showing 14 changed files with 69 additions and 53 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ android {
applicationId "com.mw.beam.beamwallet"
minSdkVersion 23
targetSdkVersion 30
versionCode 447
versionCode 451
versionName "6.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
Expand Down
2 changes: 1 addition & 1 deletion app/src/beamtestnet/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<resources>
<string name="app_name">Beam Wallet Testnet</string>
<string name="online">Online (testnet)</string>
<string name="online">Online</string>
<string name="redirect" translatable="false">open.testnet.app</string>
</resources>
35 changes: 11 additions & 24 deletions app/src/main/java/com/mw/beam/beamwallet/core/AppManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import java.util.*


class AppManager {

var wallet: Wallet? = null

private var handler:android.os.Handler? = null
Expand Down Expand Up @@ -80,6 +81,14 @@ class AppManager {

return INSTANCE!!
}

fun getNode():String {
val node = Api.getDefaultPeers().random()
if (!node.contains("shanghai")) {
return node
}
return Api.getDefaultPeers().random()
}
}


Expand Down Expand Up @@ -154,32 +163,10 @@ class AppManager {
return wallet?.isConnectionTrusted() == true
}

private fun chooseRandomNodeWithoutNodes(): String {
val peers = Api.getDefaultPeers()

val array = mutableListOf<String>()

peers.forEach { random ->
if(!random.contains("shanghai")) {
var found = false

array.forEach { node ->
if(random == node) {
found = true;
}
}

if(!found) {
array.add(random)
}
}
}

if(array.count() > 0 ) {
return array[0]
}

return ""
private fun chooseRandomNodeWithoutNodes(): String {
return AppManager.getNode()
}

fun reload() {
Expand Down
26 changes: 19 additions & 7 deletions app/src/main/java/com/mw/beam/beamwallet/core/AssetManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,14 @@ class AssetManager {
var requestesAssets = arrayListOf<Int>()
var selectedAssetId = 0
var assets = arrayListOf<Asset>()
var filteredAssets = arrayListOf<Asset>()

fun loadAssets() : List<Asset> {
return assets.map { it }.toList()
return filteredAssets.map { it }.toList()
}

fun filteredDataUsed() : List<Asset> {
val array = assets.map { it }.toList()
val array = filteredAssets.map { it }.toList()
val filtered = array.filter {
it.available > 0L || it.lockedSum() > 0L || it.hasInProgressTransactions()
|| it.isBeam()
Expand All @@ -67,12 +68,13 @@ class AssetManager {
addBeam()
}


val filtered = assets.filter {
it.available > 0L || it.lockedSum() > 0L || it.hasInProgressTransactions()
|| it.isBeam()
}
assets.clear()
assets.addAll(filtered)
filteredAssets.clear()
filteredAssets.addAll(filtered)
}

private fun addBeam() {
Expand All @@ -91,7 +93,7 @@ class AssetManager {
}

fun clear() {
assets.clear()
filteredAssets.clear()
selectedAssetId = 0
addBeam()
onChangeAssets()
Expand All @@ -113,8 +115,8 @@ class AssetManager {
it.available > 0L || it.lockedSum() > 0L || it.hasInProgressTransactions()
|| it.isBeam()
}
assets.clear()
assets.addAll(filtered)
filteredAssets.clear()
filteredAssets.addAll(filtered)

val g = Gson()
val jsonString = g.toJson(assets)
Expand Down Expand Up @@ -142,13 +144,23 @@ class AssetManager {
val jsonString = g.toJson(assets)
PreferencesManager.putString(PreferencesManager.KEY_ASSETS, jsonString)

val filtered = assets.filter {
it.available > 0L || it.lockedSum() > 0L || it.hasInProgressTransactions()
|| it.isBeam()
}
filteredAssets.clear()
filteredAssets.addAll(filtered)

requestesAssets.remove(info.id)
}

private fun getColor(asset: Asset):String {
return if (asset.isBeam()) {
return "#00F6D2"
}
else if (asset.isDemoX()) {
return "#977dff"
}
// else if(asset.isDemoX()) {
// return "#00F6D2"
// }
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/mw/beam/beamwallet/core/entities/Asset.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Asset(val assetId: Int,
}

fun isDemoX():Boolean {
return unitName == "DEMOX" || unitName == "BEAMX"
return unitName.toUpperCase() == "DEMOX" || unitName.toUpperCase() == "BEAMX"
}

fun hasInProgressTransactions():Boolean {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/mw/beam/beamwallet/core/listeners/WalletListener.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@ object WalletListener {

@JvmStatic
fun onExchangeRates(rates: Array<ExchangeRateDTO>?) {
Log.e("RATES", rates?.size.toString() ?: "UNKNOWN")
LogUtils.logResponse(rates, "onExchangeRates")
if (newTime == 0L) {
if(rates!=null) {
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/java/com/mw/beam/beamwallet/screens/assets_list/AssetsListPresenter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,32 +60,32 @@ class AssetsListPresenter(view: AssetsListContract.View?, repository: AssetsList
fun getAssets():List<Asset> {
when (filter) {
AssetFilter.recent_old -> {
return AssetManager.instance.assets.sortedBy {
return AssetManager.instance.filteredAssets.sortedBy {
it.dateUsed()
}.reversed()
}
AssetFilter.old_recent -> {
return AssetManager.instance.assets.sortedBy {
return AssetManager.instance.filteredAssets.sortedBy {
it.dateUsed()
}
}
AssetFilter.amount_large_small -> {
return AssetManager.instance.assets.sortedBy {
return AssetManager.instance.filteredAssets.sortedBy {
it.available
}.reversed()
}
AssetFilter.amount_small_large -> {
return AssetManager.instance.assets.sortedBy {
return AssetManager.instance.filteredAssets.sortedBy {
it.available
}
}
AssetFilter.amount_usd_large -> {
return AssetManager.instance.assets.sortedBy {
return AssetManager.instance.filteredAssets.sortedBy {
it.usd()
}.reversed()
}
else -> {
return AssetManager.instance.assets.sortedBy {
return AssetManager.instance.filteredAssets.sortedBy {
it.usd()
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/mw/beam/beamwallet/screens/node/NodeFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ class NodeFragment: BaseFragment<NodePresenter>(), NodeContract.View {

AppManager.instance.wallet?.enableBodyRequests(false)
AppManager.instance.onChangeNodeAddress()
AppConfig.NODE_ADDRESS = Api.getDefaultPeers().random()
AppConfig.NODE_ADDRESS = AppManager.getNode()
AppManager.instance.wallet?.changeNodeAddress(AppConfig.NODE_ADDRESS)

if (isCreate() == true) {
Expand All @@ -380,7 +380,7 @@ class NodeFragment: BaseFragment<NodePresenter>(), NodeContract.View {
AppManager.instance.wallet?.enableBodyRequests(true)

AppManager.instance.onChangeNodeAddress()
AppConfig.NODE_ADDRESS = Api.getDefaultPeers().random()
AppConfig.NODE_ADDRESS = AppManager.getNode()
AppManager.instance.wallet?.changeNodeAddress(AppConfig.NODE_ADDRESS)

if (isCreate() == true) {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/mw/beam/beamwallet/screens/receive/ReceiveFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ class ReceiveFragment : BaseFragment<ReceivePresenter>(), ReceiveContract.View {
presenter?.onCopyPressed()
}

if(AssetManager.instance.assets.size != 1) {
if(AssetManager.instance.filteredAssets.size != 1) {
currencyLayout.setOnClickListener {
animateDropDownIcon(btnExpandCurrency, true)
val menu = PopupMenu(requireContext(), currencyLayout, Gravity.END, R.attr.listPopupWindowStyle, R.style.popupOverflowMenu)
Expand All @@ -312,7 +312,7 @@ class ReceiveFragment : BaseFragment<ReceivePresenter>(), ReceiveContract.View {
menu.setOnDismissListener {
animateDropDownIcon(btnExpandCurrency, false)
}
AssetManager.instance.assets.forEach {
AssetManager.instance.filteredAssets.forEach {
var name = it.unitName
if (name.length > 8) {
name = name.substring(0,8) + "..."
Expand Down Expand Up @@ -383,7 +383,7 @@ class ReceiveFragment : BaseFragment<ReceivePresenter>(), ReceiveContract.View {
backgroundView.setBackgroundResource(R.drawable.receive_bg_dark)
}

if(AssetManager.instance.assets.size <= 1) {
if(AssetManager.instance.filteredAssets.size <= 1) {
btnExpandCurrency.visibility = View.GONE
}

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/mw/beam/beamwallet/screens/send/SendFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,7 @@ class SendFragment : BaseFragment<SendPresenter>(), SendContract.View {
// addressContainer.setBackgroundColor(requireContext().getColor(R.color.colorPrimary).withAlpha(95))
// }

if(AssetManager.instance.assets.size != 1) {
if(AssetManager.instance.filteredAssets.size != 1) {
currencyLayout
.setOnClickListener {
animateDropDownIcon(btnExpandCurrency, true)
Expand All @@ -562,7 +562,7 @@ class SendFragment : BaseFragment<SendPresenter>(), SendContract.View {
}
menu.gravity = Gravity.END;

AssetManager.instance.assets.forEach {
AssetManager.instance.filteredAssets.forEach {
var name = it.unitName
if (name.length > 8) {
name = name.substring(0,8) + "..."
Expand Down Expand Up @@ -669,7 +669,7 @@ class SendFragment : BaseFragment<SendPresenter>(), SendContract.View {
presenter?.onScanQrPressed()
}

if(AssetManager.instance.assets.size <= 1) {
if(AssetManager.instance.filteredAssets.size <= 1) {
btnExpandCurrency.visibility = View.GONE
}

Expand Down
16 changes: 13 additions & 3 deletions app/src/main/java/com/mw/beam/beamwallet/screens/send/SendPresenter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -614,9 +614,14 @@ class SendPresenter(currentView: SendContract.View, currentRepository: SendContr
onFeeDidCalculated(it.fee)

if(isAllPressed) {
maxSelected = it.max - it.fee
if (assetId == 0) {
maxSelected = it.max - it.fee
}
else {
maxSelected = it.max
}

if (view?.getAmount()?.convertToGroth() != it.max - it.fee) {
if (view?.getAmount()?.convertToGroth() != maxSelected) {
setAmount(it.max, it.fee)

val availableAmount = AssetManager.instance.getAvailable(assetId)
Expand All @@ -632,7 +637,12 @@ class SendPresenter(currentView: SendContract.View, currentRepository: SendContr
val amount = view?.getAmount()
if (amount != null) {
if(amount > 0.0) {
maxSelected = it.max - it.fee
if (assetId == 0) {
maxSelected = it.max - it.fee
}
else {
maxSelected = it.max
}

val availableAmount = AssetManager.instance.getAvailable(assetId)
val feeAmount = try {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/mw/beam/beamwallet/screens/settings/SettingsRepository.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class SettingsRepository : BaseRepository(), SettingsContract.Repository {

if (random) {
AppManager.instance.onChangeNodeAddress()
AppConfig.NODE_ADDRESS = Api.getDefaultPeers().random()
AppConfig.NODE_ADDRESS = AppManager.getNode()
AppManager.instance.wallet?.changeNodeAddress(AppConfig.NODE_ADDRESS)
}
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_welcome_create.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
android:paddingEnd="20dp"
android:paddingBottom="8dp"
android:textColor="@color/colorAccent"
android:visibility="gone"
tools:text="EN" />

</LinearLayout>
Expand Down
7 changes: 6 additions & 1 deletion app/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,12 @@
<color name="sent_color_picked_dark">@android:color/transparent</color>
<color name="cardDarkColor">#191919</color>
<color name="addresses_status_bar_color_black">#162e40</color>
<color name="receive_toolbar_color">#18373E</color>
<color name="window_popup_bg">#303030</color>

<color name="send_toolbar_color_dark">#79418d</color>
<color name="receive_toolbar_color_dark">#08a4c9</color>
<!-- <color name="receive_toolbar_color">#147494</color>-->
<color name="send_toolbar_color">#9452bd</color>
<color name="receive_toolbar_color">#08a4c9</color>

</resources>

0 comments on commit ab8c836

Please sign in to comment.