Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ValueTransfer #118

Merged
merged 1 commit into from
Sep 9, 2022
Merged

Fix ValueTransfer #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/nl/tudelft/trustchain/app/AppDefinition.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ enum class AppDefinition(
LiquidityPoolMainActivity::class.java
),
VALUETRANSFER(
R.drawable.ic_confidapp_logo,
"ConfIDapp",
R.drawable.ic_idelft_logo,
"IDelft",
R.color.colorPrimaryValueTransfer,
ValueTransferMainActivity::class.java,
true,
Expand Down
15 changes: 15 additions & 0 deletions common/src/main/res/drawable/ic_idelft_logo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
android:viewportWidth="595.3"
android:viewportHeight="390"
android:width="595.3dp"
android:height="390dp">
<path
android:pathData="M509.6 11.5h-424C43 11.5 8.2 46.4 8.2 89v217.3c0 42.6 34.9 77.5 77.5 77.5h424c42.6 0 77.5 -34.9 77.5 -77.5V89C587.1 46.4 552.3 11.5 509.6 11.5zM297.1 347.3H102.7c-29.9 0 -54.3 -24.4 -54.3 -54.3V102.3c0 -29.9 24.4 -54.3 54.3 -54.3h194.3V347.3zM464.8 272.1c-3 3 -7.1 4.8 -11.6 4.8H350.6c-9.1 0 -16.5 -7.4 -16.5 -16.4c0 -4.5 1.9 -8.6 4.8 -11.6c3 -3 7.1 -4.8 11.6 -4.8h102.6c9.1 0 16.4 7.4 16.4 16.5C469.6 265 467.7 269.1 464.8 272.1zM544.3 208.2c-3 3 -7.1 4.8 -11.6 4.8H350.6c-9.1 0 -16.5 -7.4 -16.5 -16.4c0 -4.5 1.9 -8.6 4.8 -11.6c3 -3 7.1 -4.8 11.6 -4.8h182.1c9.1 0 16.5 7.4 16.5 16.5C549.1 201.2 547.3 205.3 544.3 208.2zM544.3 144.4c-3 3 -7.1 4.8 -11.6 4.8H350.6c-9.1 0 -16.5 -7.4 -16.5 -16.4c0 -4.5 1.9 -8.6 4.8 -11.6c3 -3 7.1 -4.8 11.6 -4.8h182.1c9.1 0 16.5 7.4 16.5 16.5C549.1 137.3 547.3 141.4 544.3 144.4z"
android:fillColor="#00A6D6" />
<path
android:pathData="M150.9 326L198.5 326 198.5 297.4 251.8 297.4 251.8 264.1 97.5 264.1 97.5 297.4 150.9 297.4Z"
android:fillColor="#00A6D6" />
<path
android:pathData="M242.2 161.8c-10.8 5.8 -23.2 5.1 -26.1 -10.3c-4.4 -23.5 47.1 -53.4 50.9 -75.3c0.9 -5.5 0.3 -9.7 -2.1 -9.1c-1.7 0.4 0.1 2.7 -3 7.3c-18.6 27.1 -56.8 34.2 -83.7 52.8c-17.6 12.2 -69.1 49.3 -45 106c1.1 2.7 4.6 11.8 6.3 11.5c2 -0.4 0.9 -6 -0.4 -12.8c-7 -35.2 32.9 -52.8 42.2 -78.3c1.1 -3.1 3.2 -7.4 4.2 -5.8c0.5 0.8 0.5 2.1 0.4 4.7c-0.7 19.7 -18.2 35.5 -10.1 48c10.5 16.2 29.1 -0.8 33.4 -13.3c1.1 -3.4 1.7 -5.6 3 -5.4c0.9 0.1 1.6 3.7 1.6 7c0.4 21 -2.2 33.3 -14.9 47.7c-4.1 4.6 -11.4 6.8 -9.9 9.4c0.4 0.7 3.6 0 6.1 -0.7c39.2 -9.9 63.7 -62.9 66.8 -95.1c0.5 -2.3 0.4 -4.4 -0.7 -5c-1.4 -0.7 -2.7 1.7 -4.2 3.7C253 153.7 247.6 159 242.2 161.8z"
android:fillColor="#00A6D6" />
</vector>
2 changes: 1 addition & 1 deletion common/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<color name="colorPrimarySSI">#810000</color>
<color name="colorPrimaryDarkSSI">#570000</color>

<color name="colorPrimaryValueTransfer">#009688</color>
<color name="colorPrimaryValueTransfer">#00A6D6</color>
<color name="colorPrimaryDarkValueTransfer">#015951</color>

<color name="text_primary">#000000</color>
Expand Down
38 changes: 17 additions & 21 deletions valuetransfer/src/main/java/nl/tudelft/trustchain/valuetransfer/ValueTransferMainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,30 +198,26 @@ class ValueTransferMainActivity : BaseActivity() {
/**
* On initialisation of activity pre-load all fragments to allow instant switching to increase performance
*/
fragmentManager.beginTransaction()
.add(R.id.container, identityFragment, identityFragmentTag).hide(identityFragment)
.add(R.id.container, exchangeFragment, exchangeFragmentTag).hide(exchangeFragment)
.add(R.id.container, contactsFragment, contactsFragmentTag).hide(contactsFragment)
.add(R.id.container, qrScanController, qrScanControllerTag).hide(qrScanController)
.add(R.id.container, settingsFragment, settingsFragmentTag).hide(settingsFragment)
if (!requestMoney) {
fragmentManager.beginTransaction().add(
R.id.container,
exchangeTransferMoneyLinkFragment,
exchangeTransferMoneyLinkFragmentTag
).hide(exchangeTransferMoneyLinkFragment)
if (!requestMoney)
fragmentManager.beginTransaction()
.add(R.id.container, identityFragment, identityFragmentTag).hide(identityFragment)
.add(R.id.container, exchangeFragment, exchangeFragmentTag).hide(exchangeFragment)
.add(R.id.container, contactsFragment, contactsFragmentTag).hide(contactsFragment)
.add(R.id.container, qrScanController, qrScanControllerTag).hide(qrScanController)
.add(R.id.container, settingsFragment, settingsFragmentTag).hide(settingsFragment)
.add(R.id.container, exchangeTransferMoneyLinkFragment, exchangeTransferMoneyLinkFragmentTag).hide(exchangeTransferMoneyLinkFragment)
.add(R.id.container, walletOverviewFragment, walletOverviewFragmentTag)
.commit()
} else {
fragmentManager.beginTransaction().add(
R.id.container,
exchangeTransferMoneyLinkFragment,
exchangeTransferMoneyLinkFragmentTag
)
.add(R.id.container, walletOverviewFragment, walletOverviewFragmentTag)
.hide(walletOverviewFragment)
else
fragmentManager.beginTransaction()
.add(R.id.container, identityFragment, identityFragmentTag).hide(identityFragment)
.add(R.id.container, exchangeFragment, exchangeFragmentTag).hide(exchangeFragment)
.add(R.id.container, contactsFragment, contactsFragmentTag).hide(contactsFragment)
.add(R.id.container, qrScanController, qrScanControllerTag).hide(qrScanController)
.add(R.id.container, settingsFragment, settingsFragmentTag).hide(settingsFragment)
.add(R.id.container, exchangeTransferMoneyLinkFragment, exchangeTransferMoneyLinkFragmentTag)
.add(R.id.container, walletOverviewFragment, walletOverviewFragmentTag).hide(walletOverviewFragment)
.commit()
}
fragmentManager.executePendingTransactions()

/**
Expand Down