From 5b30976b3341189f441ed2ab3d22d265ab5c8c6f Mon Sep 17 00:00:00 2001
From: clams2017
Date: Tue, 27 Feb 2018 23:19:08 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=AD=E3=82=B0=E8=BF=BD=E5=8A=A0?=
=?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92=EF=BC=8B=E3=83=9C=E3=82=BF?=
=?UTF-8?q?=E3=83=B3=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/slymapp/diverlog/view/MainActivity.java | 4 +++-
app/src/main/res/layout/activity_main.xml | 9 +++++++--
2 files changed, 10 insertions(+), 3 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
index fc0d2e7..257a889 100644
--- a/app/src/main/java/com/slymapp/diverlog/view/MainActivity.java
+++ b/app/src/main/java/com/slymapp/diverlog/view/MainActivity.java
@@ -9,6 +9,8 @@
import android.view.MenuItem;
import android.view.View;
+import com.beardedhen.androidbootstrap.AwesomeTextView;
+import com.beardedhen.androidbootstrap.BootstrapButton;
import com.slymapp.diverlog.R;
public class MainActivity extends AppCompatActivity {
@@ -21,7 +23,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
index 8745cd6..3b4da54 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -22,12 +22,17 @@
-
+ app:bootstrapBrand="primary"
+ app:bootstrapSize="xl"
+ app:buttonMode="regular"
+ app:showOutline="false"
+ app:roundedCorners="true"
+ app:fontAwesomeIcon="fa_plus"/>
From 5b1c13f2ed2de72caef9c37433d6bf4d9caac31c Mon Sep 17 00:00:00 2001
From: clams2017
Date: Tue, 27 Feb 2018 23:20:51 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=83=A9?=
=?UTF-8?q?=E3=82=A4=E3=83=96=E3=83=A9=E3=83=AA=E3=81=AEimport=E3=82=92?=
=?UTF-8?q?=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/src/main/java/com/slymapp/diverlog/view/MainActivity.java | 3 ---
1 file changed, 3 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
index 257a889..a2760cb 100644
--- a/app/src/main/java/com/slymapp/diverlog/view/MainActivity.java
+++ b/app/src/main/java/com/slymapp/diverlog/view/MainActivity.java
@@ -1,15 +1,12 @@
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.AwesomeTextView;
import com.beardedhen.androidbootstrap.BootstrapButton;
import com.slymapp.diverlog.R;