add library methods and basic ui

championswimmer · championswimmer · commit 2e3974387062 · 2020-12-12T17:17:30.000+05:30
Signed-off-by: Arnav Gupta &lt;arnav@codingblocks.com&gt;
diff --git a/api/build.gradle b/api/build.gradle
@@ -11,6 +11,7 @@ java {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2"
     implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
     implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version"
     implementation  "com.squareup.moshi:moshi:$moshi_version"
diff --git a/api/src/main/java/io/realworld/api/models/entities/Article.kt b/api/src/main/java/io/realworld/api/models/entities/Article.kt
@@ -1,4 +1,4 @@
-package io.realworld.api.models
+package io.realworld.api.models.entities
 
 
 import com.squareup.moshi.Json
diff --git a/api/src/main/java/io/realworld/api/models/entities/Comment.kt b/api/src/main/java/io/realworld/api/models/entities/Comment.kt
@@ -1,4 +1,4 @@
-package io.realworld.api.models
+package io.realworld.api.models.entities
 
 
 import com.squareup.moshi.Json
diff --git a/api/src/main/java/io/realworld/api/models/entities/Errors.kt b/api/src/main/java/io/realworld/api/models/entities/Errors.kt
@@ -1,4 +1,4 @@
-package io.realworld.api.models
+package io.realworld.api.models.entities
 
 
 import com.squareup.moshi.Json
diff --git a/api/src/main/java/io/realworld/api/models/entities/Profile.kt b/api/src/main/java/io/realworld/api/models/entities/Profile.kt
@@ -1,4 +1,4 @@
-package io.realworld.api.models
+package io.realworld.api.models.entities
 
 
 import com.squareup.moshi.Json
diff --git a/api/src/main/java/io/realworld/api/models/entities/User.kt b/api/src/main/java/io/realworld/api/models/entities/User.kt
@@ -1,4 +1,4 @@
-package io.realworld.api.models
+package io.realworld.api.models.entities
 
 
 import com.squareup.moshi.Json
@@ -7,7 +7,7 @@ import com.squareup.moshi.JsonClass
 @JsonClass(generateAdapter = true)
 data class User(
     @Json(name = "bio")
-    val bio: String,
+    val bio: String?,
     @Json(name = "email")
     val email: String,
     @Json(name = "image")
diff --git a/api/src/main/java/io/realworld/api/models/entities/UserCreds.kt b/api/src/main/java/io/realworld/api/models/entities/UserCreds.kt
@@ -0,0 +1,15 @@
+package io.realworld.api.models.entities
+
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class UserCreds(
+    @Json(name = "email")
+    val email: String,
+    @Json(name = "password")
+    val password: String,
+    @Json(name = "username")
+    val username: String
+)
diff --git a/api/src/main/java/io/realworld/api/models/requests/SignupRequest.kt b/api/src/main/java/io/realworld/api/models/requests/SignupRequest.kt
@@ -0,0 +1,12 @@
+package io.realworld.api.models.requests
+
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import io.realworld.api.models.entities.UserCreds
+
+@JsonClass(generateAdapter = true)
+data class SignupRequest(
+    @Json(name = "user")
+    val user: UserCreds
+)
diff --git a/api/src/main/java/io/realworld/api/models/responses/ArticleResponse.kt b/api/src/main/java/io/realworld/api/models/responses/ArticleResponse.kt
@@ -1,8 +1,9 @@
-package io.realworld.api.models
+package io.realworld.api.models.responses
 
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import io.realworld.api.models.entities.Article
 
 @JsonClass(generateAdapter = true)
 data class ArticleResponse(
diff --git a/api/src/main/java/io/realworld/api/models/responses/ArticlesResponse.kt b/api/src/main/java/io/realworld/api/models/responses/ArticlesResponse.kt
@@ -1,8 +1,9 @@
-package io.realworld.api.models
+package io.realworld.api.models.responses
 
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import io.realworld.api.models.entities.Article
 
 @JsonClass(generateAdapter = true)
 data class ArticlesResponse(
diff --git a/api/src/main/java/io/realworld/api/models/responses/CommentResponse.kt b/api/src/main/java/io/realworld/api/models/responses/CommentResponse.kt
@@ -1,8 +1,9 @@
-package io.realworld.api.models
+package io.realworld.api.models.responses
 
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import io.realworld.api.models.entities.Comment
 
 @JsonClass(generateAdapter = true)
 data class CommentResponse(
diff --git a/api/src/main/java/io/realworld/api/models/responses/CommentsResponse.kt b/api/src/main/java/io/realworld/api/models/responses/CommentsResponse.kt
@@ -1,8 +1,9 @@
-package io.realworld.api.models
+package io.realworld.api.models.responses
 
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import io.realworld.api.models.entities.Comment
 
 @JsonClass(generateAdapter = true)
 data class CommentsResponse(
diff --git a/api/src/main/java/io/realworld/api/models/responses/ErrorResponse.kt b/api/src/main/java/io/realworld/api/models/responses/ErrorResponse.kt
@@ -1,8 +1,9 @@
-package io.realworld.api.models
+package io.realworld.api.models.responses
 
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import io.realworld.api.models.entities.Errors
 
 @JsonClass(generateAdapter = true)
 data class ErrorResponse(
diff --git a/api/src/main/java/io/realworld/api/models/responses/ProfileResponse.kt b/api/src/main/java/io/realworld/api/models/responses/ProfileResponse.kt
@@ -1,8 +1,9 @@
-package io.realworld.api.models
+package io.realworld.api.models.responses
 
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import io.realworld.api.models.entities.Profile
 
 @JsonClass(generateAdapter = true)
 data class ProfileResponse(
diff --git a/api/src/main/java/io/realworld/api/models/responses/TagsResponse.kt b/api/src/main/java/io/realworld/api/models/responses/TagsResponse.kt
@@ -1,4 +1,4 @@
-package io.realworld.api.models
+package io.realworld.api.models.responses
 
 
 import com.squareup.moshi.Json
diff --git a/api/src/main/java/io/realworld/api/models/responses/UserResponse.kt b/api/src/main/java/io/realworld/api/models/responses/UserResponse.kt
@@ -1,8 +1,9 @@
-package io.realworld.api.models
+package io.realworld.api.models.responses
 
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import io.realworld.api.models.entities.User
 
 @JsonClass(generateAdapter = true)
 data class UserResponse(
diff --git a/api/src/main/java/io/realworld/api/services/ConduitAPI.kt b/api/src/main/java/io/realworld/api/services/ConduitAPI.kt
@@ -1,11 +1,27 @@
 package io.realworld.api.services
 
-import io.realworld.api.models.ArticlesResponse
-import retrofit2.Call
+import io.realworld.api.models.entities.UserCreds
+import io.realworld.api.models.requests.SignupRequest
+import io.realworld.api.models.responses.ArticlesResponse
+import io.realworld.api.models.responses.UserResponse
+import retrofit2.Response
+import retrofit2.http.Body
 import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Query
 
 interface ConduitAPI {
 
+    @POST("users")
+    suspend fun signupUser(
+        @Body userCreds: SignupRequest
+    ): Response<UserResponse>
+
     @GET("articles")
-    fun getArticles(): Call<ArticlesResponse>
+    suspend fun getArticles(
+        @Query("author") author: String? = null,
+        @Query("favourited") favourited: String? = null,
+        @Query("tag") tag: String? = null
+    ): Response<ArticlesResponse>
+
 }
diff --git a/api/src/test/java/io/realworld/api/ConduitClientTests.kt b/api/src/test/java/io/realworld/api/ConduitClientTests.kt
@@ -1,15 +1,51 @@
 package io.realworld.api
 
+import io.realworld.api.models.entities.UserCreds
+import io.realworld.api.models.requests.SignupRequest
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Test
+import kotlin.random.Random
 
 class ConduitClientTests {
 
     private val conduitClient = ConduitClient()
 
     @Test
     fun `GET articles`() {
-        val articles = conduitClient.api.getArticles().execute()
-        assertNotNull(articles.body()?.articles)
+        runBlocking {
+            val articles = conduitClient.api.getArticles()
+            assertNotNull(articles.body()?.articles)
+        }
+    }
+
+    @Test
+    fun `GET articles by author`() {
+        runBlocking {
+            val articles = conduitClient.api.getArticles(author = "444")
+            assertNotNull(articles.body()?.articles)
+        }
+    }
+
+    @Test
+    fun `GET articles by tags`() {
+        runBlocking {
+            val articles = conduitClient.api.getArticles(tag = "dragons")
+            assertNotNull(articles.body()?.articles)
+        }
+    }
+
+    @Test
+    fun `POST users - create user`() {
+        val userCreds = UserCreds(
+            email = "testemail${Random.nextInt(999, 9999)}@test.com",
+            password = "pass${Random.nextInt(9999, 999999)}",
+            username = "rand_user_${Random.nextInt(99, 999)}"
+        )
+        runBlocking {
+            val resp = conduitClient.api.signupUser(SignupRequest(userCreds))
+            assertEquals(userCreds.username, resp.body()?.user?.username)
+        }
     }
 }
diff --git a/app/build.gradle b/app/build.gradle
@@ -37,6 +37,7 @@ android {
 dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2"
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
diff --git a/app/src/main/res/drawable/ic_menu_feed.xml b/app/src/main/res/drawable/ic_menu_feed.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
+        
+    <path android:fillColor="@android:color/white" android:pathData="M19,5v14L5,19L5,5h14m1.1,-2L3.9,3c-0.5,0 -0.9,0.4 -0.9,0.9v16.2c0,0.4 0.4,0.9 0.9,0.9h16.2c0.4,0 0.9,-0.5 0.9,-0.9L21,3.9c0,-0.5 -0.5,-0.9 -0.9,-0.9zM11,7h6v2h-6L11,7zM11,11h6v2h-6v-2zM11,15h6v2h-6zM7,7h2v2L7,9zM7,11h2v2L7,13zM7,15h2v2L7,17z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu_settings.xml b/app/src/main/res/drawable/ic_menu_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
+        
+    <path android:fillColor="@android:color/white" android:pathData="M12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM17.25,12c0,0.23 -0.02,0.46 -0.05,0.68l1.48,1.16c0.13,0.11 0.17,0.3 0.08,0.45l-1.4,2.42c-0.09,0.15 -0.27,0.21 -0.43,0.15l-1.74,-0.7c-0.36,0.28 -0.76,0.51 -1.18,0.69l-0.26,1.85c-0.03,0.17 -0.18,0.3 -0.35,0.3h-2.8c-0.17,0 -0.32,-0.13 -0.35,-0.29l-0.26,-1.85c-0.43,-0.18 -0.82,-0.41 -1.18,-0.69l-1.74,0.7c-0.16,0.06 -0.34,0 -0.43,-0.15l-1.4,-2.42c-0.09,-0.15 -0.05,-0.34 0.08,-0.45l1.48,-1.16c-0.03,-0.23 -0.05,-0.46 -0.05,-0.69 0,-0.23 0.02,-0.46 0.05,-0.68l-1.48,-1.16c-0.13,-0.11 -0.17,-0.3 -0.08,-0.45l1.4,-2.42c0.09,-0.15 0.27,-0.21 0.43,-0.15l1.74,0.7c0.36,-0.28 0.76,-0.51 1.18,-0.69l0.26,-1.85c0.03,-0.17 0.18,-0.3 0.35,-0.3h2.8c0.17,0 0.32,0.13 0.35,0.29l0.26,1.85c0.43,0.18 0.82,0.41 1.18,0.69l1.74,-0.7c0.16,-0.06 0.34,0 0.43,0.15l1.4,2.42c0.09,0.15 0.05,0.34 -0.08,0.45l-1.48,1.16c0.03,0.23 0.05,0.46 0.05,0.69z"/>
+    
+</vector>
diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml
@@ -1,9 +1,4 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
         android:shape="rectangle">
-    <gradient
-            android:angle="135"
-            android:centerColor="#009688"
-            android:endColor="#00695C"
-            android:startColor="#4DB6AC"
-            android:type="linear" />
+    <solid android:color="@color/conduit_green"/>
 </shape>
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
@@ -7,7 +7,7 @@
         android:gravity="bottom"
         android:orientation="vertical"
         android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin"
+        android:paddingTop="@dimen/navdrawer_vertical_margin"
         android:paddingRight="@dimen/activity_horizontal_margin"
         android:paddingBottom="@dimen/activity_vertical_margin"
         android:theme="@style/ThemeOverlay.AppCompat.Dark">
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -2,15 +2,15 @@
     <!-- Base application theme. -->
     <style name="Theme.Conduit" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
+        <item name="colorPrimary">@color/conduit_green</item>
+        <item name="colorPrimaryVariant">@color/conduit_grey_dark</item>
+        <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
+        <item name="colorSecondary">@color/conduit_grey</item>
+        <item name="colorSecondaryVariant">@color/conduit_grey_dark</item>
+        <item name="colorOnSecondary">@color/white</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor" tools:targetApi="l">@color/conduit_green_transparent</item>
         <!-- Customize your theme here. -->
     </style>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
+    <color name="white">#EFEFEF</color>
+    <color name="conduit_green">#5CB85C</color>
+    <color name="conduit_green_dark">#347634</color>
+    <color name="conduit_grey">#818a91</color>
+    <color name="conduit_grey_dark">#4B5359</color>
+    <color name="conduit_green_transparent">#5C347634</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -2,7 +2,8 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="navdrawer_vertical_margin">48dp</dimen>
     <dimen name="nav_header_vertical_spacing">8dp</dimen>
-    <dimen name="nav_header_height">176dp</dimen>
+    <dimen name="nav_header_height">192dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -2,15 +2,15 @@
     <!-- Base application theme. -->
     <style name="Theme.Conduit" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">@color/conduit_green</item>
+        <item name="colorPrimaryVariant">@color/conduit_green_dark</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
+        <item name="colorSecondary">@color/conduit_grey</item>
+        <item name="colorSecondaryVariant">@color/conduit_grey_dark</item>
+        <item name="colorOnSecondary">@color/white</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor" tools:targetApi="l">@color/conduit_green_transparent</item>
         <!-- Customize your theme here. -->
     </style>
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.realworld.api.models`
	`1`	`+package io.realworld.api.models.entities`
`2`	`2`
`3`	`3`
`4`	`4`	`import com.squareup.moshi.Json`