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

Dev #180

Merged
bogdan-evtushenko merged 12 commits into from
Aug 23, 2019
Merged

Dev #180

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b3f63c2
Update kotlin version
Jul 8, 2019
f31342e
#167. Kotlinify MainActivity.
bogdan-evtushenko Jul 12, 2019
fbc82ea
#167. Add review fixes.
bogdan-evtushenko Jul 12, 2019
c962ba0
#168. Migrate ListView to RecyclerView in MainActivity.
bogdan-evtushenko Jul 17, 2019
0e7a980
#168. Add review fixes.
bogdan-evtushenko Jul 18, 2019
4072e27
#168. Add SummaryViewInterface.
bogdan-evtushenko Jul 18, 2019
f207de6
#168. Add some fixes.
bogdan-evtushenko Jul 18, 2019
282f8b5
#168. Add review fixes.
bogdan-evtushenko Jul 19, 2019
285c58c
#168. Add @Inject in RecordAdapter. Change anonymous class into lambd…
bogdan-evtushenko Jul 19, 2019
ba92df5
#168. Fix bug connected to shortSummary update in first launch.
bogdan-evtushenko Jul 22, 2019
0a708c4
Merge branch 'dev' of github.com:yevhenii-kanivets/Money-Tracker into…
bogdan-evtushenko Aug 23, 2019
0477d1e
Merge branch 'master' into dev
bogdan-evtushenko Aug 23, 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
Prev Previous commit
Next Next commit
#167. Add review fixes.
  • Loading branch information
@bogdan-evtushenko
bogdan-evtushenko committed Aug 23, 2019
commit fbc82ead2e0468831b663abd0916576935ddabd3
23 changes: 8 additions & 15 deletions app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/record/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.content_main.*
import javax.inject.Inject


class MainActivity : BaseDrawerActivity() {

private lateinit var recordList: List<Record>
Expand All @@ -51,16 +50,14 @@ class MainActivity : BaseDrawerActivity() {
private lateinit var tvDefaultAccountSum: TextView
private lateinit var tvCurrency: TextView

override fun getContentViewId(): Int {
return R.layout.activity_main
}
override fun getContentViewId(): Int = R.layout.activity_main

override fun initData(): Boolean {
super.initData()
appComponent.inject(this@MainActivity)
appComponent.inject(this)

preferenceController.addLaunchCount()
summaryPresenter = ShortSummaryPresenter(this@MainActivity)
summaryPresenter = ShortSummaryPresenter(this)

return super.initData()
}
Expand Down Expand Up @@ -115,7 +112,7 @@ class MainActivity : BaseDrawerActivity() {

private fun showReport() {
AnswersProxy.get().logButton("Show Report")
val intent = Intent(this@MainActivity, ReportActivity::class.java)
val intent = Intent(this, ReportActivity::class.java)
intent.putExtra(ReportActivity.KEY_PERIOD, period)
startActivity(intent)
}
Expand All @@ -125,10 +122,7 @@ class MainActivity : BaseDrawerActivity() {

if (resultCode == AppCompatActivity.RESULT_OK) {
when (requestCode) {
REQUEST_ACTION_RECORD -> {
appComponent.inject(this@MainActivity)
update()
}
REQUEST_ACTION_RECORD -> update()

REQUEST_BACKUP -> {
appComponent.inject(this@MainActivity)
Expand All @@ -142,11 +136,10 @@ class MainActivity : BaseDrawerActivity() {
}

override fun update() {
println("Hello update")
recordList = recordController.getRecordsForPeriod(period)
recordList = recordList.reversed()

listView.adapter = RecordAdapter(this@MainActivity, recordList)
listView.adapter = RecordAdapter(this, recordList)

val currency = currencyController.readDefaultCurrency()

Expand All @@ -159,13 +152,13 @@ class MainActivity : BaseDrawerActivity() {

private fun showAppRateDialog() {
AnswersProxy.get().logEvent("Show App Rate Dialog")
val dialog = AppRateDialog(this@MainActivity)
val dialog = AppRateDialog(this)
dialog.setCanceledOnTouchOutside(false)
dialog.show()
}

private fun startAddRecordActivity(record: Record?, mode: AddRecordActivity.Mode, type: Int) {
val intent = Intent(this@MainActivity, AddRecordActivity::class.java)
val intent = Intent(this, AddRecordActivity::class.java)
intent.putExtra(AddRecordActivity.KEY_RECORD, record)
intent.putExtra(AddRecordActivity.KEY_MODE, mode)
intent.putExtra(AddRecordActivity.KEY_TYPE, type)
Expand Down