New transaction auto complete WIP

mvarnagiris · Dec 13, 2014 · 129c29b · 129c29b
1 parent 595b867
commit 129c29b
Show file tree

Hide file tree

Showing 30 changed files with 368 additions and 73 deletions.
diff --git a/backend/src/main/java/com/code44/finance/backend/endpoint/body/RegisterBody.java b/backend/src/main/java/com/code44/finance/backend/endpoint/body/RegisterBody.java
@@ -1,6 +1,6 @@
 package com.code44.finance.backend.endpoint.body;
 
-import com.code44.finance.common.utils.StringUtils;
+import com.code44.finance.common.utils.Strings;
 import com.google.api.server.spi.response.BadRequestException;
 import com.google.gson.annotations.SerializedName;
 
@@ -21,11 +21,11 @@ public class RegisterBody implements Body {
     private String coverUrl;
 
     public void verifyRequiredFields() throws BadRequestException {
-        if (StringUtils.isEmpty(googleId)) {
+        if (Strings.isEmpty(googleId)) {
             throw new BadRequestException("google_id cannot be empty.");
         }
 
-        if (StringUtils.isEmpty(firstName)) {
+        if (Strings.isEmpty(firstName)) {
             throw new BadRequestException("first_name cannot be empty.");
         }
     }

diff --git a/backend/src/main/java/com/code44/finance/backend/endpoint/body/RegisterDeviceBody.java b/backend/src/main/java/com/code44/finance/backend/endpoint/body/RegisterDeviceBody.java
@@ -1,6 +1,6 @@
 package com.code44.finance.backend.endpoint.body;
 
-import com.code44.finance.common.utils.StringUtils;
+import com.code44.finance.common.utils.Strings;
 import com.google.api.server.spi.response.BadRequestException;
 import com.google.gson.annotations.SerializedName;
 
@@ -9,7 +9,7 @@ public class RegisterDeviceBody implements Body {
     private String regId;
 
     public void verifyRequiredFields() throws BadRequestException {
-        if (StringUtils.isEmpty(regId)) {
+        if (Strings.isEmpty(regId)) {
             throw new BadRequestException("registration_id cannot be empty.");
         }
     }

diff --git a/backend/src/main/java/com/code44/finance/backend/entity/BaseEntity.java b/backend/src/main/java/com/code44/finance/backend/entity/BaseEntity.java
@@ -1,7 +1,7 @@
 package com.code44.finance.backend.entity;
 
 import com.code44.finance.common.model.ModelState;
-import com.code44.finance.common.utils.StringUtils;
+import com.code44.finance.common.utils.Strings;
 import com.google.api.server.spi.config.ApiResourceProperty;
 import com.googlecode.objectify.annotation.Id;
 import com.googlecode.objectify.annotation.Index;
@@ -28,7 +28,7 @@ protected BaseEntity() {
     }
 
     public void onCreate() {
-        if (StringUtils.isEmpty(getId())) {
+        if (Strings.isEmpty(getId())) {
             setId(UUID.randomUUID().toString());
         }
         final long timestamp = System.currentTimeMillis();

diff --git a/backend/src/main/java/com/code44/finance/backend/utils/EndpointUtils.java b/backend/src/main/java/com/code44/finance/backend/utils/EndpointUtils.java
@@ -3,7 +3,7 @@
 import com.code44.finance.backend.endpoint.body.Body;
 import com.code44.finance.backend.entity.DeviceEntity;
 import com.code44.finance.backend.entity.UserAccount;
-import com.code44.finance.common.utils.StringUtils;
+import com.code44.finance.common.utils.Strings;
 import com.google.android.gcm.server.Constants;
 import com.google.android.gcm.server.Message;
 import com.google.android.gcm.server.Result;
@@ -36,7 +36,7 @@ public static void verifyBodyNotNull(Body body) throws BadRequestException {
     }
 
     public static void verifyIdNotEmpty(String id) throws BadRequestException {
-        if (StringUtils.isEmpty(id)) {
+        if (Strings.isEmpty(id)) {
             throw new BadRequestException("Id cannot be empty.");
         }
     }

diff --git a/common/src/main/java/com/code44/finance/common/utils/Preconditions.java b/common/src/main/java/com/code44/finance/common/utils/Preconditions.java
@@ -19,7 +19,7 @@ public static <T> T isNull(T object, String message) throws IllegalStateExceptio
     }
 
     public static String notEmpty(String str, String message) throws IllegalArgumentException {
-        if (StringUtils.isEmpty(str)) {
+        if (Strings.isEmpty(str)) {
             throw new IllegalArgumentException(message);
         }
         return str;

diff --git a/...e44/finance/common/utils/StringUtils.java → .../code44/finance/common/utils/Strings.java b/...e44/finance/common/utils/StringUtils.java → .../code44/finance/common/utils/Strings.java
@@ -1,7 +1,7 @@
 package com.code44.finance.common.utils;
 
-public final class StringUtils {
-    private StringUtils() {
+public final class Strings {
+    private Strings() {
     }
 
     public static boolean isEmpty(String str) {

diff --git a/financius/build.gradle b/financius/build.gradle
@@ -19,7 +19,7 @@ apply plugin: 'hugo'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion '21.1.1'
+    buildToolsVersion '21.1.2'
     defaultConfig {
         applicationId 'com.code44.finance'
         targetSdkVersion 21
@@ -63,13 +63,13 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(path: ':backend', configuration: 'android-endpoints')
     compile project(path: ':common')
-    compile 'com.android.support:support-v4:21.0.2'
+    compile 'com.android.support:support-v4:21.0.3'
     compile 'com.android.support:support-v13:20.0.0'
     compile 'com.android.support:recyclerview-v7:21.0.0'
     compile 'com.android.support:cardview-v7:21.0.0'
-    compile 'com.android.support:appcompat-v7:21.0.2'
+    compile 'com.android.support:appcompat-v7:21.0.3'
     compile 'com.android.support:multidex:1.0.0'
-    compile 'com.google.android.gms:play-services:6.1.71'
+    compile 'com.google.android.gms:play-services:6.1.+'
     compile 'com.github.castorflex.smoothprogressbar:library:1.0.0'
     compile 'com.github.castorflex.smoothprogressbar:library-circular:1.0.0'
     compile 'com.squareup.okhttp:okhttp-urlconnection:2.0.0'

diff --git a/financius/src/main/java/com/code44/finance/api/currencies/ExchangeRateRequest.java b/financius/src/main/java/com/code44/finance/api/currencies/ExchangeRateRequest.java
@@ -5,7 +5,7 @@
 
 import com.code44.finance.api.Request;
 import com.code44.finance.common.utils.Preconditions;
-import com.code44.finance.common.utils.StringUtils;
+import com.code44.finance.common.utils.Strings;
 import com.code44.finance.data.DataStore;
 import com.code44.finance.data.db.Tables;
 import com.code44.finance.data.model.Currency;
@@ -57,7 +57,7 @@ public ExchangeRateRequest(EventBus eventBus, Context context, CurrenciesRequest
         IOUtils.closeQuietly(cursor);
 
         boolean currencyExists = true;
-        if (currency == null || StringUtils.isEmpty(currency.getId())) {
+        if (currency == null || Strings.isEmpty(currency.getId())) {
             currencyExists = false;
             currency = new Currency();
             currency.setId(UUID.randomUUID().toString());

diff --git a/financius/src/main/java/com/code44/finance/data/Query.java b/financius/src/main/java/com/code44/finance/data/Query.java
@@ -7,7 +7,7 @@
 import android.support.v4.content.CursorLoader;
 import android.text.TextUtils;
 
-import com.code44.finance.common.utils.StringUtils;
+import com.code44.finance.common.utils.Strings;
 import com.code44.finance.data.db.Column;
 
 import java.util.ArrayList;
@@ -35,7 +35,7 @@ public static Query create() {
     private static String getSelectionWithGroupBy(Query query) {
         final String groupBy = query.getGroupBy();
         final String selection;
-        if (StringUtils.isEmpty(groupBy)) {
+        if (Strings.isEmpty(groupBy)) {
             selection = query.getSelection();
         } else {
             selection = query.getSelection() + ") group by (" + groupBy;
@@ -47,7 +47,7 @@ private static String getSortOrderWithLimit(Query query) {
         final int limit = query.getLimit();
         String sortOrder = query.getSortOrder();
         if (limit >= 0) {
-            sortOrder = StringUtils.isEmpty(sortOrder) ? "1" : sortOrder + " limit " + limit;
+            sortOrder = Strings.isEmpty(sortOrder) ? "1" : sortOrder + " limit " + limit;
         }
         return sortOrder;
     }

diff --git a/financius/src/main/java/com/code44/finance/data/db/Column.java b/financius/src/main/java/com/code44/finance/data/db/Column.java
@@ -1,6 +1,6 @@
 package com.code44.finance.data.db;
 
-import com.code44.finance.common.utils.StringUtils;
+import com.code44.finance.common.utils.Strings;
 
 public final class Column {
     private final String tableName;
@@ -49,7 +49,7 @@ public String getName() {
      * same as using {@link #getName()}.
      */
     public String getName(String prefix) {
-        if (StringUtils.isEmpty(prefix)) {
+        if (Strings.isEmpty(prefix)) {
             return getName();
         } else {
             return prefix + "_" + name;
@@ -80,7 +80,7 @@ public String getNameWithAs(String tableName) {
     }
 
     public String getCreateScript() {
-        return name + " " + dataType + (StringUtils.isEmpty(defaultValue) ? "" : " default " + defaultValue);
+        return name + " " + dataType + (Strings.isEmpty(defaultValue) ? "" : " default " + defaultValue);
     }
 
     public static enum DataType {

diff --git a/financius/src/main/java/com/code44/finance/data/model/Model.java b/financius/src/main/java/com/code44/finance/data/model/Model.java
@@ -7,7 +7,7 @@
 
 import com.code44.finance.common.model.ModelState;
 import com.code44.finance.common.utils.Preconditions;
-import com.code44.finance.common.utils.StringUtils;
+import com.code44.finance.common.utils.Strings;
 import com.code44.finance.data.db.Column;
 
 import java.util.UUID;
@@ -52,7 +52,7 @@ protected Model(Parcel parcel) {
         // We are only checking id, because otherwise some parts of the app might misbehave
         // For example BaseModelAdapter contains Set<BaseModel> selectedItems
         // noinspection RedundantIfStatement
-        return !(StringUtils.isEmpty(id) || StringUtils.isEmpty(model.id)) && id.equals(model.id);
+        return !(Strings.isEmpty(id) || Strings.isEmpty(model.id)) && id.equals(model.id);
 
     }
 
@@ -70,7 +70,7 @@ protected Model(Parcel parcel) {
     protected abstract Column getSyncStateColumn();
 
     public void prepareForDb() {
-        if (StringUtils.isEmpty(id)) {
+        if (Strings.isEmpty(id)) {
             id = UUID.randomUUID().toString();
         }
 
@@ -159,6 +159,6 @@ public void updateFrom(Cursor cursor, String columnPrefixTable) {
     }
 
     public boolean hasId() {
-        return !StringUtils.isEmpty(id);
+        return !Strings.isEmpty(id);
     }
 }
diff --git a/financius/src/main/java/com/code44/finance/data/model/Transaction.java b/financius/src/main/java/com/code44/finance/data/model/Transaction.java
@@ -10,7 +10,7 @@
 import com.code44.finance.common.model.TransactionState;
 import com.code44.finance.common.model.TransactionType;
 import com.code44.finance.common.utils.Preconditions;
-import com.code44.finance.common.utils.StringUtils;
+import com.code44.finance.common.utils.Strings;
 import com.code44.finance.data.db.Column;
 import com.code44.finance.data.db.Tables;
 import com.crashlytics.android.Crashlytics;
@@ -243,7 +243,7 @@ public static Transaction from(Cursor cursor) {
 
         // Account from
         index = cursor.getColumnIndex(Tables.Transactions.ACCOUNT_FROM_ID.getName(columnPrefixTable));
-        if (index >= 0 && !StringUtils.isEmpty(cursor.getString(index)) && !cursor.getString(index).equals("null")) {
+        if (index >= 0 && !Strings.isEmpty(cursor.getString(index)) && !cursor.getString(index).equals("null")) {
             final Account accountFrom = Account.fromAccountFrom(cursor);
             accountFrom.setId(cursor.getString(index));
             setAccountFrom(accountFrom);
@@ -253,7 +253,7 @@ public static Transaction from(Cursor cursor) {
 
         // Account to
         index = cursor.getColumnIndex(Tables.Transactions.ACCOUNT_TO_ID.getName(columnPrefixTable));
-        if (index >= 0 && !StringUtils.isEmpty(cursor.getString(index)) && !cursor.getString(index).equals("null")) {
+        if (index >= 0 && !Strings.isEmpty(cursor.getString(index)) && !cursor.getString(index).equals("null")) {
             final Account accountTo = Account.fromAccountTo(cursor);
             accountTo.setId(cursor.getString(index));
             setAccountTo(accountTo);
@@ -263,7 +263,7 @@ public static Transaction from(Cursor cursor) {
 
         // Category
         index = cursor.getColumnIndex(Tables.Transactions.CATEGORY_ID.getName(columnPrefixTable));
-        if (index >= 0 && !StringUtils.isEmpty(cursor.getString(index)) && !cursor.getString(index).equals("null")) {
+        if (index >= 0 && !Strings.isEmpty(cursor.getString(index)) && !cursor.getString(index).equals("null")) {
             final Category category = Category.from(cursor);
             category.setId(cursor.getString(index));
             setCategory(category);
@@ -278,7 +278,7 @@ public static Transaction from(Cursor cursor) {
         index = cursor.getColumnIndex(Tables.Tags.ID.getName(columnPrefixTable));
         if (index >= 0) {
             final String str = cursor.getString(index);
-            if (!StringUtils.isEmpty(str)) {
+            if (!Strings.isEmpty(str)) {
                 tagIds = TextUtils.split(str, Tables.CONCAT_SEPARATOR);
             } else {
                 tagIds = null;
@@ -290,7 +290,7 @@ public static Transaction from(Cursor cursor) {
         index = cursor.getColumnIndex(Tables.Tags.TITLE.getName(columnPrefixTable));
         if (index >= 0) {
             final String str = cursor.getString(index);
-            if (!StringUtils.isEmpty(str)) {
+            if (!Strings.isEmpty(str)) {
                 tagTitles = TextUtils.split(str, Tables.CONCAT_SEPARATOR);
             } else {
                 tagTitles = null;

diff --git a/financius/src/main/java/com/code44/finance/data/providers/AccountsProvider.java b/financius/src/main/java/com/code44/finance/data/providers/AccountsProvider.java
@@ -8,7 +8,7 @@
 import com.code44.finance.common.model.ModelState;
 import com.code44.finance.common.model.TransactionState;
 import com.code44.finance.common.model.TransactionType;
-import com.code44.finance.common.utils.StringUtils;
+import com.code44.finance.common.utils.Strings;
 import com.code44.finance.data.DataStore;
 import com.code44.finance.data.Query;
 import com.code44.finance.data.db.Column;
@@ -96,7 +96,7 @@ public static Uri uriAccount(String accountServerId) {
 
     private long getCurrentBalance(ContentValues values) {
         final String accountId = values.getAsString(Tables.Accounts.ID.getName());
-        if (StringUtils.isEmpty(accountId)) {
+        if (Strings.isEmpty(accountId)) {
             return 0;
         }
 

diff --git a/financius/src/main/java/com/code44/finance/data/providers/BaseModelProvider.java b/financius/src/main/java/com/code44/finance/data/providers/BaseModelProvider.java
@@ -11,7 +11,7 @@
 
 import com.code44.finance.api.Api;
 import com.code44.finance.common.model.ModelState;
-import com.code44.finance.common.utils.StringUtils;
+import com.code44.finance.common.utils.Strings;
 import com.code44.finance.data.Query;
 import com.code44.finance.data.db.Column;
 import com.code44.finance.data.db.Tables;
@@ -91,7 +91,7 @@ public static Uri uriModel(Class<? extends BaseModelProvider> providerClass, Str
 
     @Override public Uri insert(Uri uri, ContentValues values) {
         final String serverId = values.getAsString(getIdColumn().getName());
-        if (StringUtils.isEmpty(serverId)) {
+        if (Strings.isEmpty(serverId)) {
             throw new IllegalArgumentException("Server Id cannot be empty.");
         }
 

diff --git a/financius/src/main/java/com/code44/finance/ui/FilePickerActivity.java b/financius/src/main/java/com/code44/finance/ui/FilePickerActivity.java
@@ -4,7 +4,7 @@
 import android.content.Context;
 import android.content.Intent;
 
-import com.code44.finance.common.utils.StringUtils;
+import com.code44.finance.common.utils.Strings;
 
 import java.io.File;
 
@@ -24,7 +24,7 @@ private static Intent makeIntent(Context context, boolean allowCreateDir, int mo
         intent.putExtra(EXTRA_ALLOW_CREATE_DIR, allowCreateDir);
         intent.putExtra(EXTRA_ALLOW_MULTIPLE, false);
         intent.putExtra(EXTRA_MODE, mode);
-        if (!StringUtils.isEmpty(startPath) && new File(startPath).exists()) {
+        if (!Strings.isEmpty(startPath) && new File(startPath).exists()) {
             intent.putExtra(EXTRA_START_PATH, startPath);
         }
         return intent;

diff --git a/financius/src/main/java/com/code44/finance/ui/categories/CategoryEditActivity.java b/financius/src/main/java/com/code44/finance/ui/categories/CategoryEditActivity.java
@@ -13,7 +13,7 @@
 
 import com.code44.finance.R;
 import com.code44.finance.common.model.TransactionType;
-import com.code44.finance.common.utils.StringUtils;
+import com.code44.finance.common.utils.Strings;
 import com.code44.finance.data.DataStore;
 import com.code44.finance.data.db.Tables;
 import com.code44.finance.data.model.Category;
@@ -88,7 +88,7 @@ public static void start(Context context, String categoryId) {
 
     @Override protected Category getModelFrom(Cursor cursor) {
         final Category category = Category.from(cursor);
-        if (StringUtils.isEmpty(category.getId())) {
+        if (Strings.isEmpty(category.getId())) {
             category.setColor(0xff607d8b);
         }
         return category;

diff --git a/financius/src/main/java/com/code44/finance/ui/common/ModelActivity.java b/financius/src/main/java/com/code44/finance/ui/common/ModelActivity.java
@@ -13,7 +13,7 @@
 import android.view.MenuItem;
 
 import com.code44.finance.R;
-import com.code44.finance.common.utils.StringUtils;
+import com.code44.finance.common.utils.Strings;
 import com.code44.finance.data.model.Model;
 import com.code44.finance.ui.DrawerActivity;
 import com.code44.finance.ui.ModelFragment;
@@ -115,7 +115,7 @@ protected static Intent makeIntent(Context context, Class<? extends ModelActivit
 
     protected void onExtras(Intent extras) {
         modelId = extras.getStringExtra(EXTRA_MODEL_ID);
-        if (StringUtils.isEmpty(modelId)) {
+        if (Strings.isEmpty(modelId)) {
             modelId = "0";
         }
     }

diff --git a/financius/src/main/java/com/code44/finance/ui/currencies/CurrencyAccountsAdapter.java b/financius/src/main/java/com/code44/finance/ui/currencies/CurrencyAccountsAdapter.java
@@ -12,7 +12,7 @@
 import android.widget.TextView;
 
 import com.code44.finance.R;
-import com.code44.finance.common.utils.StringUtils;
+import com.code44.finance.common.utils.Strings;
 import com.code44.finance.data.DataStore;
 import com.code44.finance.data.model.Account;
 import com.code44.finance.data.model.Currency;
@@ -39,7 +39,7 @@ public CurrencyAccountsAdapter(Context context) {
     }
 
     @Override public int getCount() {
-        return currency == null || StringUtils.isEmpty(currency.getCode()) ? 0 : super.getCount();
+        return currency == null || Strings.isEmpty(currency.getCode()) ? 0 : super.getCount();
     }
 
     @Override public View newView(Context context, Cursor cursor, ViewGroup parent) {