Merge pull request #1 from kacpak/develop

Moved database to DBFlow with EventBus and introduced looking for mul…
kacpak · Jul 1, 2016 · 3cb74bc · 3cb74bc
2 parents 81c6c57 + 69e1a36
commit 3cb74bc
Show file tree

Hide file tree

Showing 27 changed files with 549 additions and 869 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,8 +2,8 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.neenbedankt.android-apt'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 24
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         applicationId "net.kacpak.batterychargingmonitor"
@@ -28,13 +28,17 @@ android {
 }
 
 repositories {
-    maven { url "https://jitpack.io" } // To compile from GitHub when MavenCentral is outdated (circleprogress)
+    maven { url "https://jitpack.io" } // To compile from GitHub when MavenCentral is outdated (circleprogress, DBFlow)
 }
 
 ext {
-    supportLibrary_version = "23.3.0"
+    supportLibrary_version = "24.0.0"
     circleProgress_version = "a947edf" // TODO change to new release when startingPoint is merged
-    butterKnife_version = "8.0.1"
+    butterKnife_version = "8.1.0"
+    dbFlow_version = "3.0.1"
+    eventbus_version = "3.0.0"
+    apacheCommonsLang = "3.4"
+    apacheCommonsIo = "1.3.2"
 }
 
 dependencies {
@@ -52,4 +56,13 @@ dependencies {
     // Butter Knife
     compile "com.jakewharton:butterknife:$butterKnife_version"
     apt "com.jakewharton:butterknife-compiler:$butterKnife_version"
+    // DBFlow
+    apt "com.github.Raizlabs.DBFlow:dbflow-processor:$dbFlow_version"
+    compile "com.github.Raizlabs.DBFlow:dbflow-core:$dbFlow_version"
+    compile "com.github.Raizlabs.DBFlow:dbflow:$dbFlow_version"
+    // EventBus
+    compile "org.greenrobot:eventbus:$eventbus_version"
+    // Apache Commons
+    compile "org.apache.commons:commons-lang3:$apacheCommonsLang"
+    compile "org.apache.commons:commons-io:$apacheCommonsIo"
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -15,3 +15,5 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+-keep class * extends com.raizlabs.android.dbflow.config.DatabaseHolder { *; }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -30,11 +30,6 @@
                 android:value=".ui.MainActivity" />
         </activity>
 
-        <provider
-            android:authorities="net.kacpak.batterychargingmonitor"
-            android:name=".data.database.DataProvider"
-            android:exported="false" />
-
         <receiver android:name=".data.receiver.PowerConnectionReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.ACTION_POWER_CONNECTED"/>

diff --git a/app/src/main/java/net/kacpak/batterychargingmonitor/App.java b/app/src/main/java/net/kacpak/batterychargingmonitor/App.java
@@ -3,6 +3,9 @@
 import android.app.Application;
 import android.content.Context;
 
+import com.raizlabs.android.dbflow.config.FlowConfig;
+import com.raizlabs.android.dbflow.config.FlowManager;
+
 public class App extends Application {
 
     private static Context mContext;
@@ -11,6 +14,9 @@ public class App extends Application {
     public void onCreate() {
         super.onCreate();
         mContext = this;
+
+        FlowConfig flowConfig = new FlowConfig.Builder(this).build();
+        FlowManager.init(flowConfig);
     }
 
     public static Context getContext(){

diff --git a/app/src/main/java/net/kacpak/batterychargingmonitor/data/BatteryDataPaths.java b/app/src/main/java/net/kacpak/batterychargingmonitor/data/BatteryDataPaths.java
@@ -0,0 +1,92 @@
+package net.kacpak.batterychargingmonitor.data;
+
+import android.util.Log;
+
+import java.io.File;
+
+public class BatteryDataPaths {
+
+    /**
+     * Znane ścieżki do folderu systemowego zawierającego dane o stanie baterii
+     */
+    private static final String[] mBatteryDataPaths = new String[] {
+            "/sys/class/power_supply/battery/"
+    };
+
+    /**
+     *
+     */
+    private static final String[] mCurrentNowFilenames = new String[] {
+            "batt_current_ua_now",
+            "current_now"
+    };
+
+    /**
+     *
+     */
+    private static final String[] mCurrentAvgFilenames = new String[] {
+            "batt_current_ua_avg",
+            "current_avg"
+    };
+
+    public static final String CurrentNow;
+
+    public static final String CurrentAvg;
+
+    private static final String mBatteryDataPath;
+
+    static {
+        mBatteryDataPath = getBatteryDataPath();
+        CurrentNow = getCurrentNowPath();
+        CurrentAvg = getCurrentAvgPath();
+    }
+
+    /**
+     *
+     * @return
+     */
+    private static String getBatteryDataPath() {
+        File dir;
+        for (String path : mBatteryDataPaths) {
+            Log.d("BatteryStatus", "PATH checked: " + path);
+            dir = new File(path);
+            if (dir.isDirectory()) {
+                return path;
+            }
+        }
+        return null;
+    }
+
+    /**
+     *
+     * @return
+     */
+    private static String getCurrentNowPath() {
+        File dir;
+        for (String path : mCurrentNowFilenames) {
+            dir = new File(mBatteryDataPath + path);
+            if (dir.isFile()) {
+                return dir.getPath();
+            }
+        }
+        return "";
+    }
+
+    /**
+     *
+     * @return
+     */
+    private static String getCurrentAvgPath() {
+        File dir;
+        for (String path : mCurrentAvgFilenames) {
+            dir = new File(mBatteryDataPath + path);
+            if (dir.isFile()) {
+                return dir.getPath();
+            }
+        }
+        return "";
+    }
+
+    private BatteryDataPaths() {
+    }
+}