Fix errors from Android linter

andybalaam · Jan 8, 2019 · 686ba50 · 686ba50
1 parent b5ce3c7
commit 686ba50
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/rabbit-escape-ui-android/app/src/main/java/rabbitescape/ui/android/AbilityButton.java b/rabbit-escape-ui-android/app/src/main/java/rabbitescape/ui/android/AbilityButton.java
@@ -4,16 +4,16 @@
 import android.content.res.Resources;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
+import android.support.v7.widget.AppCompatButton;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.RadioGroup;
 
 import static net.artificialworlds.rabbitescape.BuildConfig.APPLICATION_ID;
 
-public class AbilityButton extends Button
+public class AbilityButton extends AppCompatButton
 {
     private class OnClickListener implements ImageButton.OnClickListener
     {

diff --git a/rabbit-escape-ui-android/app/src/main/java/rabbitescape/ui/android/MenuListAdapter.java b/rabbit-escape-ui-android/app/src/main/java/rabbitescape/ui/android/MenuListAdapter.java
@@ -1,5 +1,6 @@
 package rabbitescape.ui.android;
 
+import android.graphics.Typeface;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
@@ -50,7 +51,10 @@ public View getView( int position, View convertView, ViewGroup viewGroup )
 
         MenuItem item = items[ position ];
         ret.setText( t( item.name, item.nameParams ) );
-        ret.setTypeface( null, menuActivity.selectedItemPosition == position ? 1 : 0 );
+        ret.setTypeface(
+            null,
+            menuActivity.selectedItemPosition == position ? Typeface.BOLD : Typeface.NORMAL
+        );
         ret.setEnabled( item.enabled || TapTimer.matched );
 
         return ret;

diff --git a/rabbit-escape-ui-android/app/src/main/res/layout/activity_android_about.xml b/rabbit-escape-ui-android/app/src/main/res/layout/activity_android_about.xml
@@ -6,7 +6,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context=".AndroidMenuActivity">
+    tools:context="rabbitescape.ui.android.AndroidAboutActivity">
 
     <LinearLayout
         android:orientation="vertical"