Merge branch 'master' into feature/#19

app/app.iml

@@ -86,19 +86,29 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/data-binding-compiler" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/data-binding-info" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />

app/src/main/java/com/slymapp/diverlog/DiverLogApplication.java

@@ -2,6 +2,7 @@
 
 import android.app.Application;
 
+import com.beardedhen.androidbootstrap.TypefaceProvider;
 import com.jakewharton.threetenabp.AndroidThreeTen;
 import com.slymapp.diverlog.infrastructure.realm.RealmHelper;
 
@@ -12,5 +13,6 @@ public void onCreate() {
         super.onCreate();
         AndroidThreeTen.init(this);
         RealmHelper.initialize(this);
+        TypefaceProvider.registerDefaultIconSets();
     }
 }

app/src/main/java/com/slymapp/diverlog/view/LogAddActivity.java

@@ -3,7 +3,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.constraint.ConstraintLayout;
 import android.support.v7.app.AppCompatActivity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.FrameLayout;
 
 import com.slymapp.diverlog.R;
 import com.slymapp.diverlog.domain.DiverLog;
@@ -38,7 +43,6 @@ public static Intent createIntent(Context context, DiverLog diverLog) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_log_add);
-
         getSupportFragmentManager().beginTransaction()
                 .replace(R.id.log_add_activity_fragment_container, LogAddFragment.newInstance())
                 .commit();

app/src/main/java/com/slymapp/diverlog/view/LogAddFragment.java

@@ -1,16 +1,24 @@
 package com.slymapp.diverlog.view;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.DatePickerDialog;
+import android.app.TimePickerDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.databinding.DataBindingUtil;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.constraint.ConstraintLayout;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.DatePicker;
+import android.widget.TimePicker;
 import android.widget.Toast;
 
 import com.slymapp.diverlog.R;
@@ -47,7 +55,7 @@ public static LogAddFragment newInstance() {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_log_add, container, false);
+        View mainView = inflater.inflate(R.layout.fragment_log_add, container, false);
         Intent intent = getActivity().getIntent();
 
         // 破棄された時用の復元処理
@@ -64,11 +72,11 @@ else if (intent != null){
         }
 
         // DataBindingはViewHolderとしてのみ利用する
-        final FragmentLogAddBinding binding = DataBindingUtil.bind(view);
+        final FragmentLogAddBinding binding = DataBindingUtil.bind(mainView);
         binding.logAddDivingNumberValue.setText(String.valueOf(diverLog.getDivingNumber()));
         binding.logAddDateValue.setText(DateUtils.toDateString(diverLog.getDate()));
         binding.logAddPlaceValue.setText(diverLog.getPlace());
-        binding.logAddDateImageButton.setOnClickListener(new View.OnClickListener() {
+        binding.logAddDateValue.setOnClickListener(new View.OnClickListener() {
             @TargetApi(Build.VERSION_CODES.N)
             @Override
             public void onClick(View view) {
@@ -85,12 +93,56 @@ public void onDateSet(DatePicker datePicker, int i, int i1, int i2) {
                         .show();
             }
         });
-        binding.logAddAddBtn.setOnClickListener(new View.OnClickListener() {
+        binding.logAddInTimeValue.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Calendar cal = Calendar.getInstance();
+
+                new TimePickerDialog(getContext(), new TimePickerDialog.OnTimeSetListener() {
+                    @Override
+                    public void onTimeSet(TimePicker timePicker, int i, int i1) {
+                        Date date = DateUtils.createFromTime(i, i1, 0);
+                        diverLog.setStartTime(date);
+                        binding.logAddInTimeValue.setText(DateUtils.toTimeString(diverLog.getStartTime()));
+                    }
+                }, cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), true)
+                        .show();
+            }
+        });
+        binding.logAddOutTimeValue.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Calendar cal = Calendar.getInstance();
+
+                new TimePickerDialog(getContext(), new TimePickerDialog.OnTimeSetListener() {
+                    @Override
+                    public void onTimeSet(TimePicker timePicker, int i, int i1) {
+                        Date date = DateUtils.createFromTime(i, i1, 0);
+                        diverLog.setStartTime(date);
+                        binding.logAddOutTimeValue.setText(DateUtils.toTimeString(diverLog.getStartTime()));
+                    }
+                }, cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), true)
+                        .show();
+            }
+        });
+        binding.logAddSubmitBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 Toast.makeText(getContext(), "ログの登録完了!(メッセージのみ)", Toast.LENGTH_SHORT).show();
             }
         });
-        return view;
+        binding.logAddMainLayout.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View view, boolean b) {
+                if(b){
+                    InputMethodManager inputMethodManager = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+                    assert inputMethodManager != null;
+                    inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(),
+                            InputMethodManager.HIDE_NOT_ALWAYS);
+                    view.requestFocus();
+                }
+            }
+        });
+        return mainView;
     }
 }

app/src/main/java/com/slymapp/diverlog/view/MainActivity.java

@@ -1,18 +1,16 @@
 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
-        implements LogDetailFragment.OnFragmentInteractionListener {
+public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -22,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) {
@@ -45,15 +43,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
-        if (id == R.id.action_settings) {
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onFragmentInteraction(Uri uri) {
-
+        return id == R.id.action_settings || super.onOptionsItemSelected(item);
     }
 }

app/src/main/res/drawable/underline.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:top="-2dp"
+        android:right="-2dp"
+        android:left="-2dp">
+        <shape>
+            <solid android:color="@android:color/transparent" />
+            <stroke
+                android:width="1dp"/>
+        </shape>
+    </item>
+</layer-list>

app/src/main/res/layout/activity_log_add.xml

@@ -3,6 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:focusableInTouchMode="true"
+    android:id="@+id/log_add_activity_main_layout"
     tools:context="com.slymapp.diverlog.view.LogAddActivity">
 
     <FrameLayout

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>