From d0c6f542b0ebb194b447ccb818fc571111a945ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80lex=20Magaz=20Gra=C3=A7a?= Date: Wed, 24 Jun 2015 18:10:30 +0200 Subject: [PATCH 001/225] Replace ActionBarSherlock with appcompat support v7 library. --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index e13248646..8a9007eab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -152,7 +152,7 @@ afterEvaluate { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile('com.android.support:support-v4:22.1.1', - 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar', + 'com.android.support:appcompat-v7:22.1.0', 'com.viewpagerindicator:library:2.4.1@aar', 'com.doomonafireball.betterpickers:library:1.6.0', 'com.commonsware.cwac:merge:1.1.+', From 61462ffbe436c14a70fee116e087459d6f0cc57d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80lex=20Magaz=20Gra=C3=A7a?= Date: Wed, 24 Jun 2015 19:07:40 +0200 Subject: [PATCH 002/225] Avoid BetterPickers conflicting with support v7 appcompat. See: https://github.com/derekbrameyer/android-betterpickers/issues/120 https://github.com/derekbrameyer/android-betterpickers#including-in-your-project --- app/build.gradle | 1 + build.gradle | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 8a9007eab..6353a54b9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -155,6 +155,7 @@ dependencies { 'com.android.support:appcompat-v7:22.1.0', 'com.viewpagerindicator:library:2.4.1@aar', 'com.doomonafireball.betterpickers:library:1.6.0', + 'org.jraf:android-switch-backport:1.4.0@aar', 'com.commonsware.cwac:merge:1.1.+', 'com.github.PhilJay:MPAndroidChart:v2.1.0', 'joda-time:joda-time:2.7', diff --git a/build.gradle b/build.gradle index 3b732287f..621fc92e5 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,8 @@ allprojects { maven { url "https://repo.commonsware.com.s3.amazonaws.com"} maven { url 'http://download.crashlytics.com/maven' } maven { url "https://jitpack.io" } - jcenter() + maven { url "http://JRAF.org/static/maven/2" } + jcenter() mavenCentral() } } \ No newline at end of file From d2454f2145d2533fdbef4c0724c61223b131b040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80lex=20Magaz=20Gra=C3=A7a?= Date: Wed, 24 Jun 2015 20:06:49 +0200 Subject: [PATCH 003/225] Adjust versions in build.gradle to avoid problems and use the latest features from the support library. --- app/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6353a54b9..93d60a067 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,13 +20,13 @@ def gitSha() { android { - compileSdkVersion 19 - buildToolsVersion "21.1.2" //maintain this version until we migrate to ActionBarCompat + compileSdkVersion 22 + buildToolsVersion "22.0.1" defaultConfig { applicationId "org.gnucash.android" testApplicationId 'org.gnucash.android.test' minSdkVersion 10 - targetSdkVersion 19 + targetSdkVersion 22 versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild versionName "${versionMajor}.${versionMinor}.${versionPatch}" resValue "string", "app_version_name", "${versionName}" @@ -151,8 +151,8 @@ afterEvaluate { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile('com.android.support:support-v4:22.1.1', - 'com.android.support:appcompat-v7:22.1.0', + compile('com.android.support:support-v4:22.2.0', + 'com.android.support:appcompat-v7:22.2.0', 'com.viewpagerindicator:library:2.4.1@aar', 'com.doomonafireball.betterpickers:library:1.6.0', 'org.jraf:android-switch-backport:1.4.0@aar', @@ -173,5 +173,5 @@ dependencies { exclude group: 'com.android.support', module:'support-annotations' } androidTestCompile ('com.android.support.test.espresso:espresso-core:2.1') - androidTestCompile 'com.android.support:support-annotations:22.1.1' + androidTestCompile 'com.android.support:support-annotations:22.2.0' } \ No newline at end of file From e2efa9215d9dc2ef7054e3806d3dc8ba550335bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80lex=20Magaz=20Gra=C3=A7a?= Date: Thu, 25 Jun 2015 17:23:09 +0200 Subject: [PATCH 004/225] Fix errors in XML resources. --- app/src/main/res/drawable/numeric_button.xml | 8 ++++---- app/src/main/res/drawable/selected_background.xml | 4 ++-- app/src/main/res/layout/default_buttons.xml | 6 +++--- app/src/main/res/layout/fragment_accounts_list.xml | 2 +- .../main/res/layout/fragment_scheduled_events_list.xml | 2 +- app/src/main/res/layout/fragment_transactions_list.xml | 2 +- app/src/main/res/layout/transactions_sum_bar.xml | 3 ++- app/src/main/res/menu/global_actions.xml | 4 ++-- app/src/main/res/values/styles.xml | 6 +++--- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/app/src/main/res/drawable/numeric_button.xml b/app/src/main/res/drawable/numeric_button.xml index 610ad3499..696f061cb 100644 --- a/app/src/main/res/drawable/numeric_button.xml +++ b/app/src/main/res/drawable/numeric_button.xml @@ -25,18 +25,18 @@ android:radius="200dp" /> + android:color="@color/vpi__bright_foreground_disabled_holo_light" /> + android:color="@color/abc_primary_text_disable_only_material_dark" /> + android:color="@color/vpi__bright_foreground_disabled_holo_light" /> @@ -46,7 +46,7 @@ android:radius="200dp" /> + android:color="@color/vpi__bright_foreground_disabled_holo_light" /> diff --git a/app/src/main/res/drawable/selected_background.xml b/app/src/main/res/drawable/selected_background.xml index dc2f9cc35..9c4e8722b 100644 --- a/app/src/main/res/drawable/selected_background.xml +++ b/app/src/main/res/drawable/selected_background.xml @@ -1,8 +1,8 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/default_buttons.xml b/app/src/main/res/layout/default_buttons.xml index 83fb30646..067e77671 100644 --- a/app/src/main/res/layout/default_buttons.xml +++ b/app/src/main/res/layout/default_buttons.xml @@ -27,13 +27,13 @@ -