Cleaned up the UI a little, added app icons to list view - optimised …

…scrolling significantly.
lwis · Jan 4, 2015 · dfac3cc · dfac3cc
1 parent 6de4c70
commit dfac3cc
Show file tree

Hide file tree

Showing 6 changed files with 345 additions and 223 deletions.
diff --git a/src/main/java/com/lewisjuggins/miband/ApplicationArrayAdapter.java b/src/main/java/com/lewisjuggins/miband/ApplicationArrayAdapter.java
@@ -7,6 +7,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.ImageView;
 import android.widget.TextView;
 import com.lewisjuggins.miband.preferences.Application;
 
@@ -19,34 +20,41 @@ public class ApplicationArrayAdapter extends ArrayAdapter<Application>
 {
 	private final Context context;
 	private final List<Application> values;
+	private final int mResource;
 
 	public ApplicationArrayAdapter(Context context, int resource, List<Application> values)
 	{
 		super(context, resource, values);
 		this.context = context;
 		this.values = values;
+		this.mResource = resource;
 	}
 
 	@Override public View getView(int position, View convertView, ViewGroup parent)
 	{
 		try
 		{
-			//This behaves weirdly (unable to resolve the local variables) when the LayoutInflater isn't used - this is not performant.
-			final LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-			final View rowView = inflater.inflate(android.R.layout.simple_list_item_1, parent, false);
-
-			final TextView textView = (TextView) rowView.findViewById(android.R.id.text1);
+			if(convertView == null)
+			{
+				final LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+				convertView = inflater.inflate(mResource, parent, false);
+			}
 
 			final PackageManager pm = context.getPackageManager();
 
 			final Application application = values.get(position);
+
 			final ApplicationInfo applicationInfo = pm.getApplicationInfo(application.getmPackageName(), PackageManager.GET_META_DATA);
 
 			application.setmAppName(pm.getApplicationLabel(applicationInfo).toString());
 
+			final ImageView imageView = (ImageView) convertView.findViewById(R.id.appIcon);
+			imageView.setImageDrawable(pm.getApplicationIcon(applicationInfo));
+
+			final TextView textView = (TextView) convertView.findViewById(R.id.appName);
 			textView.setText(pm.getApplicationLabel(applicationInfo));
 
-			return rowView;
+			return convertView;
 		}
 		catch(PackageManager.NameNotFoundException e)
 		{

diff --git a/src/main/java/com/lewisjuggins/miband/BLECommunicationManager.java b/src/main/java/com/lewisjuggins/miband/BLECommunicationManager.java
@@ -161,18 +161,8 @@ public synchronized void disconnectGatt()
 	{
 		if(mGatt != null)
 		{
-			//try
-			//{
-				//final BluetoothGattCharacteristic characteristic = getCharacteristic(MiBandConstants.UUID_CHARACTERISTIC_LE_PARAMS);
-				//characteristic.setValue(mCurrentLeParams);
-				//mGatt.writeCharacteristic(characteristic).waitSafely();
-				mGatt.disconnect();
-				mGatt.close();
-//			}
-//			catch(InterruptedException e)
-//			{
-//				Log.d(TAG, "Failed to disconnect");
-//			}
+			mGatt.disconnect();
+			mGatt.close();
 		}
 	}
 
@@ -209,25 +199,9 @@ public synchronized void write(final BluetoothGattCharacteristic characteristic)
 	public void setLowLatency()
 			throws MiBandConnectFailureException
 	{
-//		try
-//		{
-			//mGatt.readCharacteristic(getCharacteristic(MiBandConstants.UUID_CHARACTERISTIC_LE_PARAMS)).done(new DoneCallback<BluetoothGattCharacteristic>()
-			//{
-			//	@Override public void onDone(final BluetoothGattCharacteristic result)
-			//	{
-			//		mCurrentLeParams = result.getValue();
-			//		Log.i(TAG, "Read LE Params");
-			//	}
-			//}).waitSafely();
-
-			final BluetoothGattCharacteristic characteristic = getCharacteristic(MiBandConstants.UUID_CHARACTERISTIC_LE_PARAMS);
-			characteristic.setValue(mLowLatencyLeParams);
-			write(characteristic);
-//		}
-//		catch(InterruptedException e)
-//		{
-//			setLowLatency();
-//		}
+		final BluetoothGattCharacteristic characteristic = getCharacteristic(MiBandConstants.UUID_CHARACTERISTIC_LE_PARAMS);
+		characteristic.setValue(mLowLatencyLeParams);
+		write(characteristic);
 	}
 
 	private BluetoothGattService getMiliService()

diff --git a/src/main/java/com/lewisjuggins/miband/MiBandCommunicationService.java b/src/main/java/com/lewisjuggins/miband/MiBandCommunicationService.java
@@ -238,6 +238,7 @@ private synchronized void notifyBand(long vibrateDuration, int vibrateTimes, int
 			setColor(flashColours[0], flashColours[1], flashColours[2], true);
 			threadWait(flashDuration);
 			setColor(originalColours[0], originalColours[1], originalColours[2], false);
+			threadWait(500L);
 		}
 	}
 }
diff --git a/src/main/java/com/lewisjuggins/miband/MiOverviewActivity.java b/src/main/java/com/lewisjuggins/miband/MiOverviewActivity.java
@@ -55,7 +55,7 @@ protected AddDialog(Context context)
 
 			setTitle("Select an app");
 
-			final ApplicationArrayAdapter arrayAdapter = new ApplicationArrayAdapter(MiOverviewActivity.this, android.R.layout.simple_list_item_1, getApps());
+			final ApplicationArrayAdapter arrayAdapter = new ApplicationArrayAdapter(MiOverviewActivity.this, R.layout.list_row_layout, getApps());
 			final ListView listView = new ListView(getContext());
 			setView(listView);
 			listView.setAdapter(arrayAdapter);
@@ -238,7 +238,7 @@ public int compare(Object lhs, Object rhs)
 			}
 		});
 
-		mAppArrayAdapter = new ApplicationArrayAdapter(MiOverviewActivity.this, android.R.layout.simple_list_item_1, appArray);
+		mAppArrayAdapter = new ApplicationArrayAdapter(MiOverviewActivity.this, R.layout.list_row_layout, appArray);
 		mListView = ((ListView) findViewById(R.id.listView));
 		mListView.setAdapter(mAppArrayAdapter);
 		mListView.setOnItemLongClickListener(mItemLongClickListerer);