Skip to content

Merge setting-up-android-xavi to setting-up-android branch #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 27, 2019
Merged

Merge setting-up-android-xavi to setting-up-android branch #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75d9cc8
Added inputkit and rest of things. It builds in AS
xaviraol Dec 20, 2019
3597821
The app runs in Android. IK doesn't work yet: INPUT_KIT_NOT_CONNECTED…
xaviraol Dec 20, 2019
130e2ab
Added debug keystore
panjiyudasetya Dec 27, 2019
0abbc67
Updated example android build gradle
panjiyudasetya Dec 27, 2019
7f341a3
Commented out `apply plugin: 'maven'`
panjiyudasetya Dec 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions android/.settings/org.eclipse.buildship.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
connection.project.dir=
eclipse.preferences.version=1
5 changes: 5 additions & 0 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ dependencies {
implementation "androidx.appcompat:appcompat:${safeExtGet('androidxVersion', '1.0.2')}"
implementation 'com.google.code.gson:gson:2.8.5'
implementation "com.google.android.gms:play-services-location:${safeExtGet('playServiceVersion', '16.0.0')}"
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation "com.google.android.gms:play-services-fitness:${safeExtGet('fitnessApiVersion', '16.0.1')}"
implementation "com.google.android.gms:play-services-awareness:${safeExtGet('awarenessApiVersion', '16.0.0')}"
implementation "com.google.android.gms:play-services-auth:${safeExtGet('authApiVersion', '16.0.1')}"
}

def configureReactNativePom(def pom) {
Expand Down
Binary file added android/libs/samsung-health-data-v1.3.0.jar
View file
Open in desktop
Binary file not shown.
Binary file added android/libs/sdk-v1.0.0.jar
View file
Open in desktop
Binary file not shown.
50 changes: 49 additions & 1 deletion android/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,52 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="nl.sense.rninputkit">
package="nl.sense.rninputkit">

<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

<application
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true"
android:icon="@mipmap/ic_launcher"
android:theme="@style/AppTheme"
android:vmSafeMode="true">
>
<!-- Play service metadata -->
<meta-data
android:name="com.google.android.gms.version;
com.samsung.android.health.permission.read"
android:value="com.samsung.health.step_count;
com.samsung.shealth.step_daily_trend;
com.samsung.health.sleep;
com.samsung.health.blood_pressure;
com.samsung.health.weight;
@integer/google_play_services_version;"
/>

<!-- Receiver -->
<receiver android:name=".service.broadcasts.BootReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
</intent-filter>
</receiver>

<!-- Services -->
<service
android:name=".service.activity.detector.DetectedActivitiesIntentService"
android:exported="false" />
<service android:name=".service.activity.detector.ActivityMonitoringService" />
<service android:name=".service.EventHandlerTaskService" />
<service
android:name=".service.scheduler.JobSchedulerService"
android:permission="android.permission.BIND_JOB_SERVICE" />
</application>

</manifest>

2 changes: 1 addition & 1 deletion android/src/main/java/nl/sense/rninputkit/helper/BloodPressureConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import java.util.List;

import nl.sense_os.input_kit.entity.BloodPressure; // TODO IMPORTS
import nl.sense.rninputkit.inputkit.entity.BloodPressure; // TODO IMPORTS

/**
* Created by xedi on 10/16/17.
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/java/nl/sense/rninputkit/helper/DataConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.WritableMap;

import nl.sense_os.input_kit.entity.DateContent; // TODO IMPORTS
import nl.sense.rninputkit.inputkit.entity.DateContent; // TODO IMPORTS

/**
* Created by xedi on 10/13/17.
Expand Down
4 changes: 2 additions & 2 deletions android/src/main/java/nl/sense/rninputkit/helper/ValueConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

import java.util.List;

import nl.sense_os.input_kit.entity.DateContent; // TODO IMPORTS
import nl.sense_os.input_kit.entity.IKValue; // TODO IMPORTS
import nl.sense.rninputkit.inputkit.entity.DateContent; // TODO IMPORTS
import nl.sense.rninputkit.inputkit.entity.IKValue; // TODO IMPORTS

/**
* Created by panjiyudasetya on 10/23/17.
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/java/nl/sense/rninputkit/helper/WeightConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import java.util.List;

import nl.sense_os.input_kit.entity.Weight; // TODO IMPORTS
import nl.sense.rninputkit.inputkit.entity.Weight; // TODO IMPORTS

/**
* Created by xedi on 10/13/17.
Expand Down
Loading