Merge update-design

app/build.gradle

@@ -27,6 +27,7 @@ android {
         debug {
             ext.alwaysUpdateBuildId = false
             ext.enableCrashlytics = false
+            applicationIdSuffix ".debug"
         }
         release {
             minifyEnabled true

app/src/androidTest/java/com/marknkamau/justjava/ui/main/MainActivityTest.kt

@@ -8,9 +8,8 @@ import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.filters.LargeTest
 import androidx.test.rule.ActivityTestRule
 import androidx.test.runner.AndroidJUnit4
-import androidx.recyclerview.widget.RecyclerView
-import com.marknkamau.justjava.R
 import com.marknjunge.core.data.local.DrinksProvider
+import com.marknkamau.justjava.R
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith

app/src/debug/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="109.81469"
+    android:viewportHeight="109.81469">
+  <group android:translateX="3.8435142"
+      android:translateY="3.8435142">
+      <group android:translateX="27.06383"
+              android:translateY="27.06383">
+        <path
+            android:pathData="M39.8,8.6h-1.4H9.6H8.2V5.8h1.9h27.8h1.9V8.6zM36.2,18.7h-6.9c0,0 -0.3,-0.1 -0.5,-0.4c-0.4,-0.6 -0.8,-1.3 -1.7,-1.6c-0.2,0 -0.4,-0.1 -0.7,-0.1c-0.6,0 -1.1,0.2 -1.5,0.4c-0.3,0.1 -0.7,0.3 -0.9,0.3s-0.6,-0.1 -0.9,-0.3c-0.5,-0.2 -1,-0.4 -1.5,-0.4c-0.2,0 -0.4,0 -0.7,0.1c-0.8,0.3 -1.3,1 -1.7,1.6c-0.1,0.1 -0.2,0.3 -0.2,0.4h-7.2l-1,-8.2h26.4L36.2,18.7zM32.9,46.1H15.2l-1.4,-12H19c0.1,0.1 0.2,0.2 0.2,0.4c0.4,0.6 0.8,1.3 1.7,1.6c0.2,0 0.4,0.1 0.7,0.1l0,0c0.6,0 1.1,-0.2 1.5,-0.4c0.3,-0.1 0.7,-0.3 0.9,-0.3c0.2,0 0.6,0.1 0.9,0.3c0.5,0.2 1,0.4 1.5,0.4c0.2,0 0.4,0 0.7,-0.1c0.8,-0.3 1.3,-1 1.7,-1.6c0.1,-0.2 0.5,-0.4 0.5,-0.4h5L32.9,46.1zM15.4,22.7c0,0.3 0,0.7 0,0.9c0,0.2 -0.3,0.5 -0.5,0.7c-0.4,0.5 -1,1.2 -1,2.1s0.5,1.5 1,2.1c0.2,0.2 0.4,0.5 0.5,0.7c0,0.2 0,0.6 0,0.9c0,0.6 0,1.4 0.3,2h-2.3L12,20.5h3.6C15.4,21.3 15.4,22 15.4,22.7L15.4,22.7zM29.7,21.2c0.3,0.1 0.8,0.2 0.9,0.4c0.1,0.1 0.1,0.6 0,1c0,0.5 0,1.1 0.1,1.6c0.2,0.5 0.5,1 0.8,1.3c0.2,0.3 0.5,0.7 0.5,0.9c0,0.2 -0.3,0.6 -0.5,0.9c-0.3,0.4 -0.7,0.8 -0.8,1.3c-0.2,0.5 -0.1,1.1 -0.1,1.6c0,0.3 0,0.9 0,1c-0.1,0.1 -0.6,0.3 -0.9,0.4c-0.5,0.1 -1.1,0.3 -1.5,0.6s-0.8,0.8 -1.1,1.2c-0.2,0.3 -0.5,0.7 -0.6,0.8l0,0c-0.2,0 -0.5,-0.1 -0.9,-0.2c-0.5,-0.2 -1,-0.4 -1.6,-0.4s-1.1,0.2 -1.6,0.4c-0.3,0.1 -0.7,0.2 -0.9,0.2l0,0c-0.2,0 -0.4,-0.5 -0.6,-0.8c-0.3,-0.4 -0.6,-0.9 -1.1,-1.2s-1,-0.5 -1.5,-0.6c-0.3,-0.1 -0.8,-0.2 -0.9,-0.4c-0.1,-0.1 -0.1,-0.6 0,-1c0,-0.5 0,-1.1 -0.1,-1.6c-0.2,-0.5 -0.5,-1 -0.8,-1.3C16.3,27 16,26.6 16,26.4c0,-0.2 0.3,-0.6 0.5,-0.9c0.3,-0.4 0.7,-0.8 0.8,-1.3c0.2,-0.5 0.1,-1.1 0.1,-1.6c0,-0.3 0,-0.9 0,-1c0.1,-0.1 0.6,-0.3 0.9,-0.4c0.5,-0.1 1.1,-0.3 1.5,-0.6c0.4,-0.3 0.8,-0.8 1.1,-1.2c0.2,-0.3 0.5,-0.7 0.6,-0.8l0,0c0.2,0 0.5,0.1 0.9,0.2c0.5,0.2 1,0.4 1.6,0.4s1.1,-0.2 1.6,-0.4c0.3,-0.1 0.7,-0.2 0.9,-0.2l0,0c0.2,0 0.4,0.5 0.6,0.8c0.3,0.4 0.6,0.9 1.1,1.2S29.2,21.1 29.7,21.2L29.7,21.2zM32.6,30.1c0,-0.3 0,-0.7 0,-0.9c0,-0.2 0.3,-0.5 0.5,-0.7c0.4,-0.5 1,-1.2 1,-2.1s-0.5,-1.5 -1,-2.1c-0.2,-0.2 -0.4,-0.5 -0.5,-0.7c0,-0.2 0,-0.6 0,-0.9c0,-0.6 0,-1.4 -0.3,-2H36l-1.4,11.5h-2.3C32.7,31.5 32.6,30.7 32.6,30.1L32.6,30.1zM12.5,1.9h23.1l0.7,1.9H11.9L12.5,1.9zM40.8,3.8h-2.6l-1,-2.9C37.1,0.4 36.5,0 36,0H12c-0.5,0 -1.1,0.4 -1.2,0.9l-1,2.9H7.2c-0.5,0 -1,0.4 -1,1v4.8c0,0.5 0.4,1 1,1h1.7L13.3,47c0,0.5 0.5,1 1.1,1h19.2c0.5,0 1,-0.4 1.1,-1l4.5,-36.5h1.7c0.5,0 1,-0.4 1,-1V4.8C41.8,4.2 41.4,3.8 40.8,3.8L40.8,3.8z"
+            android:fillColor="#FFFFFF"/>
+      </group>
+  </group>
+</vector>

app/src/debug/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#5C5C5C</color>
+</resources>

app/src/debug/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">[D] JustJava</string>
+</resources>

app/src/main/java/com/marknkamau/justjava/JustJavaApp.kt

@@ -19,6 +19,7 @@ import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 import java.lang.Exception
 
+@Suppress("unused")
 class JustJavaApp : Application() {
     private val authService: AuthService by inject()
     private val userService: UserService by inject()

app/src/main/java/com/marknkamau/justjava/ui/BasePresenter.kt

@@ -2,7 +2,6 @@ package com.marknkamau.justjava.ui
 
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 
 abstract class BasePresenter(mainDispatcher: CoroutineDispatcher) {

app/src/main/java/com/marknkamau/justjava/ui/drinkdetails/DrinkDetailsActivity.kt

@@ -1,13 +1,9 @@
 package com.marknkamau.justjava.ui.drinkdetails
 
-import android.animation.AnimatorSet
-import android.animation.ObjectAnimator
-import android.animation.PropertyValuesHolder
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.util.TypedValue
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity

app/src/main/java/com/marknkamau/justjava/ui/main/MainActivity.kt

@@ -52,7 +52,7 @@ class MainActivity : BaseActivity(), MainView {
         presenter.getCatalogItems()
     }
 
-    override fun displayCatalog(drinkList: MutableList<CoffeeDrink>) {
+    override fun displayCatalog(drinkList: List<CoffeeDrink>) {
         catalogAdapter.setItems(drinkList)
     }
 }

app/src/main/java/com/marknkamau/justjava/ui/main/MainView.kt

@@ -3,5 +3,5 @@ package com.marknkamau.justjava.ui.main
 import com.marknjunge.core.model.CoffeeDrink
 
 internal interface MainView {
-    fun displayCatalog(drinkList: MutableList<CoffeeDrink>)
+    fun displayCatalog(drinkList: List<CoffeeDrink>)
 }

app/src/main/java/com/marknkamau/justjava/ui/viewOrder/ViewOrderActivity.kt

@@ -1,21 +1,21 @@
 package com.marknkamau.justjava.ui.viewOrder
 
+import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import androidx.appcompat.app.AlertDialog
 import android.view.View
-import android.widget.LinearLayout
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.recyclerview.widget.RecyclerView
-import com.marknkamau.justjava.R
-import com.marknkamau.justjava.data.local.PreferencesRepository
 import com.marknjunge.core.model.Order
 import com.marknjunge.core.model.OrderItem
+import com.marknkamau.justjava.R
+import com.marknkamau.justjava.data.local.PreferencesRepository
 import com.marknkamau.justjava.data.network.MyFirebaseMessagingService
 import com.marknkamau.justjava.utils.BaseRecyclerViewAdapter
 import com.marknkamau.justjava.utils.formatForApp
@@ -46,6 +46,7 @@ class ViewOrderActivity : AppCompatActivity(), ViewOrderView {
     private val broadcastManager by lazy { LocalBroadcastManager.getInstance(this) }
     private val presenter: ViewOrderPresenter by inject { parametersOf(this) }
 
+    @SuppressLint("SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_view_order)
@@ -93,7 +94,7 @@ class ViewOrderActivity : AppCompatActivity(), ViewOrderView {
                     if (order.orderId == orderId) {
                         Timber.d("The current order has been paid for!")
                         btnPayOrder.visibility = View.GONE
-                        tvPaymentStatusOrder .text = "Paid"
+                        tvPaymentStatusOrder .text = getString(R.string.paid)
                         displayMessage("Payment received!")
                     }
                 }

app/src/main/java/com/marknkamau/justjava/utils/KeyboardUtils.kt

@@ -10,8 +10,3 @@ fun AppCompatActivity.hideKeyboard() {
         manager.hideSoftInputFromWindow(it.windowToken, 0)
     }
 }
-
-fun AppCompatActivity.showKeyboard() {
-    val manager = this.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-    manager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0)
-}

app/src/main/res/drawable/background_splash.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@color/colorPrimaryDark" />
     <item
         android:drawable="@drawable/ic_launcher_foreground"

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

@@ -17,6 +17,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="16dp"
+            android:contentDescription="@string/back_button"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/ic_arrow_back" />
@@ -93,7 +94,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
-        android:text="Mark Njung'e"
+        android:text="@string/developer_name"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView17" />
 
@@ -103,7 +104,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:text="contact@marknjunge.com"
+        android:text="@string/developer_contact"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView18" />
 

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

@@ -24,6 +24,7 @@
             android:layout_width="172dp"
             android:layout_height="172dp"
             android:layout_gravity="center"
+            android:contentDescription="@null"
             app:srcCompat="@drawable/il_empty_cart" />
 
         <TextView
@@ -46,7 +47,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
             tools:context="com.marknkamau.justjava.ui.cart.CartActivity">
 
@@ -64,7 +65,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 tools:itemCount="2"
-                tools:listitem="@layout/item_cart" />
+                tools:listitem="@layout/item_order_item" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnClearCart"

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

@@ -63,7 +63,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btnLoginLogin"
-            style="@style/AppTheme.PrimaryButton"
+            style="@style/AppTheme.Button.FilledAccent"
             android:layout_width="0dp"
             android:layout_height="56dp"
             android:layout_marginLeft="32dp"
@@ -90,7 +90,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btnSignUpLogin"
-            style="@style/AppTheme.SecondaryButton"
+            style="@style/AppTheme.Button.OutlinedAccent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"

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

@@ -30,6 +30,7 @@
             android:layout_width="72dp"
             android:layout_height="72dp"
             android:layout_gravity="center"
+            android:contentDescription="@null"
             app:srcCompat="@drawable/il_no_orders" />
 
         <TextView

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

@@ -138,6 +138,7 @@
             android:layout_width="72dp"
             android:layout_height="72dp"
             android:layout_gravity="center"
+            android:contentDescription="@null"
             app:srcCompat="@drawable/il_no_orders" />
 
         <TextView

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

@@ -44,7 +44,7 @@
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/tilEmailAddressSignUp"
-            style="@style/AppTheme.InputField"
+            style="@style/AppTheme.InputField.OnDark"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginLeft="16dp"
@@ -163,7 +163,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btnSignupSignUp"
-            style="@style/AppTheme.PrimaryButton"
+            style="@style/AppTheme.Button.FilledAccent"
             android:layout_width="0dp"
             android:layout_height="56dp"
             android:layout_marginStart="32dp"

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

@@ -21,10 +21,9 @@
         style="@style/AppTheme.Text.14Accent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
+        app:layout_constraintBaseline_toBaselineOf="@+id/tvDrinkNameDetail"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         tools:text="Ksh. 100" />
 
     <TextView