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

Commit db929b8

Browse files
author
Evgenii Kanivets
committed
#95. Add localization.
1 parent 7cc5dae commit db929b8

File tree

8 files changed

+65
-85
lines changed

8 files changed

+65
-85
lines changed

‎app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/EditAccountActivity.kt‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ import android.view.Menu
88
import android.view.MenuItem
99

1010
import com.blogspot.e_kanivets.moneytracker.R
11-
import com.blogspot.e_kanivets.moneytracker.activity.account.edit.adapter.EditAccountFragmentPagerAdapter
11+
import com.blogspot.e_kanivets.moneytracker.activity.account.edit.fragment.AccountOperationsFragment
12+
import com.blogspot.e_kanivets.moneytracker.activity.account.edit.fragment.EditAccountFragment
1213
import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity
14+
import com.blogspot.e_kanivets.moneytracker.adapter.GeneralViewPagerAdapter
1315
import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController
1416
import com.blogspot.e_kanivets.moneytracker.entity.data.Account
1517
import kotlinx.android.synthetic.main.activity_edit_account.*
@@ -40,7 +42,11 @@ class EditAccountActivity : BaseBackActivity() {
4042
super.initViews()
4143

4244
tabLayout.setupWithViewPager(viewPager)
43-
viewPager.adapter = EditAccountFragmentPagerAdapter(supportFragmentManager, account)
45+
46+
val adapter = GeneralViewPagerAdapter(supportFragmentManager)
47+
adapter.addFragment(EditAccountFragment.newInstance(account), getString(R.string.information))
48+
adapter.addFragment(AccountOperationsFragment.newInstance(account), getString(R.string.operations))
49+
viewPager.adapter = adapter
4450
}
4551

4652
override fun onCreateOptionsMenu(menu: Menu): Boolean {

‎app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/adapter/EditAccountFragmentPagerAdapter.kt‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/ChartsActivity.java‎

Lines changed: 12 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
package com.blogspot.e_kanivets.moneytracker.activity.charts;
22

3-
import android.graphics.Color;
43
import android.support.design.widget.TabLayout;
54
import android.support.v4.app.Fragment;
6-
import android.support.v4.app.FragmentManager;
7-
import android.support.v4.app.FragmentPagerAdapter;
85
import android.support.v4.view.ViewPager;
96

107
import com.blogspot.e_kanivets.moneytracker.R;
118
import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
129
import com.blogspot.e_kanivets.moneytracker.activity.charts.fragment.GraphFragment;
1310
import com.blogspot.e_kanivets.moneytracker.activity.charts.fragment.SummaryFragment;
11+
import com.blogspot.e_kanivets.moneytracker.adapter.GeneralViewPagerAdapter;
1412
import com.blogspot.e_kanivets.moneytracker.controller.CurrencyController;
1513
import com.blogspot.e_kanivets.moneytracker.controller.data.ExchangeRateController;
1614
import com.blogspot.e_kanivets.moneytracker.controller.data.RecordController;
1715
import com.blogspot.e_kanivets.moneytracker.entity.data.Record;
1816
import com.blogspot.e_kanivets.moneytracker.report.ReportMaker;
1917
import com.blogspot.e_kanivets.moneytracker.report.chart.IMonthReport;
2018

21-
import java.util.ArrayList;
2219
import java.util.List;
2320

2421
import javax.inject.Inject;
@@ -27,32 +24,24 @@
2724

2825
public class ChartsActivity extends BaseBackActivity {
2926

30-
@Inject
31-
RecordController recordController;
32-
@Inject
33-
ExchangeRateController exchangeRateController;
34-
@Inject
35-
CurrencyController currencyController;
27+
@Inject RecordController recordController;
28+
@Inject ExchangeRateController exchangeRateController;
29+
@Inject CurrencyController currencyController;
3630

37-
@BindView(R.id.tabs)
38-
TabLayout tabLayout;
39-
@BindView(R.id.view_pager)
40-
ViewPager viewPager;
31+
@BindView(R.id.tabs) TabLayout tabLayout;
32+
@BindView(R.id.view_pager) ViewPager viewPager;
4133

42-
@Override
43-
protected int getContentViewId() {
34+
@Override protected int getContentViewId() {
4435
return R.layout.activity_charts;
4536
}
4637

47-
@Override
48-
protected boolean initData() {
38+
@Override protected boolean initData() {
4939
boolean result = super.initData();
5040
getAppComponent().inject(ChartsActivity.this);
5141
return result;
5242
}
5343

54-
@Override
55-
protected void initViews() {
44+
@Override protected void initViews() {
5645
super.initViews();
5746

5847
setupViewPager(viewPager);
@@ -85,38 +74,9 @@ private void setupViewPager(ViewPager viewPager) {
8574
graphFragment = GraphFragment.newInstance(monthReport);
8675
}
8776

88-
ViewPagerAdapter adapter = new ViewPagerAdapter(getSupportFragmentManager());
89-
adapter.addFragment(SummaryFragment.newInstance(monthReport), "Summary");
90-
adapter.addFragment(graphFragment, "Graph");
77+
GeneralViewPagerAdapter adapter = new GeneralViewPagerAdapter(getSupportFragmentManager());
78+
adapter.addFragment(SummaryFragment.newInstance(monthReport), getString(R.string.summary));
79+
adapter.addFragment(graphFragment, getString(R.string.graph));
9180
viewPager.setAdapter(adapter);
9281
}
93-
94-
class ViewPagerAdapter extends FragmentPagerAdapter {
95-
private final List<Fragment> mFragmentList = new ArrayList<>();
96-
private final List<String> mFragmentTitleList = new ArrayList<>();
97-
98-
ViewPagerAdapter(FragmentManager manager) {
99-
super(manager);
100-
}
101-
102-
@Override
103-
public Fragment getItem(int position) {
104-
return mFragmentList.get(position);
105-
}
106-
107-
@Override
108-
public int getCount() {
109-
return mFragmentList.size();
110-
}
111-
112-
void addFragment(Fragment fragment, String title) {
113-
mFragmentList.add(fragment);
114-
mFragmentTitleList.add(title);
115-
}
116-
117-
@Override
118-
public CharSequence getPageTitle(int position) {
119-
return mFragmentTitleList.get(position);
120-
}
121-
}
12282
}

‎app/src/main/java/com/blogspot/e_kanivets/moneytracker/adapter/GeneralViewPagerAdapter.kt‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com.blogspot.e_kanivets.moneytracker.adapter
2+
3+
import android.support.v4.app.Fragment
4+
import android.support.v4.app.FragmentManager
5+
import android.support.v4.app.FragmentPagerAdapter
6+
import java.util.ArrayList
7+
8+
class GeneralViewPagerAdapter(manager: FragmentManager) : FragmentPagerAdapter(manager) {
9+
private val fragmentList = ArrayList<Fragment>()
10+
private val fragmentTitleList = ArrayList<String>()
11+
12+
override fun getItem(position: Int): Fragment {
13+
return fragmentList[position]
14+
}
15+
16+
override fun getCount(): Int {
17+
return fragmentList.size
18+
}
19+
20+
fun addFragment(fragment: Fragment, title: String) {
21+
fragmentList.add(fragment)
22+
fragmentTitleList.add(title)
23+
}
24+
25+
override fun getPageTitle(position: Int): CharSequence? {
26+
return fragmentTitleList[position]
27+
}
28+
29+
}

‎app/src/main/res/values-ru/strings.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,8 @@
123123
<string name="cant_archive_default_account">Нельзя архивировать счет по умолчанию.</string>
124124
<string name="delete_account_title">Удалить счет</string>
125125
<string name="delete_account_message">Вы уверены, что хотите удалить этот счет ? Вы не сможете восстановить его после удаления.</string>
126+
127+
<string name="graph">График</string>
128+
<string name="information">Информация</string>
129+
<string name="operations">Операции</string>
126130
</resources>

‎app/src/main/res/values-uk/strings.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,8 @@
123123
<string name="cant_archive_default_account">Неможливо архівувати рахунок за замовчанням.</string>
124124
<string name="delete_account_title">Видалити рахунок</string>
125125
<string name="delete_account_message">Ви впевнені, що хочете видалити цей рахунок? Ви не зможете відновити його після видалення.</string>
126+
127+
<string name="graph">Графік</string>
128+
<string name="information">Інформація</string>
129+
<string name="operations">Операції</string>
126130
</resources>

‎app/src/main/res/values-zh/strings.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,8 @@
112112
<string name="cant_archive_default_account">您无法获得默认帐户。</string>
113113
<string name="delete_account_title">删除帐户</string>
114114
<string name="delete_account_message">你确定要删除这个帐户吗？ 以后不能恢复。</string>
115+
116+
<string name="graph">圖形</string>
117+
<string name="information">信息</string>
118+
<string name="operations">操作</string>
115119
</resources>

‎app/src/main/res/values/strings.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,5 +133,9 @@
133133
<string name="delete_account_title">Delete account</string>
134134
<string name="delete_account_message">Are you sure about deleting this account? It can\'t be restored after.</string>
135135

136+
<string name="graph">Graph</string>
137+
<string name="information">Information</string>
138+
<string name="operations">Operations</string>
139+
136140
<!-- Not translated strings -->
137141
</resources>

0 commit comments

Comments
 (0)