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. Add localization.
  • Loading branch information
Evgenii Kanivets committed Sep 10, 2018
commit db929b89040eac22f98ee23fa7c7d88be25c4af8
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ import android.view.Menu
import android.view.MenuItem

import com.blogspot.e_kanivets.moneytracker.R
import com.blogspot.e_kanivets.moneytracker.activity.account.edit.adapter.EditAccountFragmentPagerAdapter
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.base.BaseBackActivity
import com.blogspot.e_kanivets.moneytracker.adapter.GeneralViewPagerAdapter
import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController
import com.blogspot.e_kanivets.moneytracker.entity.data.Account
import kotlinx.android.synthetic.main.activity_edit_account.*
Expand Down Expand Up @@ -40,7 +42,11 @@ class EditAccountActivity : BaseBackActivity() {
super.initViews()

tabLayout.setupWithViewPager(viewPager)
viewPager.adapter = EditAccountFragmentPagerAdapter(supportFragmentManager, account)

val adapter = GeneralViewPagerAdapter(supportFragmentManager)
adapter.addFragment(EditAccountFragment.newInstance(account), getString(R.string.information))
adapter.addFragment(AccountOperationsFragment.newInstance(account), getString(R.string.operations))
viewPager.adapter = adapter
}

override fun onCreateOptionsMenu(menu: Menu): Boolean {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
package com.blogspot.e_kanivets.moneytracker.activity.charts;

import android.graphics.Color;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager;

import com.blogspot.e_kanivets.moneytracker.R;
import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
import com.blogspot.e_kanivets.moneytracker.activity.charts.fragment.GraphFragment;
import com.blogspot.e_kanivets.moneytracker.activity.charts.fragment.SummaryFragment;
import com.blogspot.e_kanivets.moneytracker.adapter.GeneralViewPagerAdapter;
import com.blogspot.e_kanivets.moneytracker.controller.CurrencyController;
import com.blogspot.e_kanivets.moneytracker.controller.data.ExchangeRateController;
import com.blogspot.e_kanivets.moneytracker.controller.data.RecordController;
import com.blogspot.e_kanivets.moneytracker.entity.data.Record;
import com.blogspot.e_kanivets.moneytracker.report.ReportMaker;
import com.blogspot.e_kanivets.moneytracker.report.chart.IMonthReport;

import java.util.ArrayList;
import java.util.List;

import javax.inject.Inject;
Expand All @@ -27,32 +24,24 @@

public class ChartsActivity extends BaseBackActivity {

@Inject
RecordController recordController;
@Inject
ExchangeRateController exchangeRateController;
@Inject
CurrencyController currencyController;
@Inject RecordController recordController;
@Inject ExchangeRateController exchangeRateController;
@Inject CurrencyController currencyController;

@BindView(R.id.tabs)
TabLayout tabLayout;
@BindView(R.id.view_pager)
ViewPager viewPager;
@BindView(R.id.tabs) TabLayout tabLayout;
@BindView(R.id.view_pager) ViewPager viewPager;

@Override
protected int getContentViewId() {
@Override protected int getContentViewId() {
return R.layout.activity_charts;
}

@Override
protected boolean initData() {
@Override protected boolean initData() {
boolean result = super.initData();
getAppComponent().inject(ChartsActivity.this);
return result;
}

@Override
protected void initViews() {
@Override protected void initViews() {
super.initViews();

setupViewPager(viewPager);
Expand Down Expand Up @@ -85,38 +74,9 @@ private void setupViewPager(ViewPager viewPager) {
graphFragment = GraphFragment.newInstance(monthReport);
}

ViewPagerAdapter adapter = new ViewPagerAdapter(getSupportFragmentManager());
adapter.addFragment(SummaryFragment.newInstance(monthReport), "Summary");
adapter.addFragment(graphFragment, "Graph");
GeneralViewPagerAdapter adapter = new GeneralViewPagerAdapter(getSupportFragmentManager());
adapter.addFragment(SummaryFragment.newInstance(monthReport), getString(R.string.summary));
adapter.addFragment(graphFragment, getString(R.string.graph));
viewPager.setAdapter(adapter);
}

class ViewPagerAdapter extends FragmentPagerAdapter {
private final List<Fragment> mFragmentList = new ArrayList<>();
private final List<String> mFragmentTitleList = new ArrayList<>();

ViewPagerAdapter(FragmentManager manager) {
super(manager);
}

@Override
public Fragment getItem(int position) {
return mFragmentList.get(position);
}

@Override
public int getCount() {
return mFragmentList.size();
}

void addFragment(Fragment fragment, String title) {
mFragmentList.add(fragment);
mFragmentTitleList.add(title);
}

@Override
public CharSequence getPageTitle(int position) {
return mFragmentTitleList.get(position);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.blogspot.e_kanivets.moneytracker.adapter

import android.support.v4.app.Fragment
import android.support.v4.app.FragmentManager
import android.support.v4.app.FragmentPagerAdapter
import java.util.ArrayList

class GeneralViewPagerAdapter(manager: FragmentManager) : FragmentPagerAdapter(manager) {
private val fragmentList = ArrayList<Fragment>()
private val fragmentTitleList = ArrayList<String>()

override fun getItem(position: Int): Fragment {
return fragmentList[position]
}

override fun getCount(): Int {
return fragmentList.size
}

fun addFragment(fragment: Fragment, title: String) {
fragmentList.add(fragment)
fragmentTitleList.add(title)
}

override fun getPageTitle(position: Int): CharSequence? {
return fragmentTitleList[position]
}

}
4 changes: 4 additions & 0 deletions app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,8 @@
<string name="cant_archive_default_account">Нельзя архивировать счет по умолчанию.</string>
<string name="delete_account_title">Удалить счет</string>
<string name="delete_account_message">Вы уверены, что хотите удалить этот счет ? Вы не сможете восстановить его после удаления.</string>

<string name="graph">График</string>
<string name="information">Информация</string>
<string name="operations">Операции</string>
</resources>
4 changes: 4 additions & 0 deletions app/src/main/res/values-uk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,8 @@
<string name="cant_archive_default_account">Неможливо архівувати рахунок за замовчанням.</string>
<string name="delete_account_title">Видалити рахунок</string>
<string name="delete_account_message">Ви впевнені, що хочете видалити цей рахунок? Ви не зможете відновити його після видалення.</string>

<string name="graph">Графік</string>
<string name="information">Інформація</string>
<string name="operations">Операції</string>
</resources>
4 changes: 4 additions & 0 deletions app/src/main/res/values-zh/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,8 @@
<string name="cant_archive_default_account">您无法获得默认帐户。</string>
<string name="delete_account_title">删除帐户</string>
<string name="delete_account_message">你确定要删除这个帐户吗? 以后不能恢复。</string>

<string name="graph">圖形</string>
<string name="information">信息</string>
<string name="operations">操作</string>
</resources>
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -133,5 +133,9 @@
<string name="delete_account_title">Delete account</string>
<string name="delete_account_message">Are you sure about deleting this account? It can\'t be restored after.</string>

<string name="graph">Graph</string>
<string name="information">Information</string>
<string name="operations">Operations</string>

<!-- Not translated strings -->
</resources>