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

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

Browse source
This commit is contained in:
Severiano Jaramillo 2018-10-31 19:07:54 -06:00
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" android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning"> tools:ignore="GoogleAppIndexingWarning">
<activity <activity
android:name=".activities.MainActivity" android:name="de.bitshares_munich.smartcoinswallet.ReceiveActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar"> android:theme="@style/AppTheme.NoActionBar">
<intent-filter> <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 { 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( constructor(context: Context, @Nullable attrs: AttributeSet, defStyleAttr: Int) : super(
context, context,
attrs, attrs,