diff --git a/.travis.yml b/.travis.yml index e8002e2..1337593 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,31 +2,26 @@ language: android jdk: oraclejdk8 android: components: - # Uncomment the lines below if you want to - # use the latest revision of Android SDK Tools - - platform-tools - - tools - # The BuildTools version used by your project - - build-tools-25.0.2 + - build-tools-26.0.2 # The SDK version used to compile your project - - android-25 + - android-21 + - android-26 # Additional components - extra-google-google_play_services - extra-google-m2repository - extra-android-m2repository - - addon-google_apis-google-19 + - addon-google_apis-google-26 # Specify at least one system image, # if you need to run emulator(s) during your tests - - sys-img-armeabi-v7a-android-19 - - sys-img-x86-android-17 + - sys-img-armeabi-v7a-android-21 # Emulator Management: Create, Start and Wait before_script: - - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a + - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a - emulator -avd test -no-skin -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & diff --git a/app/build.gradle b/app/build.gradle index cc12844..d28acaf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,24 +14,22 @@ repositories { maven { url 'https://maven.fabric.io/public' } } -apply plugin: 'com.neenbedankt.android-apt' - android { - compileSdkVersion 25 - buildToolsVersion '25.0.2' + compileSdkVersion 26 + buildToolsVersion '26.0.2' defaultConfig { applicationId 'com.blogspot.e_kanivets.moneytracker' minSdkVersion 17 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 20 versionName '1.8.3' } signingConfigs { releaseConfig { - storeFile file('mt_keystore.jks'); - storePassword('moneytracker'); + storeFile file('mt_keystore.jks') + storePassword('moneytracker') keyAlias 'moneytracker' - keyPassword 'moneytracker'; + keyPassword 'moneytracker' } } buildTypes { @@ -64,13 +62,13 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') { - transitive = true; + transitive = true } - compile 'com.android.support:support-v4:25.1.0' - compile 'com.android.support:appcompat-v7:25.1.0' - compile 'com.android.support:design:25.1.0' - compile 'com.jakewharton:butterknife:7.0.1' // View annotation bindings + compile 'com.android.support:support-v4:26.1.0' + compile 'com.android.support:appcompat-v7:26.1.0' + compile 'com.android.support:design:26.1.0' + compile 'com.jakewharton:butterknife:8.5.1' // View annotation bindings compile 'com.google.dagger:dagger:2.0.1' // Dependency injection tool compile 'com.github.PhilJay:MPAndroidChart:v2.2.4' // Charts compile 'com.jakewharton.timber:timber:4.1.2' // Advanced logging tool @@ -82,6 +80,6 @@ dependencies { androidTestCompile 'com.crittercism.dexmaker:dexmaker:1.4' androidTestCompile 'com.crittercism.dexmaker:dexmaker-dx:1.4' androidTestCompile 'com.crittercism.dexmaker:dexmaker-mockito:1.4' - apt 'com.google.dagger:dagger-compiler:2.0.1' + annotationProcessor 'com.google.dagger:dagger-compiler:2.0.1' provided 'org.glassfish:javax.annotation:10.0-b28' } diff --git a/app/src/androidTest/java/com/blogspot/e_kanivets/moneytracker/repo/data/AccountRepoTest.java b/app/src/androidTest/java/com/blogspot/e_kanivets/moneytracker/repo/data/AccountRepoTest.java index cb2f27e..0a620ad 100644 --- a/app/src/androidTest/java/com/blogspot/e_kanivets/moneytracker/repo/data/AccountRepoTest.java +++ b/app/src/androidTest/java/com/blogspot/e_kanivets/moneytracker/repo/data/AccountRepoTest.java @@ -40,13 +40,16 @@ public void testGetTable() throws Exception { } public void testContentValues() throws Exception { - Account account = new Account(-1, "title1", 100, "NON", 30); + Account account = new Account(-1, "title1", 100, "NON", 30, 0, false, 0); ContentValues expected = new ContentValues(); expected.put(DbHelper.TITLE_COLUMN, "title1"); expected.put(DbHelper.CUR_SUM_COLUMN, 100L); expected.put(DbHelper.CURRENCY_COLUMN, "NON"); expected.put(DbHelper.DECIMALS_COLUMN, 30L); + expected.put(DbHelper.GOAL_COLUMN, 0.0); + expected.put(DbHelper.ARCHIVED_COLUMN, false); + expected.put(DbHelper.COLOR_COLUMN, 0); ContentValues actual = repo.contentValues(account); @@ -71,7 +74,7 @@ public void testGetListFromCursor() throws Exception { Mockito.when(mockCursor.getString(4)).thenReturn("NON"); List expected = new ArrayList<>(); - expected.add(new Account(1, "title", 100, "NON", 0)); + expected.add(new Account(1, "title", 100, "NON", 0, 0, false, 0)); assertEquals(expected, repo.getListFromCursor(mockCursor)); diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/AboutActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/AboutActivity.java index 4f250fc..59c0960 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/AboutActivity.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/AboutActivity.java @@ -6,10 +6,10 @@ import com.blogspot.e_kanivets.moneytracker.R; import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity; -import butterknife.Bind; +import butterknife.BindView; public class AboutActivity extends BaseBackActivity { - @Bind(R.id.tv_about) + @BindView(R.id.tv_about) TextView tvAbout; @Override diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ReportActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ReportActivity.java index f13327b..3332d6a 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ReportActivity.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ReportActivity.java @@ -23,7 +23,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; public class ReportActivity extends BaseBackActivity { @SuppressWarnings("unused") @@ -43,9 +43,9 @@ public class ReportActivity extends BaseBackActivity { private ShortSummaryPresenter shortSummaryPresenter; - @Bind(R.id.spinner_currency) + @BindView(R.id.spinner_currency) AppCompatSpinner spinnerCurrency; - @Bind(R.id.exp_list_view) + @BindView(R.id.exp_list_view) ExpandableListView expandableListView; @Override diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java index c889335..6f5e624 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java @@ -15,7 +15,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.OnClick; import butterknife.OnItemClick; @@ -32,7 +32,7 @@ public class AccountsActivity extends BaseBackActivity { private AccountsSummaryPresenter summaryPresenter; - @Bind(R.id.list_view) + @BindView(R.id.list_view) ListView listView; @Override diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AddAccountActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AddAccountActivity.java index 84e6595..67cd59f 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AddAccountActivity.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AddAccountActivity.java @@ -20,7 +20,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; public class AddAccountActivity extends BaseBackActivity { @SuppressWarnings("unused") @@ -33,13 +33,13 @@ public class AddAccountActivity extends BaseBackActivity { private IValidator accountValidator; - @Bind(R.id.content) + @BindView(R.id.content) View contentView; - @Bind(R.id.et_title) + @BindView(R.id.et_title) EditText etTitle; - @Bind(R.id.et_init_sum) + @BindView(R.id.et_init_sum) EditText etInitSum; - @Bind(R.id.spinner) + @BindView(R.id.spinner) AppCompatSpinner spinner; @Override diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/EditAccountActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/EditAccountActivity.java index 4039735..35fe4fd 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/EditAccountActivity.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/EditAccountActivity.java @@ -14,7 +14,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.OnClick; public class EditAccountActivity extends BaseBackActivity { @@ -26,11 +26,11 @@ public class EditAccountActivity extends BaseBackActivity { private Account account; - @Bind(R.id.et_title) + @BindView(R.id.et_title) EditText etTitle; - @Bind(R.id.et_goal) + @BindView(R.id.et_goal) EditText etGoal; - @Bind(R.id.view_color) + @BindView(R.id.view_color) View viewColor; @Override diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/TransferActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/TransferActivity.java index 346ecab..668fb73 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/TransferActivity.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/TransferActivity.java @@ -22,7 +22,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; public class TransferActivity extends BaseBackActivity { @SuppressWarnings("unused") @@ -37,15 +37,15 @@ public class TransferActivity extends BaseBackActivity { private List accountList; - @Bind(R.id.content) + @BindView(R.id.content) View contentView; - @Bind(R.id.spinner_from) + @BindView(R.id.spinner_from) AppCompatSpinner spinnerFrom; - @Bind(R.id.spinner_to) + @BindView(R.id.spinner_to) AppCompatSpinner spinnerTo; - @Bind(R.id.et_from_amount) + @BindView(R.id.et_from_amount) EditText etFromAmount; - @Bind(R.id.et_to_amount) + @BindView(R.id.et_to_amount) EditText etToAmount; @Override diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/base/BaseDrawerActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/base/BaseDrawerActivity.java index 045cf04..b581b2f 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/base/BaseDrawerActivity.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/base/BaseDrawerActivity.java @@ -18,7 +18,7 @@ import com.blogspot.e_kanivets.moneytracker.activity.exchange_rate.ExchangeRatesActivity; import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy; -import butterknife.Bind; +import butterknife.BindView; /** * Base implementation of {@link android.support.v7.app.AppCompatActivity} to encapsulate Navigation @@ -35,9 +35,9 @@ public abstract class BaseDrawerActivity extends BaseActivity private static final int REQUEST_IMPORT_EXPORT = 4; protected static final int REQUEST_BACKUP = 5; - @Bind(R.id.drawer_layout) + @BindView(R.id.drawer_layout) DrawerLayout drawer; - @Bind(R.id.nav_view) + @BindView(R.id.nav_view) protected NavigationView navigationView; protected abstract void update(); diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/ChartsActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/ChartsActivity.java index e64041a..918cb11 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/ChartsActivity.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/ChartsActivity.java @@ -23,7 +23,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; public class ChartsActivity extends BaseBackActivity { @@ -34,9 +34,9 @@ public class ChartsActivity extends BaseBackActivity { @Inject CurrencyController currencyController; - @Bind(R.id.tabs) + @BindView(R.id.tabs) TabLayout tabLayout; - @Bind(R.id.view_pager) + @BindView(R.id.view_pager) ViewPager viewPager; @Override diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/GraphFragment.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/GraphFragment.java index bb598f8..b8ef013 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/GraphFragment.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/GraphFragment.java @@ -14,7 +14,7 @@ import com.github.mikephil.charting.charts.BarChart; import com.github.mikephil.charting.data.BarData; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; /** @@ -31,7 +31,7 @@ public class GraphFragment extends Fragment { @Nullable private String noDataText; - @Bind(R.id.bar_chart) + @BindView(R.id.bar_chart) BarChart barChart; public GraphFragment() { diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/SummaryFragment.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/SummaryFragment.java index 30c57ce..509eab1 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/SummaryFragment.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/SummaryFragment.java @@ -12,7 +12,7 @@ import com.blogspot.e_kanivets.moneytracker.adapter.MonthSummaryAdapter; import com.blogspot.e_kanivets.moneytracker.report.chart.IMonthReport; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; /** @@ -26,7 +26,7 @@ public class SummaryFragment extends Fragment { @Nullable private IMonthReport monthReport; - @Bind(R.id.list_view) + @BindView(R.id.list_view) ListView listView; public SummaryFragment() { diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/AddExchangeRateActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/AddExchangeRateActivity.java index 926eb36..c24cb85 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/AddExchangeRateActivity.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/AddExchangeRateActivity.java @@ -23,7 +23,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; public class AddExchangeRateActivity extends BaseBackActivity { @SuppressWarnings("unused") @@ -44,15 +44,15 @@ public class AddExchangeRateActivity extends BaseBackActivity { @Nullable private ExchangeRatePair exchangeRatePair; - @Bind(R.id.content) + @BindView(R.id.content) View contentView; - @Bind(R.id.spinner_from_currency) + @BindView(R.id.spinner_from_currency) AppCompatSpinner spinnerFromCurrency; - @Bind(R.id.spinner_to_currency) + @BindView(R.id.spinner_to_currency) AppCompatSpinner spinnerToCurrency; - @Bind(R.id.et_buy) + @BindView(R.id.et_buy) EditText etBuy; - @Bind(R.id.et_sell) + @BindView(R.id.et_sell) EditText etSell; @Override diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java index 4c2e7bf..3628eaa 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java @@ -22,7 +22,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.OnClick; import butterknife.OnItemClick; @@ -37,7 +37,7 @@ public class ExchangeRatesActivity extends BaseBackActivity { private List exchangeRateList; - @Bind(R.id.list_view) + @BindView(R.id.list_view) ListView listView; @Override diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/BackupActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/BackupActivity.java index 9d59c04..64590ea 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/BackupActivity.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/BackupActivity.java @@ -21,7 +21,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.OnClick; import butterknife.OnItemClick; import timber.log.Timber; @@ -37,9 +37,9 @@ public class BackupActivity extends BaseBackActivity { private DropboxAPI dbApi; - @Bind(R.id.btn_backup_now) + @BindView(R.id.btn_backup_now) View btnBackupNow; - @Bind(R.id.list_view) + @BindView(R.id.list_view) ListView listView; @Override diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/ImportExportActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/ImportExportActivity.java index e80c1a9..0549f63 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/ImportExportActivity.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/ImportExportActivity.java @@ -24,7 +24,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.OnClick; import timber.log.Timber; @@ -36,7 +36,7 @@ public class ImportExportActivity extends BaseBackActivity { @Inject ExportController exportController; - @Bind(R.id.et_import_data) + @BindView(R.id.et_import_data) EditText etImportData; @Override diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/AddRecordActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/AddRecordActivity.java index 3bb5d19..1e04b51 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/AddRecordActivity.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/AddRecordActivity.java @@ -45,7 +45,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.OnClick; /** @@ -84,19 +84,19 @@ public class AddRecordActivity extends BaseBackActivity { private AddRecordUiDecorator uiDecorator; private CategoryAutoCompleter autoCompleter; - @Bind(R.id.content) + @BindView(R.id.content) View contentView; - @Bind(R.id.tv_date) + @BindView(R.id.tv_date) TextView tvDate; - @Bind(R.id.tv_time) + @BindView(R.id.tv_time) TextView tvTime; - @Bind(R.id.et_title) + @BindView(R.id.et_title) EditText etTitle; - @Bind(R.id.et_category) + @BindView(R.id.et_category) AutoCompleteTextView etCategory; - @Bind(R.id.et_price) + @BindView(R.id.et_price) EditText etPrice; - @Bind(R.id.spinner_account) + @BindView(R.id.spinner_account) AppCompatSpinner spinnerAccount; @Override diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.java index 14aec7e..aa7fded 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.java @@ -28,13 +28,12 @@ import com.blogspot.e_kanivets.moneytracker.ui.presenter.ShortSummaryPresenter; import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.OnClick; import butterknife.OnItemClick; @@ -64,9 +63,9 @@ public class MainActivity extends BaseDrawerActivity { private ShortSummaryPresenter summaryPresenter; - @Bind(R.id.list_view) + @BindView(R.id.list_view) ListView listView; - @Bind(R.id.spinner_period) + @BindView(R.id.spinner_period) PeriodSpinner spinner; TextView tvDefaultAccountTitle; diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/AccountAdapter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/AccountAdapter.java index 016ff27..c6afbb2 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/AccountAdapter.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/AccountAdapter.java @@ -17,7 +17,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; /** @@ -101,11 +101,11 @@ public View getView(final int position, View convertView, ViewGroup parent) { } public static class ViewHolder { - @Bind(R.id.tv_title) + @BindView(R.id.tv_title) TextView tvTitle; - @Bind(R.id.tv_cur_sum) + @BindView(R.id.tv_cur_sum) TextView tvCurSum; - @Bind(R.id.tv_currency) + @BindView(R.id.tv_currency) TextView tvCurrency; public ViewHolder(View view) { diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/CategoryAutoCompleteAdapter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/CategoryAutoCompleteAdapter.java index 234c1bc..d0b0e11 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/CategoryAutoCompleteAdapter.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/CategoryAutoCompleteAdapter.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; /** @@ -98,9 +98,9 @@ protected void publishResults(CharSequence constraint, FilterResults results) { } public static class ViewHolder { - @Bind(R.id.tv_category) + @BindView(R.id.tv_category) TextView tvCategory; - @Bind(R.id.iv_cancel) + @BindView(R.id.iv_cancel) View ivCancel; public ViewHolder(View view) { diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/ExchangeRateAdapter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/ExchangeRateAdapter.java index 97be2aa..ff1ef4d 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/ExchangeRateAdapter.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/ExchangeRateAdapter.java @@ -17,7 +17,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; /** @@ -79,13 +79,13 @@ public View getView(final int position, View convertView, ViewGroup parent) { } public static class ViewHolder { - @Bind(R.id.tv_from_currency) + @BindView(R.id.tv_from_currency) TextView tvFromCurrency; - @Bind(R.id.tv_to_currency) + @BindView(R.id.tv_to_currency) TextView tvToCurrency; - @Bind(R.id.tv_amount_buy) + @BindView(R.id.tv_amount_buy) TextView tvAmountBuy; - @Bind(R.id.tv_amount_sell) + @BindView(R.id.tv_amount_sell) TextView tvAmountSell; public ViewHolder(View view) { diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/ExpandableListReportAdapter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/ExpandableListReportAdapter.java index 4018db3..2961e15 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/ExpandableListReportAdapter.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/ExpandableListReportAdapter.java @@ -17,7 +17,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; /** @@ -95,9 +95,9 @@ private void customizeView(View view, Map values, boolean groupV } public static class ViewHolder { - @Bind(R.id.tv_category) + @BindView(R.id.tv_category) TextView tvCategory; - @Bind(R.id.tv_total) + @BindView(R.id.tv_total) TextView tvTotal; public ViewHolder(View view) { diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/MonthSummaryAdapter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/MonthSummaryAdapter.java index 553b0f7..a156d05 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/MonthSummaryAdapter.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/MonthSummaryAdapter.java @@ -18,7 +18,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; /** @@ -99,11 +99,11 @@ public View getView(int position, View convertView, ViewGroup parent) { } public static class ViewHolder { - @Bind(R.id.tv_month) + @BindView(R.id.tv_month) TextView tvMonth; - @Bind(R.id.tv_total_income) + @BindView(R.id.tv_total_income) TextView tvTotalIncome; - @Bind(R.id.tv_total_expense) + @BindView(R.id.tv_total_expense) TextView tvTotalExpense; public ViewHolder(View view) { diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.java index 95d684e..5c8a31e 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/RecordAdapter.java @@ -17,7 +17,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; /** @@ -96,17 +96,17 @@ public View getView(final int position, View convertView, ViewGroup parent) { } public static class ViewHolder { - @Bind(R.id.container) + @BindView(R.id.container) View container; - @Bind(R.id.tv_date_and_time) + @BindView(R.id.tv_date_and_time) TextView tvDateAndTime; - @Bind(R.id.tv_price) + @BindView(R.id.tv_price) TextView tvPrice; - @Bind(R.id.tv_title) + @BindView(R.id.tv_title) TextView tvTitle; - @Bind(R.id.tv_category) + @BindView(R.id.tv_category) TextView tvCategory; - @Bind(R.id.tv_currency) + @BindView(R.id.tv_currency) TextView tvCurrency; public ViewHolder(View view) { diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/ChangeDateDialog.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/ChangeDateDialog.java index d963355..eb11fb0 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/ChangeDateDialog.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/ChangeDateDialog.java @@ -10,7 +10,7 @@ import java.util.Calendar; import java.util.Date; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; @@ -24,7 +24,7 @@ public class ChangeDateDialog extends AlertDialog{ private Date date; private OnDateChangedListener listener; - @Bind(R.id.datePicker) + @BindView(R.id.datePicker) DatePicker datePicker; public ChangeDateDialog(Context context, Date date, OnDateChangedListener listener) { diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/AccountsSummaryPresenter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/AccountsSummaryPresenter.java index d628b55..858cb31 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/AccountsSummaryPresenter.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/AccountsSummaryPresenter.java @@ -22,7 +22,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; /** @@ -116,11 +116,11 @@ public void update() { } public static class ViewHolder { - @Bind(R.id.spinner_currency) + @BindView(R.id.spinner_currency) AppCompatSpinner spinnerCurrency; - @Bind(R.id.tv_total) + @BindView(R.id.tv_total) TextView tvTotal; - @Bind(R.id.tv_currency) + @BindView(R.id.tv_currency) TextView tvCurrency; public ViewHolder(View view) { diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java index f6af61c..85213e1 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/presenter/ShortSummaryPresenter.java @@ -15,7 +15,7 @@ import javax.inject.Inject; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; /** @@ -81,13 +81,13 @@ public void update(IRecordReport report, String currency, List ratesNeed } public static class ViewHolder { - @Bind(R.id.tv_period) + @BindView(R.id.tv_period) TextView tvPeriod; - @Bind(R.id.tv_total_income) + @BindView(R.id.tv_total_income) TextView tvTotalIncome; - @Bind(R.id.tv_total_expense) + @BindView(R.id.tv_total_expense) TextView tvTotalExpense; - @Bind(R.id.tv_total) + @BindView(R.id.tv_total) TextView tvTotal; public ViewHolder(View view) { diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/AccountValidator.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/AccountValidator.java index 0402299..0d095ed 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/AccountValidator.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/AccountValidator.java @@ -10,7 +10,7 @@ import com.blogspot.e_kanivets.moneytracker.R; import com.blogspot.e_kanivets.moneytracker.entity.data.Account; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; /** @@ -25,15 +25,15 @@ public class AccountValidator implements IValidator { @NonNull private final Context context; - @Bind(R.id.til_title) + @BindView(R.id.til_title) TextInputLayout tilTitle; - @Bind(R.id.et_title) + @BindView(R.id.et_title) EditText etTitle; - @Bind(R.id.til_init_sum) + @BindView(R.id.til_init_sum) TextInputLayout tilInitSum; - @Bind(R.id.et_init_sum) + @BindView(R.id.et_init_sum) EditText etInitSum; - @Bind(R.id.spinner) + @BindView(R.id.spinner) AppCompatSpinner spinner; public AccountValidator(@NonNull Context context, @NonNull View view) { diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/ExchangeRatePairValidator.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/ExchangeRatePairValidator.java index c7c99af..d9db7dc 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/ExchangeRatePairValidator.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/ExchangeRatePairValidator.java @@ -11,7 +11,7 @@ import com.blogspot.e_kanivets.moneytracker.R; import com.blogspot.e_kanivets.moneytracker.entity.ExchangeRatePair; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; /** @@ -27,17 +27,17 @@ public class ExchangeRatePairValidator implements IValidator { @NonNull private final Context context; - @Bind(R.id.spinner_from_currency) + @BindView(R.id.spinner_from_currency) AppCompatSpinner spinnerFromCurrency; - @Bind(R.id.spinner_to_currency) + @BindView(R.id.spinner_to_currency) AppCompatSpinner spinnerToCurrency; - @Bind(R.id.til_buy) + @BindView(R.id.til_buy) TextInputLayout tilBuy; - @Bind(R.id.et_buy) + @BindView(R.id.et_buy) EditText etBuy; - @Bind(R.id.til_sell) + @BindView(R.id.til_sell) TextInputLayout tilSell; - @Bind(R.id.et_sell) + @BindView(R.id.et_sell) EditText etSell; public ExchangeRatePairValidator(@NonNull Context context, @NonNull View view) { diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/RecordValidator.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/RecordValidator.java index c04a6e3..3a842a9 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/RecordValidator.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/RecordValidator.java @@ -11,7 +11,7 @@ import com.blogspot.e_kanivets.moneytracker.R; import com.blogspot.e_kanivets.moneytracker.entity.data.Record; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; /** @@ -26,19 +26,19 @@ public class RecordValidator implements IValidator { @NonNull private final Context context; - @Bind(R.id.til_title) + @BindView(R.id.til_title) TextInputLayout tilTitle; - @Bind(R.id.et_title) + @BindView(R.id.et_title) EditText etTitle; - @Bind(R.id.til_category) + @BindView(R.id.til_category) TextInputLayout tilCategory; - @Bind(R.id.et_category) + @BindView(R.id.et_category) EditText etCategory; - @Bind(R.id.til_price) + @BindView(R.id.til_price) TextInputLayout tilPrice; - @Bind(R.id.et_price) + @BindView(R.id.et_price) EditText etPrice; - @Bind(R.id.spinner_account) + @BindView(R.id.spinner_account) AppCompatSpinner spinnerAccount; public RecordValidator(@NonNull Context context, @NonNull View view) { diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/TransferValidator.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/TransferValidator.java index 4bfa153..ea01edf 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/TransferValidator.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/TransferValidator.java @@ -11,7 +11,7 @@ import com.blogspot.e_kanivets.moneytracker.R; import com.blogspot.e_kanivets.moneytracker.entity.data.Transfer; -import butterknife.Bind; +import butterknife.BindView; import butterknife.ButterKnife; /** @@ -27,17 +27,17 @@ public class TransferValidator implements IValidator { @NonNull private final Context context; - @Bind(R.id.spinner_from) + @BindView(R.id.spinner_from) AppCompatSpinner spinnerFrom; - @Bind(R.id.spinner_to) + @BindView(R.id.spinner_to) AppCompatSpinner spinnerTo; - @Bind(R.id.til_from_amount) + @BindView(R.id.til_from_amount) TextInputLayout tilFromAmount; - @Bind(R.id.et_from_amount) + @BindView(R.id.et_from_amount) EditText etFromAmount; - @Bind(R.id.til_to_amount) + @BindView(R.id.til_to_amount) TextInputLayout tilToAmount; - @Bind(R.id.et_to_amount) + @BindView(R.id.et_to_amount) EditText etToAmount; public TransferValidator(@NonNull Context context, @NonNull View view) { diff --git a/app/src/test/java/com/blogspot/e_kanivets/moneytracker/controller/CurrencyControllerTest.java b/app/src/test/java/com/blogspot/e_kanivets/moneytracker/controller/CurrencyControllerTest.java index fc6ae90..ff13b04 100644 --- a/app/src/test/java/com/blogspot/e_kanivets/moneytracker/controller/CurrencyControllerTest.java +++ b/app/src/test/java/com/blogspot/e_kanivets/moneytracker/controller/CurrencyControllerTest.java @@ -26,7 +26,7 @@ public void testReadDefaultCurrency() throws Exception { Mockito.when(accountMock.readDefaultAccount()).thenReturn(null); assertEquals("NON", currencyController.readDefaultCurrency()); - Account account = new Account(1, "a1", 100, "ACM", 0); + Account account = new Account(1, "a1", 100, "ACM", 0, 0, false, 0); Mockito.when(prefsMock.readDefaultCurrency()).thenReturn(null); Mockito.when(accountMock.readDefaultAccount()).thenReturn(account); assertEquals(account.getCurrency(), currencyController.readDefaultCurrency()); diff --git a/app/src/test/java/com/blogspot/e_kanivets/moneytracker/controller/data/AccountControllerTest.java b/app/src/test/java/com/blogspot/e_kanivets/moneytracker/controller/data/AccountControllerTest.java index 5556aa7..6a38f35 100644 --- a/app/src/test/java/com/blogspot/e_kanivets/moneytracker/controller/data/AccountControllerTest.java +++ b/app/src/test/java/com/blogspot/e_kanivets/moneytracker/controller/data/AccountControllerTest.java @@ -52,7 +52,7 @@ public void tearDown() throws Exception { @Test public void testRecordAdded() throws Exception { Category category = new Category(1, "c1"); - Account account = new Account(1, "a1", 100, "NON", 0); + Account account = new Account(1, "a1", 100, "NON", 0, 0, false, 0); repo.create(account); Record income = new Record(1, 1, Record.TYPE_INCOME, "income", category, 10, account, @@ -78,7 +78,7 @@ public void testRecordAdded() throws Exception { @Test public void testRecordDeleted() throws Exception { Category category = new Category(1, "c1"); - Account account = new Account(1, "a1", 100, "NON", 0); + Account account = new Account(1, "a1", 100, "NON", 0, 0, false, 0); repo.create(account); Record income = new Record(1, 1, Record.TYPE_INCOME, "income", category, 10, account, @@ -104,7 +104,7 @@ public void testRecordDeleted() throws Exception { @Test public void testRecordUpdated() throws Exception { Category category = new Category(1, "c1"); - Account account = new Account(1, "a1", 100, "NON", 0); + Account account = new Account(1, "a1", 100, "NON", 0, 0, false, 0); repo.create(account); Record incomeOld = new Record(1, 1, Record.TYPE_INCOME, "income", category, 10, account, @@ -139,8 +139,8 @@ public void testRecordUpdated() throws Exception { @Test public void testTransferDone() throws Exception { - Account account1 = new Account(1, "a1", 100, "NON", 0); - Account account2 = new Account(2, "a2", 0, "NON", 0); + Account account1 = new Account(1, "a1", 100, "NON", 0, 0, false, 0); + Account account2 = new Account(2, "a2", 0, "NON", 0, 0, false, 0); repo.create(account1); repo.create(account2); @@ -174,11 +174,11 @@ public void testTransferDone() throws Exception { public void testReadDefaultAccount() throws Exception { assertNull(accountController.readDefaultAccount()); - Account account1 = new Account(1, "a1", 100, "NON", 0); + Account account1 = new Account(1, "a1", 100, "NON", 0, 0, false, 0); repo.create(account1); assertEquals(account1, accountController.readDefaultAccount()); - Account account2 = new Account(2, "a2", 0, "NON", 0); + Account account2 = new Account(2, "a2", 0, "NON", 0, 0, false, 0); repo.create(account2); assertEquals(account1, accountController.readDefaultAccount()); diff --git a/app/src/test/java/com/blogspot/e_kanivets/moneytracker/controller/data/RecordControllerTest.java b/app/src/test/java/com/blogspot/e_kanivets/moneytracker/controller/data/RecordControllerTest.java index d9a4020..274299f 100644 --- a/app/src/test/java/com/blogspot/e_kanivets/moneytracker/controller/data/RecordControllerTest.java +++ b/app/src/test/java/com/blogspot/e_kanivets/moneytracker/controller/data/RecordControllerTest.java @@ -60,7 +60,7 @@ public void testCreate() throws Exception { Mockito.verify(accountMock, Mockito.times(0)).recordAdded(null); Category category = new Category(1, "c1"); - Account account = new Account(1, "a1", 100, "NON", 0); + Account account = new Account(1, "a1", 100, "NON", 0, 0, false, 0); Record record = new Record(1, 1, Record.TYPE_INCOME, "r1", category, 10, account, "NON"); Mockito.when(categoryMock.readOrCreate(category.getName())).thenReturn(category); @@ -78,7 +78,7 @@ public void testUpdate() throws Exception { Mockito.verify(accountMock, Mockito.times(0)).recordAdded(null); Category category = new Category(1, "c1"); - Account account = new Account(1, "a1", 100, "NON", 0); + Account account = new Account(1, "a1", 100, "NON", 0, 0, false, 0); Record record = new Record(1, 1, Record.TYPE_INCOME, "r1", category, 10, account, "NON"); Mockito.when(categoryMock.readOrCreate(category.getName())).thenReturn(category); @@ -95,7 +95,7 @@ public void testDelete() throws Exception { Mockito.verify(accountMock, Mockito.times(0)).recordDeleted(null); Category category = new Category(1, "c1"); - Account account = new Account(1, "a1", 100, "NON", 0); + Account account = new Account(1, "a1", 100, "NON", 0, 0, false, 0); Record record = new Record(1, 1, Record.TYPE_INCOME, "r1", category, 10, account, "NON"); assertFalse(recordController.delete(record)); @@ -112,7 +112,7 @@ public void testRead() throws Exception { assertNull(recordController.read(-1)); Category category = new Category(1, "c1"); - Account account = new Account(1, "a1", 100, "NON", 0); + Account account = new Account(1, "a1", 100, "NON", 0, 0, false, 0); Record recordNotFull = new Record(1, 1, Record.TYPE_INCOME, "r1", category.getId(), 10, account.getId(), "NON", 0); Record record = new Record(1, 1, Record.TYPE_INCOME, "r1", category, 10, account, "NON"); diff --git a/app/src/test/java/com/blogspot/e_kanivets/moneytracker/report/ReportTest.java b/app/src/test/java/com/blogspot/e_kanivets/moneytracker/report/ReportTest.java index 75116de..42deb1a 100644 --- a/app/src/test/java/com/blogspot/e_kanivets/moneytracker/report/ReportTest.java +++ b/app/src/test/java/com/blogspot/e_kanivets/moneytracker/report/ReportTest.java @@ -175,8 +175,8 @@ public void testGetSummary() throws Exception { List recordList = new ArrayList<>(); Category category = new Category(1, "category"); - Account account1 = new Account(1, "account1", 100, "UAH", 0); - Account account2 = new Account(2, "account2", 100, "USD", 0); + Account account1 = new Account(1, "account1", 100, "UAH", 0, 0, false, 0); + Account account2 = new Account(2, "account2", 100, "USD", 0, 0, false, 0); Record record1 = new Record(1, 0, Record.TYPE_INCOME, "1", category, 10, account2, "USD"); recordList.add(record1); @@ -220,8 +220,8 @@ private List getRecordList() { List recordList = new ArrayList<>(); Category category = new Category(1, "category"); - Account account1 = new Account(1, "account1", 100, "UAH", 0); - Account account2 = new Account(2, "account2", 100, "USD", 0); + Account account1 = new Account(1, "account1", 100, "UAH", 0, 0, false, 0); + Account account2 = new Account(2, "account2", 100, "USD", 0, 0, false, 0); Record record1 = new Record(1, 0, Record.TYPE_INCOME, "1", category, 10, account2, "USD"); recordList.add(record1); diff --git a/build.gradle b/build.gradle index 67cbb59..1535c90 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,10 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4' classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.2' } @@ -11,8 +12,11 @@ buildscript { allprojects { repositories { + google() + jcenter() mavenCentral() maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } maven { url "https://jitpack.io" } + maven { url "https://maven.google.com" } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 50930a9..a9609a0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jul 27 13:57:32 EEST 2017 +#Wed Nov 29 19:03:06 EET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip