From b90e0af0e1a7aa4c1653390d43326604346fe90d Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Fri, 11 Sep 2015 12:40:07 -0700
Subject: Change colors list to primitive array

---
 app/src/main/java/org/connectbot/ColorsActivity.java   | 18 +++++++++---------
 app/src/main/java/org/connectbot/util/Colors.java      |  2 +-
 .../main/java/org/connectbot/util/HostDatabase.java    |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'app/src/main')

diff --git a/app/src/main/java/org/connectbot/ColorsActivity.java b/app/src/main/java/org/connectbot/ColorsActivity.java
index 55904c5..11a991a 100644
--- a/app/src/main/java/org/connectbot/ColorsActivity.java
+++ b/app/src/main/java/org/connectbot/ColorsActivity.java
@@ -55,7 +55,7 @@ public class ColorsActivity extends Activity implements OnItemClickListener, OnC
 
 	private int mColorScheme;
 
-	private List<Integer> mColorList;
+	private int[] mColorList;
 	private HostDatabase mHostDb;
 
 	private int mCurrentColor = 0;
@@ -76,7 +76,7 @@ public class ColorsActivity extends Activity implements OnItemClickListener, OnC
 
 		mHostDb = HostDatabase.get(this);
 
-		mColorList = Arrays.asList(mHostDb.getColorsForScheme(mColorScheme));
+		mColorList = mHostDb.getColorsForScheme(mColorScheme);
 		mDefaultColors = mHostDb.getDefaultColorsForScheme(mColorScheme);
 
 		mColorGrid = (GridView) findViewById(R.id.color_grid);
@@ -135,18 +135,18 @@ public class ColorsActivity extends Activity implements OnItemClickListener, OnC
 				c = (ColorView) convertView;
 			}
 
-			c.setColor(mColorList.get(position));
+			c.setColor(mColorList[position]);
 			c.setNumber(position + 1);
 
 			return c;
 		}
 
 		public int getCount() {
-			return mColorList.size();
+			return mColorList.length;
 		}
 
 		public Object getItem(int position) {
-			return mColorList.get(position);
+			return mColorList[position];
 		}
 
 		public long getItemId(int position) {
@@ -294,7 +294,7 @@ public class ColorsActivity extends Activity implements OnItemClickListener, OnC
 
 	private void editColor(int colorNumber) {
 		mCurrentColor = colorNumber;
-		new UberColorPickerDialog(this, this, mColorList.get(colorNumber)).show();
+		new UberColorPickerDialog(this, this, mColorList[colorNumber]).show();
 	}
 
 	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -305,7 +305,7 @@ public class ColorsActivity extends Activity implements OnItemClickListener, OnC
 
 	public void colorChanged(int value) {
 		mHostDb.setGlobalColor(mCurrentColor, value);
-		mColorList.set(mCurrentColor, value);
+		mColorList[mCurrentColor] = value;
 		mColorGrid.invalidateViews();
 	}
 
@@ -341,9 +341,9 @@ public class ColorsActivity extends Activity implements OnItemClickListener, OnC
 			public boolean onMenuItemClick(MenuItem arg0) {
 				// Reset each individual color to defaults.
 				for (int i = 0; i < Colors.defaults.length; i++) {
-					if (!mColorList.get(i).equals(Colors.defaults[i])) {
+					if (mColorList[i] != Colors.defaults[i]) {
 						mHostDb.setGlobalColor(i, Colors.defaults[i]);
-						mColorList.set(i, Colors.defaults[i]);
+						mColorList[i] = Colors.defaults[i];
 					}
 				}
 				mColorGrid.invalidateViews();
diff --git a/app/src/main/java/org/connectbot/util/Colors.java b/app/src/main/java/org/connectbot/util/Colors.java
index ff88d68..e0637fb 100644
--- a/app/src/main/java/org/connectbot/util/Colors.java
+++ b/app/src/main/java/org/connectbot/util/Colors.java
@@ -22,7 +22,7 @@ package org.connectbot.util;
  *
  */
 public class Colors {
-	public final static Integer[] defaults = new Integer[] {
+	public final static int[] defaults = new int[] {
 			0xff000000, // black
 			0xffcc0000, // red
 			0xff00cc00, // green
diff --git a/app/src/main/java/org/connectbot/util/HostDatabase.java b/app/src/main/java/org/connectbot/util/HostDatabase.java
index 2da9925..e8ced95 100644
--- a/app/src/main/java/org/connectbot/util/HostDatabase.java
+++ b/app/src/main/java/org/connectbot/util/HostDatabase.java
@@ -699,8 +699,8 @@ public class HostDatabase extends RobustSQLiteOpenHelper {
 		}
 	}
 
-	public Integer[] getColorsForScheme(int scheme) {
-		Integer[] colors = Colors.defaults.clone();
+	public int[] getColorsForScheme(int scheme) {
+		int[] colors = Colors.defaults.clone();
 
 		Cursor c = mDb.query(TABLE_COLORS, new String[] {
 						FIELD_COLOR_NUMBER, FIELD_COLOR_VALUE},
-- 
cgit v1.2.3