From 8c0c0b4ebe06a8aa1d0daef35300311b7694a8a5 Mon Sep 17 00:00:00 2001
From: Alexandros Schillings
Date: Tue, 14 Jul 2015 15:04:31 +0100
Subject: [PATCH] Finalising before merging
---
.idea/inspectionProfiles/Project_Default.xml | 1 +
library/build.gradle | 37 ++++++++++++------
library/library.iml | 6 +++
library/src/main/AndroidManifest.xml | 16 +-------
.../device/adrecord/AdRecord.java | 6 +--
.../ibeacon/IBeaconManufacturerData.java | 15 ++++---
.../resolvers/GattAttributeResolver.java | 2 +-
.../alt236/bluetoothlelib/util/ByteUtils.java | 4 +-
.../main/res/drawable-hdpi/ic_launcher.png | Bin 4501 -> 0 bytes
.../main/res/drawable-mdpi/ic_launcher.png | Bin 2930 -> 0 bytes
.../main/res/drawable-xhdpi/ic_launcher.png | Bin 6098 -> 0 bytes
.../main/res/drawable-xxhdpi/ic_launcher.png | Bin 9428 -> 0 bytes
library/src/main/res/values-v11/styles.xml | 11 ------
library/src/main/res/values-v14/styles.xml | 12 ------
library/src/main/res/values/strings.xml | 5 ---
library/src/main/res/values/styles.xml | 20 ----------
sample_app/build.gradle | 15 +++----
sample_app/sample_app.iml | 2 +
sample_app/src/main/AndroidManifest.xml | 8 +---
.../src/main/res/layout/list_item_device.xml | 4 +-
sample_app/src/main/res/values/strings.xml | 3 +-
21 files changed, 61 insertions(+), 106 deletions(-)
delete mode 100644 library/src/main/res/drawable-hdpi/ic_launcher.png
delete mode 100644 library/src/main/res/drawable-mdpi/ic_launcher.png
delete mode 100644 library/src/main/res/drawable-xhdpi/ic_launcher.png
delete mode 100644 library/src/main/res/drawable-xxhdpi/ic_launcher.png
delete mode 100644 library/src/main/res/values-v11/styles.xml
delete mode 100644 library/src/main/res/values-v14/styles.xml
delete mode 100644 library/src/main/res/values/strings.xml
delete mode 100644 library/src/main/res/values/styles.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 22bce9e..198ad64 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -7,6 +7,7 @@
+
diff --git a/library/build.gradle b/library/build.gradle
index 1878ac4..8eb4ed6 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,12 +1,26 @@
apply plugin: 'com.android.library'
-final def versionMajor = 1
-final def versionMinor = 0
-final def versionPatch = 0
-final def androidVersionCode = 100
+final int versionMajor = 1
+final int versionMinor = 0
+final int versionPatch = 0
+final int androidVersionCode = 5
-final def targetSdk = rootProject.targetSdkVersion;
-final def minSdkRed = rootProject.minSdkVersion;
+final int targetSdk = rootProject.targetSdkVersion;
+final int minSdkRed = rootProject.minSdkVersion;
+final String semanticVersion = "${versionMajor}.${versionMinor}.${versionPatch}"
+
+
+dependencies {
+ testCompile 'junit:junit:4.12'
+ testCompile "org.mockito:mockito-core:1.9.5"
+ compile fileTree(include: ['*.jar'], dir: 'libs')
+}
+
+ext {
+ PUBLISH_GROUP_ID = 'co.uk.alt236'
+ PUBLISH_ARTIFACT_ID = 'bluetooth-le-library'
+ PUBLISH_VERSION = "${semanticVersion}"
+}
android {
compileSdkVersion rootProject.compileSdkVersion
@@ -21,7 +35,7 @@ android {
minSdkVersion minSdkRed
targetSdkVersion targetSdk
versionCode androidVersionCode
- versionName "${versionMajor}.${versionMinor}.${versionPatch}"
+ versionName semanticVersion
}
buildTypes {
@@ -34,8 +48,7 @@ android {
}
}
-dependencies {
- testCompile 'junit:junit:4.12'
- testCompile "org.mockito:mockito-core:1.9.5"
- compile fileTree(include: ['*.jar'], dir: 'libs')
-}
+// Script from https://github.com/blundell/release-android-library
+// execute: ./gradlew clean build generateRelease
+apply from: 'https://raw.githubusercontent.com/ArthurHub/release-android-library/master/android-release-aar.gradle'
+
diff --git a/library/library.iml b/library/library.iml
index 7656b88..450e0af 100644
--- a/library/library.iml
+++ b/library/library.iml
@@ -63,6 +63,7 @@
+
@@ -82,7 +83,12 @@
+
+
+
+
+
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index 7dfa1fc..8aa616d 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1,19 +1,5 @@
-
-
-
-
-
+ package="uk.co.alt236.bluetoothlelib">
\ No newline at end of file
diff --git a/library/src/main/java/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecord.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecord.java
index e5a989d..d043da1 100644
--- a/library/src/main/java/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecord.java
+++ b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecord.java
@@ -9,7 +9,7 @@ import java.util.Arrays;
/**
* Created by Dave Smith
* Double Encore, Inc.
- *
+ *
* Expanded by Alexandros Schillings
*/
public final class AdRecord implements Parcelable {
@@ -34,9 +34,9 @@ public final class AdRecord implements Parcelable {
/**
* General FLAGS
- *
+ *
* Description: Flags
- *
+ *
* Information:
* Bit 0: LE Limited Discoverable Mode
* Bit 1: LE General Discoverable Mode
diff --git a/library/src/main/java/uk/co/alt236/bluetoothlelib/device/beacon/ibeacon/IBeaconManufacturerData.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/beacon/ibeacon/IBeaconManufacturerData.java
index 80fcfaa..4c7d706 100644
--- a/library/src/main/java/uk/co/alt236/bluetoothlelib/device/beacon/ibeacon/IBeaconManufacturerData.java
+++ b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/beacon/ibeacon/IBeaconManufacturerData.java
@@ -10,10 +10,11 @@ import uk.co.alt236.bluetoothlelib.util.ByteUtils;
/**
* Parses the Manufactured Data field of an iBeacon
- *
- * The parsing is based on the following schema:
- *
*
+ * The parsing is based on the following schema:
+ *
+ * Byte|Value
+ * -------------------------------------------------
* 0 4C - Byte 1 (LSB) of Company identifier code
* 1 00 - Byte 0 (MSB) of Company identifier code (0x004C == Apple)
* 2 02 - Byte 0 of iBeacon advertisement indicator
@@ -25,8 +26,8 @@ import uk.co.alt236.bluetoothlelib.util.ByteUtils;
* 8 df |###\\
* 9 fb |####\\
* 10 48 |#####\\
- * 11 d2 |#####|| iBeacon proximity UUID
- * 12 b0 |#####||
+ * 11 d2 |#####|| iBeacon
+ * 12 b0 |#####|| Proximity UUID
* 13 60 |#####//
* 14 d0 |####//
* 15 f5 |###//
@@ -39,9 +40,7 @@ import uk.co.alt236.bluetoothlelib.util.ByteUtils;
* 22 00 - minor
* 23 00
* 24 c5 - The 2's complement of the calibrated Tx Power
- *
- *
- *
+ *
* @author Alexandros Schillings
*/
diff --git a/library/src/main/java/uk/co/alt236/bluetoothlelib/resolvers/GattAttributeResolver.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/resolvers/GattAttributeResolver.java
index d009a25..429ffef 100644
--- a/library/src/main/java/uk/co/alt236/bluetoothlelib/resolvers/GattAttributeResolver.java
+++ b/library/src/main/java/uk/co/alt236/bluetoothlelib/resolvers/GattAttributeResolver.java
@@ -6,7 +6,7 @@ import java.util.Map;
/**
* The UUIDS have been collected from the following sources:
- *
+ *
* - http://developer.nokia.com/community/wiki/Bluetooth_Services_for_Windows_Phone
* - The Bluez project
*
diff --git a/library/src/main/java/uk/co/alt236/bluetoothlelib/util/ByteUtils.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/util/ByteUtils.java
index 53f009f..c13dbf9 100644
--- a/library/src/main/java/uk/co/alt236/bluetoothlelib/util/ByteUtils.java
+++ b/library/src/main/java/uk/co/alt236/bluetoothlelib/util/ByteUtils.java
@@ -15,7 +15,7 @@ public class ByteUtils {
/**
* Gets a pretty representation of a Byte Array as a HEX String.
- *
+ *
* Sample output: [01, 30, FF, AA]
*
* @param array the array
@@ -79,7 +79,7 @@ public class ByteUtils {
/**
* Converts a byte to an int, preserving the sign.
- *
+ *
* For example, FF will be converted to 255 and not -1.
*
* @param bite the byte
diff --git a/library/src/main/res/drawable-hdpi/ic_launcher.png b/library/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 7fe8ce898e3ff21efb3b2e35919dbb8011cbdc27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 4501
zcmV;G5o+#
RWsojZ4CAAa~D`{<*O
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
diff --git a/library/src/main/res/drawable-mdpi/ic_launcher.png b/library/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 81ca4ca4730fd44d3e779d8d4831e59408f9e25e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2930
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
diff --git a/library/src/main/res/drawable-xhdpi/ic_launcher.png b/library/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 8e4b1c6154c6baed40212cedb477dbe5f427a2d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6098
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
YAF^9+HFf7;Q2+n{07*qoM6N<$f+{Mg=l}o!
diff --git a/library/src/main/res/drawable-xxhdpi/ic_launcher.png b/library/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index ed2d39300648a0229691acfd6b15193492724544..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 9428
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
JkIGgd{|_a{lo$X2
diff --git a/library/src/main/res/values-v11/styles.xml b/library/src/main/res/values-v11/styles.xml
deleted file mode 100644
index 3c02242..0000000
--- a/library/src/main/res/values-v11/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
diff --git a/library/src/main/res/values-v14/styles.xml b/library/src/main/res/values-v14/styles.xml
deleted file mode 100644
index a91fd03..0000000
--- a/library/src/main/res/values-v14/styles.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml
deleted file mode 100644
index 666f295..0000000
--- a/library/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- Bluetooth LE Library
-
-
diff --git a/library/src/main/res/values/styles.xml b/library/src/main/res/values/styles.xml
deleted file mode 100644
index 6ce89c7..0000000
--- a/library/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/sample_app/build.gradle b/sample_app/build.gradle
index 7cb7815..38e6eb0 100644
--- a/sample_app/build.gradle
+++ b/sample_app/build.gradle
@@ -1,12 +1,13 @@
apply plugin: 'com.android.application'
-final def versionMajor = 1
-final def versionMinor = 0
-final def versionPatch = 0
-final def androidVersionCode = 100
+final int versionMajor = 1
+final int versionMinor = 0
+final int versionPatch = 0
+final int androidVersionCode = 5
-final def targetSdk = rootProject.targetSdkVersion;
-final def minSdkRed = rootProject.minSdkVersion;
+final int targetSdk = rootProject.targetSdkVersion;
+final int minSdkRed = rootProject.minSdkVersion;
+final String semanticVersion = "${versionMajor}.${versionMinor}.${versionPatch}"
repositories {
maven {
@@ -35,7 +36,7 @@ android {
minSdkVersion minSdkRed
targetSdkVersion targetSdk
versionCode androidVersionCode
- versionName "${versionMajor}.${versionMinor}.${versionPatch}"
+ versionName semanticVersion
}
buildTypes {
diff --git a/sample_app/sample_app.iml b/sample_app/sample_app.iml
index cfe2b1d..07c9f6a 100644
--- a/sample_app/sample_app.iml
+++ b/sample_app/sample_app.iml
@@ -86,6 +86,8 @@
+
+
diff --git a/sample_app/src/main/AndroidManifest.xml b/sample_app/src/main/AndroidManifest.xml
index a06cc95..7546b22 100644
--- a/sample_app/src/main/AndroidManifest.xml
+++ b/sample_app/src/main/AndroidManifest.xml
@@ -1,13 +1,7 @@
-
-
+ xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/sample_app/src/main/res/layout/list_item_device.xml b/sample_app/src/main/res/layout/list_item_device.xml
index 49f20e0..4a2bc2d 100644
--- a/sample_app/src/main/res/layout/list_item_device.xml
+++ b/sample_app/src/main/res/layout/list_item_device.xml
@@ -63,7 +63,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
- android:text="Updated:"
+ android:text="@string/label_updated"
android:textSize="12sp"
android:textStyle="bold"/>
@@ -187,7 +187,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
- android:text="Descriptor:"
+ android:text="@string/label_decriptor"
android:textSize="12sp"
android:textStyle="bold"/>
diff --git a/sample_app/src/main/res/values/strings.xml b/sample_app/src/main/res/values/strings.xml
index d03c640..84c3f4f 100644
--- a/sample_app/src/main/res/values/strings.xml
+++ b/sample_app/src/main/res/values/strings.xml
@@ -70,5 +70,6 @@
State:
TX Power:
UUID:
-
+ Updated:
+ Descriptor:
\ No newline at end of file