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

Fixed small issues and added comments

Browse source
This commit is contained in:
sjaramillo10 2017-11-17 00:05:41 -06:00 committed by Severiano Jaramillo
parent b6a00f4c83
commit c2a6ae7835
3 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".activities.BoardActivity" <activity android:name=".activities.BoardActivity"
android:theme="@style/AppTheme.NoActionBar" > android:theme="@style/AppTheme.NoActionBar" > <!-- Dirty trick to avoid toolbar error on balance -->
</activity> </activity>
<activity android:name=".activities.AccountSeedsManagementActivity" > <activity android:name=".activities.AccountSeedsManagementActivity" >
</activity> </activity>

22
app/src/main/res/layout/board.xml
View file

@ -5,10 +5,6 @@
android:id="@+id/main_content" android:id="@+id/main_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
<<<<<<< HEAD
app:theme="@style/AppTheme.NoActionBar"
=======
>>>>>>> Added custom toolbar and tab labels to board activity
android:fitsSystemWindows="true"> android:fitsSystemWindows="true">
<android.support.design.widget.AppBarLayout <android.support.design.widget.AppBarLayout
@ -26,11 +22,7 @@
android:background="?attr/colorPrimary" android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways" app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/AppTheme.PopupOverlay" app:popupTheme="@style/AppTheme.PopupOverlay"
<<<<<<< HEAD
app:title="Client Logo"> app:title="Client Logo">
=======
app:title="@string/app_name">
>>>>>>> Added custom toolbar and tab labels to board activity
</android.support.v7.widget.Toolbar> </android.support.v7.widget.Toolbar>
@ -67,22 +59,14 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior"/> app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> Added bottom buttons to balance, transactions and contacts
android:id="@+id/fabReceive" android:id="@+id/fabReceive"
android:layout_width="250dp" android:layout_width="250dp"
android:layout_height="250dp" android:layout_height="250dp"
android:layout_gravity="start|bottom" android:layout_gravity="start|bottom"
android:layout_marginBottom="-125dp" android:layout_marginBottom="-125dp"
android:layout_marginStart="-125dp" android:layout_marginStart="-125dp"
<<<<<<< HEAD
app:backgroundTint="@color/white" app:backgroundTint="@color/white"
app:srcCompat="@drawable/receive_icon" /> app:srcCompat="@drawable/receive_icon" />
=======
app:srcCompat="@android:drawable/ic_dialog_email" />
>>>>>>> Added bottom buttons to balance, transactions and contacts
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/fabSend" android:id="@+id/fabSend"
@ -95,12 +79,6 @@
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/fabAddContact" android:id="@+id/fabAddContact"
<<<<<<< HEAD
=======
android:id="@+id/fab"
>>>>>>> Added custom toolbar and tab labels to board activity
=======
>>>>>>> Added bottom buttons to balance, transactions and contacts
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end|bottom" android:layout_gravity="end|bottom"