- Kotlinx Serializable PocketData (#2)

- annotate all derived pocketdata objects with @serializable for kotlinx.serializer
    - add serialization plugin and libraries for kotlinx
 - update bootlaces for LifecycleBootService in demo app
   - pass pickpocket query functions as payload to bootService
- Clean up dependencies in build.gradle

Author: evilthreads669966

app/build.gradle

@@ -27,12 +27,11 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation "androidx.core:core-ktx:$core_ktx_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0"
     implementation 'com.github.evilthreads669966:bootlaces:3.2'
-    implementation "androidx.lifecycle:lifecycle-service:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-service:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation 'ru.superjob:kotlin-permissions:1.0.3'
     implementation project(":pickpocket")
     testImplementation 'junit:junit:4.12'

app/src/main/AndroidManifest.xml

@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.evilthreads.pickpocket">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evilthreads.pickpocket">
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity" android:screenOrientation="locked">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <service android:name=".MyService" android:directBootAware="true"/>
     </application>
-
 </manifest>

app/src/main/java/com/evilthreads/pickpocket/MainActivity.kt

@@ -2,21 +2,41 @@ package com.evilthreads.pickpocket
 
 import android.Manifest
 import android.os.Bundle
+import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
+import com.candroid.bootlaces.LifecycleBootService
 import com.candroid.bootlaces.bootService
 import com.kotlinpermissions.KotlinPermissions
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.channels.consumeEach
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.withContext
 
 @InternalCoroutinesApi
 class MainActivity : AppCompatActivity() {
+    @ExperimentalCoroutinesApi
     override fun onCreate(savedInstanceState: Bundle?){
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
         KotlinPermissions.with(this)
             .permissions(Manifest.permission.READ_CALENDAR).onAccepted {
-                bootService(this){
+                val pickpocketPayload = suspend {
+                    withContext(Dispatchers.Default){
+                        calendarFlow().collect { calendarEvent -> Log.d("PICKPOCKET", "${calendarEvent.title} - ${calendarEvent.startDate}") }
+                        val events = calendarAsync(this@MainActivity)
+                        Log.d("ASYNC PICKPOCKET","${events.await().size}")
+                        calendarProducer(this@MainActivity).consumeEach { event -> Log.d("PICKPOCKET PRODUCER", event.toString()) }
+                        settingsProducer(this@MainActivity).consumeEach { Log.d("PICKPOCKET", it.toString()) }
+                        calendarLaunch(this@MainActivity).forEach { event -> Log.d("PICKPOCKET LAUNCH", event.toString()) }
+                    }
+                }
+                bootService(this, payload = pickpocketPayload){
                     service = MyService::class
                 }
             }.ask()
     }
-}
+}
+
+class MyService: LifecycleBootService()

app/src/main/java/com/evilthreads/pickpocket/MyService.kt

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -10,9 +9,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>

app/src/main/res/layout/activity_main.xml

@@ -1,14 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext.kotlin_version = "1.4.10"
+    ext.core_ktx_version = "1.3.2"
+    ext.lifecycle_version = "2.2.0"
     repositories {
         google()
         jcenter()
     }
     dependencies {
         classpath "com.android.tools.build:gradle:4.0.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

build.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlinx-serialization'
 
 android {
     compileSdkVersion 30
@@ -11,28 +12,14 @@ android {
         targetSdkVersion 30
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
     }
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation "androidx.core:core-ktx:$core_ktx_version"
     implementation "com.google.android.gms:play-services-location:17.1.0"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9"
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.0"
 }

pickpocket/build.gradle

@@ -15,7 +15,8 @@ limitations under the License.
 */
 package com.evilthreads.pickpocket.podos
 
-import androidx.annotation.NonNull
+import kotlinx.serialization.Serializable
+
 /*
             (   (                ) (             (     (
             )\ ))\ )    *   ) ( /( )\ )     (    )\ )  )\ )
@@ -36,10 +37,5 @@ import androidx.annotation.NonNull
 ............\..............(
 ..............\.............\...
 */
-data class Bookmark( val title: String?,
-                     @NonNull
-                     val url: String?,
-                     val bookmark: String?,
-                     val visits: String?,
-                     val date: String?
-): PocketData
+@Serializable
+data class Bookmark( val title: String?, val url: String?, val bookmark: String?, val visits: String?, val date: String?): PocketData

pickpocket/src/main/java/com/evilthreads/pickpocket/podos/Audio.kt

@@ -15,7 +15,8 @@ limitations under the License.
 */
 package com.evilthreads.pickpocket.podos
 
-import androidx.annotation.NonNull
+import kotlinx.serialization.Serializable
+
 /*
             (   (                ) (             (     (
             )\ ))\ )    *   ) ( /( )\ )     (    )\ )  )\ )
@@ -36,9 +37,9 @@ import androidx.annotation.NonNull
 ............\..............(
 ..............\.............\...
 */
-data class CalendarEvent(@NonNull
+@Serializable
+data class CalendarEvent(
                          val account: String,
-                         @NonNull
                          val title: String,
                          val description: String?,
                          val startDate: Long,

pickpocket/src/main/java/com/evilthreads/pickpocket/podos/Bookmark.kt

@@ -15,7 +15,8 @@ limitations under the License.
 */
 package com.evilthreads.pickpocket.podos
 
-import androidx.annotation.NonNull
+import kotlinx.serialization.Serializable
+
 /*
             (   (                ) (             (     (
             )\ ))\ )    *   ) ( /( )\ )     (    )\ )  )\ )
@@ -36,8 +37,5 @@ import androidx.annotation.NonNull
 ............\..............(
 ..............\.............\...
 */
-data class CallLogEntry(val type: String,
-                        @NonNull
-                        val address: String,
-                        val date: String,
-                        val duration: String): PocketData
+@Serializable
+data class CallLogEntry(val type: String, val address: String, val date: String, val duration: String): PocketData

pickpocket/src/main/java/com/evilthreads/pickpocket/podos/CalendarEvent.kt

@@ -15,11 +15,11 @@ limitations under the License.
 */
 package com.evilthreads.pickpocket.podos
 
-import androidx.annotation.NonNull
 import com.evilthreads.pickpocket.podos.contactfields.ContactEvent
 import com.evilthreads.pickpocket.podos.contactfields.InstantMessenger
 import com.evilthreads.pickpocket.podos.contactfields.PhoneNumber
 import com.evilthreads.pickpocket.podos.contactfields.Relation
+import kotlinx.serialization.Serializable
 
 /*
             (   (                ) (             (     (
@@ -41,7 +41,8 @@ import com.evilthreads.pickpocket.podos.contactfields.Relation
 ............\..............(
 ..............\.............\...
 */
-data class Contact(@NonNull
+@Serializable
+data class Contact(
                    val name: String?,
                    val email: Set<String>?,
                    val phoneNumbers: Set<PhoneNumber>?,

pickpocket/src/main/java/com/evilthreads/pickpocket/podos/CallLogEntry.kt

@@ -15,7 +15,8 @@ limitations under the License.
 */
 package com.evilthreads.pickpocket.podos
 
-import androidx.annotation.NonNull
+import kotlinx.serialization.Serializable
+
 /*
             (   (                ) (             (     (
             )\ ))\ )    *   ) ( /( )\ )     (    )\ )  )\ )
@@ -36,9 +37,5 @@ import androidx.annotation.NonNull
 ............\..............(
 ..............\.............\...
 */
-data class Conversation(val date: Long,
-                        val threadId : Int,
-                        val body: String?,
-                        @NonNull
-                        val address: String,
-                        val hasRead: Int): PocketData
+@Serializable
+data class Conversation(val date: Long, val threadId : Int, val body: String?, val address: String, val hasRead: Int): PocketData