[FEAT] Add image resources to fragments empty states

peterkrauz · Sep 23, 2020 · 11ec0b1 · 11ec0b1
1 parent a22875c
commit 11ec0b1
Show file tree

Hide file tree

Showing 20 changed files with 137 additions and 24 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,6 +10,9 @@ plugins {
     id 'com.google.firebase.appdistribution'
 }
 
+def firebaseBetaGroups = System.getenv("FIREBASE_TESTERS")
+def firebaseBetaTesters = System.getenv("TESTER_GROUP_ALIAS")
+
 android {
     compileSdkVersion AndroidConfig.compileSdkVersion
     buildToolsVersion AndroidConfig.buildToolsVersion
@@ -21,7 +24,7 @@ android {
         versionCode AndroidConfig.versionCode
         versionName AndroidConfig.versionName
         testInstrumentationRunner AndroidConfig.testInstrumentationRunner
-        ext.betaDistributionGroupAliases = AndroidConfig.firebaseAppTestersGroupAlias
+        ext.betaDistributionGroupAliases = firebaseBetaGroups
 
         javaCompileOptions {
             annotationProcessorOptions {
@@ -46,7 +49,8 @@ android {
             resValue "string", "app_name", "Grimoire Beta"
             firebaseAppDistribution {
                 releaseNotesFile="releasenotes.txt"
-                groups=AndroidConfig.firebaseAppTestersGroupAlias
+                testers=firebaseBetaTesters
+                groups=firebaseBetaGroups
             }
         }
     }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     package="com.peterkrauz.grimoire">
 
     <application
+        android:name=".GrimoireApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

diff --git a/app/src/main/java/com/peterkrauz/grimoire/MainActivity.kt b/app/src/main/java/com/peterkrauz/grimoire/MainActivity.kt
@@ -4,8 +4,10 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
+import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.android.synthetic.main.activity_main.*
 
+@AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -15,7 +17,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun setupView() {
         bottomNavigationView.run {
-            setOnNavigationItemReselectedListener { Unit }
+//            setOnNavigationItemReselectedListener { Unit }
             setupWithNavController(mainNavFragment.findNavController())
         }
     }

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -27,7 +27,7 @@
         app:elevation="16dp"
         app:itemIconTint="@drawable/selector_bottom_nav_item"
         app:itemTextColor="@drawable/selector_bottom_nav_item"
-        app:itemTextAppearanceActive="@style/TextAppearance.Grimoire.Bold"
+        app:itemTextAppearanceActive="@style/TextAppearance.Grimoire.BottomNavItem.Bold"
         app:labelVisibilityMode="selected"
         app:layout_constraintBottom_toBottomOf="parent" />
 

diff --git a/buildSrc/src/main/java/AndroidConfig.kt b/buildSrc/src/main/java/AndroidConfig.kt
@@ -8,10 +8,9 @@ object AndroidConfig {
     const val minSdkVersion = 21
     const val targetSdkVersion = 30
     const val versionCode = 1
-    val versionName = System.getenv("VERSION_NAME")
+    const val versionName = "0.0.2"
     const val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     const val consumerProguardFile = "consumer-rules.pro"
-    val firebaseAppTestersGroupAlias = System.getenv("TESTER_GROUP_ALIAS")
 
     val javaVersion = JavaVersion.VERSION_1_8
     const val jvmTarget = "1.8"

diff --git a/common/src/main/java/com/peterkrauz/grimoire/common/BaseViewModel.kt b/common/src/main/java/com/peterkrauz/grimoire/common/BaseViewModel.kt
@@ -3,6 +3,8 @@ package com.peterkrauz.grimoire.common
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlin.coroutines.CoroutineContext
 import kotlin.properties.Delegates
 import kotlin.reflect.KProperty
 
@@ -14,12 +16,16 @@ abstract class BaseViewModel<out S : BaseViewState, A : BaseViewAction>(state: S
     val stateLiveData: LiveData<out S>
         get() = _stateLiveData
 
+    private val coroutinesErrorHandler by lazy { CoroutineExceptionHandler(::handleError) }
+
     fun performAction(action: A) {
         state = reduceState(action)
     }
 
     abstract fun loadData()
 
+    abstract fun handleError(context: CoroutineContext, error: Throwable)
+
     protected abstract fun reduceState(action: A): S
 
     private fun onStateChanged(property: KProperty<*>, oldState: S, newState: S) {

diff --git a/common/src/main/java/com/peterkrauz/grimoire/common/BaseViewState.kt b/common/src/main/java/com/peterkrauz/grimoire/common/BaseViewState.kt
@@ -1,5 +1,3 @@
 package com.peterkrauz.grimoire.common
 
-interface BaseViewState {
-    object Loading : BaseViewState
-}
+interface BaseViewState
diff --git a/app/src/main/res/values/colors.xml → common/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml → common/src/main/res/values/colors.xml
@@ -5,4 +5,5 @@
     <color name="colorAccent">#9162e4</color>
     <color name="colorBackground">#fafafa</color>
     <color name="grey64">#868586</color>
+    <color name="grey82">#636363</color>
 </resources>
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Empty state messages  -->
+    <string name="arcs_empty_state_msg">It seems you haven\'t\ncreated any Arc yet.</string>
+    <string name="characters_empty_state_msg">It seems you haven\'t\ncreated any Character yet.</string>
+    <string name="notes_empty_state_msg">It seems you haven\'t\ncreated any Note yet.</string>
+</resources>
diff --git a/app/src/main/res/values/styles.xml → common/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml → common/src/main/res/values/styles.xml
@@ -19,7 +19,13 @@
         <item name="contentInsetEnd">0dp</item>
     </style>
 
-    <style name="TextAppearance.Grimoire.Bold" parent="TextAppearance.AppCompat">
+    <style name="TextAppearance.Grimoire.BottomNavItem.Bold" parent="TextAppearance.AppCompat">
         <item name="android:fontFamily">@font/kumbh_sans_bold</item>
     </style>
+
+    <style name="TextAppearance.Grimoire.H2" parent="TextAppearance.AppCompat">
+        <item name="android:fontFamily">@font/kumbh_sans_bold</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/grey82</item>
+    </style>
 </resources>
diff --git a/presentation/characters/build.gradle b/presentation/characters/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-android-extensions'
     id 'kotlin-kapt'
+    id 'dagger.hilt.android.plugin'
 }
 
 android {
@@ -45,4 +46,6 @@ dependencies {
     implementation Hilt.viewModel
     kapt Hilt.compiler
     kapt Hilt.androidXCompiler
+
+    implementation project(ModulePaths.common)
 }
diff --git a/presentation/characters/src/main/res/drawable/img_tree.png b/presentation/characters/src/main/res/drawable/img_tree.png
diff --git a/presentation/characters/src/main/res/layout/fragment_characters.xml b/presentation/characters/src/main/res/layout/fragment_characters.xml
@@ -1,6 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-</LinearLayout>
+    <LinearLayout
+        android:id="@+id/linearLayoutEmptyState"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="center"
+        app:layout_constraintVertical_bias="0.4"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" >
+
+        <ImageView
+            android:layout_width="190dp"
+            android:layout_height="190dp"
+            android:src="@drawable/img_tree" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/characters_empty_state_msg"
+            android:textAppearance="@style/TextAppearance.Grimoire.H2"
+            android:gravity="center"
+            android:layout_marginTop="64dp"/>
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/presentation/home/build.gradle b/presentation/home/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-android-extensions'
     id 'kotlin-kapt'
+    id 'dagger.hilt.android.plugin'
 }
 
 android {
@@ -45,4 +46,6 @@ dependencies {
     implementation Hilt.viewModel
     kapt Hilt.compiler
     kapt Hilt.androidXCompiler
+
+    implementation project(ModulePaths.common)
 }
diff --git a/presentation/home/src/main/res/drawable/img_crow.png b/presentation/home/src/main/res/drawable/img_crow.png
diff --git a/presentation/home/src/main/res/layout/fragment_arcs.xml b/presentation/home/src/main/res/layout/fragment_arcs.xml
@@ -1,6 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-</LinearLayout>
+    <LinearLayout
+        android:id="@+id/linearLayoutEmptyState"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="center"
+        app:layout_constraintVertical_bias="0.4"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" >
+
+        <ImageView
+            android:layout_width="190dp"
+            android:layout_height="190dp"
+            android:src="@drawable/img_crow" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/arcs_empty_state_msg"
+            android:textAppearance="@style/TextAppearance.Grimoire.H2"
+            android:gravity="center"
+            android:layout_marginTop="64dp"/>
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/presentation/notes/build.gradle b/presentation/notes/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'kotlin-android'
     id 'kotlin-android-extensions'
     id 'kotlin-kapt'
+    id 'dagger.hilt.android.plugin'
 }
 
 android {
@@ -45,4 +46,6 @@ dependencies {
     implementation Hilt.viewModel
     kapt Hilt.compiler
     kapt Hilt.androidXCompiler
+
+    implementation project(ModulePaths.common)
 }
diff --git a/presentation/notes/src/main/res/drawable/img_magic_book.png b/presentation/notes/src/main/res/drawable/img_magic_book.png
diff --git a/presentation/notes/src/main/res/layout/fragment_notes.xml b/presentation/notes/src/main/res/layout/fragment_notes.xml
@@ -1,6 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-</LinearLayout>
+    <LinearLayout
+        android:id="@+id/linearLayoutEmptyState"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="center"
+        app:layout_constraintVertical_bias="0.4"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" >
+
+        <ImageView
+            android:layout_width="190dp"
+            android:layout_height="190dp"
+            android:src="@drawable/img_magic_book" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/notes_empty_state_msg"
+            android:textAppearance="@style/TextAppearance.Grimoire.H2"
+            android:gravity="center"
+            android:layout_marginTop="64dp"/>
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/releasenotes.txt b/releasenotes.txt
@@ -1,5 +1 @@
-Version: 0.0.1
-
-Features:
-- Home screen
-- App icon
+Version: 0.0.2