X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=9cb68cb85a49d146a37e538bfa0fc5cb171edfe5;hb=a87079ed41bdc3ad89fe8bd15dfba10e37b29b76;hp=eb74e11f60d97763ad231b261d00f9f42e74c2b8;hpb=212517cf2f1e8f04830ea1a635a10b2a6755c999;p=mobile-ledger-staging.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
index eb74e11f..9cb68cb8 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
@@ -36,16 +36,17 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager.widget.ViewPager;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
+import androidx.viewpager2.widget.ViewPager2;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
@@ -83,7 +84,7 @@ public class MainActivity extends ProfileThemedActivity {
     private View profileListHeadMore, profileListHeadCancel, profileListHeadAddProfile;
     private View bTransactionListCancelDownload;
     private SectionsPagerAdapter mSectionsPagerAdapter;
-    private ViewPager mViewPager;
+    private ViewPager2 mViewPager;
     private FloatingActionButton fab;
     private ProfilesRecyclerViewAdapter mProfileListAdapter;
     private int mCurrentPage;
@@ -91,7 +92,7 @@ public class MainActivity extends ProfileThemedActivity {
     private Toolbar mToolbar;
     private DrawerLayout.SimpleDrawerListener drawerListener;
     private ActionBarDrawerToggle barDrawerToggle;
-    private ViewPager.SimpleOnPageChangeListener pageChangeListener;
+    private ViewPager2.OnPageChangeCallback pageChangeCallback;
     private MobileLedgerProfile profile;
     private MainModel mainModel;
     @Override
@@ -124,8 +125,8 @@ public class MainActivity extends ProfileThemedActivity {
             drawer.removeDrawerListener(barDrawerToggle);
         barDrawerToggle = null;
         if (mViewPager != null)
-            mViewPager.removeOnPageChangeListener(pageChangeListener);
-        pageChangeListener = null;
+            mViewPager.unregisterOnPageChangeCallback(pageChangeCallback);
+        pageChangeCallback = null;
         super.onDestroy();
     }
     @Override
@@ -156,7 +157,7 @@ public class MainActivity extends ProfileThemedActivity {
         profileListHeadAddProfile = findViewById(R.id.nav_new_profile_button);
         drawer = findViewById(R.id.drawer_layout);
         bTransactionListCancelDownload = findViewById(R.id.transaction_list_cancel_download);
-        mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
+        mSectionsPagerAdapter = new SectionsPagerAdapter(this);
         mViewPager = findViewById(R.id.root_frame);
 
         Bundle extra = getIntent().getBundleExtra(BUNDLE_SAVED_STATE);
@@ -196,8 +197,8 @@ public class MainActivity extends ProfileThemedActivity {
 
         mViewPager.setAdapter(mSectionsPagerAdapter);
 
-        if (pageChangeListener == null) {
-            pageChangeListener = new ViewPager.SimpleOnPageChangeListener() {
+        if (pageChangeCallback == null) {
+            pageChangeCallback = new ViewPager2.OnPageChangeCallback() {
                 @Override
                 public void onPageSelected(int position) {
                     mCurrentPage = position;
@@ -216,7 +217,7 @@ public class MainActivity extends ProfileThemedActivity {
                     super.onPageSelected(position);
                 }
             };
-            mViewPager.addOnPageChangeListener(pageChangeListener);
+            mViewPager.registerOnPageChangeCallback(pageChangeCallback);
         }
 
         mCurrentPage = 0;
@@ -237,7 +238,8 @@ public class MainActivity extends ProfileThemedActivity {
         findViewById(R.id.nav_new_profile_button).setOnClickListener(
                 v -> startEditProfileActivity(null));
 
-        findViewById(R.id.transaction_list_cancel_download).setOnClickListener(this::onStopTransactionRefreshClick);
+        findViewById(R.id.transaction_list_cancel_download).setOnClickListener(
+                this::onStopTransactionRefreshClick);
 
         RecyclerView root = findViewById(R.id.nav_profile_list);
         if (root == null)
@@ -619,9 +621,19 @@ public class MainActivity extends ProfileThemedActivity {
 
             mainModel.transactionRetrievalDone();
 
-            if (progress.getError() != null) {
-                Snackbar.make(mViewPager, progress.getError(), Snackbar.LENGTH_LONG)
-                        .show();
+            String error = progress.getError();
+            if (error != null) {
+                if (error.equals(RetrieveTransactionsTask.Result.ERR_JSON_PARSER_ERROR))
+                    error = getResources().getString(R.string.err_json_parser_error);
+
+                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+                builder.setMessage(error);
+                builder.setPositiveButton(R.string.btn_profile_options, (dialog, which) -> {
+                    Logger.debug("error", "will start profile editor");
+                    startEditProfileActivity(profile);
+                });
+                builder.create()
+                       .show();
                 return;
             }
 
@@ -669,15 +681,14 @@ public class MainActivity extends ProfileThemedActivity {
         fab.hide();
     }
 
-    public static class SectionsPagerAdapter extends FragmentPagerAdapter {
+    public static class SectionsPagerAdapter extends FragmentStateAdapter {
 
-        SectionsPagerAdapter(FragmentManager fm) {
-            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+        public SectionsPagerAdapter(@NonNull FragmentActivity fragmentActivity) {
+            super(fragmentActivity);
         }
-
         @NotNull
         @Override
-        public Fragment getItem(int position) {
+        public Fragment createFragment(int position) {
             Logger.debug("main",
                     String.format(Locale.ENGLISH, "Switching to fragment %d", position));
             switch (position) {
@@ -693,7 +704,7 @@ public class MainActivity extends ProfileThemedActivity {
         }
 
         @Override
-        public int getCount() {
+        public int getItemCount() {
             return 2;
         }
     }