From eb749a7b3729dc6e0fb65549e67e641c772cb6bc Mon Sep 17 00:00:00 2001 From: kdeng00 Date: Sun, 29 Sep 2019 22:02:06 -0400 Subject: [PATCH] Built and linked nlohmann::json package --- app/app.iml | 4 +- app/build.gradle | 4 + app/src/main/AndroidManifest.xml | 14 ++- app/src/main/cpp/3rdparty/json | 1 + app/src/main/cpp/CMakeLists.txt | 9 +- app/src/main/cpp/Demo.cpp | 47 ++++++++- .../mear/activities/DemoStreamActivity.kt | 37 ++++++++ .../main/res/layout/activity_demo_stream.xml | 33 +++++++ .../main/res/layout/content_demo_stream.xml | 21 ++++ app/src/main/res/values/strings.xml | 95 ++++++++++--------- app/src/main/res/values/styles.xml | 6 +- 11 files changed, 215 insertions(+), 56 deletions(-) create mode 160000 app/src/main/cpp/3rdparty/json create mode 100644 app/src/main/java/com/example/mear/activities/DemoStreamActivity.kt create mode 100644 app/src/main/res/layout/activity_demo_stream.xml create mode 100644 app/src/main/res/layout/content_demo_stream.xml diff --git a/app/app.iml b/app/app.iml index 292e30e..42fa1fa 100644 --- a/app/app.iml +++ b/app/app.iml @@ -29,7 +29,7 @@