From 29c0f7877327915e91e5931e99cc74672d8780b1 Mon Sep 17 00:00:00 2001 From: Abdelrahman Mahmoud Date: Thu, 10 Sep 2015 13:30:10 -0400 Subject: [PATCH] Add the new affdexme --- AffdexMe/.idea/gradle.xml | 2 +- AffdexMe/app/app.iml | 12 +- AffdexMe/app/build.gradle | 4 +- AffdexMe/app/src/main/AndroidManifest.xml | 28 +- .../com/affectiva/affdexme/DrawingView.java | 170 ++++- .../affdexme/GradientMetricView.java | 48 -- .../com/affectiva/affdexme/MainActivity.java | 351 +++++----- .../{MetricView.java => MetricDisplay.java} | 58 +- .../affdexme/MetricSelectionFragment.java | 599 ++++++++++++++++++ .../affectiva/affdexme/MetricSelector.java | 172 +++++ .../affectiva/affdexme/MetricsManager.java | 140 ++++ .../affectiva/affdexme/PreferencesUtils.java | 95 +++ .../affectiva/affdexme/SettingsActivity.java | 72 +++ .../errorreporting/CustomApplication.java | 44 ++ .../errorreporting/ErrorReporter.java | 66 ++ .../ic_arrow_back_white_24dp.png | Bin 0 -> 250 bytes .../res/drawable-hdpi/settings_button.png | Bin 0 -> 1675 bytes .../drawable-hdpi/settings_button_pressed.png | Bin 0 -> 1684 bytes .../ic_arrow_back_white_24dp.png | Bin 0 -> 201 bytes .../res/drawable-mdpi/settings_button.png | Bin 0 -> 1159 bytes .../drawable-mdpi/settings_button_pressed.png | Bin 0 -> 1151 bytes .../app/src/main/res/drawable-nodpi/anger.jpg | Bin 0 -> 6359 bytes .../src/main/res/drawable-nodpi/attention.jpg | Bin 0 -> 6520 bytes .../main/res/drawable-nodpi/brow_furrow.jpg | Bin 0 -> 6462 bytes .../main/res/drawable-nodpi/brow_raise.jpg | Bin 0 -> 5874 bytes .../main/res/drawable-nodpi/chin_raise.jpg | Bin 0 -> 7186 bytes .../src/main/res/drawable-nodpi/contempt.jpg | Bin 0 -> 6251 bytes .../src/main/res/drawable-nodpi/disgust.jpg | Bin 0 -> 7722 bytes .../main/res/drawable-nodpi/engagement.jpg | Bin 0 -> 5786 bytes .../main/res/drawable-nodpi/eye_closure.jpg | Bin 0 -> 5833 bytes .../app/src/main/res/drawable-nodpi/fear.jpg | Bin 0 -> 6148 bytes .../res/drawable-nodpi/inner_brow_raise.jpg | Bin 0 -> 6013 bytes .../app/src/main/res/drawable-nodpi/joy.jpg | Bin 0 -> 7205 bytes .../drawable-nodpi/lip_corner_depressor.jpg | Bin 0 -> 5873 bytes .../src/main/res/drawable-nodpi/lip_press.jpg | Bin 0 -> 6549 bytes .../main/res/drawable-nodpi/lip_pucker.jpg | Bin 0 -> 5725 bytes .../src/main/res/drawable-nodpi/lip_suck.jpg | Bin 0 -> 5293 bytes .../main/res/drawable-nodpi/mouth_open.jpg | Bin 0 -> 5457 bytes .../res/drawable-nodpi/negative_valence.jpg | Bin 0 -> 5162 bytes .../main/res/drawable-nodpi/nose_wrinkle.jpg | Bin 0 -> 6377 bytes .../src/main/res/drawable-nodpi/sadness.jpg | Bin 0 -> 5835 bytes .../app/src/main/res/drawable-nodpi/smile.jpg | Bin 0 -> 7240 bytes .../app/src/main/res/drawable-nodpi/smirk.jpg | Bin 0 -> 6251 bytes .../src/main/res/drawable-nodpi/surprise.jpg | Bin 0 -> 6199 bytes .../res/drawable-nodpi/upper_lip_raise.jpg | Bin 0 -> 5671 bytes .../src/main/res/drawable-nodpi/valence.jpg | Bin 0 -> 5003 bytes .../ic_arrow_back_white_24dp.png | Bin 0 -> 232 bytes .../res/drawable-xhdpi/settings_button.png | Bin 0 -> 2449 bytes .../settings_button_pressed.png | Bin 0 -> 2519 bytes .../ic_arrow_back_white_24dp.png | Bin 0 -> 290 bytes .../res/drawable-xxhdpi/settings_button.png | Bin 0 -> 2897 bytes .../settings_button_pressed.png | Bin 0 -> 2943 bytes .../affectiva_logo_clear_background.png | Bin 0 -> 12893 bytes .../res/drawable/ic_arrow_back_white_24dp.png | Bin 0 -> 232 bytes .../src/main/res/drawable/settings_button.png | Bin 0 -> 1675 bytes .../res/drawable/settings_button_pressed.png | Bin 0 -> 1684 bytes .../res/drawable/settings_button_selector.xml | 5 + .../app/src/main/res/layout/activity_main.xml | 44 +- .../src/main/res/layout/error_reporter.xml | 23 + .../app/src/main/res/layout/grid_header.xml | 17 + .../app/src/main/res/layout/grid_item.xml | 39 ++ .../app/src/main/res/layout/menu_layout.xml | 60 -- .../src/main/res/layout/metric_chooser.xml | 47 ++ .../app/src/main/res/layout/metric_layout.xml | 51 +- .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 4258 -> 2725 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2142 -> 1706 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 5142 -> 4255 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 11271 -> 7456 bytes AffdexMe/app/src/main/res/raw/anger.mp4 | Bin 0 -> 12269 bytes AffdexMe/app/src/main/res/raw/attention.mp4 | Bin 0 -> 18972 bytes AffdexMe/app/src/main/res/raw/brow_furrow.mp4 | Bin 0 -> 19513 bytes AffdexMe/app/src/main/res/raw/brow_raise.mp4 | Bin 0 -> 12661 bytes AffdexMe/app/src/main/res/raw/chin_raise.mp4 | Bin 0 -> 21734 bytes AffdexMe/app/src/main/res/raw/contempt.mp4 | Bin 0 -> 23980 bytes AffdexMe/app/src/main/res/raw/disgust.mp4 | Bin 0 -> 19557 bytes AffdexMe/app/src/main/res/raw/engagement.mp4 | Bin 0 -> 48905 bytes AffdexMe/app/src/main/res/raw/eye_closure.mp4 | Bin 0 -> 8282 bytes AffdexMe/app/src/main/res/raw/fear.mp4 | Bin 0 -> 22588 bytes .../app/src/main/res/raw/inner_brow_raise.mp4 | Bin 0 -> 18627 bytes AffdexMe/app/src/main/res/raw/joy.mp4 | Bin 0 -> 27042 bytes .../src/main/res/raw/lip_corner_depressor.mp4 | Bin 0 -> 21359 bytes AffdexMe/app/src/main/res/raw/lip_press.mp4 | Bin 0 -> 20948 bytes AffdexMe/app/src/main/res/raw/lip_pucker.mp4 | Bin 0 -> 15858 bytes AffdexMe/app/src/main/res/raw/lip_suck.mp4 | Bin 0 -> 21071 bytes AffdexMe/app/src/main/res/raw/mouth_open.mp4 | Bin 0 -> 12883 bytes .../app/src/main/res/raw/nose_wrinkle.mp4 | Bin 0 -> 15524 bytes AffdexMe/app/src/main/res/raw/sadness.mp4 | Bin 0 -> 11868 bytes AffdexMe/app/src/main/res/raw/smile.mp4 | Bin 0 -> 22108 bytes AffdexMe/app/src/main/res/raw/smirk.mp4 | Bin 0 -> 23980 bytes AffdexMe/app/src/main/res/raw/surprise.mp4 | Bin 0 -> 23111 bytes .../app/src/main/res/raw/upper_lip_raise.mp4 | Bin 0 -> 17259 bytes AffdexMe/app/src/main/res/raw/valence.mp4 | Bin 0 -> 35652 bytes AffdexMe/app/src/main/res/raw/valence0.mp4 | Bin 0 -> 75113 bytes .../app/src/main/res/values-large/dimens.xml | 31 +- .../app/src/main/res/values-normal/dimens.xml | 26 +- .../app/src/main/res/values-small/dimens.xml | 25 +- .../app/src/main/res/values-xlarge/dimens.xml | 28 +- AffdexMe/app/src/main/res/values/attrs.xml | 8 + AffdexMe/app/src/main/res/values/colors.xml | 8 +- AffdexMe/app/src/main/res/values/dimens.xml | 28 +- .../src/main/res/values/metricStyleName.xml | 2 +- AffdexMe/app/src/main/res/values/strings.xml | 42 +- AffdexMe/app/src/main/res/values/styles.xml | 11 +- .../src/main/res/xml/preference_headers.xml | 9 + .../src/main/res/xml/settings_preferences.xml | 27 + 105 files changed, 2001 insertions(+), 391 deletions(-) delete mode 100644 AffdexMe/app/src/main/java/com/affectiva/affdexme/GradientMetricView.java rename AffdexMe/app/src/main/java/com/affectiva/affdexme/{MetricView.java => MetricDisplay.java} (64%) create mode 100644 AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelectionFragment.java create mode 100644 AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelector.java create mode 100644 AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricsManager.java create mode 100644 AffdexMe/app/src/main/java/com/affectiva/affdexme/PreferencesUtils.java create mode 100644 AffdexMe/app/src/main/java/com/affectiva/affdexme/SettingsActivity.java create mode 100644 AffdexMe/app/src/main/java/com/affectiva/errorreporting/CustomApplication.java create mode 100644 AffdexMe/app/src/main/java/com/affectiva/errorreporting/ErrorReporter.java create mode 100644 AffdexMe/app/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png create mode 100644 AffdexMe/app/src/main/res/drawable-hdpi/settings_button.png create mode 100644 AffdexMe/app/src/main/res/drawable-hdpi/settings_button_pressed.png create mode 100644 AffdexMe/app/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png create mode 100644 AffdexMe/app/src/main/res/drawable-mdpi/settings_button.png create mode 100644 AffdexMe/app/src/main/res/drawable-mdpi/settings_button_pressed.png create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/anger.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/attention.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/brow_furrow.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/brow_raise.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/chin_raise.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/contempt.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/disgust.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/engagement.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/eye_closure.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/fear.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/inner_brow_raise.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/joy.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/lip_corner_depressor.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/lip_press.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/lip_pucker.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/lip_suck.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/mouth_open.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/negative_valence.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/nose_wrinkle.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/sadness.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/smile.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/smirk.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/surprise.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/upper_lip_raise.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-nodpi/valence.jpg create mode 100644 AffdexMe/app/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png create mode 100644 AffdexMe/app/src/main/res/drawable-xhdpi/settings_button.png create mode 100644 AffdexMe/app/src/main/res/drawable-xhdpi/settings_button_pressed.png create mode 100644 AffdexMe/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png create mode 100644 AffdexMe/app/src/main/res/drawable-xxhdpi/settings_button.png create mode 100644 AffdexMe/app/src/main/res/drawable-xxhdpi/settings_button_pressed.png create mode 100644 AffdexMe/app/src/main/res/drawable/affectiva_logo_clear_background.png create mode 100644 AffdexMe/app/src/main/res/drawable/ic_arrow_back_white_24dp.png create mode 100644 AffdexMe/app/src/main/res/drawable/settings_button.png create mode 100644 AffdexMe/app/src/main/res/drawable/settings_button_pressed.png create mode 100644 AffdexMe/app/src/main/res/drawable/settings_button_selector.xml create mode 100644 AffdexMe/app/src/main/res/layout/error_reporter.xml create mode 100644 AffdexMe/app/src/main/res/layout/grid_header.xml create mode 100644 AffdexMe/app/src/main/res/layout/grid_item.xml delete mode 100644 AffdexMe/app/src/main/res/layout/menu_layout.xml create mode 100644 AffdexMe/app/src/main/res/layout/metric_chooser.xml create mode 100644 AffdexMe/app/src/main/res/raw/anger.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/attention.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/brow_furrow.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/brow_raise.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/chin_raise.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/contempt.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/disgust.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/engagement.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/eye_closure.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/fear.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/inner_brow_raise.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/joy.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/lip_corner_depressor.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/lip_press.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/lip_pucker.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/lip_suck.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/mouth_open.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/nose_wrinkle.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/sadness.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/smile.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/smirk.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/surprise.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/upper_lip_raise.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/valence.mp4 create mode 100644 AffdexMe/app/src/main/res/raw/valence0.mp4 create mode 100644 AffdexMe/app/src/main/res/xml/preference_headers.xml create mode 100644 AffdexMe/app/src/main/res/xml/settings_preferences.xml diff --git a/AffdexMe/.idea/gradle.xml b/AffdexMe/.idea/gradle.xml index 7d80135..3ec5955 100644 --- a/AffdexMe/.idea/gradle.xml +++ b/AffdexMe/.idea/gradle.xml @@ -5,7 +5,7 @@