Skip to content

Commit

Permalink
Both - release v1.5.20
Browse files Browse the repository at this point in the history
  • Loading branch information
@wannabit-yongjoo
wannabit-yongjoo committed Oct 4, 2021
1 parent 797a62f commit be238a8
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Cosmos-Android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ android {
applicationId "wannabit.io.cosmostaion"
minSdkVersion 23
targetSdkVersion 30
versionCode 119
versionName "1.5.19"
versionCode 120
versionName "1.5.20"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
}
Expand Down
2 changes: 1 addition & 1 deletion Cosmos-Android/app/src/main/java/wannabit/io/cosmostaion/base/BaseChain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ public static ArrayList<BaseChain> SUPPORT_CHAINS() {
// result.add(IOV_TEST);
// result.add(OK_TEST);
// result.add(CERTIK_TEST);
result.add(RIZON_TEST);
// result.add(RIZON_TEST);
// result.add(MEDI_TEST);
// result.add(ALTHEA_TEST);
result.add(UMEE_TEST);
Expand Down
8 changes: 4 additions & 4 deletions Cosmos-IOS/Cosmostation/Cosmostation.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5751,7 +5751,7 @@
CODE_SIGN_ENTITLEMENTS = Cosmostation/Cosmostation.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 119;
CURRENT_PROJECT_VERSION = 120;
DEVELOPMENT_TEAM = 8G562MW56M;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -5763,7 +5763,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.5.19;
MARKETING_VERSION = 1.5.20;
PRODUCT_BUNDLE_IDENTIFIER = io.wannabit.cosmostation;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -5783,7 +5783,7 @@
CODE_SIGN_ENTITLEMENTS = Cosmostation/Cosmostation.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 119;
CURRENT_PROJECT_VERSION = 120;
DEVELOPMENT_TEAM = 8G562MW56M;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -5795,7 +5795,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.5.19;
MARKETING_VERSION = 1.5.20;
PRODUCT_BUNDLE_IDENTIFIER = io.wannabit.cosmostation;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
12 changes: 12 additions & 0 deletions Cosmos-IOS/Cosmostation/Cosmostation/Assets.xcassets/chainJuno.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "chainJuno.pdf",
"idiom" : "universal"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added Cosmos-IOS/Cosmostation/Cosmostation/Assets.xcassets/chainJuno.imageset/chainJuno.pdf
View file
Binary file not shown.
7 changes: 4 additions & 3 deletions Cosmos-IOS/Cosmostation/Cosmostation/Base/BaseConstant.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import Foundation
import SQLite

let SHOW_LOG = true;
let SHOW_LOG = false;
let SUPPORT_BEP3_SWAP = true;

let KEY_RECENT_ACCOUNT = "KEY_RECENT_ACCOUNT"
Expand Down Expand Up @@ -497,7 +497,7 @@ let GAS_FEE_AMOUNT_MID = "200000"
let GAS_FEE_AMOUNT_HIGH = "300000"
let GAS_FEE_AMOUNT_REINVEST = "220000"
let GAS_FEE_AMOUNT_REDELE = "240000"
let GAS_FEE_AMOUNT_IBC_SEND = "400000"
let GAS_FEE_AMOUNT_IBC_SEND = "500000"

let GAS_FEE_AMOUNT_COSMOS_SWAP = "200000"
let GAS_FEE_AMOUNT_COSMOS_JOIN_POOL = "300000"
Expand Down Expand Up @@ -822,6 +822,7 @@ public enum ChainType: String {
case RIZON_MAIN

case REGEN_MAIN
case JUNO_MAIN

case COSMOS_TEST
case IRIS_TEST
Expand Down Expand Up @@ -866,7 +867,7 @@ public enum ChainType: String {
// result.append(IOV_TEST)
// result.append(OKEX_TEST)
// result.append(CERTIK_TEST)
result.append(RIZON_TEST)
// result.append(RIZON_TEST)
// result.append(MEDI_TEST)
// result.append(ALTHEA_TEST)
result.append(UMEE_TEST)
Expand Down
3 changes: 2 additions & 1 deletion ...IOS/Cosmostation/Cosmostation/Controller/GenTx/kava/KavaIncentiveClaim3ViewController.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
<color key="textColor" red="0.47843137250000001" green="0.49803921569999998" blue="0.53333333329999999" alpha="1" colorSpace="deviceRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="-" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vnf-NT-Cu3">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vnf-NT-Cu3">
<rect key="frame" x="369" y="140.5" width="5" height="16.5"/>
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
Expand Down Expand Up @@ -216,6 +216,7 @@
<constraint firstItem="Q01-yb-JkX" firstAttribute="leading" secondItem="o6K-qo-IRz" secondAttribute="trailing" constant="4" id="kuj-mw-4gU"/>
<constraint firstItem="Q01-yb-JkX" firstAttribute="trailing" secondItem="IQO-DT-MEd" secondAttribute="trailing" id="kzQ-3g-JkC"/>
<constraint firstItem="aPH-LG-xg1" firstAttribute="top" secondItem="xAD-oI-uNF" secondAttribute="top" constant="16" id="n8w-2J-TAR"/>
<constraint firstItem="Vnf-NT-Cu3" firstAttribute="trailing" secondItem="fhU-ah-Frs" secondAttribute="trailing" id="osn-RZ-Zof"/>
<constraint firstItem="HgO-NH-Flg" firstAttribute="top" secondItem="Q01-yb-JkX" secondAttribute="bottom" constant="8" id="oxw-CX-Hhw"/>
<constraint firstItem="IQO-DT-MEd" firstAttribute="leading" secondItem="nPO-uE-DIw" secondAttribute="trailing" constant="4" id="sa8-lD-AsT"/>
<constraint firstItem="gcA-w3-LM4" firstAttribute="top" secondItem="60G-IM-rW1" secondAttribute="bottom" constant="8" id="te9-GE-otg"/>
Expand Down
6 changes: 6 additions & 0 deletions Cosmos-IOS/Cosmostation/Cosmostation/Utils/WUtils.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4623,6 +4623,7 @@ public class WUtils {
else if (chain == ChainType.RIZON_MAIN) { return UIImage(named: "chainRizon") }

else if (chain == ChainType.REGEN_MAIN) { return UIImage(named: "chainRegen") }
else if (chain == ChainType.JUNO_MAIN) { return UIImage(named: "chainJuno") }

else if (chain == ChainType.COSMOS_TEST) { return UIImage(named: "cosmosTestChainImg") }
else if (chain == ChainType.IRIS_TEST) { return UIImage(named: "irisTestChainImg") }
Expand Down Expand Up @@ -4658,6 +4659,7 @@ public class WUtils {
else if (chain == ChainType.RIZON_MAIN) { return "(Rizon Mainnet)" }

else if (chain == ChainType.REGEN_MAIN) { return "(Regen Mainnet)" }
else if (chain == ChainType.JUNO_MAIN) { return "(Juno Mainnet)" }

else if (chain == ChainType.COSMOS_TEST) { return "(StarGate Testnet)" }
else if (chain == ChainType.IRIS_TEST) { return "(Bifrost Testnet)" }
Expand Down Expand Up @@ -4694,6 +4696,7 @@ public class WUtils {
else if (chain == ChainType.RIZON_MAIN) { return "RIZON" }

else if (chain == ChainType.REGEN_MAIN) { return "REGEN" }
else if (chain == ChainType.JUNO_MAIN) { return "JUNO" }

else if (chain == ChainType.COSMOS_TEST) { return "STARGATE" }
else if (chain == ChainType.IRIS_TEST) { return "BIFROST" }
Expand Down Expand Up @@ -4742,6 +4745,8 @@ public class WUtils {

else if (chainId?.contains("regen-") == true) {
return ChainType.REGEN_MAIN
}else if (chainId?.contains("juno-") == true) {
return ChainType.JUNO_MAIN
}
return nil
}
Expand Down Expand Up @@ -4777,6 +4782,7 @@ public class WUtils {
else if (address?.starts(with: "rizon1") == true && chain == ChainType.RIZON_MAIN) { return true }

else if (address?.starts(with: "regen1") == true && chain == ChainType.REGEN_MAIN) { return true }
else if (address?.starts(with: "juno1") == true && chain == ChainType.JUNO_MAIN) { return true }

return false
}
Expand Down

0 comments on commit be238a8

Please sign in to comment.