Kotlin migration & Boot Options

tejado · Oct 29, 2022 · 3a2d571 · 3a2d571
1 parent 7dd4ac4
commit 3a2d571
Show file tree

Hide file tree

Showing 63 changed files with 1,681 additions and 1,531 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,17 +41,7 @@ captures/
 
 # IntelliJ
 *.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/dictionaries
-.idea/libraries
-# Android Studio 3 in .gitignore file.
-.idea/caches
-.idea/modules.xml
-# Comment next line if keeping position of elements in Navigation Editor is relevant for you
-.idea/navEditor.xml
+.idea/
 
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.

diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 33
@@ -23,6 +24,11 @@ android {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
+
+    buildFeatures {
+        viewBinding true
+    }
+
 }
 
 dependencies {
@@ -34,6 +40,10 @@ dependencies {
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.tjado.usbgadget">
 
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -16,6 +18,12 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <receiver android:name=".BootConfiguration">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>
diff --git a/app/src/main/assets/usbFunctionProfiles/CCID b/app/src/main/assets/usbFunctionProfiles/CCID
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-GADGET="ccid"
 GADGET_PATH="____gadgetPath____"
 
 cd $GADGET_PATH/configs/

diff --git a/app/src/main/assets/usbFunctionProfiles/CTAP b/app/src/main/assets/usbFunctionProfiles/CTAP
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-GADGET="ctap"
 GADGET_PATH="____gadgetPath____"
 
 cd $GADGET_PATH/configs/

diff --git a/app/src/main/assets/usbFunctionProfiles/Keyboard b/app/src/main/assets/usbFunctionProfiles/Keyboard
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-GADGET="keyboard"
 GADGET_PATH="____gadgetPath____"
 
 cd $GADGET_PATH/configs/

diff --git a/app/src/main/assets/usbFunctionProfiles/Mouse b/app/src/main/assets/usbFunctionProfiles/Mouse
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-GADGET="mouse"
 GADGET_PATH="____gadgetPath____"
 
 cd $GADGET_PATH/configs/

diff --git a/app/src/main/assets/usbFunctionProfiles/UVC b/app/src/main/assets/usbFunctionProfiles/UVC
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-GADGET="camera"
 GADGET_PATH="____gadgetPath____"
 
 cd $GADGET_PATH/configs/

diff --git a/app/src/main/assets/usbGadgetProfiles/CCID b/app/src/main/assets/usbGadgetProfiles/CCID
@@ -3,7 +3,7 @@
 CONFIGFS_DIR="/config"
 GADGETS_PATH="${CONFIGFS_DIR}/usb_gadget"
 
-GADGET="ccid3"
+GADGET="____gadgetName____"
 GADGET_PATH=${GADGETS_PATH}/${GADGET}
 
 CONFIG_PATH="$GADGET_PATH/configs/c.1/"
@@ -27,6 +27,7 @@ echo "42" > serialnumber
 
 cd $CONFIG_PATH
 echo 30 > MaxPower
+mkdir -p strings/0x409
 echo "Configuration" > strings/0x409/configuration
 
 ln -s ${GADGET_PATH}/functions/ccid.usb0 $CONFIG_PATH/ccid.usb0
diff --git a/app/src/main/assets/usbGadgetProfiles/CTAP b/app/src/main/assets/usbGadgetProfiles/CTAP
@@ -3,7 +3,7 @@
 CONFIGFS_DIR="/config"
 GADGETS_PATH="${CONFIGFS_DIR}/usb_gadget"
 
-GADGET="ctap3"
+GADGET="____gadgetName____"
 GADGET_PATH=${GADGETS_PATH}/${GADGET}
 
 CONFIG_PATH="$GADGET_PATH/configs/c.1/"
@@ -42,6 +42,7 @@ echo "42" > serialnumber
 
 cd $CONFIG_PATH
 echo 30 > MaxPower
+mkdir -p strings/0x409
 echo "Configuration" > strings/0x409/configuration
 
 ln -s ${GADGET_PATH}/functions/hid.usb0 $CONFIG_PATH/hid.usb0
diff --git a/app/src/main/assets/usbGadgetProfiles/Empty b/app/src/main/assets/usbGadgetProfiles/Empty
@@ -3,7 +3,7 @@
 CONFIGFS_DIR="/config"
 GADGETS_PATH="${CONFIGFS_DIR}/usb_gadget"
 
-GADGET="gadget_${RANDOM}"
+GADGET="____gadgetName____"
 GADGET_PATH=${GADGETS_PATH}/${GADGET}
 
 CONFIG_PATH="$GADGET_PATH/configs/c.1/"
@@ -24,4 +24,5 @@ echo "42" > serialnumber
 
 cd $CONFIG_PATH
 echo 120 > MaxPower
+mkdir -p strings/0x409
 echo "Configuration" > strings/0x409/configuration
diff --git a/...assets/usbGadgetProfiles/Mouse & Keyboard → ...in/assets/usbGadgetProfiles/MouseKeyboard b/...assets/usbGadgetProfiles/Mouse & Keyboard → ...in/assets/usbGadgetProfiles/MouseKeyboard
@@ -3,7 +3,7 @@
 CONFIGFS_DIR="/config"
 GADGETS_PATH="${CONFIGFS_DIR}/usb_gadget"
 
-GADGET="keyboard"
+GADGET="____gadgetName____"
 GADGET_PATH=${GADGETS_PATH}/${GADGET}
 
 CONFIG_PATH="$GADGET_PATH/configs/c.1/"
@@ -50,6 +50,7 @@ echo "42" > serialnumber
 
 cd $CONFIG_PATH
 echo 120 > MaxPower
+mkdir -p strings/0x409
 echo "Configuration" > strings/0x409/configuration
 
 ln -s ${GADGET_PATH}/functions/hid.keyboard $CONFIG_PATH/hid.keyboard

diff --git a/app/src/main/assets/usbGadgetProfiles/UVC b/app/src/main/assets/usbGadgetProfiles/UVC
@@ -3,7 +3,7 @@
 CONFIGFS_DIR="/config"
 GADGETS_PATH="${CONFIGFS_DIR}/usb_gadget"
 
-GADGET="uvc"
+GADGET="____gadgetName____"
 GADGET_PATH=${GADGETS_PATH}/${GADGET}
 
 CONFIG_PATH="$GADGET_PATH/configs/c.1/"