agorise
/
bitsy-wallet
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feat_merchants' of github.com:Agorise/bitsy-wallet into feat_merchants

master
Severiano Jaramillo 2018-10-31 19:07:54 -06:00
parent aea1fd3302 a2f696c326
commit b2c355210d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -12,7 +12,7 @@
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
<activity
android:name=".activities.MainActivity"
android:name="de.bitshares_munich.smartcoinswallet.ReceiveActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>

2
app/src/main/java/cy/agorise/bitsybitshareswallet/utils/SquaredImageView.kt
View File

@ -11,10 +11,10 @@ import androidx.appcompat.widget.AppCompatImageView
*/
class SquaredImageView : AppCompatImageView {
constructor(context: Context) : super(context)
constructor(context: Context, @Nullable attrs: AttributeSet) : super(context, attrs)
constructor(context: Context, @Nullable attrs: AttributeSet, defStyleAttr: Int) : super(
context,
attrs,