Update design (#8)

* Update dependencies

* Revert Material and AppCompat versions

* Update main activity, toolbar, fonts, icons

* Update drink details activity

* Update cart activity

* Update about activity

* Update profile activity

* Remove unused theme

* Add previous orders activity

* Fix class visibility

* Fix recent orders in profile screen

* Update order screen

* Update edit cart dialog

* Fix quantity display not reducing in drink details activity

* Update login and signup activities

app/src/main/AndroidManifest.xml

@@ -14,9 +14,10 @@
         android:supportsRtl="false"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
+
         <activity
             android:name=".ui.SplashActivity"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/AppTheme.SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -31,38 +32,34 @@
             android:name=".ui.drinkdetails.DrinkDetailsActivity"
             android:configChanges="orientation|keyboardHidden"
             android:parentActivityName=".ui.main.MainActivity"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.TranslucentStatus" />
         <activity
             android:name=".ui.cart.CartActivity"
             android:configChanges="orientation|keyboardHidden"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.checkout.CheckoutActivity"
-            android:configChanges="orientation|keyboardHidden"
-            android:parentActivityName=".ui.cart.CartActivity"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.login.LogInActivity"
             android:configChanges="orientation|keyboardHidden"
             android:screenOrientation="portrait"
-            android:theme="@style/AppThemeNoBar"
             android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".ui.signup.SignUpActivity"
             android:configChanges="orientation|keyboardHidden"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppThemeNoBar" />
+            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.profile.ProfileActivity"
             android:configChanges="orientation|keyboardHidden"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.about.AboutActivity"
-            android:theme="@style/AppThemeNoBar" />
-        <activity android:name=".ui.previousOrder.PreviousOrderActivity" />
+            android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.libraries.LibrariesActivity"
-            android:parentActivityName=".ui.about.AboutActivity" />
+            android:name=".ui.previousOrders.PreviousOrdersActivity"
+            android:screenOrientation="portrait"
+            android:parentActivityName=".ui.profile.ProfileActivity"/>
+        <activity android:name=".ui.viewOrder.ViewOrderActivity"
+            android:parentActivityName=".ui.profile.ProfileActivity"/>
 
         <service android:name=".data.network.MyFirebaseMessagingService">
             <intent-filter>

app/src/main/java/com/marknkamau/justjava/di/Modules.kt

@@ -7,16 +7,16 @@ import com.marknkamau.justjava.data.local.PreferencesRepository
 import com.marknkamau.justjava.data.local.PreferencesRepositoryImpl
 import com.marknkamau.justjava.ui.cart.CartPresenter
 import com.marknkamau.justjava.ui.cart.CartView
-import com.marknkamau.justjava.ui.checkout.CheckoutPresenter
-import com.marknkamau.justjava.ui.checkout.CheckoutView
 import com.marknkamau.justjava.ui.drinkdetails.DrinkDetailsPresenter
 import com.marknkamau.justjava.ui.drinkdetails.DrinkDetailsView
 import com.marknkamau.justjava.ui.login.LogInPresenter
 import com.marknkamau.justjava.ui.login.LogInView
 import com.marknkamau.justjava.ui.main.MainPresenter
 import com.marknkamau.justjava.ui.main.MainView
-import com.marknkamau.justjava.ui.previousOrder.PreviousOrderPresenter
-import com.marknkamau.justjava.ui.previousOrder.PreviousOrderView
+import com.marknkamau.justjava.ui.viewOrder.ViewOrderPresenter
+import com.marknkamau.justjava.ui.viewOrder.ViewOrderView
+import com.marknkamau.justjava.ui.previousOrders.PreviousOrdersPresenter
+import com.marknkamau.justjava.ui.previousOrders.PreviousOrdersView
 import com.marknkamau.justjava.ui.profile.ProfilePresenter
 import com.marknkamau.justjava.ui.profile.ProfileView
 import com.marknkamau.justjava.ui.signup.SignUpPresenter
@@ -35,8 +35,8 @@ val appModule = module {
     factory { (view: SignUpView) -> SignUpPresenter(view, get(), get(), get(), Dispatchers.Main) }
     factory { (view: MainView) -> MainPresenter(view, Dispatchers.Main) }
     factory { (view: DrinkDetailsView) -> DrinkDetailsPresenter(view, get(), Dispatchers.Main) }
-    factory { (view: CartView) -> CartPresenter(view, get(), Dispatchers.Main) }
-    factory { (view: CheckoutView) -> CheckoutPresenter(view, get(), get(), get(), get(), Dispatchers.Main) }
-    factory { (view: PreviousOrderView) -> PreviousOrderPresenter(view, get(), get(), get(), Dispatchers.Main) }
+    factory { (view: CartView) -> CartPresenter(view, get(), get(), get(), get(), Dispatchers.Main) }
+    factory { (view: ViewOrderView) -> ViewOrderPresenter(view, get(), get(), get(), Dispatchers.Main) }
     factory { (view: ProfileView) -> ProfilePresenter(view, get(), get(), get(), get(), Dispatchers.Main) }
+    factory { (view: PreviousOrdersView) -> PreviousOrdersPresenter(view, get(), get(), Dispatchers.Main) }
 }

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

@@ -1,18 +1,15 @@
 package com.marknkamau.justjava.ui
 
 import android.content.Intent
-
-import androidx.appcompat.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import com.marknjunge.core.auth.AuthService
-import com.marknkamau.justjava.JustJavaApp
 import com.marknkamau.justjava.R
 import com.marknkamau.justjava.data.local.PreferencesRepository
 import com.marknkamau.justjava.ui.about.AboutActivity
 import com.marknkamau.justjava.ui.cart.CartActivity
-import com.marknkamau.justjava.ui.checkout.CheckoutActivity
 import com.marknkamau.justjava.ui.login.LogInActivity
 import com.marknkamau.justjava.ui.profile.ProfileActivity
 import org.koin.android.ext.android.inject
@@ -30,22 +27,14 @@ abstract class BaseActivity : AppCompatActivity() {
 
     override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
         super.onPrepareOptionsMenu(menu)
-        if (this is CartActivity || this is CheckoutActivity) {
+        if (this is CartActivity) {
             menu?.findItem(R.id.menu_cart)?.isVisible = false
         }
         if (this is ProfileActivity) {
             menu?.findItem(R.id.menu_profile)?.isVisible = false
         }
 
-        if (authService.isSignedIn()) {
-            menu?.findItem(R.id.menu_login)?.isVisible = false
-//            menu?.findItem(R.id.menu_profile)?.isVisible = true
-            menu?.findItem(R.id.menu_logout)?.isVisible = true
-        } else {
-            menu?.findItem(R.id.menu_login)?.isVisible = true
-//            menu?.findItem(R.id.menu_profile)?.isVisible = false
-            menu?.findItem(R.id.menu_logout)?.isVisible = false
-        }
+        menu?.findItem(R.id.menu_logout)?.isVisible = authService.isSignedIn()
         return true
     }
 
@@ -55,10 +44,6 @@ abstract class BaseActivity : AppCompatActivity() {
                 startActivity(Intent(this, CartActivity::class.java))
                 return true
             }
-            R.id.menu_login -> {
-                startActivity(Intent(this, LogInActivity::class.java))
-                return true
-            }
             R.id.menu_profile -> {
                 if (authService.isSignedIn()) {
                     startActivity(Intent(this, ProfileActivity::class.java))
@@ -71,9 +56,10 @@ abstract class BaseActivity : AppCompatActivity() {
                 invalidateOptionsMenu()
                 preferencesRepository.clearUserDetails()
                 authService.logOut()
-                // If this is ProfileActivity
+                // If this is ProfileActivity, leave it
                 (this as? ProfileActivity)?.finish()
                 Toast.makeText(this, "Logged out", Toast.LENGTH_SHORT).show()
+                onLoggedOut()
                 return true
             }
             R.id.menu_about -> {
@@ -84,4 +70,6 @@ abstract class BaseActivity : AppCompatActivity() {
         }
     }
 
+    open fun onLoggedOut(){}
+
 }

app/src/main/java/com/marknkamau/justjava/ui/about/AboutActivity.kt

@@ -1,43 +1,33 @@
 package com.marknkamau.justjava.ui.about
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import android.view.View
+import androidx.appcompat.app.AppCompatActivity
 import com.marknkamau.justjava.BuildConfig
 import com.marknkamau.justjava.R
-import com.marknkamau.justjava.ui.libraries.LibrariesActivity
 import kotlinx.android.synthetic.main.activity_about.*
 
-class AboutActivity : AppCompatActivity(), View.OnClickListener {
+class AboutActivity : AppCompatActivity() {
 
+    @SuppressLint("SetTextI18n")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_about)
 
-        tvVersion.text = "v${BuildConfig.VERSION_NAME}"
-
-        tvSource.setOnClickListener(this)
-        imgBack.setOnClickListener(this)
-        imgMail.setOnClickListener(this)
-        imgLinkedin.setOnClickListener(this)
-        imgGithub.setOnClickListener(this)
-        imgWebsite.setOnClickListener(this)
-        tvPrivacyPolicy.setOnClickListener(this)
-        tvLibraries.setOnClickListener { startActivity(Intent(this, LibrariesActivity::class.java)) }
-    }
-
-    override fun onClick(view: View) {
-        when (view) {
-            tvSource -> openUrl("https://github.com/MarkNjunge/JustJava-Android")
-            imgBack -> finish()
-            imgMail -> sendEmail()
-            imgLinkedin -> openUrl("https://linkedin.com/in/marknjunge")
-            imgGithub -> openUrl("https://github.com/MarkNjunge")
-            imgWebsite -> openUrl("https://marknjunge.com")
-            tvPrivacyPolicy -> openUrl("https://marknjunge.com/justjava/privacy")
-        }
+        imgBackAbout.setOnClickListener { finish() }
+        tvAppVersionAbout.text = "v${BuildConfig.VERSION_NAME} ${if (BuildConfig.BUILD_TYPE == "debug") "(debug)" else ""}"
+        tvSourceCodeAbout.setOnClickListener { openUrl("https://github.com/MarkNjunge/JustJava-Android") }
+        imgEmailAbout.setOnClickListener { sendEmail() }
+        imgLinkedInAbout.setOnClickListener { openUrl("https://linkedin.com/in/marknjunge") }
+        imgWebsiteAbout.setOnClickListener { openUrl("https://marknjunge.com") }
+        imgGithubAbout.setOnClickListener { openUrl("https://github.com/MarkNjunge") }
+        tvPrivacyPolicyAbout.setOnClickListener { openUrl("https://marknjunge.com/justjava/privacy") }
+
+        // See https://github.com/google/play-services-plugins/pull/62
+        tvLicensesAbout.visibility = View.GONE
     }
 
     private fun openUrl(url: String) = startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))