Merge pull request #299 from appwrite/feat-android-response-models

christyjacob4 · web-flow · commit ca6022f74a00 · 2021-11-08T17:28:19.000+04:00
Feat android response models
diff --git a/src/SDK/Language/Android.php b/src/SDK/Language/Android.php
@@ -140,6 +140,12 @@ public function getFiles()
                 'template'      => '/android/library/src/main/java/io/appwrite/extensions/CollectionExtensions.kt.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/json/PreciseNumberAdapter.kt',
+                'template'      => '/android/library/src/main/java/io/appwrite/json/PreciseNumberAdapter.kt.twig',
+                'minify'        => false,
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/models/RealtimeModels.kt',
@@ -359,6 +365,12 @@ public function getFiles()
                 'template'      => '/android/example-java/.gitignore',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'definition',
+                'destination'   => 'library/src/main/java/io/appwrite/models/{{ definition.name | caseUcfirst }}.kt',
+                'template'      => '/android/library/src/main/java/io/appwrite/models/Model.kt.twig',
+                'minify'        => false,
+            ],
         ];
     }
 }
diff --git a/src/SDK/Language/Kotlin.php b/src/SDK/Language/Kotlin.php
@@ -97,7 +97,7 @@ public function getTypeName($type)
     {
         switch ($type) {
             case self::TYPE_INTEGER:
-                return 'Int';
+                return 'Long';
             case self::TYPE_NUMBER:
                 return 'Double';
             case self::TYPE_STRING:
diff --git a/templates/android/.github/workflows/publish.yml b/templates/android/.github/workflows/publish.yml
@@ -12,10 +12,10 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
         # Base64 decodes and pipes the GPG key content into the secret file
       - name: Prepare environment
         env:
@@ -51,4 +51,4 @@ jobs:
           SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
           SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
           SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
-          SDK_VERSION: ${{ github.event.release.tag_name }}
+          SDK_VERSION: ${{ github.event.release.tag_name }}
diff --git a/templates/android/build.gradle.twig b/templates/android/build.gradle.twig
@@ -2,15 +2,15 @@ apply plugin: 'io.github.gradle-nexus.publish-plugin'
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.31"
-    version '{{ sdk.version }}'
+    ext.kotlin_version = "1.5.31"
+    version "{{ sdk.version }}"
     repositories {
         maven { url "https://plugins.gradle.org/m2/" }
         google()
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.2.0"
+        classpath "com.android.tools.build:gradle:7.0.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
 
diff --git a/templates/android/example-java/build.gradle.twig b/templates/android/example-java/build.gradle.twig
@@ -3,13 +3,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "{{ sdk.namespace | caseDot }}.example_java"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 
@@ -29,8 +28,8 @@ android {
 }
 
 dependencies {
-
     implementation project(path: ':library')
+
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
diff --git a/templates/android/example-java/src/main/AndroidManifest.xml b/templates/android/example-java/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AppwriteAndroidSDK">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/templates/android/example-java/src/main/java/io/appwrite/example_java/MainActivity.java.twig b/templates/android/example-java/src/main/java/io/appwrite/example_java/MainActivity.java.twig
@@ -4,15 +4,15 @@ import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import org.jetbrains.annotations.NotNull;
-import org.json.JSONObject;
 import {{ sdk.namespace | caseDot }}.Client;
-import {{ sdk.namespace | caseDot }}.exceptions.AppwriteException;
+import {{ sdk.namespace | caseDot }}.exceptions.{{ spec.title | caseUcfirst }}Exception;
+import {{ sdk.namespace | caseDot }}.extensions.JsonExtensionsKt;
+import {{ sdk.namespace | caseDot }}.models.Session;
 import {{ sdk.namespace | caseDot }}.services.Account;
 import kotlin.Result;
 import kotlin.coroutines.Continuation;
 import kotlin.coroutines.CoroutineContext;
 import kotlin.coroutines.EmptyCoroutineContext;
-import okhttp3.Response;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -28,7 +28,7 @@ public class MainActivity extends AppCompatActivity {
         Account account = new Account(client);
 
         try {
-            account.createSession("test7@test.com","password", new Continuation<Response>() {
+            account.createSession("test7@test.com","password", new Continuation<Session>() {
                 @NotNull
                 @Override
                 public CoroutineContext getContext() {
@@ -37,16 +37,13 @@ public class MainActivity extends AppCompatActivity {
 
                 @Override
                 public void resumeWith(@NotNull Object o) {
-                    String json = "";
                     try {
                         if (o instanceof Result.Failure) {
                             Result.Failure failure = (Result.Failure) o;
                             throw failure.exception;
                         } else {
-                            Response response = (Response) o;
-                            json = response.body().string();
-                            json = new JSONObject(json).toString(8);
-                            Log.d("RESPONSE", json);
+                            Session session = (Session) o;
+                            Log.d("RESPONSE", JsonExtensionsKt.toJson(session));
                         }
                     } catch (Throwable th) {
                         Log.e("ERROR", th.toString());
diff --git a/templates/android/example/build.gradle.twig b/templates/android/example/build.gradle.twig
@@ -4,13 +4,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "{{ sdk.namespace | caseDot }}.android"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 
@@ -37,23 +36,23 @@ android {
 }
 
 dependencies {
-
     implementation project(path: ':library')
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.5.0'
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'com.google.android.material:material:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
-    implementation "androidx.fragment:fragment-ktx:1.3.2"
+    implementation "androidx.fragment:fragment-ktx:1.3.6"
     implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
     implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
     testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
diff --git a/templates/android/example/src/main/AndroidManifest.xml b/templates/android/example/src/main/AndroidManifest.xml
@@ -9,14 +9,14 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AppwriteAndroidSDK">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <activity android:name="io.appwrite.views.CallbackActivity" >
+        <activity android:name="io.appwrite.views.CallbackActivity" android:exported="true">
             <intent-filter android:label="android_web_auth">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/templates/android/example/src/main/java/io/appwrite/android/ui/accounts/AccountsViewModel.kt.twig b/templates/android/example/src/main/java/io/appwrite/android/ui/accounts/AccountsViewModel.kt.twig
@@ -5,11 +5,10 @@ import androidx.activity.ComponentActivity
 import androidx.lifecycle.*
 import {{ sdk.namespace | caseDot }}.android.utils.Client.client
 import {{ sdk.namespace | caseDot }}.android.utils.Event
-import {{ sdk.namespace | caseDot }}.exceptions.AppwriteException
+import {{ sdk.namespace | caseDot }}.exceptions.{{ spec.title | caseUcfirst }}Exception
+import {{ sdk.namespace | caseDot }}.extensions.toJson
 import {{ sdk.namespace | caseDot }}.services.Account
 import kotlinx.coroutines.launch
-import org.json.JSONObject
-
 
 class AccountsViewModel : ViewModel() {
 
@@ -27,28 +26,25 @@ class AccountsViewModel : ViewModel() {
         Account(client)
     }
 
-    fun onLogin(email: Editable , password : Editable) {
+    fun onLogin(email: Editable, password: Editable) {
         viewModelScope.launch {
             try {
-                var response = accountService.createSession(email.toString(), password.toString())
-                var json = response.body?.string() ?: ""
-                json = JSONObject(json).toString(8)
-                _response.postValue(Event(json))
-            } catch (e: AppwriteException) {
+                val session = accountService.createSession(email.toString(), password.toString())
+                _response.postValue(Event(session.toJson()))
+            } catch (e: {{ spec.title | caseUcfirst }}Exception) {
                 _error.postValue(Event(e))
             }
         }
 
     }
 
-    fun onSignup(email: Editable , password : Editable, name: Editable) {
+    fun onSignup(email: Editable, password: Editable, name: Editable) {
         viewModelScope.launch {
             try {
-                var response = accountService.create(email.toString(), password.toString(), name.toString())
-                var json = response.body?.string() ?: ""
-                json = JSONObject(json).toString(2)
-                _response.postValue(Event(json))
-            } catch (e: AppwriteException) {
+                val user =
+                    accountService.create(email.toString(), password.toString(), name.toString())
+                _response.postValue(Event(user.toJson()))
+            } catch (e: {{ spec.title | caseUcfirst }}Exception) {
                 _error.postValue(Event(e))
             }
         }
@@ -58,10 +54,15 @@ class AccountsViewModel : ViewModel() {
     fun oAuthLogin(activity: ComponentActivity) {
         viewModelScope.launch {
             try {
-                accountService.createOAuth2Session(activity, "facebook", "appwrite-callback-6070749e6acd4://demo.appwrite.io/auth/oauth2/success", "appwrite-callback-6070749e6acd4://demo.appwrite.io/auth/oauth2/failure")
+                accountService.createOAuth2Session(
+                    activity,
+                    "facebook",
+                    "appwrite-callback-6070749e6acd4://demo.appwrite.io/auth/oauth2/success",
+                    "appwrite-callback-6070749e6acd4://demo.appwrite.io/auth/oauth2/failure"
+                )
             } catch (e: Exception) {
                 _error.postValue(Event(e))
-            } catch (e: AppwriteException) {
+            } catch (e: {{ spec.title | caseUcfirst }}Exception) {
                 _error.postValue(Event(e))
             }
         }
@@ -70,11 +71,9 @@ class AccountsViewModel : ViewModel() {
     fun getUser() {
         viewModelScope.launch {
             try {
-                var response = accountService.get()
-                var json = response.body?.string() ?: ""
-                json = JSONObject(json).toString(2)
-                _response.postValue(Event(json))
-            } catch (e: AppwriteException) {
+                val account = accountService.get()
+                _response.postValue(Event(account.toJson()))
+            } catch (e: {{ spec.title | caseUcfirst }}Exception) {
                 _error.postValue(Event(e))
             }
         }
@@ -83,14 +82,11 @@ class AccountsViewModel : ViewModel() {
     fun logout() {
         viewModelScope.launch {
             try {
-                var response = accountService.deleteSession("current")
-                var json = response.body?.string()?.ifEmpty { "{}" }
-                json = JSONObject(json).toString(4)
-                _response.postValue(Event(json))
-            } catch (e: AppwriteException) {
+                val result = accountService.deleteSession("current")
+                _response.postValue(Event(result.toJson()))
+            } catch (e: {{ spec.title | caseUcfirst }}Exception) {
                 _error.postValue(Event(e))
             }
         }
     }
-
 }
diff --git a/templates/android/gradle/wrapper/gradle-wrapper.properties b/templates/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Jun 01 15:55:54 IST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/templates/android/library/build.gradle.twig b/templates/android/library/build.gradle.twig
@@ -1,4 +1,3 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -21,11 +20,11 @@ ext {
 }
 
 android {
-    compileSdkVersion(30)
+    compileSdkVersion(31)
 
     defaultConfig {
         minSdkVersion(21)
-        targetSdkVersion(30)
+        targetSdkVersion(31)
         versionCode = 1
         versionName = "1.0"
         buildConfigField "String", "SDK_VERSION", "\"${PUBLISH_VERSION}\""
@@ -52,9 +51,9 @@ android {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${KotlinCompilerVersion.VERSION}")
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION}")
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2")
 
     api(platform("com.squareup.okhttp3:okhttp-bom:4.9.0"))
     api("com.squareup.okhttp3:okhttp")
diff --git a/templates/android/library/src/main/java/io/appwrite/Client.kt.twig b/templates/android/library/src/main/java/io/appwrite/Client.kt.twig
diff --git a/templates/android/library/src/main/java/io/appwrite/json/PreciseNumberAdapter.kt.twig b/templates/android/library/src/main/java/io/appwrite/json/PreciseNumberAdapter.kt.twig
diff --git a/templates/android/library/src/main/java/io/appwrite/models/Model.kt.twig b/templates/android/library/src/main/java/io/appwrite/models/Model.kt.twig
diff --git a/templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig b/templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig
diff --git a/tests/SDKTest.php b/tests/SDKTest.php
diff --git a/tests/languages/android/ServiceTest.kt b/tests/languages/android/ServiceTest.kt

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function getTypeName($type)`
`97`	`97`	`{`
`98`	`98`	`switch ($type) {`
`99`	`99`	`case self::TYPE_INTEGER:`
`100`		`- return 'Int';`
	`100`	`+ return 'Long';`
`101`	`101`	`case self::TYPE_NUMBER:`
`102`	`102`	`return 'Double';`
`103`	`103`	`case self::TYPE_STRING:`