diff --git a/app/build.gradle b/app/build.gradle
index ff3c28f7..a2c1fcda 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,7 +19,7 @@ android {
defaultConfig {
minSdkVersion 14
- targetSdkVersion 21
+ targetSdkVersion 22
multiDexEnabled true
}
diff --git a/app/src/main/java/org/ethereum/android_app/MainActivity.java b/app/src/main/java/org/ethereum/android_app/MainActivity.java
index 3a29109e..17b2a209 100644
--- a/app/src/main/java/org/ethereum/android_app/MainActivity.java
+++ b/app/src/main/java/org/ethereum/android_app/MainActivity.java
@@ -62,7 +62,7 @@ public class MainActivity extends ActionBarActivity {
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
- Log.v(TAG, new Integer(id).toString());
+ Log.v(TAG, Integer.valueOf(id).toString());
//noinspection SimplifiableIfStatement
if (id == R.id.action_settings) {
return true;
diff --git a/app/src/main/java/org/ethereum/android_app/SlidingTabStrip.java b/app/src/main/java/org/ethereum/android_app/SlidingTabStrip.java
index 875d052b..da123eeb 100644
--- a/app/src/main/java/org/ethereum/android_app/SlidingTabStrip.java
+++ b/app/src/main/java/org/ethereum/android_app/SlidingTabStrip.java
@@ -1,6 +1,5 @@
package org.ethereum.android_app;
-import android.R;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Color;
@@ -42,7 +41,7 @@ class SlidingTabStrip extends LinearLayout {
final float density = getResources().getDisplayMetrics().density;
TypedValue outValue = new TypedValue();
- context.getTheme().resolveAttribute(R.attr.colorForeground, outValue, true);
+ context.getTheme().resolveAttribute(android.R.attr.colorForeground, outValue, true);
final int themeForegroundColor = outValue.data;
mDefaultBottomBorderColor = setColorAlpha(themeForegroundColor,
diff --git a/app/src/main/res/drawable-hdpi/drawer_shadow.9.png b/app/src/main/res/drawable-hdpi/drawer_shadow.9.png
deleted file mode 100644
index 236bff55..00000000
Binary files a/app/src/main/res/drawable-hdpi/drawer_shadow.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_drawer.png b/app/src/main/res/drawable-hdpi/ic_drawer.png
deleted file mode 100644
index c59f601c..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_drawer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_menu_check.png b/app/src/main/res/drawable-hdpi/ic_menu_check.png
deleted file mode 100644
index af35ffdb..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_menu_check.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/drawer_shadow.9.png b/app/src/main/res/drawable-mdpi/drawer_shadow.9.png
deleted file mode 100644
index ffe3a28d..00000000
Binary files a/app/src/main/res/drawable-mdpi/drawer_shadow.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_drawer.png b/app/src/main/res/drawable-mdpi/ic_drawer.png
deleted file mode 100644
index 1ed2c56e..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_drawer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_menu_check.png b/app/src/main/res/drawable-mdpi/ic_menu_check.png
deleted file mode 100644
index 80e46c61..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_menu_check.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png
deleted file mode 100644
index fabe9d96..00000000
Binary files a/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_drawer.png b/app/src/main/res/drawable-xhdpi/ic_drawer.png
deleted file mode 100644
index a5fa74de..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_drawer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_check.png b/app/src/main/res/drawable-xhdpi/ic_menu_check.png
deleted file mode 100644
index b71bc71b..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_check.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png
deleted file mode 100644
index b91e9d7f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_drawer.png b/app/src/main/res/drawable-xxhdpi/ic_drawer.png
deleted file mode 100644
index 9c4685d6..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_drawer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_menu_check.png b/app/src/main/res/drawable-xxhdpi/ic_menu_check.png
deleted file mode 100644
index 84aad60e..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_menu_check.png and /dev/null differ
diff --git a/app/src/main/res/drawable/row_selector.xml b/app/src/main/res/drawable/row_selector.xml
deleted file mode 100644
index 9d3138e8..00000000
--- a/app/src/main/res/drawable/row_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b8311cd4..7a5f47c3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -15,12 +15,11 @@ tools:context=".MainActivity">
+ android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/fragment_console.xml b/app/src/main/res/layout/fragment_console.xml
index e5f54eea..3ed25685 100644
--- a/app/src/main/res/layout/fragment_console.xml
+++ b/app/src/main/res/layout/fragment_console.xml
@@ -5,8 +5,8 @@
diff --git a/app/src/main/res/layout/fragment_tests.xml b/app/src/main/res/layout/fragment_tests.xml
index 3b4d8f47..43783032 100644
--- a/app/src/main/res/layout/fragment_tests.xml
+++ b/app/src/main/res/layout/fragment_tests.xml
@@ -5,7 +5,7 @@
diff --git a/app/src/main/res/layout/toolbar_default.xml b/app/src/main/res/layout/toolbar_default.xml
index fe41dc93..112579bc 100644
--- a/app/src/main/res/layout/toolbar_default.xml
+++ b/app/src/main/res/layout/toolbar_default.xml
@@ -2,6 +2,5 @@
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6914552e..f179793d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,7 +11,6 @@
#2196F3
#1976D2
#FF4081
- #FFF
#FFF
#212121
#000
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index d74bbd97..27233ab7 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,10 +1,3 @@
-
- 16dp
- 16dp
-
-
- 240dp
4dp
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2d42e714..f6f2585e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,18 +1,10 @@
Ethereum-android
- Hello world!
Settings
- MenuActivity
- Console
- Wallet
- Section 3
+ Console Output:
- Open navigation drawer
- Close navigation drawer
+ EthereumJ Tests
- Example action
- Menu opened
- Menu closed
diff --git a/ethereumj-core-android/build.gradle b/ethereumj-core-android/build.gradle
index 9e85e9a0..86cd8034 100644
--- a/ethereumj-core-android/build.gradle
+++ b/ethereumj-core-android/build.gradle
@@ -35,6 +35,10 @@ android {
}
}
+tasks.withType(JavaCompile){
+ options.warnings = false
+}
+
dependencies {
apt 'com.google.dagger:dagger-compiler:2.0'
compile fileTree(dir: 'libs', include: ['*.jar'])
@@ -52,4 +56,5 @@ dependencies {
compile "org.glassfish:javax.annotation:10.0-b28"
compile "org.iq80.leveldb:leveldb:0.7"
compile 'org.slf4j:slf4j-android:1.7.12'
+ compile 'javax.persistence:persistence-api:1.0.2'
}