Some lint fixes.
|
@ -19,7 +19,7 @@ android {
|
|||
|
||||
defaultConfig {
|
||||
minSdkVersion 14
|
||||
targetSdkVersion 21
|
||||
targetSdkVersion 22
|
||||
multiDexEnabled true
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
Before Width: | Height: | Size: 161 B |
Before Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 212 B |
Before Width: | Height: | Size: 142 B |
Before Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 163 B |
Before Width: | Height: | Size: 174 B |
Before Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 232 B |
Before Width: | Height: | Size: 208 B |
Before Width: | Height: | Size: 202 B |
Before Width: | Height: | Size: 329 B |
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_selected="true" android:drawable="@drawable/selected_gray"/>
|
||||
<item android:state_pressed="true" android:drawable="@drawable/pressed_gray"/>
|
||||
</selector>
|
|
@ -15,12 +15,11 @@ tools:context=".MainActivity">
|
|||
<org.ethereum.android_app.SlidingTabLayout
|
||||
android:id="@+id/tabs"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:elevation="2dp"/>
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
<android.support.v4.view.ViewPager
|
||||
android:id="@+id/pager"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_weight="1">
|
||||
</android.support.v4.view.ViewPager>
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
<TextView android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="top"
|
||||
android:text="Console Output:"
|
||||
android:textSize="14dp"
|
||||
android:text="@string/console_output"
|
||||
android:textSize="14sp"
|
||||
android:layout_centerInParent="true"
|
||||
android:id="@+id/console"/>
|
||||
</RelativeLayout>
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<TextView android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="EthereumJ Tests"
|
||||
android:textSize="20dp"
|
||||
android:text="@string/ethereumj_tests"
|
||||
android:textSize="20sp"
|
||||
android:layout_centerInParent="true"/>
|
||||
</RelativeLayout>
|
||||
|
|
|
@ -2,6 +2,5 @@
|
|||
<android.support.v7.widget.Toolbar
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:elevation="2dp"
|
||||
android:theme="@style/Base.ThemeOverlay.AppCompat.Dark"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android" />
|
||||
|
|
|
@ -11,7 +11,6 @@
|
|||
<color name="myPrimaryColor">#2196F3</color>
|
||||
<color name="myPrimaryDarkColor">#1976D2</color>
|
||||
<color name="myAccentColor">#FF4081</color>
|
||||
<color name="myDrawerBackground">#FFF</color>
|
||||
<color name="myWindowBackground">#FFF</color>
|
||||
<color name="myTextPrimaryColor">#212121</color>
|
||||
<color name="myNavigationColor">#000</color>
|
||||
|
|
|
@ -1,10 +1,3 @@
|
|||
<resources>
|
||||
<!-- Default screen margins, per the Android Design guidelines. -->
|
||||
<dimen name="activity_horizontal_margin">16dp</dimen>
|
||||
<dimen name="activity_vertical_margin">16dp</dimen>
|
||||
|
||||
<!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
|
||||
https://developer.android.com/design/patterns/navigation-drawer.html -->
|
||||
<dimen name="navigation_drawer_width">240dp</dimen>
|
||||
<dimen name="toolbar_elevation">4dp</dimen>
|
||||
</resources>
|
||||
|
|
|
@ -1,18 +1,10 @@
|
|||
<resources>
|
||||
<string name="app_name">Ethereum-android</string>
|
||||
|
||||
<string name="hello_world">Hello world!</string>
|
||||
<string name="action_settings">Settings</string>
|
||||
<string name="title_activity_menu">MenuActivity</string>
|
||||
|
||||
<string name="menu_console">Console</string>
|
||||
<string name="menu_wallet">Wallet</string>
|
||||
<string name="title_section3">Section 3</string>
|
||||
<string name="console_output">Console Output:</string>
|
||||
|
||||
<string name="navigation_drawer_open">Open navigation drawer</string>
|
||||
<string name="navigation_drawer_close">Close navigation drawer</string>
|
||||
<string name="ethereumj_tests">EthereumJ Tests</string>
|
||||
|
||||
<string name="action_example">Example action</string>
|
||||
<string name="drawer_open">Menu opened</string>
|
||||
<string name="drawer_close">Menu closed</string>
|
||||
</resources>
|
||||
|
|
|
@ -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'
|
||||
}
|
||||
|
|