SendFragment and ReceiveFragment changes
This commit is contained in:
dtvv
Severiano Jaramillo
parent
5c5bc5c439
commit
aea1fd3302
5 changed files with 83 additions and 14 deletions
|
|
@ -29,6 +29,16 @@
|
|||
</activity>
|
||||
<activity android:name=".activities.ReceiveTransactionActivity">
|
||||
</activity>
|
||||
|
||||
<!--<activity
|
||||
android:name="de.bitshares_munich.smartcoinswallet.ReceiveActivity"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/AppTheme" />-->
|
||||
|
||||
<activity
|
||||
android:name=".activities.RequestActivity"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/AppTheme" />
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,39 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="colorPrimary">#009FE3</color>
|
||||
<color name="colorPrimaryDark">#0071b1</color>
|
||||
<color name="colorAccent">#D81B60</color>
|
||||
<color name="colorPrimary">#0099d6</color>
|
||||
<color name="colorPrimaryDark">#0099d6</color>
|
||||
<color name="colorAccent">#669900</color>
|
||||
<color name="gray">#d3d3d3</color>
|
||||
<color name="darkGray">#686767</color>
|
||||
<color name="white">#ffffff</color>
|
||||
<color name="pink">#f0006b</color>
|
||||
|
||||
<color name="black">#000</color>
|
||||
<color name="colorReceive">#669900</color>
|
||||
<color name="colorSend">#DC473A</color>
|
||||
<color name="green">#147b00</color>
|
||||
|
||||
<color name="black">#000000</color>
|
||||
<color name="skyblue">#BFD1FF</color>
|
||||
<color name="light_blue">#f2f6ff</color>
|
||||
<color name="greencolor">#70882E</color>
|
||||
<color name="red">#ff0000</color>
|
||||
<color name="pinkColor">#FF4081</color>
|
||||
<color name="redcolor">#DD4739</color>
|
||||
|
||||
<color name="textColorPrimary">#FFFFFF</color>
|
||||
<color name="windowBackground">#FFFFFF</color>
|
||||
<color name="navigationBarColor">#000000</color>
|
||||
|
||||
<color name="bottomBarColor">#dddddd</color>
|
||||
|
||||
<color name="blackColor">#000000</color>
|
||||
<color name="whiteColor">#ffffff</color>
|
||||
<color name="receive_amount">#669900</color>
|
||||
<color name="receive_amount_light">#c5e1a5</color>
|
||||
<color name="send_amount">#DC473A</color>
|
||||
<color name="send_amount_light">#ef9a9a</color>
|
||||
<color name="transactionsHeader">#BFE5F5</color>
|
||||
<color name="transactionsseparator">#CCCCCC</color>
|
||||
|
||||
<color name="color_preloader_start">#000000</color>
|
||||
<color name="color_preloader_center">#000000</color>
|
||||
<color name="color_preloader_end">#ff56a9c7</color>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -4,4 +4,7 @@
|
|||
<dimen name="activity_vertical_margin">16dp</dimen>
|
||||
<dimen name="fab_margin">16dp</dimen>
|
||||
<dimen name="appbar_padding_top">8dp</dimen>
|
||||
|
||||
<dimen name="layout_margin">35sp</dimen>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -9,4 +9,31 @@
|
|||
<!-- Settings -->
|
||||
<string name="title_settings">Settings</string>
|
||||
<string name="night_mode">Night mode</string>
|
||||
|
||||
<string name="cancel">CANCEL</string>
|
||||
|
||||
<string name="to">to</string>
|
||||
<string name="from">from</string>
|
||||
|
||||
<string name="account_id">accountId</string>
|
||||
|
||||
<string name="pref_language">language</string>
|
||||
|
||||
<string name="next">NEXT</string>
|
||||
|
||||
<string name="from_capital">From</string>
|
||||
<string name="to_capital">To</string>
|
||||
|
||||
<string name="amount">Amount</string>
|
||||
|
||||
<string name="loyalty_points">Loyalty Points</string>
|
||||
<string name="backup_asset">Backup Asset</string>
|
||||
<string name="memo_capital">Memo</string>
|
||||
<string name="checkbox_donate">Donate 2 BTS to the Support Developers at</string>
|
||||
<string name="send_capital">Send</string>
|
||||
<string name="v_1_0_beta" translatable="false">v 1.0 beta</string>
|
||||
<string name="block_number" translatable="false">block# -------</string>
|
||||
<string name="no_amount_requested">No amount requested</string>
|
||||
<string name="request_amount_screen_name">Amount</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Reference in a new issue