Skip to content

Commit f2f9ac3

Browse files
committed
Bumped app version, updated manifest and README
1 parent be2583c commit f2f9ac3

17 files changed

+34
-29
lines changed

README.md

+27-24
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ It also offers:
1111

1212
This will only work on devices with Android 4.3 (API Level 18) and above.
1313

14-
Sample app available on the [Play Store](https://play.google.com/store/apps/details?id=uk.co.alt236.btlescan)
14+
<a href='https://play.google.com/store/apps/details?id=uk.co.alt236.btlescan&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'>
15+
<img alt='Get it on Google Play' height=100 src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/>
16+
</a>
1517

1618
## Including the Library in Your Project
1719

@@ -115,51 +117,51 @@ You can also lookup values and convert them to human friendly strings:
115117
* `CompanyIdentifierResolver.getCompanyName(int companyId, String fallback)`: Will try to resolve a Company identifier to the company name
116118
* `GattAttributeResolver.getAttributeName(String uuid, String fallback)`: Will try to convert a UUID to its name.
117119

118-
**Note:** The data can be found as ODS (Open Office Spreadsheets) in the documents folder.
120+
**Note:** The data can be found as ODS (Open Office Spreadsheets) in the documents folder.
119121

120122
## Library Changelog
121-
* v0.0.1
123+
* v0.0.1
122124
* First public release
123-
* v0.0.2:
125+
* v0.0.2:
124126
* Attempting to create an iBeaconDevice from a device which is not an iBeacon will now throw an IllegalArgumentException exception.
125127
* Fixed a ConcurrentModificationException on getRunningAverageRssi()
126128
* Added some Estimote UUIDs
127129
* v1.0.0:
128-
* Migrated project to Android Studio/ gradle
129-
* Note that the API has slightly changed in this version.
130-
* We now use the more generic `BeaconUtils.getBeaconType()` method instead of `IBeaconUtils.isThisAnIBeacon()`
131-
* Fix for [issue 5](https://github.com/alt236/Bluetooth-LE-Library---Android/issues/5)
130+
* Migrated project to Android Studio/ gradle
131+
* Note that the API has slightly changed in this version.
132+
* We now use the more generic `BeaconUtils.getBeaconType()` method instead of `IBeaconUtils.isThisAnIBeacon()`
133+
* Fix for [issue 5](https://github.com/alt236/Bluetooth-LE-Library---Android/issues/5)
132134
* Fix for [issue 9](https://github.com/alt236/Bluetooth-LE-Library---Android/issues/9)
133135

134136
## Sample Application Changelog
135-
* v0.0.1
136-
* First public release
137-
* v0.0.2:
138-
* Can now export scanned devices as a CSV file.
139-
* v0.0.3:
140-
* UI Refresh.
137+
* v0.0.1
138+
* First public release
139+
* v0.0.2:
140+
* Can now export scanned devices as a CSV file.
141+
* v0.0.3:
142+
* UI Refresh.
141143
* v1.0.0:
142-
* Migrated project to Android Studio/ gradle
143-
* Using version v1.0.0 of the library project
144+
* Migrated project to Android Studio/ gradle
145+
* Using version v1.0.0 of the library project
146+
* v1.1.0:
147+
* App refactor and materialisation.
148+
* Added runtime permissions.
144149

145150
## Permission Explanation
146151
You will need the following permissions to access the Bluetooth Hardware
147152

148153
* `android.permission.BLUETOOTH`
149154
* `android.permission.BLUETOOTH_ADMIN`
150155

156+
In addition one of the following is needed from API 23 and above to scan for BT LE devices:
157+
* `android.permission.ACCESS_COARSE_LOCATION`
158+
* `android.permission.ACCESS_FINE_LOCATION `
159+
151160
## TODO
152161

153162
* Tidy up Javadoc. There is quite a lot of it that is template
154163
* Add parsers for common Ad Records.
155164

156-
## Sample App Screenshots
157-
158-
![screenshot1](https://github.com/alt236/Bluetooth-LE-Library---Android/raw/master/screenshots/screenshot_1.png)
159-
![screenshot2](https://github.com/alt236/Bluetooth-LE-Library---Android/raw/master/screenshots/screenshot_2.png)
160-
![screenshot3](https://github.com/alt236/Bluetooth-LE-Library---Android/raw/master/screenshots/screenshot_3.png)
161-
![screenshot4](https://github.com/alt236/Bluetooth-LE-Library---Android/raw/master/screenshots/screenshot_4.png)
162-
163165
## Links
164166
* Github: [https://github.com/alt236/Bluetooth-LE-Library---Android]()
165167

@@ -169,9 +171,10 @@ Author: [Alexandros Schillings](https://github.com/alt236).
169171
* The Accuracy calculation algorithm was taken from: http://stackoverflow.com/questions/20416218/understanding-ibeacon-distancing
170172
* The AdRecord parser was taken from: https://github.com/devunwired/accessory-samples
171173
* The sample application has been adapted from Android's Bluetooth LE example
174+
* Google Play and the Google Play logo are trademarks of Google Inc.
172175

173176
All logos are the property of their respective owners.
174177

175178
The code in this project is licensed under the Apache Software License 2.0.
176179

177-
Copyright (c) 2014 Alexandros Schillings.
180+
Copyright (c) 2014-2017 Alexandros Schillings.

image_assets/feature_graphic.png

110 KB
Loading
Loading
Loading
Loading
Loading
File renamed without changes.

sample_app/build.gradle

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apply plugin: 'com.android.application'
22

33
final int versionMajor = 1
4-
final int versionMinor = 0
4+
final int versionMinor = 1
55
final int versionPatch = 0
6-
final int androidVersionCode = 5
6+
final int androidVersionCode = 6
77

88
final int targetSdk = rootProject.targetSdkVersion;
99
final int minSdkRed = rootProject.minSdkVersion;
@@ -24,13 +24,14 @@ repositories {
2424
}
2525

2626
dependencies {
27+
compile fileTree(include: ['*.jar'], dir: 'libs')
28+
compile project(':library')
29+
2730
compile 'com.jakewharton:butterknife:7.0.1'
2831
compile 'com.android.support:appcompat-v7:24.2.0'
2932
compile 'com.android.support:recyclerview-v7:24.2.0'
3033
compile 'com.anthonycr.grant:permissions:1.0'
3134
compile 'uk.co.alt236:easycursor-android:1.0.0'
32-
compile fileTree(include: ['*.jar'], dir: 'libs')
33-
compile project(':library')
3435

3536
testCompile 'junit:junit:4.12'
3637
testCompile 'org.mockito:mockito-all:1.9.5'

sample_app/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
<uses-permission android:name="android.permission.BLUETOOTH" />
66
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
7-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
7+
8+
<uses-permission-sdk-23 android:name="android.permission.ACCESS_COARSE_LOCATION"/>
89

910
<uses-feature
1011
android:name="android.hardware.bluetooth_le"

screenshots/screenshot_1.png

-96.2 KB
Binary file not shown.

screenshots/screenshot_1_full.png

-378 KB
Binary file not shown.

screenshots/screenshot_2.png

-76.2 KB
Binary file not shown.

screenshots/screenshot_2_full.png

-269 KB
Binary file not shown.

screenshots/screenshot_3.png

-74.4 KB
Binary file not shown.

screenshots/screenshot_3_full.png

-267 KB
Binary file not shown.

screenshots/screenshot_4.png

-79.8 KB
Binary file not shown.

screenshots/screenshot_4_full.png

-287 KB
Binary file not shown.

0 commit comments

Comments
 (0)