Merge pull request #24 from appwrite/dev

update to support 1.0.0-RC1

Author: christyjacob4

.github/workflows/publish.yml

@@ -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 }}

LICENSE.md

@@ -9,4 +9,4 @@ Redistribution and use in source and binary forms, with or without modification,
 
     3. Neither the name Appwrite nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -2,12 +2,12 @@
 
 ![Maven Central](https://img.shields.io/maven-central/v/io.appwrite/sdk-for-android.svg?color=green&style=flat-square)
 ![License](https://img.shields.io/github/license/appwrite/sdk-for-android.svg?style=flat-square)
-![Version](https://img.shields.io/badge/api%20version-0.15.0-blue.svg?style=flat-square)
+![Version](https://img.shields.io/badge/api%20version-1.0.0-RC1-blue.svg?style=flat-square)
 [![Build Status](https://img.shields.io/travis/com/appwrite/sdk-generator?style=flat-square)](https://travis-ci.com/appwrite/sdk-generator)
 [![Twitter Account](https://img.shields.io/twitter/follow/appwrite?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite)
 [![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord)
 
-**This SDK is compatible with Appwrite server version 0.15.x. For older versions, please check [previous releases](https://github.com/appwrite/sdk-for-android/releases).**
+**This SDK is compatible with Appwrite server version 1.0.0-RC1. For older versions, please check [previous releases](https://github.com/appwrite/sdk-for-android/releases).**
 
 Appwrite is an open-source backend as a service server that abstract and simplify complex and repetitive development tasks behind a very simple to use REST API. Appwrite aims to help you develop your apps faster and in a more secure way. Use the Android SDK to integrate your app with the Appwrite server to easily start interacting with all of Appwrite backend APIs and tools. For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)
 
@@ -38,7 +38,7 @@ repositories {
 Next, add the dependency to your project's `build.gradle(.kts)` file:
 
 ```groovy
-implementation("io.appwrite:sdk-for-android:0.7.0")
+implementation("io.appwrite:sdk-for-android:1.0.0-SNAPSHOT")
 ```
 
 ### Maven
@@ -49,7 +49,7 @@ Add this to your project's `pom.xml` file:
     <dependency>
         <groupId>io.appwrite</groupId>
         <artifactId>sdk-for-android</artifactId>
-        <version>0.7.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </dependency>
 </dependencies>
 ```

docs/examples/java/databases/create-document.md

@@ -16,9 +16,10 @@ public class MainActivity extends AppCompatActivity {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
-        Databases databases = new Databases(client, "[DATABASE_ID]");
+        Databases databases = new Databases(client);
 
         databases.createDocument(
+            "[DATABASE_ID]", 
             "[COLLECTION_ID]", 
             "[DOCUMENT_ID]", 
             mapOf( "a" to "b" ), 

docs/examples/java/databases/delete-document.md

@@ -16,9 +16,10 @@ public class MainActivity extends AppCompatActivity {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
-        Databases databases = new Databases(client, "[DATABASE_ID]");
+        Databases databases = new Databases(client);
 
         databases.deleteDocument(
+            "[DATABASE_ID]", 
             "[COLLECTION_ID]", 
             "[DOCUMENT_ID]"
             new Continuation<Object>() {

docs/examples/java/databases/get-document.md

@@ -16,9 +16,10 @@ public class MainActivity extends AppCompatActivity {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
-        Databases databases = new Databases(client, "[DATABASE_ID]");
+        Databases databases = new Databases(client);
 
         databases.getDocument(
+            "[DATABASE_ID]", 
             "[COLLECTION_ID]", 
             "[DOCUMENT_ID]"
             new Continuation<Object>() {

docs/examples/java/databases/list-documents.md

@@ -16,9 +16,10 @@ public class MainActivity extends AppCompatActivity {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
-        Databases databases = new Databases(client, "[DATABASE_ID]");
+        Databases databases = new Databases(client);
 
         databases.listDocuments(
+            "[DATABASE_ID]", 
             "[COLLECTION_ID]", 
             new Continuation<Object>() {
                 @NotNull

docs/examples/java/databases/update-document.md

@@ -16,9 +16,10 @@ public class MainActivity extends AppCompatActivity {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
-        Databases databases = new Databases(client, "[DATABASE_ID]");
+        Databases databases = new Databases(client);
 
         databases.updateDocument(
+            "[DATABASE_ID]", 
             "[COLLECTION_ID]", 
             "[DOCUMENT_ID]", 
             new Continuation<Object>() {

docs/examples/java/storage/create-file.md

@@ -3,6 +3,7 @@ import android.os.Bundle
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import io.appwrite.Client
+import io.appwrite.models.InputFile
 import io.appwrite.services.Storage
 
 public class MainActivity extends AppCompatActivity {

docs/examples/kotlin/account/create-phone-session.md

@@ -19,7 +19,7 @@ class MainActivity : AppCompatActivity() {
         GlobalScope.launch {
             val response = account.createPhoneSession(
                 userId = "[USER_ID]",
-                number = ""
+                phone = ""
             )
             val json = response.body?.string()        
         }

docs/examples/kotlin/account/update-phone.md

@@ -18,7 +18,7 @@ class MainActivity : AppCompatActivity() {
 
         GlobalScope.launch {
             val response = account.updatePhone(
-                number = "",
+                phone = "",
                 password = "password"
             )
             val json = response.body?.string()        

docs/examples/kotlin/databases/create-document.md

@@ -14,10 +14,11 @@ class MainActivity : AppCompatActivity() {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2") // Your project ID
 
-        val databases = Databases(client, "[DATABASE_ID]")
+        val databases = Databases(client)
 
         GlobalScope.launch {
             val response = databases.createDocument(
+                databaseId = "[DATABASE_ID]",
                 collectionId = "[COLLECTION_ID]",
                 documentId = "[DOCUMENT_ID]",
                 data = mapOf( "a" to "b" ),

docs/examples/kotlin/databases/delete-document.md

@@ -14,10 +14,11 @@ class MainActivity : AppCompatActivity() {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2") // Your project ID
 
-        val databases = Databases(client, "[DATABASE_ID]")
+        val databases = Databases(client)
 
         GlobalScope.launch {
             val response = databases.deleteDocument(
+                databaseId = "[DATABASE_ID]",
                 collectionId = "[COLLECTION_ID]",
                 documentId = "[DOCUMENT_ID]"
             )

docs/examples/kotlin/databases/get-document.md

@@ -14,10 +14,11 @@ class MainActivity : AppCompatActivity() {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2") // Your project ID
 
-        val databases = Databases(client, "[DATABASE_ID]")
+        val databases = Databases(client)
 
         GlobalScope.launch {
             val response = databases.getDocument(
+                databaseId = "[DATABASE_ID]",
                 collectionId = "[COLLECTION_ID]",
                 documentId = "[DOCUMENT_ID]"
             )

docs/examples/kotlin/databases/list-documents.md

@@ -14,10 +14,11 @@ class MainActivity : AppCompatActivity() {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2") // Your project ID
 
-        val databases = Databases(client, "[DATABASE_ID]")
+        val databases = Databases(client)
 
         GlobalScope.launch {
             val response = databases.listDocuments(
+                databaseId = "[DATABASE_ID]",
                 collectionId = "[COLLECTION_ID]",
             )
             val json = response.body?.string()        

docs/examples/kotlin/databases/update-document.md

@@ -14,10 +14,11 @@ class MainActivity : AppCompatActivity() {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2") // Your project ID
 
-        val databases = Databases(client, "[DATABASE_ID]")
+        val databases = Databases(client)
 
         GlobalScope.launch {
             val response = databases.updateDocument(
+                databaseId = "[DATABASE_ID]",
                 collectionId = "[COLLECTION_ID]",
                 documentId = "[DOCUMENT_ID]",
             )

docs/examples/kotlin/storage/create-file.md

@@ -3,6 +3,7 @@ import android.os.Bundle
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import io.appwrite.Client
+import io.appwrite.models.InputFile
 import io.appwrite.services.Storage
 
 class MainActivity : AppCompatActivity() {

library/src/main/java/io/appwrite/Client.kt

@@ -40,7 +40,7 @@ import kotlin.coroutines.resume
 
 class Client @JvmOverloads constructor(
     context: Context,
-    var endPoint: String = "https://appwrite.io/v1",
+    var endPoint: String = "https://HOSTNAME/v1",
     var endPointRealtime: String? = null,
     private var selfSigned: Boolean = false
 ) : CoroutineScope {
@@ -85,8 +85,11 @@ class Client @JvmOverloads constructor(
             "content-type" to "application/json",
             "origin" to "appwrite-android://${context.packageName}",
             "user-agent" to "${context.packageName}/${appVersion}, ${System.getProperty("http.agent")}",
-            "x-sdk-version" to "appwrite:android:${BuildConfig.SDK_VERSION}",            
-            "x-appwrite-response-format" to "0.15.0"
+            "x-sdk-name" to "Android",
+            "x-sdk-platform" to "client",
+            "x-sdk-language" to "android",
+            "x-sdk-version" to "1.0.0-SNAPSHOT",            
+            "x-appwrite-response-format" to "1.0.0-RC1"
         )
         config = mutableMapOf()
 

library/src/main/java/io/appwrite/ID.kt

@@ -0,0 +1,10 @@
+package io.appwrite
+
+class ID {
+    companion object {
+        fun custom(id: String): String
+            = id
+        fun unique(): String
+            = "unique()"
+    }
+}

library/src/main/java/io/appwrite/Permission.kt

@@ -0,0 +1,21 @@
+package io.appwrite
+
+class Permission {
+    companion object {
+        fun read(role: String): String {
+            return "read(\"${role}\")"
+        }        
+        fun write(role: String): String {
+            return "write(\"${role}\")"
+        }        
+        fun create(role: String): String {
+            return "create(\"${role}\")"
+        }        
+        fun update(role: String): String {
+            return "update(\"${role}\")"
+        }        
+        fun delete(role: String): String {
+            return "delete(\"${role}\")"
+        }        
+    }
+}

library/src/main/java/io/appwrite/Query.kt

@@ -6,20 +6,32 @@ class Query {
 
     fun notEqual(attribute: String, value: Any) = Query.addQuery(attribute, "notEqual", value)
 
-    fun lesser(attribute: String, value: Any) = Query.addQuery(attribute, "lesser", value)
+    fun lessThan(attribute: String, value: Any) = Query.addQuery(attribute, "lessThan", value)
 
-    fun lesserEqual(attribute: String, value: Any) = Query.addQuery(attribute, "lesserEqual", value)
+    fun lessThanEqual(attribute: String, value: Any) = Query.addQuery(attribute, "lessThanEqual", value)
 
-    fun greater(attribute: String, value: Any) = Query.addQuery(attribute, "greater", value)
+    fun greaterThan(attribute: String, value: Any) = Query.addQuery(attribute, "greaterThan", value)
 
-    fun greaterEqual(attribute: String, value: Any) = Query.addQuery(attribute, "greaterEqual", value)
+    fun greaterThanEqual(attribute: String, value: Any) = Query.addQuery(attribute, "greaterThanEqual", value)
 
     fun search(attribute: String, value: String) = Query.addQuery(attribute, "search", value)
 
-    private fun addQuery(attribute: String, oper: String, value: Any): String {
+    fun orderAsc(attribute: String) = "orderAsc(\"${attribute}\")"
+
+    fun orderDesc(attribute: String) = "orderDesc(\"${attribute}\")"
+
+    fun cursorBefore(documentId: String) = "cursorBefore(\"${documentId}\")"
+
+    fun cursorAfter(documentId: String) = "cursorAfter(\"${documentId}\")"
+
+    fun limit(limit: Int) = "limit(${limit})"
+
+    fun offset(offset: Int) = "offset(${offset})"
+
+    private fun addQuery(attribute: String, method: String, value: Any): String {
       return when (value) {
-        is List<*> -> "${attribute}.${oper}(${value.map{it -> parseValues(it!!)}.joinToString(",")})"
-    	  else -> "${attribute}.${oper}(${Query.parseValues(value)})"
+        is List<*> -> "${method}(\"${attribute}\", [${value.map{it -> parseValues(it!!)}.joinToString(",")}])"
+    	  else -> "${method}(\"${attribute}\", [${Query.parseValues(value)}])"
       }
     }
     private fun parseValues(value: Any): String {

library/src/main/java/io/appwrite/Role.kt

@@ -0,0 +1,22 @@
+package io.appwrite
+
+class Role {
+    companion object {
+        fun any(): String
+            = "any"
+        fun user(id: String): String
+            = "user:$id"
+        fun users(): String
+            = "users"
+        fun guests(): String
+            = "guests"
+        fun team(id: String, role: String = ""): String
+            = if(role.isEmpty()) {
+                "team:$id"
+            } else {
+                "team:$id/$role"
+            }
+        fun status(status: String): String
+            = "status:$status"
+    }
+}