Skip to content
This repository was archived by the owner on Jun 27, 2020. It is now read-only.

177 redesign add record activity #191

Merged
bogdan-evtushenko merged 4 commits into from
Sep 13, 2019
Merged

177 redesign add record activity #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a36f8b
Raise minSdkVersion to 21.
bogdan-evtushenko Sep 13, 2019
1d4697f
Raise targetSdkVersion to 29.
bogdan-evtushenko Sep 13, 2019
00a1b7c
#177. Redesign AddRecordActivity.
bogdan-evtushenko Sep 13, 2019
0e31fd7
#177. Add review fixes.
bogdan-evtushenko Sep 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ android {
buildToolsVersion '27.0.3'
defaultConfig {
applicationId 'com.blogspot.e_kanivets.moneytracker'
minSdkVersion 17
targetSdkVersion 26
minSdkVersion 21
targetSdkVersion 29

versionCode 31
versionName '2.0.1'
Expand Down
19 changes: 9 additions & 10 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.blogspot.e_kanivets.moneytracker">

<!-- Used only for Dropbox backup -->
<uses-permission android:name="android.permission.INTERNET" />

<application
android:name=".MtApp"
android:allowBackup="true"
Expand Down Expand Up @@ -32,7 +29,7 @@
android:name=".activity.record.AddRecordActivity"
android:screenOrientation="portrait"
android:theme="@style/Theme.Default"
android:windowSoftInputMode="stateVisible" />
android:windowSoftInputMode="adjustResize" />
<activity
android:name=".activity.account.AddAccountActivity"
android:label="@string/title_add_account"
Expand Down Expand Up @@ -98,15 +95,19 @@
android:launchMode="singleTask"
android:theme="@android:style/Theme.Translucent.NoTitleBar">
<intent-filter>
<data android:scheme="db-5lqugcckdy9y6lj" />

<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.BROWSABLE" />

<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="db-5lqugcckdy9y6lj" />
</intent-filter>
</activity>

<meta-data
android:name="io.fabric.ApiKey"
android:value="955ae4864ae2a833aeda5b62631512524288adf8" />

<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="com.blogspot.e_kanivets.moneytracker"
Expand All @@ -117,10 +118,8 @@
android:resource="@xml/file_paths" />
</provider>

<meta-data
android:name="io.fabric.ApiKey"
android:value="955ae4864ae2a833aeda5b62631512524288adf8" />

</application>

<uses-permission android:name="android.permission.INTERNET" />

</manifest>
30 changes: 20 additions & 10 deletions app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/AddRecordActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import android.annotation.SuppressLint
import android.app.Activity
import android.app.DatePickerDialog
import android.app.TimePickerDialog
import android.content.res.ColorStateList
import android.graphics.Color
import android.support.v4.content.ContextCompat
import android.text.InputFilter
import android.text.Spanned
import android.text.format.DateFormat
Expand All @@ -29,6 +32,7 @@ import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy
import com.blogspot.e_kanivets.moneytracker.util.CategoryAutoCompleter
import com.blogspot.e_kanivets.moneytracker.util.validator.IValidator
import com.blogspot.e_kanivets.moneytracker.util.validator.RecordValidator
import kotlinx.android.synthetic.main.activity_add_record.*
import kotlinx.android.synthetic.main.content_add_record.*
import java.util.*
import javax.inject.Inject
Expand Down Expand Up @@ -103,9 +107,21 @@ class AddRecordActivity : BaseBackActivity() {
tvDate.setOnClickListener { selectDate() }
tvTime.setOnClickListener { selectTime() }

if (type == Record.TYPE_EXPENSE) {
fabDone.backgroundTintList = (getColorForFab(R.color.red_light))
} else {
fabDone.backgroundTintList = (getColorForFab(R.color.green_light))
}

fabDone.setOnClickListener { tryRecord() }

updateDateAndTime()
}

private fun getColorForFab(color: Int): ColorStateList {
return ColorStateList.valueOf(ContextCompat.getColor(this, color))
}

private fun initCategoryAutocomplete() {
val categoryAutoCompleteAdapter = CategoryAutoCompleteAdapter(
this, R.layout.view_category_item, autoCompleter)
Expand Down Expand Up @@ -145,21 +161,16 @@ class AddRecordActivity : BaseBackActivity() {
}

override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
R.id.action_done -> {
tryRecord()
return true
}

return when (item.itemId) {
Copy link
Owner

@yev-kanivets yev-kanivets Sep 13, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

R.id.action_delete -> {
if (recordController.delete(record)) {
setResult(Activity.RESULT_OK)
finish()
}
return true
true
}

else -> return super.onOptionsItemSelected(item)
else -> super.onOptionsItemSelected(item)
}
}

Expand Down Expand Up @@ -284,8 +295,7 @@ class AddRecordActivity : BaseBackActivity() {
private class SemicolonInputFilter : InputFilter {

override fun filter(source: CharSequence?, start: Int, end: Int, dest: Spanned, dstart: Int, dend: Int): CharSequence? {
return if (source != null && ";" == source.toString()) ""
else null
return if (source != null && ";" == source.toString()) "" else null
}
}

Expand Down
10 changes: 9 additions & 1 deletion app/src/main/res/layout/activity_add_record.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".activity.record.AddRecordActivity">

<android.support.design.widget.AppBarLayout
Expand All @@ -20,6 +21,13 @@

</android.support.design.widget.AppBarLayout>

<include layout="@layout/content_add_record" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/fabDone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:src="@drawable/ic_done"
android:layout_margin="@dimen/normal_margin" />

<include layout="@layout/content_add_record" />
</android.support.design.widget.CoordinatorLayout>
6 changes: 0 additions & 6 deletions app/src/main/res/menu/menu_add_record.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,4 @@
android:title="@string/delete"
tools:showAsAction="ifRoom" />

<item
android:id="@+id/action_done"
android:icon="@drawable/ic_done"
android:title="@string/add"
tools:showAsAction="ifRoom" />

</menu>