Skip to content
This repository was archived by the owner on Jun 27, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
03f4b26
Raise gradle version.
Sep 5, 2018
602d875
Update all dependencies.
Sep 5, 2018
857ff38
#95. Kotlinify EditAccountActivity.
Sep 5, 2018
bba8d27
#95. Move EditAccountActivity to activity.account.edit package.
Sep 5, 2018
a942879
#95. Partly move logic from EditAccountActivity to EditAccountFragment.
Sep 5, 2018
ababa1e
#95. Completely move all logic to EditAccountFragment.
Sep 6, 2018
bc6c4c0
#95. Ongoing refactoring.
Sep 6, 2018
b49d2b1
#95. Add AccountRecordFragment.
Sep 6, 2018
05c19ab
#95. Display account records.
Sep 6, 2018
bd7615d
#95. Rename FragmentAccountRecords to FragmentAccountOperations.
Sep 6, 2018
85e09ab
#95. Kotlinify TransferController.
Sep 10, 2018
710f433
#95. Display transfers as records in account operations.
Sep 10, 2018
3c75b2c
#95. Refactor AccountOperationsFragment.
Sep 10, 2018
7cc5dae
#95. Add tabs to EditAccountActivity.
Sep 10, 2018
db929b8
#95. Add localization.
Sep 10, 2018
6b4b778
#95. Hide FAB when going to Operations tab.
Sep 11, 2018
b622cbd
#95. Updated .travis.yml.
Sep 11, 2018
84e3b7f
Merge pull request #156 from evgenii-kanivets/feature-95_account_oper…
Sep 11, 2018
3e76c15
#150. Add 'Delete' button to backup item view.
Sep 11, 2018
01e5fb2
#150. Implement delete backup listener.
Sep 12, 2018
b4af995
#150. Extract async tasks from BackupController.
Sep 12, 2018
64cae2d
#150. Refactore BackupListener.
Sep 12, 2018
e9c945e
#150. Consolidate OnBackupListener.
Sep 12, 2018
953ca7e
#150. Implement Dropbox backup removal.
Sep 15, 2018
3e396b0
Merge pull request #157 from evgenii-kanivets/feature-150_dropbox_del…
Sep 15, 2018
3bb5ab2
Add 'Removing backup' message.
Sep 15, 2018
24fbc63
#134. Add account goal to EditAccountFragment.
Sep 16, 2018
ea19a2c
#134. Formatting.
Sep 16, 2018
1be7fed
Merge pull request #158 from evgenii-kanivets/feature-134_account_goal
Sep 16, 2018
9fb0339
#153. Add 'NON susbstitution currency' setting.
Sep 16, 2018
1898059
#153. Substitute NON currency in RecordController.
Sep 17, 2018
8015367
#153. Substitute NON currency in AccountController.
Sep 17, 2018
b6924c7
#153. Fine tune CurrencyController.
Sep 17, 2018
1dd6dd4
#153. Fix RecordControllerTest.
Sep 17, 2018
69aab3f
Merge pull request #159 from evgenii-kanivets/feature-153_non_substit…
Sep 17, 2018
69e2186
#155. Fix record layout.
Sep 17, 2018
e824ff1
Merge pull request #160 from evgenii-kanivets/bugfix-155
Sep 17, 2018
6e9450a
Fix tests.
Sep 17, 2018
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
#95. Rename FragmentAccountRecords to FragmentAccountOperations.
  • Loading branch information
Evgenii Kanivets committed Sep 6, 2018
commit bd7615d93161dad45b160abfc58d1478ce37530f
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.blogspot.e_kanivets.moneytracker.activity.account.edit.adapter
import android.support.v4.app.Fragment
import android.support.v4.app.FragmentManager
import android.support.v4.app.FragmentPagerAdapter
import com.blogspot.e_kanivets.moneytracker.activity.account.edit.fragment.AccountRecordsFragment
import com.blogspot.e_kanivets.moneytracker.activity.account.edit.fragment.AccountOperationsFragment
import com.blogspot.e_kanivets.moneytracker.activity.account.edit.fragment.EditAccountFragment
import com.blogspot.e_kanivets.moneytracker.entity.data.Account

Expand All @@ -13,7 +13,7 @@ class EditAccountFragmentPagerAdapter(fragmentManager: FragmentManager, private
override fun getItem(position: Int): Fragment {
return when (position) {
0 -> EditAccountFragment.newInstance(account)
1 -> AccountRecordsFragment.newInstance(account)
1 -> AccountOperationsFragment.newInstance(account)
else -> Fragment()
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ import com.blogspot.e_kanivets.moneytracker.activity.base.BaseFragment
import com.blogspot.e_kanivets.moneytracker.adapter.RecordAdapter
import com.blogspot.e_kanivets.moneytracker.controller.data.RecordController
import com.blogspot.e_kanivets.moneytracker.entity.data.Account
import kotlinx.android.synthetic.main.fragment_account_records.*
import kotlinx.android.synthetic.main.fragment_account_operations.*
import javax.inject.Inject

class AccountRecordsFragment : BaseFragment() {
class AccountOperationsFragment : BaseFragment() {

@Inject
internal lateinit var recordController: RecordController

private lateinit var account: Account

override val contentViewId: Int = R.layout.fragment_account_records
override val contentViewId: Int = R.layout.fragment_account_operations

override fun initData() {
appComponent.inject(this@AccountRecordsFragment)
arguments?.let { arguments -> account = arguments.getParcelable(AccountRecordsFragment.KEY_ACCOUNT) }
appComponent.inject(this@AccountOperationsFragment)
arguments?.let { arguments -> account = arguments.getParcelable(AccountOperationsFragment.KEY_ACCOUNT) }
}

override fun initViews(view: View) {
Expand All @@ -32,8 +32,8 @@ class AccountRecordsFragment : BaseFragment() {

private const val KEY_ACCOUNT = "key_account"

fun newInstance(account: Account): AccountRecordsFragment {
val fragment = AccountRecordsFragment()
fun newInstance(account: Account): AccountOperationsFragment {
val fragment = AccountOperationsFragment()
val arguments = Bundle()
arguments.putParcelable(KEY_ACCOUNT, account)
fragment.arguments = arguments
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.blogspot.e_kanivets.moneytracker.di;

import com.blogspot.e_kanivets.moneytracker.activity.account.edit.EditAccountActivity;
import com.blogspot.e_kanivets.moneytracker.activity.account.edit.fragment.AccountRecordsFragment;
import com.blogspot.e_kanivets.moneytracker.activity.account.edit.fragment.AccountOperationsFragment;
import com.blogspot.e_kanivets.moneytracker.activity.account.edit.fragment.EditAccountFragment;
import com.blogspot.e_kanivets.moneytracker.activity.charts.ChartsActivity;
import com.blogspot.e_kanivets.moneytracker.activity.external.BackupActivity;
Expand Down Expand Up @@ -86,5 +86,5 @@ public interface AppComponent {

void inject(EditAccountFragment editAccountFragment);

void inject(AccountRecordsFragment accountRecordsFragment);
void inject(AccountOperationsFragment accountRecordsFragment);
}