]> git.ktnx.net Git - mobile-ledger.git/blobdiff - app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileListActivity.java
fix profile selection mess when the radio buttons are used
[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / ProfileListActivity.java
index 857e7c394a65830d60beb0f4a0480ef7855e877d..85554bf58c40f98ee0f6e9b50f9802ca313a9cf2 100644 (file)
@@ -23,13 +23,14 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.design.widget.FloatingActionButton;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
+import android.support.v7.widget.helper.ItemTouchHelper;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CompoundButton;
 import android.widget.RadioButton;
 import android.widget.TextView;
 
@@ -38,11 +39,8 @@ import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.ui.profiles.ProfileDetailActivity;
 import net.ktnx.mobileledger.ui.profiles.ProfileDetailFragment;
-import net.ktnx.mobileledger.utils.MLDB;
 
-import java.util.List;
-import java.util.Observable;
-import java.util.Observer;
+import java.util.Collections;
 
 /**
  * An activity representing a list of Profiles. This activity
@@ -63,13 +61,14 @@ public class ProfileListActivity extends AppCompatActivity {
      * device.
      */
     private boolean mTwoPane;
+    private FloatingActionButton fab;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_profile_list);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         toolbar.setTitle(getTitle());
 
@@ -77,14 +76,11 @@ public class ProfileListActivity extends AppCompatActivity {
         if (recyclerView == null) throw new AssertionError();
         setupRecyclerView(recyclerView);
 
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                ProfilesRecyclerViewAdapter adapter =
-                        (ProfilesRecyclerViewAdapter) recyclerView.getAdapter();
-                if (adapter != null) adapter.editProfile(recyclerView, null);
-            }
+        fab = findViewById(R.id.fab);
+        fab.setOnClickListener(view -> {
+            ProfilesRecyclerViewAdapter adapter =
+                    (ProfilesRecyclerViewAdapter) recyclerView.getAdapter();
+            if (adapter != null) adapter.editProfile(recyclerView, null);
         });
 
         if (findViewById(R.id.profile_detail_container) != null) {
@@ -100,18 +96,66 @@ public class ProfileListActivity extends AppCompatActivity {
             Log.d("profiles", "got edit profile action");
             int index = getIntent().getIntExtra(ARG_PROFILE_INDEX, -1);
             if (index >= 0) {
-                List<MobileLedgerProfile> list = MobileLedgerProfile.loadAllFromDB();
-                if (index < list.size()) {
-                    ProfilesRecyclerViewAdapter adapter =
-                            (ProfilesRecyclerViewAdapter) recyclerView.getAdapter();
-                    if (adapter != null) adapter.editProfile(recyclerView, list.get(index));
-                }
+                MobileLedgerProfile profile = Data.profiles.get(index);
+                ProfilesRecyclerViewAdapter adapter =
+                        (ProfilesRecyclerViewAdapter) recyclerView.getAdapter();
+                if (adapter != null) adapter.editProfile(recyclerView, profile);
             }
         }
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        fab.show();
+    }
     private void setupRecyclerView(@NonNull RecyclerView recyclerView) {
-        recyclerView.setAdapter(new ProfilesRecyclerViewAdapter(this, mTwoPane));
+        final ProfilesRecyclerViewAdapter adapter = new ProfilesRecyclerViewAdapter(this, mTwoPane);
+        recyclerView.setAdapter(adapter);
+        ItemTouchHelper.Callback cb = new ItemTouchHelper.Callback() {
+            @Override
+            public int getMovementFlags(@NonNull RecyclerView recyclerView,
+                                        @NonNull RecyclerView.ViewHolder viewHolder) {
+                return makeMovementFlags(ItemTouchHelper.UP | ItemTouchHelper.DOWN, 0);
+            }
+            @Override
+            public boolean onMove(@NonNull RecyclerView recyclerView,
+                                  @NonNull RecyclerView.ViewHolder viewHolder,
+                                  @NonNull RecyclerView.ViewHolder target) {
+                Collections.swap(Data.profiles.getList(), viewHolder.getAdapterPosition(),
+                        target.getAdapterPosition());
+                MobileLedgerProfile.storeProfilesOrder();
+                adapter.notifyItemMoved(viewHolder.getAdapterPosition(),
+                        target.getAdapterPosition());
+                return true;
+            }
+            @Override
+            public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
+
+            }
+        };
+        new ItemTouchHelper(cb).attachToRecyclerView(recyclerView);
+        recyclerView.addItemDecoration(new DividerItemDecoration(recyclerView.getContext(),
+                DividerItemDecoration.VERTICAL));
+
+        recyclerView.setOnFlingListener(new RecyclerView.OnFlingListener() {
+            @Override
+            public boolean onFling(int dX, int dY) {
+                Log.d("tmp", String.format("fling %d %d", dX, dY));
+                if (dY > 0) fab.hide();
+                if (dY < 0) fab.show();
+                return false;
+            }
+        });
+
+        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                if (dy > 0) fab.hide();
+                if (dy < 0) fab.show();
+            }
+        });
     }
 
     public static class ProfilesRecyclerViewAdapter
@@ -119,25 +163,24 @@ public class ProfileListActivity extends AppCompatActivity {
 
         private final ProfileListActivity mParentActivity;
         private final boolean mTwoPane;
-        private final View.OnClickListener mOnClickListener = new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                MobileLedgerProfile item = (MobileLedgerProfile) ((View) view.getParent()).getTag();
-                editProfile(view, item);
-            }
+        private final View.OnClickListener mOnClickListener = view -> {
+            MobileLedgerProfile profile = (MobileLedgerProfile) ((View) view.getParent()).getTag();
+            editProfile(view, profile);
         };
         ProfilesRecyclerViewAdapter(ProfileListActivity parent, boolean twoPane) {
             mParentActivity = parent;
             mTwoPane = twoPane;
-            Data.profiles.addObserver((o, arg) ->{
+            Data.profiles.addObserver((o, arg) -> {
                 Log.d("profiles", "profile list changed");
-                notifyDataSetChanged();
+                if (arg == null) notifyDataSetChanged();
+                else notifyItemChanged((int) arg);
             });
         }
-        private void editProfile(View view, MobileLedgerProfile item) {
+        private void editProfile(View view, MobileLedgerProfile profile) {
+            int index = Data.profiles.indexOf(profile);
             if (mTwoPane) {
                 Bundle arguments = new Bundle();
-                arguments.putString(ProfileDetailFragment.ARG_ITEM_ID, item.getUuid());
+                arguments.putInt(ProfileDetailFragment.ARG_ITEM_ID, index);
                 ProfileDetailFragment fragment = new ProfileDetailFragment();
                 fragment.setArguments(arguments);
                 mParentActivity.getSupportFragmentManager().beginTransaction()
@@ -146,8 +189,7 @@ public class ProfileListActivity extends AppCompatActivity {
             else {
                 Context context = view.getContext();
                 Intent intent = new Intent(context, ProfileDetailActivity.class);
-                intent.putExtra(ProfileDetailFragment.ARG_ITEM_ID,
-                        (item == null) ? null : item.getUuid());
+                if (index != -1) intent.putExtra(ProfileDetailFragment.ARG_ITEM_ID, index);
 
                 context.startActivity(intent);
             }
@@ -158,14 +200,25 @@ public class ProfileListActivity extends AppCompatActivity {
             View view = LayoutInflater.from(parent.getContext())
                     .inflate(R.layout.profile_list_content, parent, false);
             ProfileListViewHolder holder = new ProfileListViewHolder(view);
-            Data.profile.addObserver(new Observer() {
-                @Override
-                public void update(Observable o, Object arg) {
-                    MobileLedgerProfile newProfile = Data.profile.get();
-                    MobileLedgerProfile profile = (MobileLedgerProfile) holder.itemView.getTag();
-                    holder.mRadioView.setChecked(
-                            newProfile != null && newProfile.getUuid().equals(profile.getUuid()));
-                }
+            Data.profile.addObserver((o, arg) -> {
+                MobileLedgerProfile newProfile = Data.profile.get();
+                MobileLedgerProfile profile = (MobileLedgerProfile) holder.itemView.getTag();
+                holder.mRadioView.setChecked(profile.equals(newProfile));
+            });
+
+            holder.mRadioView.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                if (!isChecked) return;
+                MobileLedgerProfile profile = (MobileLedgerProfile) holder.itemView.getTag();
+                if (profile != null) Data.setCurrentProfile(profile);
+            });
+            View.OnClickListener profileSelector = v -> {
+                holder.mRadioView.setChecked(true);
+            };
+            holder.mTitle.setOnClickListener(profileSelector);
+            holder.mSubTitle.setOnClickListener(profileSelector);
+            Data.profile.addObserver((o, arg) -> {
+                MobileLedgerProfile profile = (MobileLedgerProfile) holder.itemView.getTag();
+                holder.mRadioView.setChecked(Data.profile.get().equals(profile));
             });
             return holder;
         }
@@ -175,21 +228,12 @@ public class ProfileListActivity extends AppCompatActivity {
             final MobileLedgerProfile currentProfile = Data.profile.get();
             Log.d("profiles", String.format("pos %d: %s, current: %s", position, profile.getUuid(),
                     currentProfile.getUuid()));
-            holder.mRadioView.setText(profile.getName());
+            holder.mTitle.setText(profile.getName());
+            holder.mSubTitle.setText(profile.getUrl());
             holder.mRadioView.setChecked(profile.getUuid().equals(currentProfile.getUuid()));
-            holder.mRadioView
-                    .setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-                        @Override
-                        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                            if (!isChecked) return;
-                            MLDB.set_option_value(MLDB.OPT_PROFILE_UUID, profile.getUuid());
-                            Data.profile.set(profile);
-                        }
-                    });
 
             holder.itemView.setTag(profile);
             holder.mEditButton.setOnClickListener(mOnClickListener);
-
         }
         @Override
         public int getItemCount() {
@@ -198,11 +242,14 @@ public class ProfileListActivity extends AppCompatActivity {
         class ProfileListViewHolder extends RecyclerView.ViewHolder {
             final RadioButton mRadioView;
             final TextView mEditButton;
+            final TextView mTitle, mSubTitle;
 
             ProfileListViewHolder(View view) {
                 super(view);
                 mRadioView = view.findViewById(R.id.profile_list_radio);
                 mEditButton = view.findViewById(R.id.profile_list_edit_button);
+                mTitle = view.findViewById(R.id.title);
+                mSubTitle = view.findViewById(R.id.subtitle);
             }
         }
     }