Merge pull request #3 from aandis/fix-floating-blunder

Fix floating blunder
aandis · Mar 25, 2017 · 2bf23ba · 2bf23ba
2 parents 4b8a2ef + 64b58c8
commit 2bf23ba
Show file tree

Hide file tree

Showing 43 changed files with 469 additions and 411 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,19 @@
 .gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
+local.properties
 .DS_Store
-/build
-/captures
+build/
+captures
+*.dex
+*.class
+bin/
+gen/
+out/
+proguard/
+
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/dictionaries
+.idea/libraries
+.idea/misc.xml
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/SmartAccounting.iml b/SmartAccounting.iml
diff --git a/app/app-release.apk b/app/app-release.apk
diff --git a/app/app.iml b/app/app.iml
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "help.smartbusiness.smartaccounting"
         minSdkVersion 17
         targetSdkVersion 23
-        versionCode 3
-        versionName "1.0.3"
+        versionCode 4
+        versionName "1.1.0"
     }
     buildTypes {
         release {
@@ -19,6 +19,10 @@ android {
     }
 }
 
+repositories{
+    maven { url "https://jitpack.io" }
+}
+
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
@@ -33,6 +37,8 @@ dependencies {
     compile 'com.github.halysongoncalves:pugnotification:1.8.1'
     compile 'com.google.firebase:firebase-crash:9.8.0'
     compile 'com.google.firebase:firebase-core:9.8.0'
+
+    compile 'com.github.BlacKCaT27:CurrencyEditText:v1.4.4'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,8 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:name=".SmartAccounting">
         <activity
             android:name=".activities.MainActivity"
             android:label="@string/app_name"