Skip to content

Commit ab6997b

Browse files
alt236alt236
committed
We are now using AppCompat and support Material
1 parent 262fa72 commit ab6997b

17 files changed

Lines changed: 115 additions & 78 deletions

File tree

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

3-
ext.compileSdkVersion = 18
4-
ext.buildToolsVersion = "21.1.1"
3+
ext.compileSdkVersion = 22
4+
ext.buildToolsVersion = "22.0.1"
55
ext.minSdkVersion = 18
66
ext.targetSdkVersion = 22
77

‎library/library.iml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@
8585
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8787
</content>
88-
<orderEntry type="jdk" jdkName="Android API 18 Platform" jdkType="Android SDK" />
88+
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
8989
<orderEntry type="sourceFolder" forTests="false" />
9090
<orderEntry type="library" exported="" scope="TEST" name="objenesis-1.0" level="project" />
91+
<orderEntry type="library" exported="" scope="TEST" name="mockable-android-22" level="project" />
9192
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
9293
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
93-
<orderEntry type="library" exported="" scope="TEST" name="mockable-android-18" level="project" />
9494
<orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.9.5" level="project" />
9595
</component>
9696
</module>

‎sample_app/build.gradle‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,20 @@ final def androidVersionCode = 100
88
final def targetSdk = rootProject.targetSdkVersion;
99
final def minSdkRed = rootProject.minSdkVersion;
1010

11+
repositories {
12+
maven {
13+
url "https://repo.commonsware.com.s3.amazonaws.com"
14+
}
15+
}
16+
17+
dependencies {
18+
compile 'com.jakewharton:butterknife:7.0.1'
19+
compile 'com.android.support:appcompat-v7:22.2.0'
20+
compile 'com.commonsware.cwac:merge:1.1.0'
21+
compile fileTree(include: ['*.jar'], dir: 'libs')
22+
compile project(':library')
23+
}
24+
1125
android {
1226
compileSdkVersion rootProject.compileSdkVersion
1327
buildToolsVersion rootProject.buildToolsVersion
@@ -33,8 +47,3 @@ android {
3347
productFlavors {
3448
}
3549
}
36-
37-
dependencies {
38-
compile fileTree(include: ['*.jar'], dir: 'libs')
39-
compile project(':library')
40-
}

‎sample_app/libs/android-support-v4.jar‎

-613 KB
Binary file not shown.

‎sample_app/libs/butterknife-4.0.1.jar‎

-31.6 KB
Binary file not shown.

‎sample_app/libs/merge-1.0.1.jar‎

-8.93 KB
Binary file not shown.

‎sample_app/libs/sacklist-1.0.0.jar‎

-2.57 KB
Binary file not shown.

‎sample_app/sample_app.iml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@
6969
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7070
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7171
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
72+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
73+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
74+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.commonsware.cwac/merge/1.1.0/jars" />
75+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.commonsware.cwac/sacklist/1.0.2/jars" />
7276
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7377
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
7478
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -84,14 +88,16 @@
8488
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8589
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8690
</content>
87-
<orderEntry type="jdk" jdkName="Android API 18 Platform" jdkType="Android SDK" />
91+
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
8892
<orderEntry type="sourceFolder" forTests="false" />
89-
<orderEntry type="library" exported="" name="merge-1.0.1" level="project" />
90-
<orderEntry type="library" exported="" name="android-support-v4" level="project" />
91-
<orderEntry type="library" exported="" name="sacklist-1.0.0" level="project" />
93+
<orderEntry type="library" exported="" scope="TEST" name="mockable-android-22" level="project" />
94+
<orderEntry type="library" exported="" name="butterknife-7.0.1" level="project" />
95+
<orderEntry type="library" exported="" name="merge-1.1.0" level="project" />
96+
<orderEntry type="library" exported="" name="sacklist-1.0.2" level="project" />
9297
<orderEntry type="library" exported="" name="EasyCursor-0.1.1" level="project" />
93-
<orderEntry type="library" exported="" scope="TEST" name="mockable-android-18" level="project" />
94-
<orderEntry type="library" exported="" name="butterknife-4.0.1" level="project" />
98+
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
99+
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
100+
<orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
95101
<orderEntry type="module" module-name="library" exported="" />
96102
</component>
97103
</module>

‎sample_app/src/main/java/uk/co/alt236/btlescan/activities/DeviceControlActivity.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package uk.co.alt236.btlescan.activities;
1818

19-
import android.app.Activity;
2019
import android.bluetooth.BluetoothGattCharacteristic;
2120
import android.bluetooth.BluetoothGattService;
2221
import android.content.BroadcastReceiver;
@@ -27,6 +26,7 @@
2726
import android.content.ServiceConnection;
2827
import android.os.Bundle;
2928
import android.os.IBinder;
29+
import android.support.v7.app.AppCompatActivity;
3030
import android.util.Log;
3131
import android.view.Menu;
3232
import android.view.MenuItem;
@@ -40,8 +40,8 @@
4040
import java.util.List;
4141
import java.util.Map;
4242

43+
import butterknife.Bind;
4344
import butterknife.ButterKnife;
44-
import butterknife.InjectView;
4545
import uk.co.alt236.bluetoothlelib.device.BluetoothLeDevice;
4646
import uk.co.alt236.bluetoothlelib.resolvers.GattAttributeResolver;
4747
import uk.co.alt236.bluetoothlelib.util.ByteUtils;
@@ -54,23 +54,23 @@
5454
* communicates with {@code BluetoothLeService}, which in turn interacts with the
5555
* Bluetooth LE API.
5656
*/
57-
public class DeviceControlActivity extends Activity {
57+
public class DeviceControlActivity extends AppCompatActivity {
5858
public static final String EXTRA_DEVICE = "extra_device";
5959
private final static String TAG = DeviceControlActivity.class.getSimpleName();
6060
private static final String LIST_NAME = "NAME";
6161
private static final String LIST_UUID = "UUID";
62-
@InjectView(R.id.gatt_services_list)
63-
ExpandableListView mGattServicesList;
64-
@InjectView(R.id.connection_state)
65-
TextView mConnectionState;
66-
@InjectView(R.id.uuid)
67-
TextView mGattUUID;
68-
@InjectView(R.id.description)
69-
TextView mGattUUIDDesc;
70-
@InjectView(R.id.data_as_string)
71-
TextView mDataAsString;
72-
@InjectView(R.id.data_as_array)
73-
TextView mDataAsArray;
62+
@Bind(R.id.gatt_services_list)
63+
protected ExpandableListView mGattServicesList;
64+
@Bind(R.id.connection_state)
65+
protected TextView mConnectionState;
66+
@Bind(R.id.uuid)
67+
protected TextView mGattUUID;
68+
@Bind(R.id.description)
69+
protected TextView mGattUUIDDesc;
70+
@Bind(R.id.data_as_string)
71+
protected TextView mDataAsString;
72+
@Bind(R.id.data_as_array)
73+
protected TextView mDataAsArray;
7474
private BluetoothGattCharacteristic mNotifyCharacteristic;
7575
private BluetoothLeService mBluetoothLeService;
7676
private List<List<BluetoothGattCharacteristic>> mGattCharacteristics = new ArrayList<>();
@@ -282,14 +282,14 @@ public void onCreate(final Bundle savedInstanceState) {
282282
mDeviceName = device.getName();
283283
mDeviceAddress = device.getAddress();
284284

285-
ButterKnife.inject(this);
285+
ButterKnife.bind(this);
286286

287287
// Sets up UI references.
288288
((TextView) findViewById(R.id.device_address)).setText(mDeviceAddress);
289289
mGattServicesList.setOnChildClickListener(servicesListClickListner);
290290

291-
getActionBar().setTitle(mDeviceName);
292-
getActionBar().setDisplayHomeAsUpEnabled(true);
291+
getSupportActionBar().setTitle(mDeviceName);
292+
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
293293

294294
final Intent gattServiceIntent = new Intent(this, BluetoothLeService.class);
295295
bindService(gattServiceIntent, mServiceConnection, BIND_AUTO_CREATE);

‎sample_app/src/main/java/uk/co/alt236/btlescan/activities/DeviceDetailsActivity.java‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
package uk.co.alt236.btlescan.activities;
22

3-
import android.app.ListActivity;
43
import android.content.Intent;
54
import android.os.Bundle;
5+
import android.support.annotation.Nullable;
6+
import android.support.v7.app.AppCompatActivity;
67
import android.view.Menu;
78
import android.view.MenuItem;
9+
import android.view.View;
810
import android.widget.LinearLayout;
11+
import android.widget.ListView;
912
import android.widget.TextView;
1013

1114
import com.commonsware.cwac.merge.MergeAdapter;
1215

1316
import java.util.Collection;
1417
import java.util.Locale;
1518

19+
import butterknife.Bind;
1620
import butterknife.ButterKnife;
1721
import uk.co.alt236.bluetoothlelib.device.BluetoothLeDevice;
1822
import uk.co.alt236.bluetoothlelib.device.adrecord.AdRecord;
@@ -24,9 +28,13 @@
2428
import uk.co.alt236.btlescan.R;
2529
import uk.co.alt236.btlescan.util.TimeFormatter;
2630

27-
public class DeviceDetailsActivity extends ListActivity {
31+
public class DeviceDetailsActivity extends AppCompatActivity {
2832
public static final String EXTRA_DEVICE = "extra_device";
29-
33+
@Bind(android.R.id.list)
34+
protected ListView mList;
35+
@Nullable
36+
@Bind(android.R.id.empty)
37+
protected View mEmpty;
3038
private BluetoothLeDevice mDevice;
3139

3240
private void appendAdRecordView(final MergeAdapter adapter, final String title, final AdRecord record) {
@@ -129,7 +137,9 @@ private String formatRssi(final int rssi) {
129137
protected void onCreate(final Bundle savedInstanceState) {
130138
super.onCreate(savedInstanceState);
131139
setContentView(R.layout.activity_details);
132-
ButterKnife.inject(this);
140+
ButterKnife.bind(this);
141+
142+
mList.setEmptyView(mEmpty);
133143

134144
mDevice = getIntent().getParcelableExtra(EXTRA_DEVICE);
135145

@@ -194,7 +204,7 @@ private void pupulateDetails(final BluetoothLeDevice device) {
194204
}
195205

196206
}
197-
getListView().setAdapter(adapter);
207+
mList.setAdapter(adapter);
198208
}
199209

200210
private static String formatTime(final long time) {

0 commit comments

Comments
 (0)