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

Commit a16930e

Browse files
author
Evgenii Kanivets
committed
#6[30m]. Add transfer option on Accouns screen.
1 parent bea856c commit a16930e

File tree

9 files changed

+75
-1
lines changed

9 files changed

+75
-1
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,7 @@
4444
android:label="@string/title_add_account"
4545
android:screenOrientation="portrait"
4646
android:theme="@style/Theme.Default" />
47+
<activity android:name=".activity.TransferActivity"></activity>
4748
</application>
48-
</manifest>
49+
50+
</manifest>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.blogspot.e_kanivets.moneytracker.activity;
2+
3+
import android.app.Activity;
4+
import android.os.Bundle;
5+
6+
import com.blogspot.e_kanivets.moneytracker.R;
7+
8+
public class TransferActivity extends Activity {
9+
10+
@Override
11+
protected void onCreate(Bundle savedInstanceState) {
12+
super.onCreate(savedInstanceState);
13+
setContentView(R.layout.activity_transfer);
14+
}
15+
}

app/src/main/java/com/blogspot/e_kanivets/moneytracker/fragment/AccountsFragment.java

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import android.support.v7.app.AppCompatActivity;
1010
import android.view.ContextMenu;
1111
import android.view.LayoutInflater;
12+
import android.view.Menu;
13+
import android.view.MenuInflater;
1214
import android.view.MenuItem;
1315
import android.view.View;
1416
import android.view.ViewGroup;
@@ -19,6 +21,7 @@
1921
import com.blogspot.e_kanivets.moneytracker.R;
2022
import com.blogspot.e_kanivets.moneytracker.activity.AddAccountActivity;
2123
import com.blogspot.e_kanivets.moneytracker.activity.NavDrawerActivity;
24+
import com.blogspot.e_kanivets.moneytracker.activity.TransferActivity;
2225
import com.blogspot.e_kanivets.moneytracker.adapter.AccountAdapter;
2326
import com.blogspot.e_kanivets.moneytracker.controller.AccountController;
2427
import com.blogspot.e_kanivets.moneytracker.helper.DbHelper;
@@ -31,6 +34,7 @@ public class AccountsFragment extends Fragment {
3134
public static final String TAG = "AccountsFragment";
3235

3336
private static final int REQUEST_ADD_ACCOUNT = 1;
37+
private static final int REQUEST_TRANSFER = 2;
3438

3539
@Bind(R.id.list_view)
3640
ListView listView;
@@ -51,6 +55,7 @@ public AccountsFragment() {
5155
@Override
5256
public void onCreate(@Nullable Bundle savedInstanceState) {
5357
super.onCreate(savedInstanceState);
58+
setHasOptionsMenu(true);
5459

5560
accountController = new AccountController(new DbHelper(getActivity()));
5661
}
@@ -64,6 +69,26 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
6469
return rootView;
6570
}
6671

72+
@Override
73+
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
74+
inflater.inflate(R.menu.menu_accounts, menu);
75+
}
76+
77+
@Override
78+
public boolean onOptionsItemSelected(MenuItem item) {
79+
switch (item.getItemId()) {
80+
case R.id.action_transfer:
81+
startActivityForResult(new Intent(getActivity(), TransferActivity.class),
82+
REQUEST_TRANSFER);
83+
break;
84+
85+
default:
86+
break;
87+
}
88+
89+
return super.onOptionsItemSelected(item);
90+
}
91+
6792
@Override
6893
public void onAttach(Activity activity) {
6994
super.onAttach(activity);
309 Bytes
Loading
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
android:paddingBottom="@dimen/activity_vertical_margin"
7+
android:paddingLeft="@dimen/activity_horizontal_margin"
8+
android:paddingRight="@dimen/activity_horizontal_margin"
9+
android:paddingTop="@dimen/activity_vertical_margin"
10+
tools:context="com.blogspot.e_kanivets.moneytracker.activity.TransferActivity">
11+
12+
</RelativeLayout>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<menu xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/apk/res-auto">
4+
5+
<item
6+
android:id="@+id/action_transfer"
7+
android:icon="@drawable/ic_transfer"
8+
android:title="@string/transfer"
9+
tools:showAsAction="ifRoom" />
10+
11+
</menu>

app/src/main/res/values-w820dp/dimens.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22
<!-- Example customization of dimensions originally defined in res/values/dimens.xml
33
(such as screen margins) for screens with more than 820dp of available width. This
44
would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
5+
6+
<!-- Example customization of dimensions originally defined in res/values/dimens.xml
7+
(such as screen margins) for screens with more than 820dp of available width. This
8+
would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
9+
<dimen name="activity_horizontal_margin">64dp</dimen>
510
</resources>

app/src/main/res/values/dimens.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@
44
<!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
55
https://developer.android.com/design/patterns/navigation-drawer.html -->
66
<dimen name="navigation_drawer_width">240dp</dimen>
7+
<!-- Default screen margins, per the Android Design guidelines. -->
8+
<dimen name="activity_horizontal_margin">16dp</dimen>
9+
<dimen name="activity_vertical_margin">16dp</dimen>
710
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,6 @@
4343
<string name="add_account">Add account</string>
4444
<string name="initial_sum">Initial sum</string>
4545
<string name="account">Account</string>
46+
<string name="transfer">Transfer</string>
4647

4748
</resources>

0 commit comments

Comments
 (0)