delete profile menu as action; hide when only one profile or when a new profile is...

diff --git a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
index 96fa9b215e88fc1727c2437fe0a213bf77ebf141..bbcf57fa7696041816c31d705d16996bc7b70ee1 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
@@ -56,10 +56,11 @@ public final class MobileLedgerProfile {
         List<MobileLedgerProfile> result = new ArrayList<>();
         SQLiteDatabase db = MLDB.getReadableDatabase();
         try (Cursor cursor = db.rawQuery("SELECT uuid, name, url, use_authentication, auth_user, " +
-                                         "auth_password FROM profiles", null))
+                                         "auth_password FROM profiles order by order_no", null))
         {
             while (cursor.moveToNext()) {
-                result.add(new MobileLedgerProfile(cursor.getString(0), cursor.getString(1), cursor.getString(2), cursor.getInt(3) == 1, cursor.getString(4),
+                result.add(new MobileLedgerProfile(cursor.getString(0), cursor.getString(1),
+                        cursor.getString(2), cursor.getInt(3) == 1, cursor.getString(4),
                         cursor.getString(5)));
             }
         }

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailActivity.java
index 591d147a777b037a919a9f6d2a9d359c2a04d18e..982fccfa4512f86a0e90fe7e18597f279dd94c48 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailActivity.java
@@ -46,10 +46,10 @@ public class ProfileDetailActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_profile_detail);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.detail_toolbar);
+        Toolbar toolbar = findViewById(R.id.detail_toolbar);
         setSupportActionBar(toolbar);
 
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+        FloatingActionButton fab = findViewById(R.id.fab);
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -107,7 +107,8 @@ public class ProfileDetailActivity extends AppCompatActivity {
         super.onCreateOptionsMenu(menu);
         Log.d("profiles", "[activity] Creating profile details options menu");
         getMenuInflater().inflate(R.menu.profile_details, menu);
-        menu.findItem(R.id.menuDelete).setOnMenuItemClickListener(item -> {
+        MenuItem menuDeleteProfile = menu.findItem(R.id.menuDelete);
+        menuDeleteProfile.setOnMenuItemClickListener(item -> {
             Log.d("profiles", String.format("deleting profile %s", profile.getUuid()));
             profile.removeFromDB();
             Data.profiles.remove(profile);
@@ -116,6 +117,8 @@ public class ProfileDetailActivity extends AppCompatActivity {
             return true;
         });
 
+        menuDeleteProfile.setVisible((profile != null) && (Data.profiles.size() > 1));
+
         return true;
     }
 

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
index f211139375b9cd21847e3d2c0e7e111ecd7af18b..5a1b729a205cb4bc9e3c1e434012659500593a7b 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
@@ -56,7 +56,7 @@ public class ProfileDetailFragment extends Fragment {
     /**
      * The dummy content this fragment is presenting.
      */
-    private MobileLedgerProfile mItem;
+    private MobileLedgerProfile mProfile;
     private TextView url;
     private LinearLayout authParams;
     private Switch useAuthentication;
@@ -76,18 +76,17 @@ public class ProfileDetailFragment extends Fragment {
         Log.d("profiles", "[fragment] Creating profile details options menu");
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.profile_details, menu);
-        menu.findItem(R.id.menuDelete).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                Log.d("profiles", String.format("[fragment] removing profile %s", mItem.getUuid()));
-                mItem.removeFromDB();
-                Data.profiles.remove(mItem);
-                if (Data.profile.get().getUuid().equals(mItem.getUuid())) {
-                    Data.profile.set(Data.profiles.get(0));
-                }
-                return false;
+        final MenuItem menuDeleteProfile = menu.findItem(R.id.menuDelete);
+        menuDeleteProfile.setOnMenuItemClickListener(item -> {
+            Log.d("profiles", String.format("[fragment] removing profile %s", mProfile.getUuid()));
+            mProfile.removeFromDB();
+            Data.profiles.remove(mProfile);
+            if (Data.profile.get().getUuid().equals(mProfile.getUuid())) {
+                Data.profile.set(Data.profiles.get(0));
             }
+            return false;
         });
+        menuDeleteProfile.setVisible((mProfile != null) && (Data.profiles.size() > 1));
     }
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -98,14 +97,14 @@ public class ProfileDetailFragment extends Fragment {
             // arguments. In a real-world scenario, use a Loader
             // to load content from a content provider.
             String uuid = getArguments().getString(ARG_ITEM_ID);
-            if (uuid != null)
-                mItem = MobileLedgerProfile.loadUUIDFromDB(getArguments().getString(ARG_ITEM_ID));
+            if (uuid != null) mProfile =
+                    MobileLedgerProfile.loadUUIDFromDB(getArguments().getString(ARG_ITEM_ID));
 
             Activity activity = this.getActivity();
             if (activity == null) throw new AssertionError();
             CollapsingToolbarLayout appBarLayout = activity.findViewById(R.id.toolbar_layout);
             if (appBarLayout != null) {
-                if (mItem != null) appBarLayout.setTitle(mItem.getName());
+                if (mProfile != null) appBarLayout.setTitle(mProfile.getName());
                 else appBarLayout.setTitle(getResources().getString(R.string.new_profile_title));
             }
         }
@@ -116,24 +115,25 @@ public class ProfileDetailFragment extends Fragment {
         super.onAttach(context);
         fab = ((Activity) context).findViewById(R.id.fab);
         fab.setOnClickListener(v -> {
-            if (mItem != null) {
-                mItem.setName(profileName.getText());
-                mItem.setUrl(url.getText());
-                mItem.setAuthEnabled(useAuthentication.isChecked());
-                mItem.setAuthUserName(userName.getText());
-                mItem.setAuthPassword(password.getText());
-                mItem.storeInDB();
+            if (mProfile != null) {
+                mProfile.setName(profileName.getText());
+                mProfile.setUrl(url.getText());
+                mProfile.setAuthEnabled(useAuthentication.isChecked());
+                mProfile.setAuthUserName(userName.getText());
+                mProfile.setAuthPassword(password.getText());
+                mProfile.storeInDB();
 
 
-                if (mItem.getUuid().equals(Data.profile.get().getUuid())) {
-                    Data.profile.set(mItem);
+                if (mProfile.getUuid().equals(Data.profile.get().getUuid())) {
+                    Data.profile.set(mProfile);
                 }
             }
             else {
-                mItem = new MobileLedgerProfile(profileName.getText(), url.getText(),
+                mProfile = new MobileLedgerProfile(profileName.getText(), url.getText(),
                         useAuthentication.isChecked(), userName.getText(), password.getText());
-                mItem.storeInDB();
-                Data.profiles.add(mItem);
+                mProfile.storeInDB();
+                Data.profiles.add(mProfile);
+                MobileLedgerProfile.storeProfilesOrder();
             }
 
             Activity activity = getActivity();
@@ -157,13 +157,13 @@ public class ProfileDetailFragment extends Fragment {
             authParams.setVisibility(isChecked ? View.VISIBLE : View.GONE);
         });
 
-        if (mItem != null) {
-            profileName.setText(mItem.getName());
-            url.setText(mItem.getUrl());
-            useAuthentication.setChecked(mItem.isAuthEnabled());
-            authParams.setVisibility(mItem.isAuthEnabled() ? View.VISIBLE : View.GONE);
-            userName.setText(mItem.isAuthEnabled() ? mItem.getAuthUserName() : "");
-            password.setText(mItem.isAuthEnabled() ? mItem.getAuthPassword() : "");
+        if (mProfile != null) {
+            profileName.setText(mProfile.getName());
+            url.setText(mProfile.getUrl());
+            useAuthentication.setChecked(mProfile.isAuthEnabled());
+            authParams.setVisibility(mProfile.isAuthEnabled() ? View.VISIBLE : View.GONE);
+            userName.setText(mProfile.isAuthEnabled() ? mProfile.getAuthUserName() : "");
+            password.setText(mProfile.isAuthEnabled() ? mProfile.getAuthPassword() : "");
         }
         else {
             profileName.setText("");

diff --git a/app/src/main/res/menu/profile_details.xml b/app/src/main/res/menu/profile_details.xml
index 9d62e06a66aaef4a0a60afb21f4fbf9c5171df5d..5a8593ee1192acc7cd245577cc0f8d9819c3e527 100644 (file)
--- a/app/src/main/res/menu/profile_details.xml
+++ b/app/src/main/res/menu/profile_details.xml
@@ -16,10 +16,13 @@
   ~ along with Mobile-Ledger. If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/menuDelete"
         android:icon="@drawable/ic_delete_white_24dp"
-        android:title="@string/delete" />
+        android:title="@string/delete_profile"
+        android:titleCondensed="@string/delete"
+        app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 1a7c94824bf30ba57e51e494d9d23c430bda54e1..b9ad9e7cfc49867fe6dfb46d64f22ec952216764 100644 (file)
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -64,5 +64,6 @@
     <string name="title_activity_transaction_list">Трансакции</string>
     <string name="err_http_error">Грешка в HTTP</string>
     <string name="new_profile_title">Нов профил</string>
-    <string name="delete">Изтриване на профила</string>
+    <string name="delete_profile">Изтриване на профила</string>
+    <string name="delete">Изтриване</string>
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a6b1d60fb5cd81996a0005f23a8e3f113fb489f7..c0546694899820a84da930a632168a230ead3f18 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -106,5 +106,6 @@
     <string name="title_profile_details">Profile Details</string>
     <string name="profiles">Profiles</string>
     <string name="new_profile_title" type="id">New profile</string>
-    <string name="delete">Delete profile</string>
+    <string name="delete_profile">Delete profile</string>
+    <string name="delete">Delete</string>
 </resources>