From: Damyan Ivanov Date: Fri, 7 Dec 2018 18:39:49 +0000 (+0000) Subject: rename to better reflect purpose X-Git-Tag: v0.3~299 X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=commitdiff_plain;h=7e41ae1d0d50379d8f96f5687a2633a62e34ae8b rename to better reflect purpose --- diff --git a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java index 9620a69a..a516722f 100644 --- a/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java +++ b/app/src/main/java/net/ktnx/mobileledger/AccountSummary.java @@ -46,7 +46,7 @@ public class AccountSummary extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_latest_transactions); + setContentView(R.layout.activity_account_summary); Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); diff --git a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java index a9d6097a..dca8d463 100644 --- a/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/NewTransactionActivity.java @@ -60,7 +60,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_account_summary); + setContentView(R.layout.activity_new_transaction); Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); diff --git a/app/src/main/res/layout/activity_account_summary.xml b/app/src/main/res/layout/activity_account_summary.xml index d5f20877..6154fd61 100644 --- a/app/src/main/res/layout/activity_account_summary.xml +++ b/app/src/main/res/layout/activity_account_summary.xml @@ -1,42 +1,29 @@ - + android:fitsSystemWindows="true" + tools:openDrawer="start"> - + android:layout_height="match_parent" /> - - - - - - - + android:layout_gravity="start" + android:fitsSystemWindows="true"> - + - + - \ No newline at end of file + diff --git a/app/src/main/res/layout/activity_latest_transactions.xml b/app/src/main/res/layout/activity_latest_transactions.xml deleted file mode 100644 index 1c82d931..00000000 --- a/app/src/main/res/layout/activity_latest_transactions.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_new_transaction.xml b/app/src/main/res/layout/activity_new_transaction.xml new file mode 100644 index 00000000..ba67cc34 --- /dev/null +++ b/app/src/main/res/layout/activity_new_transaction.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/app_bar_account_summary.xml b/app/src/main/res/layout/app_bar_account_summary.xml new file mode 100644 index 00000000..05591be8 --- /dev/null +++ b/app/src/main/res/layout/app_bar_account_summary.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/app_bar_latest_transactions.xml b/app/src/main/res/layout/app_bar_latest_transactions.xml deleted file mode 100644 index 05591be8..00000000 --- a/app/src/main/res/layout/app_bar_latest_transactions.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/content_account_summary.xml b/app/src/main/res/layout/content_account_summary.xml index 89114417..cde4d6a5 100644 --- a/app/src/main/res/layout/content_account_summary.xml +++ b/app/src/main/res/layout/content_account_summary.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" tools:context=".AccountSummary" - tools:showIn="@layout/app_bar_latest_transactions"> + tools:showIn="@layout/app_bar_account_summary"> + tools:showIn="@layout/activity_new_transaction">