From d0d53441f049256b683b229e4b42977f2687b834 Mon Sep 17 00:00:00 2001 From: Andrew Brady Date: Wed, 7 Dec 2022 05:17:57 -0600 Subject: [PATCH 1/2] Testing Modifications from test project --- .../CapacitiveImageViewer/.idea/gradle.xml | 3 +- .../CapacitiveImageViewer/.idea/misc.xml | 2 +- .../CapacitiveImageViewer/.idea/modules.xml | 9 ----- .../.idea/runConfigurations.xml | 12 ------ .../CapacitiveImageViewer/.idea/vcs.xml | 6 +++ .../CapacitiveImageViewer/build.gradle | 3 +- .../gradle/wrapper/gradle-wrapper.properties | 6 +-- Android/PalmTouchDemo/.idea/compiler.xml | 18 +-------- .../PalmTouchDemo/.idea/jarRepositories.xml | 40 +++++++++++++++++++ Android/PalmTouchDemo/.idea/misc.xml | 13 +----- Android/PalmTouchDemo/.idea/modules.xml | 9 ----- .../PalmTouchDemo/.idea/runConfigurations.xml | 12 ------ Android/PalmTouchDemo/.idea/vcs.xml | 6 +++ Android/PalmTouchDemo/app/build.gradle | 22 +++++----- .../app/src/main/AndroidManifest.xml | 4 +- .../palmtouchdemo/FullscreenActivity.java | 12 +++++- Android/PalmTouchDemo/build.gradle | 4 +- Android/PalmTouchDemo/gradle.properties | 2 + .../gradle/wrapper/gradle-wrapper.properties | 6 +-- 19 files changed, 94 insertions(+), 95 deletions(-) delete mode 100644 Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/modules.xml delete mode 100644 Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/runConfigurations.xml create mode 100644 Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/vcs.xml create mode 100644 Android/PalmTouchDemo/.idea/jarRepositories.xml delete mode 100644 Android/PalmTouchDemo/.idea/modules.xml delete mode 100644 Android/PalmTouchDemo/.idea/runConfigurations.xml create mode 100644 Android/PalmTouchDemo/.idea/vcs.xml diff --git a/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/gradle.xml b/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/gradle.xml index 7ac24c7..a2d7c21 100644 --- a/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/gradle.xml +++ b/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/gradle.xml @@ -1,8 +1,10 @@ + diff --git a/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/misc.xml b/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/misc.xml index dc34569..cc51e58 100644 --- a/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/misc.xml +++ b/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/misc.xml @@ -25,7 +25,7 @@ - + diff --git a/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/modules.xml b/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/modules.xml deleted file mode 100644 index 7bd9899..0000000 --- a/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/runConfigurations.xml b/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/vcs.xml b/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/vcs.xml new file mode 100644 index 0000000..c2365ab --- /dev/null +++ b/Android/MobileHCI18-Demo/CapacitiveImageViewer/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Android/MobileHCI18-Demo/CapacitiveImageViewer/build.gradle b/Android/MobileHCI18-Demo/CapacitiveImageViewer/build.gradle index c2eea8e..fa87cf1 100644 --- a/Android/MobileHCI18-Demo/CapacitiveImageViewer/build.gradle +++ b/Android/MobileHCI18-Demo/CapacitiveImageViewer/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:7.3.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/Android/MobileHCI18-Demo/CapacitiveImageViewer/gradle/wrapper/gradle-wrapper.properties b/Android/MobileHCI18-Demo/CapacitiveImageViewer/gradle/wrapper/gradle-wrapper.properties index d821015..51065b6 100644 --- a/Android/MobileHCI18-Demo/CapacitiveImageViewer/gradle/wrapper/gradle-wrapper.properties +++ b/Android/MobileHCI18-Demo/CapacitiveImageViewer/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Dec 12 14:43:29 CET 2017 +#Wed Dec 07 03:42:46 CST 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/Android/PalmTouchDemo/.idea/compiler.xml b/Android/PalmTouchDemo/.idea/compiler.xml index 96cc43e..fb7f4a8 100644 --- a/Android/PalmTouchDemo/.idea/compiler.xml +++ b/Android/PalmTouchDemo/.idea/compiler.xml @@ -1,22 +1,6 @@ - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/Android/PalmTouchDemo/.idea/jarRepositories.xml b/Android/PalmTouchDemo/.idea/jarRepositories.xml new file mode 100644 index 0000000..f3178f4 --- /dev/null +++ b/Android/PalmTouchDemo/.idea/jarRepositories.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Android/PalmTouchDemo/.idea/misc.xml b/Android/PalmTouchDemo/.idea/misc.xml index 5d19981..d02ba9a 100644 --- a/Android/PalmTouchDemo/.idea/misc.xml +++ b/Android/PalmTouchDemo/.idea/misc.xml @@ -3,6 +3,7 @@ + - - - - - - - - - - - + diff --git a/Android/PalmTouchDemo/.idea/modules.xml b/Android/PalmTouchDemo/.idea/modules.xml deleted file mode 100644 index 10cf648..0000000 --- a/Android/PalmTouchDemo/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Android/PalmTouchDemo/.idea/runConfigurations.xml b/Android/PalmTouchDemo/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/Android/PalmTouchDemo/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Android/PalmTouchDemo/.idea/vcs.xml b/Android/PalmTouchDemo/.idea/vcs.xml new file mode 100644 index 0000000..b2bdec2 --- /dev/null +++ b/Android/PalmTouchDemo/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Android/PalmTouchDemo/app/build.gradle b/Android/PalmTouchDemo/app/build.gradle index 1912e20..1c20ec7 100644 --- a/Android/PalmTouchDemo/app/build.gradle +++ b/Android/PalmTouchDemo/app/build.gradle @@ -1,15 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 33 defaultConfig { applicationId "io.interactionlab.palmtouchdemo" minSdkVersion 21 - targetSdkVersion 25 + targetSdkVersion 33 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -17,16 +16,17 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + namespace 'io.interactionlab.palmtouchdemo' } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(include: ['*.jar'], dir: 'libs') + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support:support-v4:25.3.1' - testCompile 'junit:junit:4.12' - compile 'org.tensorflow:tensorflow-android:1.3.0' - compile files('libs/libftsp.jar') + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + testImplementation 'junit:junit:4.12' + implementation 'org.tensorflow:tensorflow-android:1.3.0' + implementation files('libs/libftsp.jar') } diff --git a/Android/PalmTouchDemo/app/src/main/AndroidManifest.xml b/Android/PalmTouchDemo/app/src/main/AndroidManifest.xml index 4443e6a..4506dd7 100644 --- a/Android/PalmTouchDemo/app/src/main/AndroidManifest.xml +++ b/Android/PalmTouchDemo/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/Android/PalmTouchDemo/app/src/main/java/io/interactionlab/palmtouchdemo/FullscreenActivity.java b/Android/PalmTouchDemo/app/src/main/java/io/interactionlab/palmtouchdemo/FullscreenActivity.java index 10030db..f9f81ef 100644 --- a/Android/PalmTouchDemo/app/src/main/java/io/interactionlab/palmtouchdemo/FullscreenActivity.java +++ b/Android/PalmTouchDemo/app/src/main/java/io/interactionlab/palmtouchdemo/FullscreenActivity.java @@ -4,8 +4,16 @@ import android.annotation.SuppressLint; import android.os.Bundle; import android.os.Handler; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; + + + +//import android.support.v7.app.ActionBar; +import androidx.appcompat.app.ActionBar; + +//import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; + + import android.view.View; import android.widget.RelativeLayout; diff --git a/Android/PalmTouchDemo/build.gradle b/Android/PalmTouchDemo/build.gradle index c2eea8e..01b008f 100644 --- a/Android/PalmTouchDemo/build.gradle +++ b/Android/PalmTouchDemo/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:7.3.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/Android/PalmTouchDemo/gradle.properties b/Android/PalmTouchDemo/gradle.properties index aac7c9b..9e6fce1 100644 --- a/Android/PalmTouchDemo/gradle.properties +++ b/Android/PalmTouchDemo/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/Android/PalmTouchDemo/gradle/wrapper/gradle-wrapper.properties b/Android/PalmTouchDemo/gradle/wrapper/gradle-wrapper.properties index 6561e7b..8e9fd9b 100644 --- a/Android/PalmTouchDemo/gradle/wrapper/gradle-wrapper.properties +++ b/Android/PalmTouchDemo/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Dec 22 11:55:17 CET 2017 +#Wed Dec 07 03:48:23 CST 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +zipStoreBase=GRADLE_USER_HOME From e2f2172da73195f2015ef0223713f03f63eaa44d Mon Sep 17 00:00:00 2001 From: Andrew Brady Date: Wed, 7 Dec 2022 05:22:36 -0600 Subject: [PATCH 2/2] Successfull import and run of app --- Android/PalmTouchDemo/.idea/compiler.xml | 2 +- Android/PalmTouchDemo/.idea/misc.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Android/PalmTouchDemo/.idea/compiler.xml b/Android/PalmTouchDemo/.idea/compiler.xml index fb7f4a8..61a9130 100644 --- a/Android/PalmTouchDemo/.idea/compiler.xml +++ b/Android/PalmTouchDemo/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Android/PalmTouchDemo/.idea/misc.xml b/Android/PalmTouchDemo/.idea/misc.xml index d02ba9a..5793f3a 100644 --- a/Android/PalmTouchDemo/.idea/misc.xml +++ b/Android/PalmTouchDemo/.idea/misc.xml @@ -28,7 +28,7 @@ - +