Skip to content

Commit d6f93ea

Browse files
Merge pull request #2 from senseobservationsystems/setting-up-android-xavi
Merge `setting-up-android-xavi` to `setting-up-android` branch
2 parents 1a4be6f + 7f341a3 commit d6f93ea

File tree

83 files changed

+6830
-42
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+6830
-42
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
connection.project.dir=
2+
eclipse.preferences.version=1

android/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ dependencies {
8181
implementation "androidx.appcompat:appcompat:${safeExtGet('androidxVersion', '1.0.2')}"
8282
implementation 'com.google.code.gson:gson:2.8.5'
8383
implementation "com.google.android.gms:play-services-location:${safeExtGet('playServiceVersion', '16.0.0')}"
84+
implementation fileTree(dir: 'libs', include: ['*.jar'])
85+
implementation 'androidx.appcompat:appcompat:1.0.2'
86+
implementation "com.google.android.gms:play-services-fitness:${safeExtGet('fitnessApiVersion', '16.0.1')}"
87+
implementation "com.google.android.gms:play-services-awareness:${safeExtGet('awarenessApiVersion', '16.0.0')}"
88+
implementation "com.google.android.gms:play-services-auth:${safeExtGet('authApiVersion', '16.0.1')}"
8489
}
8590

8691
def configureReactNativePom(def pom) {
258 KB
Binary file not shown.

android/libs/sdk-v1.0.0.jar

1.95 KB
Binary file not shown.
Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,52 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="nl.sense.rninputkit">
2+
package="nl.sense.rninputkit">
3+
4+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
5+
<uses-permission android:name="android.permission.INTERNET" />
6+
<uses-permission android:name="android.permission.WAKE_LOCK" />
7+
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
8+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
9+
<uses-permission android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION" />
10+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
11+
12+
<application
13+
android:allowBackup="true"
14+
android:label="@string/app_name"
15+
android:supportsRtl="true"
16+
android:icon="@mipmap/ic_launcher"
17+
android:theme="@style/AppTheme"
18+
android:vmSafeMode="true">
19+
>
20+
<!-- Play service metadata -->
21+
<meta-data
22+
android:name="com.google.android.gms.version;
23+
com.samsung.android.health.permission.read"
24+
android:value="com.samsung.health.step_count;
25+
com.samsung.shealth.step_daily_trend;
26+
com.samsung.health.sleep;
27+
com.samsung.health.blood_pressure;
28+
com.samsung.health.weight;
29+
@integer/google_play_services_version;"
30+
/>
31+
32+
<!-- Receiver -->
33+
<receiver android:name=".service.broadcasts.BootReceiver">
34+
<intent-filter>
35+
<action android:name="android.intent.action.BOOT_COMPLETED" />
36+
<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
37+
</intent-filter>
38+
</receiver>
39+
40+
<!-- Services -->
41+
<service
42+
android:name=".service.activity.detector.DetectedActivitiesIntentService"
43+
android:exported="false" />
44+
<service android:name=".service.activity.detector.ActivityMonitoringService" />
45+
<service android:name=".service.EventHandlerTaskService" />
46+
<service
47+
android:name=".service.scheduler.JobSchedulerService"
48+
android:permission="android.permission.BIND_JOB_SERVICE" />
49+
</application>
350

451
</manifest>
52+

android/src/main/java/nl/sense/rninputkit/helper/BloodPressureConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import java.util.List;
1010

11-
import nl.sense_os.input_kit.entity.BloodPressure; // TODO IMPORTS
11+
import nl.sense.rninputkit.inputkit.entity.BloodPressure; // TODO IMPORTS
1212

1313
/**
1414
* Created by xedi on 10/16/17.

android/src/main/java/nl/sense/rninputkit/helper/DataConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.facebook.react.bridge.Arguments;
66
import com.facebook.react.bridge.WritableMap;
77

8-
import nl.sense_os.input_kit.entity.DateContent; // TODO IMPORTS
8+
import nl.sense.rninputkit.inputkit.entity.DateContent; // TODO IMPORTS
99

1010
/**
1111
* Created by xedi on 10/13/17.

android/src/main/java/nl/sense/rninputkit/helper/ValueConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
import java.util.List;
1313

14-
import nl.sense_os.input_kit.entity.DateContent; // TODO IMPORTS
15-
import nl.sense_os.input_kit.entity.IKValue; // TODO IMPORTS
14+
import nl.sense.rninputkit.inputkit.entity.DateContent; // TODO IMPORTS
15+
import nl.sense.rninputkit.inputkit.entity.IKValue; // TODO IMPORTS
1616

1717
/**
1818
* Created by panjiyudasetya on 10/23/17.

android/src/main/java/nl/sense/rninputkit/helper/WeightConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import java.util.List;
1010

11-
import nl.sense_os.input_kit.entity.Weight; // TODO IMPORTS
11+
import nl.sense.rninputkit.inputkit.entity.Weight; // TODO IMPORTS
1212

1313
/**
1414
* Created by xedi on 10/13/17.

0 commit comments

Comments
 (0)