From a10017edb02686e15fe83ec0f97eb659a4624030 Mon Sep 17 00:00:00 2001 From: sjaramillo10 Date: Thu, 16 Nov 2017 22:56:43 -0600 Subject: [PATCH] Added custom toolbar and tab labels to board activity --- app/src/main/AndroidManifest.xml | 2 +- .../crystalwallet/activities/BoardActivity.java | 3 +-- app/src/main/res/layout/board.xml | 11 +++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 44de849..a4d0d05 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,7 +20,7 @@ + android:theme="@style/AppTheme.NoActionBar" > diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java index 9f5aa39..6727373 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java @@ -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; diff --git a/app/src/main/res/layout/board.xml b/app/src/main/res/layout/board.xml index 407ded4..28eb96c 100644 --- a/app/src/main/res/layout/board.xml +++ b/app/src/main/res/layout/board.xml @@ -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"> +======= + app:title="@string/app_name"> +>>>>>>> Added custom toolbar and tab labels to board activity @@ -60,6 +67,7 @@ app:layout_behavior="@string/appbar_scrolling_view_behavior"/> >>>>>> Added custom toolbar and tab labels to board activity android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="end|bottom"