Merge pull request #2 from pushkar-anand/patch-1.1.5

patch-1.1.5
pushkar-anand · Nov 24, 2018 · ab83948 · ab83948
2 parents b0c0fd3 + 172c002
commit ab83948
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "me.pushkaranand.spendo"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 6
-        versionName "1.1.4"
+        versionCode 7
+        versionName "1.1.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         kapt {

diff --git a/app/release/release/app.aab b/app/release/release/app.aab
diff --git a/app/src/main/java/me/pushkaranand/spendo/ui/HomeActivity.kt b/app/src/main/java/me/pushkaranand/spendo/ui/HomeActivity.kt
@@ -241,7 +241,7 @@ class HomeActivity : AppCompatActivity() {
                     val categories = data.getStringExtra(NewTransactionActivity.TRANSACTION_CATEGORIES)
                     val date = data.getStringExtra(NewTransactionActivity.TRANSACTION_DATE)
                     var notes: String? = null
-                    if (data.hasCategory(NewTransactionActivity.TRANSACTION_NOTES)) {
+                    if (data.hasExtra(NewTransactionActivity.TRANSACTION_NOTES)) {
                         notes = data.getStringExtra(NewTransactionActivity.TRANSACTION_NOTES)
                     }
                     amount = if (type == getString(R.string.debit_choice)) {

diff --git a/app/src/main/java/me/pushkaranand/spendo/ui/ViewTransactionActivity.kt b/app/src/main/java/me/pushkaranand/spendo/ui/ViewTransactionActivity.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
@@ -91,6 +92,12 @@ class ViewTransactionActivity : AppCompatActivity() {
                 tmp += "$c\n"
             }
             categoriesTextView.text = tmp
+
+            if (it.notes != null) {
+                notesImg.visibility = View.VISIBLE
+                notesTextView.visibility = View.VISIBLE
+                notesTextView.text = it.notes
+            }
         }
     }
 

diff --git a/app/src/main/res/layout/content_view_transaction.xml b/app/src/main/res/layout/content_view_transaction.xml
@@ -55,6 +55,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:padding="15dp"
+        android:contentDescription="@string/category_label"
         app:layout_constraintBottom_toBottomOf="@+id/categoriesTextView"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/categoriesTextView"
@@ -81,6 +82,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:padding="15dp"
+        android:contentDescription="@string/date_label"
         app:layout_constraintBottom_toBottomOf="@+id/dateTextView"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/dateTextView"
@@ -116,6 +118,9 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:padding="15dp"
+        android:contentDescription="@string/notes_label"
+        android:visibility="gone"
+        tools:visibility="visible"
         app:layout_constraintBottom_toBottomOf="@+id/notesTextView"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/notesTextView"
@@ -131,6 +136,8 @@
         android:paddingStart="10dp"
         android:paddingEnd="10dp"
         android:textSize="18sp"
+        android:visibility="gone"
+        tools:visibility="visible"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/notesImg"
         app:layout_constraintTop_toBottomOf="@+id/dateTextView"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -54,6 +54,9 @@
 
 
     <!--ViewTransactionActivity -->
+    <string name="category_label">Category</string>
+    <string name="date_label">Date</string>
+    <string name="notes_label">Notes</string>
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
     <string name="delete_dialog_title">Delete</string>