X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FProfileListActivity.java;h=06c7a1c481ef557aed6b2223155c455373f216b5;hp=3e4f14b2d37fd3f7cc76a8ab58bb542eefa23a72;hb=25804ffce015de8598e5885e64a5ece67a5e6a26;hpb=ab390e82c5d6c9924d3fac5edbc808fb491fbc8d

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileListActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileListActivity.java
index 3e4f14b2..06c7a1c4 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileListActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileListActivity.java
@@ -23,6 +23,7 @@ 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;
@@ -30,7 +31,6 @@ 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;
 
@@ -43,8 +43,6 @@ import net.ktnx.mobileledger.utils.MLDB;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Observable;
-import java.util.Observer;
 
 /**
  * An activity representing a list of Profiles. This activity
@@ -80,13 +78,10 @@ public class ProfileListActivity extends AppCompatActivity {
         setupRecyclerView(recyclerView);
 
         FloatingActionButton fab = 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.setOnClickListener(view -> {
+            ProfilesRecyclerViewAdapter adapter =
+                    (ProfilesRecyclerViewAdapter) recyclerView.getAdapter();
+            if (adapter != null) adapter.editProfile(recyclerView, null);
         });
 
         if (findViewById(R.id.profile_detail_container) != null) {
@@ -138,6 +133,8 @@ public class ProfileListActivity extends AppCompatActivity {
             }
         };
         new ItemTouchHelper(cb).attachToRecyclerView(recyclerView);
+        recyclerView.addItemDecoration(new DividerItemDecoration(recyclerView.getContext(),
+                DividerItemDecoration.VERTICAL));
     }
 
     public static class ProfilesRecyclerViewAdapter
@@ -145,12 +142,9 @@ 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 item = (MobileLedgerProfile) ((View) view.getParent()).getTag();
+            editProfile(view, item);
         };
         ProfilesRecyclerViewAdapter(ProfileListActivity parent, boolean twoPane) {
             mParentActivity = parent;
@@ -184,14 +178,11 @@ 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(
+                        newProfile != null && newProfile.getUuid().equals(profile.getUuid()));
             });
             return holder;
         }
@@ -201,16 +192,16 @@ 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());
+            View.OnClickListener profileSelector = v -> holder.mRadioView.setChecked(true);
+            holder.mTitle.setText(profile.getName());
+            holder.mTitle.setOnClickListener(profileSelector);
+            holder.mSubTitle.setText(profile.getUrl());
+            holder.mSubTitle.setOnClickListener(profileSelector);
             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.mRadioView.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                if (!isChecked) return;
+                MLDB.set_option_value(MLDB.OPT_PROFILE_UUID, profile.getUuid());
+                Data.profile.set(profile);
                     });
 
             holder.itemView.setTag(profile);
@@ -224,11 +215,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);
             }
         }
     }