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

Added custom toolbar and tab labels to board activity

master
sjaramillo10 2017-11-16 22:56:43 -06:00 committed by Severiano Jaramillo
parent 5b1a8627f8
commit a10017edb0
3 changed files with 13 additions and 3 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>
</activity>
<activity android:name=".activities.BoardActivity"
android:theme="@style/AppTheme.NoActionBar" > <!-- Dirty trick to avoid toolbar error on balance -->
android:theme="@style/AppTheme.NoActionBar" >
</activity>
<activity android:name=".activities.AccountSeedsManagementActivity" >
</activity>

3
app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
View File

@ -3,7 +3,6 @@ package cy.agorise.crystalwallet.activities;
import android.content.Intent;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
@ -12,7 +11,7 @@ import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.widget.ImageButton;
import butterknife.BindView;

11
app/src/main/res/layout/board.xml
View File

@ -5,7 +5,10 @@
android:id="@+id/main_content"
android:layout_width="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.support.design.widget.AppBarLayout
@ -23,7 +26,11 @@
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/AppTheme.PopupOverlay"
<<<<<<< HEAD
app:title="Client Logo">
=======
app:title="@string/app_name">
>>>>>>> Added custom toolbar and tab labels to board activity
</android.support.v7.widget.Toolbar>
@ -60,6 +67,7 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
<android.support.design.widget.FloatingActionButton
<<<<<<< HEAD
android:id="@+id/fabReceive"
android:layout_width="250dp"
android:layout_height="250dp"
@ -80,6 +88,9 @@
<android.support.design.widget.FloatingActionButton
android:id="@+id/fabAddContact"
=======
android:id="@+id/fab"
>>>>>>> Added custom toolbar and tab labels to board activity
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"