Merge branch 'release-0.2'

Author: davidmigloz

app/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'jacoco-android'
+apply plugin: 'realm-android'
 
 android {
     compileSdkVersion 25
@@ -9,8 +10,8 @@ android {
         applicationId "com.davidmiguel.gobees"
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 1
-        versionName "0.1"
+        versionCode 2
+        versionName "0.2"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -79,6 +80,7 @@ dependencies {
     compile 'com.android.support:support-v4:25.0.1'
     compile 'com.github.davidmigloz:opencv-android-gradle-repo:3.1.0'
     compile 'com.google.guava:guava:20.0'
+    compile 'com.makeramen:roundedimageview:2.2.1'
 
     // Dependencies for local unit tests
     testCompile 'junit:junit:4.12'

app/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:name=".GoBeesApp"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
@@ -26,9 +27,13 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity android:name="com.davidmiguel.gobees.addeditapiary.AddEditApiaryActivity" />
+        <activity android:name=".addeditapiary.AddEditApiaryActivity" />
         <activity
-            android:name=".MainActivity"
+            android:name=".hives.HivesActivity"
+            android:parentActivityName=".apiaries.ApiariesActivity" />
+        <activity android:name=".addedithive.AddEditHiveActivity" />
+        <activity
+            android:name=".premonitoring.PreMonitoringActivity"
             android:screenOrientation="landscape"/>
     </application>
 

app/src/main/java/com/davidmiguel/gobees/GoBeesApp.java

@@ -0,0 +1,22 @@
+package com.davidmiguel.gobees;
+
+import android.app.Application;
+
+import com.davidmiguel.gobees.data.source.local.GoBeesDbConfig;
+
+import io.realm.Realm;
+
+/**
+ * Main app.
+ */
+public class GoBeesApp extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        // Initialize Realm. Should only be done once when the application starts.
+        Realm.init(this);
+        // Get Realm config
+        GoBeesDbConfig realmConfig = new GoBeesDbConfig();
+        Realm.setDefaultConfiguration(realmConfig.getRealmConfiguration());
+    }
+}

app/src/main/java/com/davidmiguel/gobees/addeditapiary/AddEditApiaryActivity.java

@@ -7,15 +7,19 @@
 
 import com.davidmiguel.gobees.Injection;
 import com.davidmiguel.gobees.R;
+import com.davidmiguel.gobees.data.source.cache.GoBeesRepository;
 import com.davidmiguel.gobees.utils.ActivityUtils;
 import com.google.common.base.Strings;
 
 /**
- * Add / edit apiaries activity.
+ * Add / edit apiary activity.
  */
 public class AddEditApiaryActivity extends AppCompatActivity {
 
     public static final int REQUEST_ADD_APIARY = 1;
+    public static final int NEW_APIARY = -1;
+
+    private GoBeesRepository goBeesRepository;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -26,17 +30,14 @@ protected void onCreate(Bundle savedInstanceState) {
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar actionBar = getSupportActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
-        actionBar.setDisplayShowHomeEnabled(true);
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayShowHomeEnabled(true);
+        }
 
         // Get apiary id (if edit)
-        String id = getIntent().getStringExtra(AddEditApiaryFragment.ARGUMENT_EDIT_APIARY_ID);
-        int apiaryId;
-        if(Strings.isNullOrEmpty(id)) {
-            apiaryId = -1;
-        } else {
-            apiaryId = Integer.parseInt(id);
-        }
+        long apiaryId = getIntent()
+                .getLongExtra(AddEditApiaryFragment.ARGUMENT_EDIT_APIARY_ID, NEW_APIARY);
 
         // Add fragment to the activity and set title
         AddEditApiaryFragment addEditApiaryFragment =
@@ -46,22 +47,35 @@ protected void onCreate(Bundle savedInstanceState) {
             addEditApiaryFragment = AddEditApiaryFragment.newInstance();
             if (getIntent().hasExtra(AddEditApiaryFragment.ARGUMENT_EDIT_APIARY_ID)) {
                 // If edit -> set edit title
-                actionBar.setTitle(R.string.edit_apiary);
+                if (actionBar != null) {
+                    actionBar.setTitle(R.string.edit_apiary);
+                }
                 Bundle bundle = new Bundle();
                 bundle.putString(AddEditApiaryFragment.ARGUMENT_EDIT_APIARY_ID, apiaryId + "");
                 addEditApiaryFragment.setArguments(bundle);
             } else {
                 // If new -> set add title
-                actionBar.setTitle(R.string.add_apiary);
+                if (actionBar != null) {
+                    actionBar.setTitle(R.string.add_apiary);
+                }
             }
             ActivityUtils.addFragmentToActivity(getSupportFragmentManager(),
                     addEditApiaryFragment, R.id.contentFrame);
         }
 
+        // Init db
+        goBeesRepository = Injection.provideApiariesRepository();
+        goBeesRepository.openDb();
+
         // Create the presenter
-        new AddEditApiaryPresenter(
-                Injection.provideApiariesRepository(getApplicationContext()),
-                addEditApiaryFragment, apiaryId);
+        new AddEditApiaryPresenter(goBeesRepository, addEditApiaryFragment, apiaryId);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        // Close database
+        goBeesRepository.closeDb();
     }
 
     @Override

app/src/main/java/com/davidmiguel/gobees/addeditapiary/AddEditApiaryContract.java

@@ -6,28 +6,53 @@
 /**
  * This specifies the contract between the view and the presenter.
  */
-public class AddEditApiaryContract {
+public interface AddEditApiaryContract {
 
     interface View extends BaseView<Presenter> {
 
+        /**
+         * Shows message warning that the apiary cannot be empty.
+         */
         void showEmptyApiaryError();
 
+        /**
+         * Shows save error message.
+         */
         void showSaveApiaryError();
 
+        /**
+         * Goes back to apiaries activity.
+         */
         void showApiariesList();
 
+        /**
+         * Sets apiary name in the text view.
+         *
+         * @param name apiary name.
+         */
         void setName(String name);
 
+        /**
+         * Sets apiary notes in the text view.
+         *
+         * @param notes apiary notes.
+         */
         void setNotes(String notes);
-
-        boolean isActive();
     }
 
     interface Presenter extends BasePresenter {
 
+        /**
+         * Saves or updates an apiary in the repository.
+         *
+         * @param name  apiary name.
+         * @param notes apiary notes.
+         */
         void saveApiary(String name, String notes);
 
+        /**
+         * Fill apiary data (the apiary must already exist in the repository).
+         */
         void populateApiary();
     }
-
 }

app/src/main/java/com/davidmiguel/gobees/addeditapiary/AddEditApiaryFragment.java

@@ -37,6 +37,19 @@ public static AddEditApiaryFragment newInstance() {
         return new AddEditApiaryFragment();
     }
 
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View root = inflater.inflate(R.layout.addeditapiary_frag, container, false);
+        nameTextView = (TextView) root.findViewById(R.id.add_apiary_name);
+        notesTextView = (TextView) root.findViewById(R.id.add_apiary_notes);
+
+        setHasOptionsMenu(true);
+        setRetainInstance(true);
+        return root;
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -54,19 +67,6 @@ public void onClick(View v) {
         });
     }
 
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View root = inflater.inflate(R.layout.addeditapiary_frag, container, false);
-        nameTextView = (TextView) root.findViewById(R.id.add_apiary_name);
-        notesTextView = (TextView) root.findViewById(R.id.add_apiary_notes);
-
-        setHasOptionsMenu(true);
-        setRetainInstance(true);
-        return root;
-    }
-
     @Override
     public void onResume() {
         super.onResume();
@@ -109,6 +109,11 @@ public void setPresenter(@NonNull AddEditApiaryContract.Presenter presenter) {
         this.presenter = checkNotNull(presenter);
     }
 
+    /**
+     * Shows a snackbar with the given message.
+     * @param view view.
+     * @param message message to show.
+     */
     @SuppressWarnings("ConstantConditions")
     private void showMessage(View view, String message) {
         Snackbar.make(view, message, Snackbar.LENGTH_LONG).show();