增加电流显示，电压显示及功率计算

guh0613 · Oct 10, 2020 · 8632168 · 8632168
1 parent 315f4db
commit 8632168
Show file tree

Hide file tree

Showing 403 changed files with 752 additions and 605 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.genisys.batteryinfo"
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 2
-        versionName "1.1"
+        versionCode 3
+        versionName "1.2"
     }
     buildTypes {
         release {

diff --git a/app/build/bin/classes.dex b/app/build/bin/classes.dex
diff --git a/app/build/bin/classesdebug/android/support/compat/R$id.class b/app/build/bin/classesdebug/android/support/compat/R$id.class
diff --git a/app/build/bin/classesdebug/android/support/compat/R$integer.class b/app/build/bin/classesdebug/android/support/compat/R$integer.class
diff --git a/app/build/bin/classesdebug/android/support/compat/R$layout.class b/app/build/bin/classesdebug/android/support/compat/R$layout.class
diff --git a/app/build/bin/classesdebug/android/support/compat/R$menu.class b/app/build/bin/classesdebug/android/support/compat/R$menu.class
diff --git a/app/build/bin/classesdebug/android/support/compat/R$mipmap.class b/app/build/bin/classesdebug/android/support/compat/R$mipmap.class
diff --git a/app/build/bin/classesdebug/android/support/compat/R$string.class b/app/build/bin/classesdebug/android/support/compat/R$string.class
diff --git a/app/build/bin/classesdebug/android/support/compat/R$style.class b/app/build/bin/classesdebug/android/support/compat/R$style.class
diff --git a/app/build/bin/classesdebug/android/support/compat/R$styleable.class b/app/build/bin/classesdebug/android/support/compat/R$styleable.class
diff --git a/app/build/bin/classesdebug/android/support/compat/R.class b/app/build/bin/classesdebug/android/support/compat/R.class
diff --git a/app/build/bin/classesdebug/android/support/coreui/R$id.class b/app/build/bin/classesdebug/android/support/coreui/R$id.class
diff --git a/app/build/bin/classesdebug/android/support/coreui/R$integer.class b/app/build/bin/classesdebug/android/support/coreui/R$integer.class
diff --git a/app/build/bin/classesdebug/android/support/coreui/R$layout.class b/app/build/bin/classesdebug/android/support/coreui/R$layout.class
diff --git a/app/build/bin/classesdebug/android/support/coreui/R$menu.class b/app/build/bin/classesdebug/android/support/coreui/R$menu.class
diff --git a/app/build/bin/classesdebug/android/support/coreui/R$mipmap.class b/app/build/bin/classesdebug/android/support/coreui/R$mipmap.class
diff --git a/app/build/bin/classesdebug/android/support/coreui/R$string.class b/app/build/bin/classesdebug/android/support/coreui/R$string.class
diff --git a/app/build/bin/classesdebug/android/support/coreui/R$style.class b/app/build/bin/classesdebug/android/support/coreui/R$style.class
diff --git a/app/build/bin/classesdebug/android/support/coreui/R$styleable.class b/app/build/bin/classesdebug/android/support/coreui/R$styleable.class
diff --git a/app/build/bin/classesdebug/android/support/coreui/R.class b/app/build/bin/classesdebug/android/support/coreui/R.class
diff --git a/app/build/bin/classesdebug/android/support/coreutils/R$id.class b/app/build/bin/classesdebug/android/support/coreutils/R$id.class
diff --git a/app/build/bin/classesdebug/android/support/coreutils/R$integer.class b/app/build/bin/classesdebug/android/support/coreutils/R$integer.class
diff --git a/app/build/bin/classesdebug/android/support/coreutils/R$layout.class b/app/build/bin/classesdebug/android/support/coreutils/R$layout.class
diff --git a/app/build/bin/classesdebug/android/support/coreutils/R$menu.class b/app/build/bin/classesdebug/android/support/coreutils/R$menu.class
diff --git a/app/build/bin/classesdebug/android/support/coreutils/R$mipmap.class b/app/build/bin/classesdebug/android/support/coreutils/R$mipmap.class
diff --git a/app/build/bin/classesdebug/android/support/coreutils/R$string.class b/app/build/bin/classesdebug/android/support/coreutils/R$string.class
diff --git a/app/build/bin/classesdebug/android/support/coreutils/R$style.class b/app/build/bin/classesdebug/android/support/coreutils/R$style.class
diff --git a/app/build/bin/classesdebug/android/support/coreutils/R$styleable.class b/app/build/bin/classesdebug/android/support/coreutils/R$styleable.class
diff --git a/app/build/bin/classesdebug/android/support/coreutils/R.class b/app/build/bin/classesdebug/android/support/coreutils/R.class
diff --git a/app/build/bin/classesdebug/android/support/design/R$id.class b/app/build/bin/classesdebug/android/support/design/R$id.class
diff --git a/app/build/bin/classesdebug/android/support/design/R$integer.class b/app/build/bin/classesdebug/android/support/design/R$integer.class
diff --git a/app/build/bin/classesdebug/android/support/design/R$layout.class b/app/build/bin/classesdebug/android/support/design/R$layout.class
diff --git a/app/build/bin/classesdebug/android/support/design/R$menu.class b/app/build/bin/classesdebug/android/support/design/R$menu.class
diff --git a/app/build/bin/classesdebug/android/support/design/R$mipmap.class b/app/build/bin/classesdebug/android/support/design/R$mipmap.class
diff --git a/app/build/bin/classesdebug/android/support/design/R$string.class b/app/build/bin/classesdebug/android/support/design/R$string.class
diff --git a/app/build/bin/classesdebug/android/support/design/R$style.class b/app/build/bin/classesdebug/android/support/design/R$style.class
diff --git a/app/build/bin/classesdebug/android/support/design/R$styleable.class b/app/build/bin/classesdebug/android/support/design/R$styleable.class
diff --git a/app/build/bin/classesdebug/android/support/design/R.class b/app/build/bin/classesdebug/android/support/design/R.class
diff --git a/app/build/bin/classesdebug/android/support/fragment/R$id.class b/app/build/bin/classesdebug/android/support/fragment/R$id.class
diff --git a/app/build/bin/classesdebug/android/support/fragment/R$integer.class b/app/build/bin/classesdebug/android/support/fragment/R$integer.class
diff --git a/app/build/bin/classesdebug/android/support/fragment/R$layout.class b/app/build/bin/classesdebug/android/support/fragment/R$layout.class
diff --git a/app/build/bin/classesdebug/android/support/fragment/R$menu.class b/app/build/bin/classesdebug/android/support/fragment/R$menu.class
diff --git a/app/build/bin/classesdebug/android/support/fragment/R$mipmap.class b/app/build/bin/classesdebug/android/support/fragment/R$mipmap.class
diff --git a/app/build/bin/classesdebug/android/support/fragment/R$string.class b/app/build/bin/classesdebug/android/support/fragment/R$string.class
diff --git a/app/build/bin/classesdebug/android/support/fragment/R$style.class b/app/build/bin/classesdebug/android/support/fragment/R$style.class
diff --git a/app/build/bin/classesdebug/android/support/fragment/R$styleable.class b/app/build/bin/classesdebug/android/support/fragment/R$styleable.class
diff --git a/app/build/bin/classesdebug/android/support/fragment/R.class b/app/build/bin/classesdebug/android/support/fragment/R.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/R$id.class b/app/build/bin/classesdebug/android/support/graphics/drawable/R$id.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/R$integer.class b/app/build/bin/classesdebug/android/support/graphics/drawable/R$integer.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/R$layout.class b/app/build/bin/classesdebug/android/support/graphics/drawable/R$layout.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/R$menu.class b/app/build/bin/classesdebug/android/support/graphics/drawable/R$menu.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/R$mipmap.class b/app/build/bin/classesdebug/android/support/graphics/drawable/R$mipmap.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/R$string.class b/app/build/bin/classesdebug/android/support/graphics/drawable/R$string.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/R$style.class b/app/build/bin/classesdebug/android/support/graphics/drawable/R$style.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/R$styleable.class b/app/build/bin/classesdebug/android/support/graphics/drawable/R$styleable.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/R.class b/app/build/bin/classesdebug/android/support/graphics/drawable/R.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R$id.class b/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R$id.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R$integer.class b/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R$integer.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R$layout.class b/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R$layout.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R$menu.class b/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R$menu.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R$mipmap.class b/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R$mipmap.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R$string.class b/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R$string.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R$style.class b/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R$style.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R$styleable.class b/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R$styleable.class
diff --git a/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R.class b/app/build/bin/classesdebug/android/support/graphics/drawable/animated/R.class
diff --git a/app/build/bin/classesdebug/android/support/mediacompat/R$id.class b/app/build/bin/classesdebug/android/support/mediacompat/R$id.class
diff --git a/app/build/bin/classesdebug/android/support/mediacompat/R$integer.class b/app/build/bin/classesdebug/android/support/mediacompat/R$integer.class
diff --git a/app/build/bin/classesdebug/android/support/mediacompat/R$layout.class b/app/build/bin/classesdebug/android/support/mediacompat/R$layout.class
diff --git a/app/build/bin/classesdebug/android/support/mediacompat/R$menu.class b/app/build/bin/classesdebug/android/support/mediacompat/R$menu.class
diff --git a/app/build/bin/classesdebug/android/support/mediacompat/R$mipmap.class b/app/build/bin/classesdebug/android/support/mediacompat/R$mipmap.class
diff --git a/app/build/bin/classesdebug/android/support/mediacompat/R$string.class b/app/build/bin/classesdebug/android/support/mediacompat/R$string.class
diff --git a/app/build/bin/classesdebug/android/support/mediacompat/R$style.class b/app/build/bin/classesdebug/android/support/mediacompat/R$style.class
diff --git a/app/build/bin/classesdebug/android/support/mediacompat/R$styleable.class b/app/build/bin/classesdebug/android/support/mediacompat/R$styleable.class
diff --git a/app/build/bin/classesdebug/android/support/mediacompat/R.class b/app/build/bin/classesdebug/android/support/mediacompat/R.class
diff --git a/app/build/bin/classesdebug/android/support/transition/R$id.class b/app/build/bin/classesdebug/android/support/transition/R$id.class
diff --git a/app/build/bin/classesdebug/android/support/transition/R$integer.class b/app/build/bin/classesdebug/android/support/transition/R$integer.class
diff --git a/app/build/bin/classesdebug/android/support/transition/R$layout.class b/app/build/bin/classesdebug/android/support/transition/R$layout.class
diff --git a/app/build/bin/classesdebug/android/support/transition/R$menu.class b/app/build/bin/classesdebug/android/support/transition/R$menu.class
diff --git a/app/build/bin/classesdebug/android/support/transition/R$mipmap.class b/app/build/bin/classesdebug/android/support/transition/R$mipmap.class
diff --git a/app/build/bin/classesdebug/android/support/transition/R$string.class b/app/build/bin/classesdebug/android/support/transition/R$string.class
diff --git a/app/build/bin/classesdebug/android/support/transition/R$style.class b/app/build/bin/classesdebug/android/support/transition/R$style.class
diff --git a/app/build/bin/classesdebug/android/support/transition/R$styleable.class b/app/build/bin/classesdebug/android/support/transition/R$styleable.class
diff --git a/app/build/bin/classesdebug/android/support/transition/R.class b/app/build/bin/classesdebug/android/support/transition/R.class
diff --git a/app/build/bin/classesdebug/android/support/v4/R$id.class b/app/build/bin/classesdebug/android/support/v4/R$id.class
diff --git a/app/build/bin/classesdebug/android/support/v4/R$integer.class b/app/build/bin/classesdebug/android/support/v4/R$integer.class
diff --git a/app/build/bin/classesdebug/android/support/v4/R$layout.class b/app/build/bin/classesdebug/android/support/v4/R$layout.class
diff --git a/app/build/bin/classesdebug/android/support/v4/R$menu.class b/app/build/bin/classesdebug/android/support/v4/R$menu.class
diff --git a/app/build/bin/classesdebug/android/support/v4/R$mipmap.class b/app/build/bin/classesdebug/android/support/v4/R$mipmap.class
diff --git a/app/build/bin/classesdebug/android/support/v4/R$string.class b/app/build/bin/classesdebug/android/support/v4/R$string.class
diff --git a/app/build/bin/classesdebug/android/support/v4/R$style.class b/app/build/bin/classesdebug/android/support/v4/R$style.class
diff --git a/app/build/bin/classesdebug/android/support/v4/R$styleable.class b/app/build/bin/classesdebug/android/support/v4/R$styleable.class
diff --git a/app/build/bin/classesdebug/android/support/v4/R.class b/app/build/bin/classesdebug/android/support/v4/R.class
diff --git a/app/build/bin/classesdebug/android/support/v7/appcompat/R$id.class b/app/build/bin/classesdebug/android/support/v7/appcompat/R$id.class
diff --git a/app/build/bin/classesdebug/android/support/v7/appcompat/R$integer.class b/app/build/bin/classesdebug/android/support/v7/appcompat/R$integer.class
diff --git a/app/build/bin/classesdebug/android/support/v7/appcompat/R$layout.class b/app/build/bin/classesdebug/android/support/v7/appcompat/R$layout.class
diff --git a/app/build/bin/classesdebug/android/support/v7/appcompat/R$menu.class b/app/build/bin/classesdebug/android/support/v7/appcompat/R$menu.class
diff --git a/app/build/bin/classesdebug/android/support/v7/appcompat/R$mipmap.class b/app/build/bin/classesdebug/android/support/v7/appcompat/R$mipmap.class
diff --git a/app/build/bin/classesdebug/android/support/v7/appcompat/R$string.class b/app/build/bin/classesdebug/android/support/v7/appcompat/R$string.class
diff --git a/app/build/bin/classesdebug/android/support/v7/appcompat/R$style.class b/app/build/bin/classesdebug/android/support/v7/appcompat/R$style.class
diff --git a/app/build/bin/classesdebug/android/support/v7/appcompat/R$styleable.class b/app/build/bin/classesdebug/android/support/v7/appcompat/R$styleable.class
diff --git a/app/build/bin/classesdebug/android/support/v7/appcompat/R.class b/app/build/bin/classesdebug/android/support/v7/appcompat/R.class
diff --git a/app/build/bin/classesdebug/android/support/v7/cardview/R$id.class b/app/build/bin/classesdebug/android/support/v7/cardview/R$id.class
diff --git a/app/build/bin/classesdebug/android/support/v7/cardview/R$integer.class b/app/build/bin/classesdebug/android/support/v7/cardview/R$integer.class
diff --git a/app/build/bin/classesdebug/android/support/v7/cardview/R$layout.class b/app/build/bin/classesdebug/android/support/v7/cardview/R$layout.class
diff --git a/app/build/bin/classesdebug/android/support/v7/cardview/R$menu.class b/app/build/bin/classesdebug/android/support/v7/cardview/R$menu.class
diff --git a/app/build/bin/classesdebug/android/support/v7/cardview/R$mipmap.class b/app/build/bin/classesdebug/android/support/v7/cardview/R$mipmap.class
diff --git a/app/build/bin/classesdebug/android/support/v7/cardview/R$string.class b/app/build/bin/classesdebug/android/support/v7/cardview/R$string.class
diff --git a/app/build/bin/classesdebug/android/support/v7/cardview/R$style.class b/app/build/bin/classesdebug/android/support/v7/cardview/R$style.class
diff --git a/app/build/bin/classesdebug/android/support/v7/cardview/R$styleable.class b/app/build/bin/classesdebug/android/support/v7/cardview/R$styleable.class
diff --git a/app/build/bin/classesdebug/android/support/v7/cardview/R.class b/app/build/bin/classesdebug/android/support/v7/cardview/R.class
diff --git a/app/build/bin/classesdebug/android/support/v7/recyclerview/R$id.class b/app/build/bin/classesdebug/android/support/v7/recyclerview/R$id.class
diff --git a/app/build/bin/classesdebug/android/support/v7/recyclerview/R$integer.class b/app/build/bin/classesdebug/android/support/v7/recyclerview/R$integer.class
diff --git a/app/build/bin/classesdebug/android/support/v7/recyclerview/R$layout.class b/app/build/bin/classesdebug/android/support/v7/recyclerview/R$layout.class
diff --git a/app/build/bin/classesdebug/android/support/v7/recyclerview/R$menu.class b/app/build/bin/classesdebug/android/support/v7/recyclerview/R$menu.class
diff --git a/app/build/bin/classesdebug/android/support/v7/recyclerview/R$mipmap.class b/app/build/bin/classesdebug/android/support/v7/recyclerview/R$mipmap.class
diff --git a/app/build/bin/classesdebug/android/support/v7/recyclerview/R$string.class b/app/build/bin/classesdebug/android/support/v7/recyclerview/R$string.class
diff --git a/app/build/bin/classesdebug/android/support/v7/recyclerview/R$style.class b/app/build/bin/classesdebug/android/support/v7/recyclerview/R$style.class
diff --git a/app/build/bin/classesdebug/android/support/v7/recyclerview/R$styleable.class b/app/build/bin/classesdebug/android/support/v7/recyclerview/R$styleable.class
diff --git a/app/build/bin/classesdebug/android/support/v7/recyclerview/R.class b/app/build/bin/classesdebug/android/support/v7/recyclerview/R.class
diff --git a/app/build/bin/classesdebug/com/genisys/batteryinfo/MainActivity$0$debug.class b/app/build/bin/classesdebug/com/genisys/batteryinfo/MainActivity$0$debug.class
diff --git a/app/build/bin/classesdebug/com/genisys/batteryinfo/MainActivity.class b/app/build/bin/classesdebug/com/genisys/batteryinfo/MainActivity.class
diff --git a/app/build/bin/classesdebug/com/genisys/batteryinfo/R$id.class b/app/build/bin/classesdebug/com/genisys/batteryinfo/R$id.class
diff --git a/app/build/bin/classesdebug/com/genisys/batteryinfo/R$integer.class b/app/build/bin/classesdebug/com/genisys/batteryinfo/R$integer.class
diff --git a/app/build/bin/classesdebug/com/genisys/batteryinfo/R$layout.class b/app/build/bin/classesdebug/com/genisys/batteryinfo/R$layout.class
diff --git a/app/build/bin/classesdebug/com/genisys/batteryinfo/R$menu.class b/app/build/bin/classesdebug/com/genisys/batteryinfo/R$menu.class
diff --git a/app/build/bin/classesdebug/com/genisys/batteryinfo/R$mipmap.class b/app/build/bin/classesdebug/com/genisys/batteryinfo/R$mipmap.class
diff --git a/app/build/bin/classesdebug/com/genisys/batteryinfo/R$string.class b/app/build/bin/classesdebug/com/genisys/batteryinfo/R$string.class
diff --git a/app/build/bin/classesdebug/com/genisys/batteryinfo/R$style.class b/app/build/bin/classesdebug/com/genisys/batteryinfo/R$style.class
diff --git a/app/build/bin/classesdebug/com/genisys/batteryinfo/R$styleable.class b/app/build/bin/classesdebug/com/genisys/batteryinfo/R$styleable.class
diff --git a/app/build/bin/classesdebug/com/genisys/batteryinfo/R.class b/app/build/bin/classesdebug/com/genisys/batteryinfo/R.class
diff --git a/app/build/bin/classesrelease/android/support/compat/R$id.class b/app/build/bin/classesrelease/android/support/compat/R$id.class
diff --git a/app/build/bin/classesrelease/android/support/compat/R$id.dex b/app/build/bin/classesrelease/android/support/compat/R$id.dex
diff --git a/app/build/bin/classesrelease/android/support/compat/R$integer.class b/app/build/bin/classesrelease/android/support/compat/R$integer.class
diff --git a/app/build/bin/classesrelease/android/support/compat/R$integer.dex b/app/build/bin/classesrelease/android/support/compat/R$integer.dex
diff --git a/app/build/bin/classesrelease/android/support/compat/R$layout.class b/app/build/bin/classesrelease/android/support/compat/R$layout.class
diff --git a/app/build/bin/classesrelease/android/support/compat/R$layout.dex b/app/build/bin/classesrelease/android/support/compat/R$layout.dex
diff --git a/app/build/bin/classesrelease/android/support/compat/R$menu.class b/app/build/bin/classesrelease/android/support/compat/R$menu.class
diff --git a/app/build/bin/classesrelease/android/support/compat/R$menu.dex b/app/build/bin/classesrelease/android/support/compat/R$menu.dex
diff --git a/app/build/bin/classesrelease/android/support/compat/R$mipmap.class b/app/build/bin/classesrelease/android/support/compat/R$mipmap.class
diff --git a/app/build/bin/classesrelease/android/support/compat/R$mipmap.dex b/app/build/bin/classesrelease/android/support/compat/R$mipmap.dex
diff --git a/app/build/bin/classesrelease/android/support/compat/R$string.class b/app/build/bin/classesrelease/android/support/compat/R$string.class
diff --git a/app/build/bin/classesrelease/android/support/compat/R$string.dex b/app/build/bin/classesrelease/android/support/compat/R$string.dex
diff --git a/app/build/bin/classesrelease/android/support/compat/R$style.class b/app/build/bin/classesrelease/android/support/compat/R$style.class
diff --git a/app/build/bin/classesrelease/android/support/compat/R$style.dex b/app/build/bin/classesrelease/android/support/compat/R$style.dex
diff --git a/app/build/bin/classesrelease/android/support/compat/R$styleable.class b/app/build/bin/classesrelease/android/support/compat/R$styleable.class
diff --git a/app/build/bin/classesrelease/android/support/compat/R$styleable.dex b/app/build/bin/classesrelease/android/support/compat/R$styleable.dex
diff --git a/app/build/bin/classesrelease/android/support/compat/R.class b/app/build/bin/classesrelease/android/support/compat/R.class
diff --git a/app/build/bin/classesrelease/android/support/compat/R.dex b/app/build/bin/classesrelease/android/support/compat/R.dex
diff --git a/app/build/bin/classesrelease/android/support/coreui/R$id.class b/app/build/bin/classesrelease/android/support/coreui/R$id.class
diff --git a/app/build/bin/classesrelease/android/support/coreui/R$id.dex b/app/build/bin/classesrelease/android/support/coreui/R$id.dex
diff --git a/app/build/bin/classesrelease/android/support/coreui/R$integer.class b/app/build/bin/classesrelease/android/support/coreui/R$integer.class
diff --git a/app/build/bin/classesrelease/android/support/coreui/R$integer.dex b/app/build/bin/classesrelease/android/support/coreui/R$integer.dex
diff --git a/app/build/bin/classesrelease/android/support/coreui/R$layout.class b/app/build/bin/classesrelease/android/support/coreui/R$layout.class
diff --git a/app/build/bin/classesrelease/android/support/coreui/R$layout.dex b/app/build/bin/classesrelease/android/support/coreui/R$layout.dex
diff --git a/app/build/bin/classesrelease/android/support/coreui/R$menu.class b/app/build/bin/classesrelease/android/support/coreui/R$menu.class
diff --git a/app/build/bin/classesrelease/android/support/coreui/R$menu.dex b/app/build/bin/classesrelease/android/support/coreui/R$menu.dex
diff --git a/app/build/bin/classesrelease/android/support/coreui/R$mipmap.class b/app/build/bin/classesrelease/android/support/coreui/R$mipmap.class
diff --git a/app/build/bin/classesrelease/android/support/coreui/R$mipmap.dex b/app/build/bin/classesrelease/android/support/coreui/R$mipmap.dex
diff --git a/app/build/bin/classesrelease/android/support/coreui/R$string.class b/app/build/bin/classesrelease/android/support/coreui/R$string.class
diff --git a/app/build/bin/classesrelease/android/support/coreui/R$string.dex b/app/build/bin/classesrelease/android/support/coreui/R$string.dex
diff --git a/app/build/bin/classesrelease/android/support/coreui/R$style.class b/app/build/bin/classesrelease/android/support/coreui/R$style.class
diff --git a/app/build/bin/classesrelease/android/support/coreui/R$style.dex b/app/build/bin/classesrelease/android/support/coreui/R$style.dex
diff --git a/app/build/bin/classesrelease/android/support/coreui/R$styleable.class b/app/build/bin/classesrelease/android/support/coreui/R$styleable.class
diff --git a/app/build/bin/classesrelease/android/support/coreui/R$styleable.dex b/app/build/bin/classesrelease/android/support/coreui/R$styleable.dex
diff --git a/app/build/bin/classesrelease/android/support/coreui/R.class b/app/build/bin/classesrelease/android/support/coreui/R.class
diff --git a/app/build/bin/classesrelease/android/support/coreui/R.dex b/app/build/bin/classesrelease/android/support/coreui/R.dex
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R$id.class b/app/build/bin/classesrelease/android/support/coreutils/R$id.class
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R$id.dex b/app/build/bin/classesrelease/android/support/coreutils/R$id.dex
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R$integer.class b/app/build/bin/classesrelease/android/support/coreutils/R$integer.class
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R$integer.dex b/app/build/bin/classesrelease/android/support/coreutils/R$integer.dex
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R$layout.class b/app/build/bin/classesrelease/android/support/coreutils/R$layout.class
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R$layout.dex b/app/build/bin/classesrelease/android/support/coreutils/R$layout.dex
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R$menu.class b/app/build/bin/classesrelease/android/support/coreutils/R$menu.class
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R$menu.dex b/app/build/bin/classesrelease/android/support/coreutils/R$menu.dex
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R$mipmap.class b/app/build/bin/classesrelease/android/support/coreutils/R$mipmap.class
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R$mipmap.dex b/app/build/bin/classesrelease/android/support/coreutils/R$mipmap.dex
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R$string.class b/app/build/bin/classesrelease/android/support/coreutils/R$string.class
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R$string.dex b/app/build/bin/classesrelease/android/support/coreutils/R$string.dex
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R$style.class b/app/build/bin/classesrelease/android/support/coreutils/R$style.class
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R$style.dex b/app/build/bin/classesrelease/android/support/coreutils/R$style.dex
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R$styleable.class b/app/build/bin/classesrelease/android/support/coreutils/R$styleable.class
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R$styleable.dex b/app/build/bin/classesrelease/android/support/coreutils/R$styleable.dex
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R.class b/app/build/bin/classesrelease/android/support/coreutils/R.class
diff --git a/app/build/bin/classesrelease/android/support/coreutils/R.dex b/app/build/bin/classesrelease/android/support/coreutils/R.dex
diff --git a/app/build/bin/classesrelease/android/support/design/R$id.class b/app/build/bin/classesrelease/android/support/design/R$id.class
diff --git a/app/build/bin/classesrelease/android/support/design/R$id.dex b/app/build/bin/classesrelease/android/support/design/R$id.dex
diff --git a/app/build/bin/classesrelease/android/support/design/R$integer.class b/app/build/bin/classesrelease/android/support/design/R$integer.class
diff --git a/app/build/bin/classesrelease/android/support/design/R$integer.dex b/app/build/bin/classesrelease/android/support/design/R$integer.dex
diff --git a/app/build/bin/classesrelease/android/support/design/R$layout.class b/app/build/bin/classesrelease/android/support/design/R$layout.class
diff --git a/app/build/bin/classesrelease/android/support/design/R$layout.dex b/app/build/bin/classesrelease/android/support/design/R$layout.dex
diff --git a/app/build/bin/classesrelease/android/support/design/R$menu.class b/app/build/bin/classesrelease/android/support/design/R$menu.class
diff --git a/app/build/bin/classesrelease/android/support/design/R$menu.dex b/app/build/bin/classesrelease/android/support/design/R$menu.dex
diff --git a/app/build/bin/classesrelease/android/support/design/R$mipmap.class b/app/build/bin/classesrelease/android/support/design/R$mipmap.class
diff --git a/app/build/bin/classesrelease/android/support/design/R$mipmap.dex b/app/build/bin/classesrelease/android/support/design/R$mipmap.dex
diff --git a/app/build/bin/classesrelease/android/support/design/R$string.class b/app/build/bin/classesrelease/android/support/design/R$string.class
diff --git a/app/build/bin/classesrelease/android/support/design/R$string.dex b/app/build/bin/classesrelease/android/support/design/R$string.dex
diff --git a/app/build/bin/classesrelease/android/support/design/R$style.class b/app/build/bin/classesrelease/android/support/design/R$style.class
diff --git a/app/build/bin/classesrelease/android/support/design/R$style.dex b/app/build/bin/classesrelease/android/support/design/R$style.dex
diff --git a/app/build/bin/classesrelease/android/support/design/R$styleable.class b/app/build/bin/classesrelease/android/support/design/R$styleable.class
diff --git a/app/build/bin/classesrelease/android/support/design/R$styleable.dex b/app/build/bin/classesrelease/android/support/design/R$styleable.dex
diff --git a/app/build/bin/classesrelease/android/support/design/R.class b/app/build/bin/classesrelease/android/support/design/R.class
diff --git a/app/build/bin/classesrelease/android/support/design/R.dex b/app/build/bin/classesrelease/android/support/design/R.dex
diff --git a/app/build/bin/classesrelease/android/support/fragment/R$id.class b/app/build/bin/classesrelease/android/support/fragment/R$id.class
diff --git a/app/build/bin/classesrelease/android/support/fragment/R$id.dex b/app/build/bin/classesrelease/android/support/fragment/R$id.dex
diff --git a/app/build/bin/classesrelease/android/support/fragment/R$integer.class b/app/build/bin/classesrelease/android/support/fragment/R$integer.class
diff --git a/app/build/bin/classesrelease/android/support/fragment/R$integer.dex b/app/build/bin/classesrelease/android/support/fragment/R$integer.dex
diff --git a/app/build/bin/classesrelease/android/support/fragment/R$layout.class b/app/build/bin/classesrelease/android/support/fragment/R$layout.class
diff --git a/app/build/bin/classesrelease/android/support/fragment/R$layout.dex b/app/build/bin/classesrelease/android/support/fragment/R$layout.dex
diff --git a/app/build/bin/classesrelease/android/support/fragment/R$menu.class b/app/build/bin/classesrelease/android/support/fragment/R$menu.class
diff --git a/app/build/bin/classesrelease/android/support/fragment/R$menu.dex b/app/build/bin/classesrelease/android/support/fragment/R$menu.dex
diff --git a/app/build/bin/classesrelease/android/support/fragment/R$mipmap.class b/app/build/bin/classesrelease/android/support/fragment/R$mipmap.class
diff --git a/app/build/bin/classesrelease/android/support/fragment/R$mipmap.dex b/app/build/bin/classesrelease/android/support/fragment/R$mipmap.dex
diff --git a/app/build/bin/classesrelease/android/support/fragment/R$string.class b/app/build/bin/classesrelease/android/support/fragment/R$string.class
diff --git a/app/build/bin/classesrelease/android/support/fragment/R$string.dex b/app/build/bin/classesrelease/android/support/fragment/R$string.dex
diff --git a/app/build/bin/classesrelease/android/support/fragment/R$style.class b/app/build/bin/classesrelease/android/support/fragment/R$style.class
diff --git a/app/build/bin/classesrelease/android/support/fragment/R$style.dex b/app/build/bin/classesrelease/android/support/fragment/R$style.dex
diff --git a/app/build/bin/classesrelease/android/support/fragment/R$styleable.class b/app/build/bin/classesrelease/android/support/fragment/R$styleable.class
diff --git a/app/build/bin/classesrelease/android/support/fragment/R$styleable.dex b/app/build/bin/classesrelease/android/support/fragment/R$styleable.dex
diff --git a/app/build/bin/classesrelease/android/support/fragment/R.class b/app/build/bin/classesrelease/android/support/fragment/R.class
diff --git a/app/build/bin/classesrelease/android/support/fragment/R.dex b/app/build/bin/classesrelease/android/support/fragment/R.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R$id.class b/app/build/bin/classesrelease/android/support/graphics/drawable/R$id.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R$id.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/R$id.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R$integer.class b/app/build/bin/classesrelease/android/support/graphics/drawable/R$integer.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R$integer.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/R$integer.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R$layout.class b/app/build/bin/classesrelease/android/support/graphics/drawable/R$layout.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R$layout.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/R$layout.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R$menu.class b/app/build/bin/classesrelease/android/support/graphics/drawable/R$menu.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R$menu.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/R$menu.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R$mipmap.class b/app/build/bin/classesrelease/android/support/graphics/drawable/R$mipmap.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R$mipmap.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/R$mipmap.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R$string.class b/app/build/bin/classesrelease/android/support/graphics/drawable/R$string.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R$string.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/R$string.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R$style.class b/app/build/bin/classesrelease/android/support/graphics/drawable/R$style.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R$style.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/R$style.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R$styleable.class b/app/build/bin/classesrelease/android/support/graphics/drawable/R$styleable.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R$styleable.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/R$styleable.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R.class b/app/build/bin/classesrelease/android/support/graphics/drawable/R.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/R.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/R.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$id.class b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$id.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$id.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$id.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$integer.class b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$integer.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$integer.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$integer.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$layout.class b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$layout.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$layout.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$layout.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$menu.class b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$menu.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$menu.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$menu.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$mipmap.class b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$mipmap.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$mipmap.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$mipmap.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$string.class b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$string.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$string.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$string.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$style.class b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$style.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$style.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$style.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$styleable.class b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$styleable.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$styleable.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R$styleable.dex
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R.class b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R.class
diff --git a/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R.dex b/app/build/bin/classesrelease/android/support/graphics/drawable/animated/R.dex
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R$id.class b/app/build/bin/classesrelease/android/support/mediacompat/R$id.class
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R$id.dex b/app/build/bin/classesrelease/android/support/mediacompat/R$id.dex
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R$integer.class b/app/build/bin/classesrelease/android/support/mediacompat/R$integer.class
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R$integer.dex b/app/build/bin/classesrelease/android/support/mediacompat/R$integer.dex
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R$layout.class b/app/build/bin/classesrelease/android/support/mediacompat/R$layout.class
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R$layout.dex b/app/build/bin/classesrelease/android/support/mediacompat/R$layout.dex
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R$menu.class b/app/build/bin/classesrelease/android/support/mediacompat/R$menu.class
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R$menu.dex b/app/build/bin/classesrelease/android/support/mediacompat/R$menu.dex
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R$mipmap.class b/app/build/bin/classesrelease/android/support/mediacompat/R$mipmap.class
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R$mipmap.dex b/app/build/bin/classesrelease/android/support/mediacompat/R$mipmap.dex
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R$string.class b/app/build/bin/classesrelease/android/support/mediacompat/R$string.class
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R$string.dex b/app/build/bin/classesrelease/android/support/mediacompat/R$string.dex
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R$style.class b/app/build/bin/classesrelease/android/support/mediacompat/R$style.class
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R$style.dex b/app/build/bin/classesrelease/android/support/mediacompat/R$style.dex
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R$styleable.class b/app/build/bin/classesrelease/android/support/mediacompat/R$styleable.class
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R$styleable.dex b/app/build/bin/classesrelease/android/support/mediacompat/R$styleable.dex
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R.class b/app/build/bin/classesrelease/android/support/mediacompat/R.class
diff --git a/app/build/bin/classesrelease/android/support/mediacompat/R.dex b/app/build/bin/classesrelease/android/support/mediacompat/R.dex
diff --git a/app/build/bin/classesrelease/android/support/transition/R$id.class b/app/build/bin/classesrelease/android/support/transition/R$id.class
diff --git a/app/build/bin/classesrelease/android/support/transition/R$id.dex b/app/build/bin/classesrelease/android/support/transition/R$id.dex
diff --git a/app/build/bin/classesrelease/android/support/transition/R$integer.class b/app/build/bin/classesrelease/android/support/transition/R$integer.class
diff --git a/app/build/bin/classesrelease/android/support/transition/R$integer.dex b/app/build/bin/classesrelease/android/support/transition/R$integer.dex
diff --git a/app/build/bin/classesrelease/android/support/transition/R$layout.class b/app/build/bin/classesrelease/android/support/transition/R$layout.class
diff --git a/app/build/bin/classesrelease/android/support/transition/R$layout.dex b/app/build/bin/classesrelease/android/support/transition/R$layout.dex
diff --git a/app/build/bin/classesrelease/android/support/transition/R$menu.class b/app/build/bin/classesrelease/android/support/transition/R$menu.class
diff --git a/app/build/bin/classesrelease/android/support/transition/R$menu.dex b/app/build/bin/classesrelease/android/support/transition/R$menu.dex
diff --git a/app/build/bin/classesrelease/android/support/transition/R$mipmap.class b/app/build/bin/classesrelease/android/support/transition/R$mipmap.class
diff --git a/app/build/bin/classesrelease/android/support/transition/R$mipmap.dex b/app/build/bin/classesrelease/android/support/transition/R$mipmap.dex
diff --git a/app/build/bin/classesrelease/android/support/transition/R$string.class b/app/build/bin/classesrelease/android/support/transition/R$string.class
diff --git a/app/build/bin/classesrelease/android/support/transition/R$string.dex b/app/build/bin/classesrelease/android/support/transition/R$string.dex
diff --git a/app/build/bin/classesrelease/android/support/transition/R$style.class b/app/build/bin/classesrelease/android/support/transition/R$style.class
diff --git a/app/build/bin/classesrelease/android/support/transition/R$style.dex b/app/build/bin/classesrelease/android/support/transition/R$style.dex
diff --git a/app/build/bin/classesrelease/android/support/transition/R$styleable.class b/app/build/bin/classesrelease/android/support/transition/R$styleable.class
diff --git a/app/build/bin/classesrelease/android/support/transition/R$styleable.dex b/app/build/bin/classesrelease/android/support/transition/R$styleable.dex
diff --git a/app/build/bin/classesrelease/android/support/transition/R.class b/app/build/bin/classesrelease/android/support/transition/R.class
diff --git a/app/build/bin/classesrelease/android/support/transition/R.dex b/app/build/bin/classesrelease/android/support/transition/R.dex
diff --git a/app/build/bin/classesrelease/android/support/v4/R$id.class b/app/build/bin/classesrelease/android/support/v4/R$id.class
diff --git a/app/build/bin/classesrelease/android/support/v4/R$id.dex b/app/build/bin/classesrelease/android/support/v4/R$id.dex
diff --git a/app/build/bin/classesrelease/android/support/v4/R$integer.class b/app/build/bin/classesrelease/android/support/v4/R$integer.class
diff --git a/app/build/bin/classesrelease/android/support/v4/R$integer.dex b/app/build/bin/classesrelease/android/support/v4/R$integer.dex
diff --git a/app/build/bin/classesrelease/android/support/v4/R$layout.class b/app/build/bin/classesrelease/android/support/v4/R$layout.class
diff --git a/app/build/bin/classesrelease/android/support/v4/R$layout.dex b/app/build/bin/classesrelease/android/support/v4/R$layout.dex
diff --git a/app/build/bin/classesrelease/android/support/v4/R$menu.class b/app/build/bin/classesrelease/android/support/v4/R$menu.class
diff --git a/app/build/bin/classesrelease/android/support/v4/R$menu.dex b/app/build/bin/classesrelease/android/support/v4/R$menu.dex