Fix list not loading correctly

joydeepsaha05 · May 9, 2017 · e1921d5 · e1921d5
1 parent 17776a4
commit e1921d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/app/src/main/java/saha/joydeep/emicalculator/ui/loanDetail/LoanDetailActivity.java b/app/src/main/java/saha/joydeep/emicalculator/ui/loanDetail/LoanDetailActivity.java
@@ -36,6 +36,7 @@ protected void onCreate(Bundle savedInstanceState) {
         ButterKnife.bind(this);
 
         setSupportActionBar(mToolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
         mAdapter = new LoanDetailAdapter(mArrayList);

diff --git a/app/src/main/java/saha/joydeep/emicalculator/ui/main/MainActivity.java b/app/src/main/java/saha/joydeep/emicalculator/ui/main/MainActivity.java
@@ -72,8 +72,6 @@ public void execute(Realm realm) {
 
         mRecyclerView.addOnItemTouchListener(new RecyclerItemClickListener(this, this));
         mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
-        mAdapter = new MainActivityAdapter(mRealmLoanList);
-        mRecyclerView.setAdapter(mAdapter);
 
         loadData();
     }
@@ -107,9 +105,6 @@ private void loadData() {
                 .findFirst();
 
         if (realmUser != null) {
-            if (realmUser.loanRealmList == null) {
-                realmUser.loanRealmList = new RealmList<>();
-            }
             mRealmLoanList = realmUser.loanRealmList;
         } else {
             mRealmLoanList = new RealmList<>();
@@ -118,10 +113,14 @@ private void loadData() {
         if (mRealmLoanList.size() == 0) {
             mDefaultTV.setVisibility(View.VISIBLE);
         } else {
+            if (mAdapter == null) {
+                mAdapter = new MainActivityAdapter(mRealmLoanList);
+                mRecyclerView.setAdapter(mAdapter);
+            } else {
+                mAdapter.notifyDataSetChanged();
+            }
             mDefaultTV.setVisibility(View.GONE);
         }
-
-        mAdapter.notifyDataSetChanged();
     }
 
     private void addLoan() {
@@ -173,7 +172,6 @@ public void execute(Realm realm) {
                     }
                 });
                 bottomSheetDialog.dismiss();
-                loadData();
                 Intent i = new Intent(MainActivity.this, LoanDetailActivity.class);
                 i.putExtra("principle", Double.parseDouble(principle));
                 i.putExtra("tenure", Double.parseDouble(tenure));