Skip to content

Commit

Permalink
Merge pull request #9 from MillerTechnologyPeru/NewBluetoothExplorer
Browse files Browse the repository at this point in the history
New bluetooth explorer
  • Loading branch information
colemancda authored Oct 9, 2018
2 parents 990b467 + 3624bdc commit 471daed
Show file tree
Hide file tree
Showing 185 changed files with 4,440 additions and 7,519 deletions.
1 change: 1 addition & 0 deletions .build/dependencies-state.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"object": {"dependencies": []}, "version": 2}
1 change: 1 addition & 0 deletions .build/regenerate-token
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0
1 change: 1 addition & 0 deletions .build/repositories/checkouts-state.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"object": {"repositories": {}}, "version": 1}
12 changes: 7 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,13 @@ playground.xcworkspace
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/
#
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace

# Carthage
#
Carthage/*

# Rswift
#
*.generated.swift

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
Expand All @@ -67,3 +65,7 @@ fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output

# SPM-generated Xcode projects
Android/app/src/main/swift/BluetoothExplorer.xcodeproj/*
BluetoothExplorer.xcodeproj/*
7 changes: 7 additions & 0 deletions Android/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
*.iml
.gradle
/local.properties
/.idea
/build
/captures
.externalNativeBuild
4 changes: 4 additions & 0 deletions Android/app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/build
/src/main/jniLibs
/src/main/swift/.build
/src/main/swift/Package.resolved
37 changes: 37 additions & 0 deletions Android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
apply plugin: 'com.android.application'

apply plugin: 'kotlin-android'

apply plugin: 'kotlin-android-extensions'

apply plugin: 'net.zhuoweizhang.swiftandroid'

android {
compileSdkVersion 28
defaultConfig {
applicationId "com.millertech.bluetoothexplorer"
minSdkVersion 21
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

implementation 'com.github.PureSwift:SwiftAndroidSupport:v0.2.1'

//implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
}
21 changes: 21 additions & 0 deletions Android/app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.millertech.bluetoothexplorer

import android.support.test.InstrumentationRegistry
import android.support.test.runner.AndroidJUnit4

import org.junit.Test
import org.junit.runner.RunWith

import org.junit.Assert.*

/**
* Instrumented test, which will execute on an Android device.
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
@RunWith(AndroidJUnit4::class)
class ExampleInstrumentedTest {
@Test
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getTargetContext()
assertEquals("com.millertech.bluetoothexplorer", appContext.packageName)
}
}
32 changes: 32 additions & 0 deletions Android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.millertech.bluetoothexplorer">

<uses-sdk
android:minSdkVersion="21"
android:targetSdkVersion="27" />

<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

<!-- Its needed since Android 6.0 -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

<application
android:name=".Application"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.millertech.bluetoothexplorer

import org.pureswift.swiftandroidsupport.app.SwiftApplication

class Application: SwiftApplication() {

companion object {

init {
System.loadLibrary("BluetoothExplorer")
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.millertech.bluetoothexplorer

import org.pureswift.swiftandroidsupport.app.SwiftAppCompatActivity

class MainActivity : SwiftAppCompatActivity()
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.millertech.bluetoothexplorer.swiftbindings;

public interface MainActivityBindings {

// Messages from Java to Swift
interface Listener {

void hi();

}

// Messages from Swift back to Java Activity
interface Responder{

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@

/// generated by: genswift.java 'java/lang|java/util|java/sql' 'Sources' '../java' ///

/// interface com.millertech.bluetoothexplorer.swiftbindings.MainActivityBindings$Listener ///

package org.swiftjava.com_millertech;

@SuppressWarnings("JniMissingFunction")
public class MainActivityBindings_ListenerProxy implements com.millertech.bluetoothexplorer.swiftbindings.MainActivityBindings.Listener {

// address of proxy object
long __swiftObject;

MainActivityBindings_ListenerProxy( long __swiftObject ) {
this.__swiftObject = __swiftObject;
}

/// public abstract void com.millertech.bluetoothexplorer.swiftbindings.MainActivityBindings$Listener.hi()

public native void __hi( long __swiftObject );

public void hi() {
__hi( __swiftObject );
}

public native void __finalize( long __swiftObject );

public void finalize() {
__finalize( __swiftObject );
}

}
34 changes: 34 additions & 0 deletions Android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportHeight="108"
android:viewportWidth="108">
<path
android:fillType="evenOdd"
android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
android:strokeColor="#00000000"
android:strokeWidth="1">
<aapt:attr name="android:fillColor">
<gradient
android:endX="78.5885"
android:endY="90.9159"
android:startX="48.7653"
android:startY="61.0927"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
android:strokeColor="#00000000"
android:strokeWidth="1" />
</vector>
5 changes: 5 additions & 0 deletions Android/app/src/main/res/drawable/ic_arrow_back.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FFFFFF" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
</vector>
9 changes: 9 additions & 0 deletions Android/app/src/main/res/drawable/ic_bluetooth.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#1786F9"
android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
</vector>
Loading

0 comments on commit 471daed

Please sign in to comment.