Show disabled items in bottom sheet menu when there're no readings.

Author: paolorotolo

app/src/main/AndroidManifest.xml

@@ -154,7 +154,6 @@
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-
             <meta-data
                 android:name="android.nfc.action.TECH_DISCOVERED"
                 android:resource="@xml/nfc_tech_filter" />

app/src/main/java/org/glucosio/android/activity/AddGlucoseActivity.java

@@ -20,10 +20,10 @@
 
 package org.glucosio.android.activity;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.Snackbar;
 import android.support.design.widget.TextInputLayout;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.AppCompatButton;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
@@ -145,7 +145,7 @@ public void onNothingChosen(View labelledSpinner, AdapterView<?> adapterView) {
             presenter.updateSpinnerTypeTime();
         }
 
-        this.getDoneFAB().postDelayed(this.getFabAnimationRunnable(), 600)
+        this.getDoneFAB().postDelayed(this.getFabAnimationRunnable(), 600);
 
         // Check if activity was started from a NFC sensor
         if (getIntent().getExtras() != null) {
@@ -235,5 +235,4 @@ public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute, int se
         DecimalFormat df = new DecimalFormat("00");
         updateSpinnerTypeHour(Integer.parseInt(df.format(hourOfDay)));
     }
-
 }

app/src/main/java/org/glucosio/android/activity/MainActivity.java

@@ -89,9 +89,9 @@ public class MainActivity extends AppCompatActivity implements DatePickerDialog.
     private BottomSheetDialog bottomSheetAddDialog;
     private TextView exportDialogDateFrom;
     private TextView exportDialogDateTo;
-
+    private View bottomSheetAddDialogView;
     private FloatingActionButton fabAddReading;
-    private FloatingActionButton fabGlucoseEmpty;
+    BottomSheetBehavior bottomSheetBehavior;
     private Toolbar toolbar;
     private TabLayout tabLayout;
 
@@ -102,6 +102,7 @@ protected void onCreate(Bundle savedInstanceState) {
         GlucosioApplication application = (GlucosioApplication) getApplication();
 
         setContentView(R.layout.activity_main);
+        initPresenters(application);
 
         toolbar = (Toolbar) findViewById(R.id.activity_main_toolbar);
         tabLayout = (TabLayout) findViewById(R.id.activity_main_tab_layout);
@@ -154,28 +155,17 @@ public void onPageScrollStateChanged(int state) {
             }
         });
 
-        fabGlucoseEmpty = (FloatingActionButton) findViewById(R.id.activity_main_fab_glucose_empty);
-        fabGlucoseEmpty.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                openNewAddActivity(AddGlucoseActivity.class);
-            }
-        });
         fabAddReading = (FloatingActionButton) findViewById(R.id.activity_main_fab_add_reading);
         fabAddReading.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 bottomSheetAddDialog.show();
+                bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
             }
         });
 
         bottomSheetAddDialog = new BottomSheetDialog(this);
 
-        View bottomSheetAddDialogView = getLayoutInflater().inflate(R.layout.fragment_add_bottom_dialog, null);
-        bottomSheetAddDialog.setContentView(bottomSheetAddDialogView);
-        BottomSheetBehavior behavior = BottomSheetBehavior.from((View) bottomSheetAddDialogView.getParent());
-        behavior.setHideable(false);
-
         // Add Nav Drawer
         final PrimaryDrawerItem itemSettings = new PrimaryDrawerItem().withName(R.string.action_settings).withIcon(R.drawable.ic_settings_grey_24dp).withSelectable(false).withTypeface(Typeface.DEFAULT_BOLD);
         final PrimaryDrawerItem itemExport = new PrimaryDrawerItem().withName(R.string.sidebar_backup_export).withIcon(R.drawable.ic_backup_grey_24dp).withSelectable(false).withTypeface(Typeface.DEFAULT_BOLD);
@@ -255,8 +245,10 @@ public boolean onItemClick(View view, int position, IDrawerItem drawerItem) {
             viewPager.setCurrentItem(b.getInt("pager"));
         }
 
-        initPresenters(application);
         checkIfEmptyLayout();
+        bottomSheetAddDialog.setContentView(bottomSheetAddDialogView);
+        bottomSheetBehavior = BottomSheetBehavior.from((View) bottomSheetAddDialogView.getParent());
+        bottomSheetBehavior.setHideable(false);
 
         Analytics analytics = application.getAnalytics();
         Log.i("MainActivity", "Setting screen name: " + "main");
@@ -291,7 +283,7 @@ private void startAboutActivity() {
     public void startHelloActivity() {
         Intent intent = new Intent(this, HelloActivity.class);
         startActivity(intent);
-        finishActivity();
+        finish();
     }
 
     public void openPreferences() {
@@ -595,9 +587,7 @@ public void checkIfEmptyLayout() {
             tabLayout.setVisibility(View.GONE);
             emptyLayout.setVisibility(View.VISIBLE);
 
-            // If empty show only Glucose fab
-            fabAddReading.setVisibility(View.GONE);
-            fabGlucoseEmpty.setVisibility(View.VISIBLE);
+            bottomSheetAddDialogView = getLayoutInflater().inflate(R.layout.fragment_add_bottom_dialog_disabled, null);
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 if (getResources().getConfiguration().orientation == 1) {
@@ -613,7 +603,7 @@ public void checkIfEmptyLayout() {
         } else {
             pager.setVisibility(View.VISIBLE);
             emptyLayout.setVisibility(View.GONE);
-            fabGlucoseEmpty.setVisibility(View.GONE);
+            bottomSheetAddDialogView = getLayoutInflater().inflate(R.layout.fragment_add_bottom_dialog, null);
         }
     }
 

app/src/main/java/org/glucosio/android/presenter/AddGlucosePresenter.java

@@ -20,6 +20,9 @@
 
 package org.glucosio.android.presenter;
 
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
 import com.google.firebase.crash.FirebaseCrash;
 
 import org.glucosio.android.activity.AddGlucoseActivity;

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/light_grey" />
+        </shape>
+    </item>
+    <item android:drawable="@drawable/ic_fab_a1c" />
+
+</layer-list>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/light_grey" />
+        </shape>
+    </item>
+    <item android:drawable="@drawable/ic_fab_cholesterol" />
+
+</layer-list>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/light_grey" />
+        </shape>
+    </item>
+    <item android:drawable="@drawable/ic_fab_ketones" />
+
+</layer-list>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/light_grey" />
+        </shape>
+    </item>
+    <item android:drawable="@drawable/ic_fab_pressure" />
+
+</layer-list>

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/light_grey" />
+        </shape>
+    </item>
+    <item android:drawable="@drawable/ic_fab_weight" />
+
+</layer-list>

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

@@ -132,20 +132,4 @@
         app:fab_colorPressed="@color/glucosio_accent"
         app:fab_colorRipple="#99FFFFFF"
         app:fab_size="normal" />
-
-    <com.github.clans.fab.FloatingActionButton
-        android:id="@+id/activity_main_fab_glucose_empty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_gravity="bottom|right"
-        android:layout_marginBottom="16dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="16dp"
-        android:src="@drawable/ic_add_black_24dp"
-        app:fab_colorNormal="@color/glucosio_accent"
-        app:fab_colorPressed="@color/glucosio_accent"
-        app:fab_colorRipple="#99FFFFFF"
-        app:fab_size="normal" />
 </android.support.design.widget.CoordinatorLayout>