diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3e49c1f..6fc1626 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,6 +29,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/SquaredImageView.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/SquaredImageView.kt index 8fd09e4..e6c81fd 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/SquaredImageView.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/SquaredImageView.kt @@ -1,8 +1,9 @@ -package cy.agorise.crystalwallet.util +package cy.agorise.bitsybitshareswallet.utils import android.content.Context -import android.support.v7.widget.AppCompatImageView import android.util.AttributeSet +import androidx.annotation.Nullable +import androidx.appcompat.widget.AppCompatImageView /** * Created by xd on 1/24/18. @@ -10,21 +11,20 @@ import android.util.AttributeSet */ class SquaredImageView : AppCompatImageView { - constructor(context: Context) : super(context) {} + constructor(context: Context) : super(context) - constructor(context: Context, @Nullable attrs: AttributeSet) : super(context, attrs) {} + constructor(context: Context, @Nullable attrs: AttributeSet) : super(context, attrs) constructor(context: Context, @Nullable attrs: AttributeSet, defStyleAttr: Int) : super( context, attrs, defStyleAttr - ) { - } + ) - protected fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { super.onMeasure(widthMeasureSpec, heightMeasureSpec) - val size = Math.min(getMeasuredWidth(), getMeasuredHeight()) + val size = Math.min(measuredWidth, measuredHeight) setMeasuredDimension(size, size) } } diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 7f68767..2a7fee2 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,10 +1,39 @@ - #009FE3 - #0071b1 - #D81B60 + #0099d6 + #0099d6 + #669900 + #d3d3d3 + #686767 + #ffffff + #f0006b - #000 - #669900 - #DC473A + #147b00 + + #000000 + #BFD1FF + #f2f6ff + #70882E + #ff0000 + #FF4081 + #DD4739 + + #FFFFFF + #FFFFFF + #000000 + + #dddddd + + #000000 + #ffffff + #669900 + #c5e1a5 + #DC473A + #ef9a9a + #BFE5F5 + #CCCCCC + + #000000 + #000000 + #ff56a9c7 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index cef3abc..9d518a5 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -4,4 +4,7 @@ 16dp 16dp 8dp + + 35sp + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7c1d12d..9d4109e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,4 +9,31 @@ Settings Night mode + + CANCEL + + to + from + + accountId + + language + + NEXT + + From + To + + Amount + + Loyalty Points + Backup Asset + Memo + Donate 2 BTS to the Support Developers at + Send + v 1.0 beta + block# ------- + No amount requested + Amount +