Merge pull request #31 from clams2017/feature/#30

Feature/#30
clams2017 · Feb 27, 2018 · 2a7ca64 · 2a7ca64
2 parents ecd309b + 5b1c13f
commit 2a7ca64
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/app/src/main/java/com/slymapp/diverlog/view/MainActivity.java b/app/src/main/java/com/slymapp/diverlog/view/MainActivity.java
@@ -1,14 +1,13 @@
 package com.slymapp.diverlog.view;
 
-import android.net.Uri;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
+import com.beardedhen.androidbootstrap.BootstrapButton;
 import com.slymapp.diverlog.R;
 
 public class MainActivity extends AppCompatActivity {
@@ -21,7 +20,7 @@ protected void onCreate(Bundle savedInstanceState) {
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        FloatingActionButton fab = findViewById(R.id.fab);
+        BootstrapButton fab = findViewById(R.id.fab);
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -22,12 +22,17 @@
 
     <include layout="@layout/content_main" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.beardedhen.androidbootstrap.BootstrapButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_dialog_email" />
+        app:bootstrapBrand="primary"
+        app:bootstrapSize="xl"
+        app:buttonMode="regular"
+        app:showOutline="false"
+        app:roundedCorners="true"
+        app:fontAwesomeIcon="fa_plus"/>
 
 </android.support.design.widget.CoordinatorLayout>