diff --git a/app/src/main/java/org/myhush/silentdragon/TransactionItemFragment.kt b/app/src/main/java/org/myhush/silentdragon/TransactionItemFragment.kt index d3fc29d..b583ba0 100644 --- a/app/src/main/java/org/myhush/silentdragon/TransactionItemFragment.kt +++ b/app/src/main/java/org/myhush/silentdragon/TransactionItemFragment.kt @@ -72,19 +72,20 @@ class TransactionItemFragment : Fragment() { amt.text = (if (tx?.type == "send") "" else "+") + DecimalFormat("#0.00########").format(amtzec) + " " + DataModel.mainResponseData?.tokenName if (tx?.type == "send") { - col.setImageResource(R.color.colorAccent) amt.setTextColor(ContextCompat.getColor(view.context, - R.color.colorAccent + R.color.white_selected )) } else { - col.setImageResource(R.color.white_selected) amt.setTextColor(ContextCompat.getColor(view.context, R.color.white_selected )) } if (param2 == "odd") - view.findViewById(R.id.outlineLayout).background = null + col.setBackgroundColor(ContextCompat.getColor(view.context, + R.color.colorPrimaryDark + )) + return view } diff --git a/app/src/main/res/drawable-anydpi/settings.xml b/app/src/main/res/drawable-anydpi/settings.xml new file mode 100644 index 0000000..6491dc9 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/settings.xml @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c093893..2a1d885 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -16,7 +16,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="?attr/colorPrimary" + android:background="?attr/colorPrimaryDark" app:popupTheme="@style/AppTheme.PopupOverlay"/> diff --git a/app/src/main/res/layout/activity_qr_reader.xml b/app/src/main/res/layout/activity_qr_reader.xml index ad03fbb..9b709a1 100644 --- a/app/src/main/res/layout/activity_qr_reader.xml +++ b/app/src/main/res/layout/activity_qr_reader.xml @@ -35,6 +35,8 @@ android:text="@string/cancel" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingLeft="10dp" + android:paddingRight="10dp" android:id="@+id/btnQrCodeCancel" app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index 0371625..e9e6e5d 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -5,26 +5,28 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/colorPrimary" app:layout_behavior="@string/appbar_scrolling_view_behavior" tools:showIn="@layout/activity_main" tools:context="org.myhush.silentdragon.MainActivity"> + android:layout_width="0dp" + android:layout_height="150dp" + app:srcCompat="@color/colorPrimary" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" android:id="@+id/imageView2" + app:layout_constraintHorizontal_bias="0.524" + app:layout_constraintTop_toTopOf="parent"/> + android:text="@string/balance" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/lblBalance" android:layout_marginTop="12dp" + app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" + android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="parent" + android:layout_marginEnd="16dp" + app:layout_constraintBottom_toTopOf="@+id/txtMainBalance" android:textColor="@color/light_grey"/> + app:srcCompat="@mipmap/ic_dragon" /> @@ -78,44 +81,54 @@ android:fillViewport="true" android:clipToPadding="false" android:layout_marginTop="8dp" app:layout_constraintTop_toBottomOf="parent"> + android:layout_height="wrap_content" + android:background="@color/colorPrimary" + android:id="@+id/txList" android:orientation="vertical"> + android:textSize="18sp" android:padding="8dp"/> - + + + + +