Merged release-0.4 into master

Author: davidmigloz

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.davidmiguel.gobees"
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 3
-        versionName "v0.3"
+        versionCode 4
+        versionName "v0.4"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -98,7 +98,7 @@ dependencies {
 
     // Dependencies for Android unit tests
     androidTestCompile 'junit:junit:4.12'
-    androidTestCompile 'org.mockito:mockito-core:2.2.26'
+    androidTestCompile 'org.mockito:mockito-core:2.3.0'
 
     // Espresso UI Testing
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'

app/src/main/AndroidManifest.xml

@@ -49,11 +49,15 @@
             android:parentActivityName=".hive.HiveActivity"/>
         <activity
             android:name=".monitoring.MonitoringActivity"
+            android:launchMode="singleTop"
             android:parentActivityName=".hive.HiveActivity"
-            android:screenOrientation="landscape"/>
+            android:screenOrientation="landscape"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen"/>
         <activity
             android:name=".settings.SettingsActivity"
             android:parentActivityName=".apiaries.ApiariesActivity"/>
+
+        <service android:name=".monitoring.MonitoringService"/>
     </application>
 
 </manifest>

app/src/main/java/com/davidmiguel/gobees/apiary/ApiaryActivity.java

@@ -37,8 +37,14 @@ protected void onCreate(Bundle savedInstanceState) {
             actionBar.setDisplayShowHomeEnabled(true);
         }
 
+        // Get apiary id
+        long apiaryId = getIntent().getLongExtra(ApiaryHivesFragment.ARGUMENT_APIARY_ID, NO_APIARY);
+        if (apiaryId == NO_APIARY) {
+            throw new IllegalArgumentException("No apiary id passed!");
+        }
+
         // Create hives fragment
-        ApiaryHivesFragment apiaryHivesFragment = ApiaryHivesFragment.newInstance();
+        ApiaryHivesFragment apiaryHivesFragment = ApiaryHivesFragment.newInstance(apiaryId);
 
         // Create apiary info fragment
         ApiaryInfoFragment apiaryInfoFragment = ApiaryInfoFragment.newInstance();
@@ -54,12 +60,6 @@ protected void onCreate(Bundle savedInstanceState) {
         TabLayout tabLayout = (TabLayout) findViewById(R.id.tabs);
         tabLayout.setupWithViewPager(viewPager);
 
-        // Get apiary id
-        long apiaryId = getIntent().getLongExtra(ApiaryHivesFragment.ARGUMENT_APIARY_ID, NO_APIARY);
-        if (apiaryId == NO_APIARY) {
-            throw new IllegalArgumentException("No apiary id passed!");
-        }
-
         // Init db
         goBeesRepository = Injection.provideApiariesRepository();
         goBeesRepository.openDb();

app/src/main/java/com/davidmiguel/gobees/apiary/ApiaryHivesFragment.java

@@ -48,15 +48,14 @@ public class ApiaryHivesFragment extends Fragment
     private View noHivesView;
     private LinearLayout hivesView;
 
-    public ApiaryHivesFragment() {
-        // Requires empty public constructor
+    public static ApiaryHivesFragment newInstance(long apiaryId) {
+        Bundle arguments = new Bundle();
+        arguments.putLong(ARGUMENT_APIARY_ID, apiaryId);
+        ApiaryHivesFragment fragment = new ApiaryHivesFragment();
+        fragment.setArguments(arguments);
+        return fragment;
     }
 
-    public static ApiaryHivesFragment newInstance() {
-        return new ApiaryHivesFragment();
-    }
-
-
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

app/src/main/java/com/davidmiguel/gobees/camera/AndroidCamera.java

@@ -0,0 +1,32 @@
+package com.davidmiguel.gobees.camera;
+
+/**
+ * AndroidCamera contract.
+ */
+public interface AndroidCamera {
+
+    /**
+     * Connects to the camera.
+     */
+    void connect();
+
+    /**
+     * Releases the camera.
+     */
+    void release();
+
+    /**
+     * Checks whether the camera is connected.
+     *
+     * @return camera status.
+     */
+    boolean isConnected();
+
+    /**
+     * Update the frame rate.
+     *
+     * @param delay  time to wait before issue the first frame (in milliseconds).
+     * @param period period between frames (in milliseconds).
+     */
+    void updateFrameRate(long delay, long period);
+}