drawer; begin camera fragment

app/src/main/java/com/rthoni/camotion/ui/MainActivity.java

@@ -1,30 +1,34 @@
 package com.rthoni.camotion.ui;
 
+import android.app.Fragment;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.util.Log;
-import android.view.View;
+import android.view.SubMenu;
 import android.support.design.widget.NavigationView;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.view.Menu;
 import android.view.MenuItem;
+import android.widget.TextView;
 
-import com.luticate.auth.business.LuticateUsersBusiness;
 import com.luticate.auth.dbo.LuFullLoginDbo;
-import com.luticate.utils.business.LuPromise;
 import com.rthoni.camotion.R;
 import com.rthoni.camotion.business.CamotionBusiness;
 import com.rthoni.camotion.dbo.LocationDbo;
+import com.rthoni.camotion.ui.fragments.CamerasFragment;
 
 import java.util.List;
 
 public class MainActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
 
+    private LuFullLoginDbo _fullLoginDbo = null;
+    private LocationDbo _currentLocation = null;
+    private TextView _locationNameView;
+    private SubMenu _locationsMenu;
+    private NavigationView _navigationView;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -32,25 +36,7 @@ public class MainActivity extends AppCompatActivity
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                /*LuticateUsersBusiness.loginFull(CamotionBusiness.getConfig(), "user", "test42")
-                        .then(new LuPromise.LuConsumer<LuFullLoginDbo>() {
-                            @Override
-                            public void execute(LuFullLoginDbo data) {
-                                Log.d("Login", data.toString());
-                            }
-                        }, new LuPromise.LuConsumer<LuPromise.LuPromiseError>() {
-                            @Override
-                            public void execute(LuPromise.LuPromiseError error) {
-                                Log.e("Login", error.toString());
-                            }
-                        });*/
-                //List<LocationDbo> locations = CamotionBusiness.getLocations(MainActivity.this);
-            }
-        });
+        _locationNameView = (TextView) findViewById(R.id.location_name_textview);
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar,
@@ -58,8 +44,51 @@ public class MainActivity extends AppCompatActivity
         drawer.setDrawerListener(toggle);
         toggle.syncState();
 
-        NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
-        navigationView.setNavigationItemSelectedListener(this);
+        _navigationView = (NavigationView) findViewById(R.id.nav_view);
+        _navigationView.setNavigationItemSelectedListener(this);
+        _locationsMenu = _navigationView.getMenu().findItem(R.id.location_menu).getSubMenu();
+
+        init();
+    }
+
+    private void init()
+    {
+        List<LocationDbo> locations = CamotionBusiness.getLocations(MainActivity.this);
+        _locationsMenu.clear();
+        if (locations.isEmpty()) {
+            return;
+        }
+        for (final LocationDbo location : locations) {
+            MenuItem item = _locationsMenu.add(location.getName());
+            item.setIcon(R.mipmap.ic_location);
+            item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+                @Override
+                public boolean onMenuItemClick(MenuItem item) {
+                    setLocation(location);
+                    return false;
+                }
+            });
+        }
+        // Force drawer update; need a fix
+        MenuItem item = _navigationView.getMenu().add("test42");
+        _navigationView.getMenu().removeItem(item.getItemId());
+        setLocation(locations.get(0));
+    }
+
+    private void setLocation(LocationDbo location)
+    {
+        _currentLocation = location;
+        _locationNameView.setText(_currentLocation.getName());
+        showView(R.id.nav_cameras);
+    }
+
+    private void showView(int view)
+    {
+        Fragment fragment = null;
+        if (view == R.id.nav_cameras) {
+            fragment = new CamerasFragment();
+        }
+        getFragmentManager().beginTransaction().replace(R.id.container, fragment).commit();
     }
 
     @Override
@@ -72,44 +101,17 @@ public class MainActivity extends AppCompatActivity
         }
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_main, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        //noinspection SimplifiableIfStatement
-        if (id == R.id.action_settings) {
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
     @SuppressWarnings("StatementWithEmptyBody")
     @Override
     public boolean onNavigationItemSelected(MenuItem item) {
-        // Handle navigation view item clicks here.
         int id = item.getItemId();
 
-        if (id == R.id.nav_camera) {
-            // Handle the camera action
-        } else if (id == R.id.nav_gallery) {
-
-        } else if (id == R.id.nav_slideshow) {
-
-        } else if (id == R.id.nav_share) {
-
-        } else if (id == R.id.nav_send) {
-
+        if (id == R.id.nav_cameras) {
+            showView(id);
+        } else if (id == R.id.nav_sensors) {
+            showView(id);
+        } else if (id == R.id.nav_commands) {
+            showView(id);
         }
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);

app/src/main/java/com/rthoni/camotion/ui/fragments/CamerasFragment.java

@@ -0,0 +1,25 @@
+package com.rthoni.camotion.ui.fragments;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.rthoni.camotion.R;
+
+/**
+ *
+ * Created by robin on 11/29/15.
+ */
+public class CamerasFragment extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState)
+    {
+        Bundle args = getArguments();
+        View rootView = inflater.inflate(R.layout.cameras_layout, container, false);
+        return rootView;
+    }
+}

app/src/main/res/drawable-v21/ic_menu_camera.xml

@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0" />
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,2L7.17,4H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2H9zm3,15c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z" />
-</vector>

app/src/main/res/drawable-v21/ic_menu_gallery.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M22,16V4c0,-1.1 -0.9,-2 -2,-2H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zm-11,-4l2.03,2.71L16,11l4,5H8l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2H4V6H2z" />
-</vector>

app/src/main/res/drawable-v21/ic_menu_manage.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z" />
-</vector>

app/src/main/res/drawable-v21/ic_menu_send.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
-</vector>

app/src/main/res/drawable-v21/ic_menu_share.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
-</vector>

app/src/main/res/drawable-v21/ic_menu_slideshow.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6zm16,-4H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zm-8,12.5v-9l6,4.5 -6,4.5z" />
-</vector>

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

@@ -23,12 +23,4 @@
 
     <include layout="@layout/content_main" />
 
-    <android.support.design.widget.FloatingActionButton
-        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"
-        android:src="@android:drawable/ic_dialog_email" />
-
 </android.support.design.widget.CoordinatorLayout>

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

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical" >
+
+    <!-- Loading progress -->
+
+    <LinearLayout
+        android:id="@+id/loadStatus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:visibility="gone" >
+
+        <ProgressBar
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="8dp" />
+
+        <TextView
+            android:id="@+id/loading_status_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:text="@string/loading"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+    </LinearLayout>
+
+    <!-- Layout -->
+
+    <ScrollView
+        android:id="@+id/imagesScrollView"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="0.33" >
+
+        <LinearLayout
+            android:id="@+id/imagesLayoutScrollView"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="vertical" >
+
+            <ImageView
+                android:contentDescription="42"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10px"
+                android:adjustViewBounds="true"
+                android:src="@drawable/camera_loading" />
+
+            <ImageView
+                android:contentDescription="42"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10px"
+                android:adjustViewBounds="true"
+                android:src="@drawable/camera_loading" />
+
+            <ImageView
+                android:contentDescription="42"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10px"
+                android:adjustViewBounds="true"
+                android:src="@drawable/camera_loading" />
+
+            <ImageView
+                android:contentDescription="42"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10px"
+                android:adjustViewBounds="true"
+                android:src="@drawable/camera_loading" />
+
+            <ImageView
+                android:contentDescription="42"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10px"
+                android:adjustViewBounds="true"
+                android:src="@drawable/camera_loading" />
+
+            <ImageView
+                android:contentDescription="42"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10px"
+                android:adjustViewBounds="true"
+                android:src="@drawable/camera_loading" />
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>

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

@@ -12,8 +12,10 @@
     tools:context=".ui.MainActivity"
     tools:showIn="@layout/app_bar_main">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!" />
+
+    <FrameLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    </FrameLayout>
 </RelativeLayout>

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

@@ -16,6 +16,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="Location Name"
+        android:id="@+id/location_name_textview"
         android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
 </LinearLayout>

app/src/main/res/menu/activity_main_drawer.xml

@@ -3,29 +3,26 @@
 
     <group android:checkableBehavior="single">
         <item
-            android:id="@+id/nav_camera"
-            android:icon="@drawable/ic_menu_camera"
-            android:title="Cameras" />
+            android:id="@+id/nav_cameras"
+            android:icon="@mipmap/ic_camera"
+            android:title="@string/camera" />
         <item
-            android:id="@+id/nav_gallery"
-            android:icon="@drawable/ic_menu_gallery"
-            android:title="Sensors" />
+            android:id="@+id/nav_sensors"
+            android:icon="@mipmap/ic_sensor"
+            android:title="@string/sensors" />
         <item
-            android:id="@+id/nav_slideshow"
-            android:icon="@drawable/ic_menu_slideshow"
-            android:title="Cammands" />
+            android:id="@+id/nav_commands"
+            android:icon="@mipmap/ic_command"
+            android:title="@string/commands" />
     </group>
 
-    <item android:title="Locations">
+    <item android:title="@string/locations"
+        android:id="@+id/location_menu">
         <menu>
             <item
                 android:id="@+id/nav_share"
-                android:icon="@drawable/ic_menu_share"
-                android:title="Select" />
-            <item
-                android:id="@+id/nav_send"
-                android:icon="@drawable/ic_menu_send"
-                android:title="Edit" />
+                android:icon="@mipmap/ic_location"
+                android:title="@string/location_select" />
         </menu>
     </item>
 

app/src/main/res/values/strings.xml

@@ -7,6 +7,8 @@
     <string name="navigation_drawer_close">Close navigation drawer</string>
 
     <string name="action_settings">Settings</string>
+    <string name="locations">Locations</string>
+    <string name="location_select">Select Location</string>
 
     <string name="add_location">Add a location</string>
     <string name="add_location_text">Fill in the following fields to add a location:</string>
@@ -24,4 +26,8 @@
 
     <string name="loading">Loading…</string>
     <string name="login_progress">Logging in…</string>
+
+    <string name="camera">Cameras</string>
+    <string name="sensors">Sensors</string>
+    <string name="commands">Commands</string>
 </resources>