more pronounced day/month delimiters in the transaction list

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / profiles / ProfileDetailModel.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailModel.java
index e1f956acb3b7e52ccde9ab59b2601ce4fcdeb0d6..09b0a067a66256b30565fa90191b870505445915 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailModel.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2020 Damyan Ivanov.
+ * Copyright © 2021 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -20,6 +20,7 @@ package net.ktnx.mobileledger.ui.profiles;
 import android.text.TextUtils;
 
 import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModel;
@@ -44,9 +45,12 @@ import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static net.ktnx.mobileledger.db.Profile.NO_PROFILE_ID;
+
 public class ProfileDetailModel extends ViewModel {
     private static final String HTTPS_URL_START = "https://";
     private final MutableLiveData<String> profileName = new MutableLiveData<>();
+    private final MutableLiveData<Integer> orderNo = new MutableLiveData<>();
     private final MutableLiveData<Boolean> postingPermitted = new MutableLiveData<>(true);
     private final MutableLiveData<String> defaultCommodity = new MutableLiveData<>(null);
     private final MutableLiveData<FutureDates> futureDates =
@@ -62,6 +66,7 @@ public class ProfileDetailModel extends ViewModel {
     private final MutableLiveData<Integer> themeId = new MutableLiveData<>(-1);
     private final MutableLiveData<HledgerVersion> detectedVersion = new MutableLiveData<>(null);
     private final MutableLiveData<Boolean> detectingHledgerVersion = new MutableLiveData<>(false);
+    private final MutableLiveData<Long> profileId = new MutableLiveData<>(NO_PROFILE_ID);
     public int initialThemeHue = Colors.DEFAULT_HUE_DEG;
     private VersionDetectionThread versionDetectionThread;
     public ProfileDetailModel() {
@@ -225,7 +230,9 @@ public class ProfileDetailModel extends ViewModel {
     }
     void setValuesFromProfile(Profile mProfile) {
         if (mProfile != null) {
+            profileId.setValue(mProfile.getId());
             profileName.setValue(mProfile.getName());
+            orderNo.setValue(mProfile.getOrderNo());
             postingPermitted.setValue(mProfile.permitPosting());
             showCommentsByDefault.setValue(mProfile.getShowCommentsByDefault());
             showCommodityByDefault.setValue(mProfile.getShowCommodityByDefault());
@@ -236,8 +243,7 @@ public class ProfileDetailModel extends ViewModel {
                 else
                     setDefaultCommodity(comm);
             }
-            futureDates.setValue(
-                    FutureDates.valueOf(mProfile.getFutureDates()));
+            futureDates.setValue(FutureDates.valueOf(mProfile.getFutureDates()));
             apiVersion.setValue(API.valueOf(mProfile.getApiVersion()));
             url.setValue(mProfile.getUrl());
             useAuthentication.setValue(mProfile.useAuthentication());
@@ -251,6 +257,8 @@ public class ProfileDetailModel extends ViewModel {
                                                                                 mProfile.getDetectedVersionMinor()));
         }
         else {
+            profileId.setValue(NO_PROFILE_ID);
+            orderNo.setValue(-1);
             profileName.setValue(null);
             url.setValue(HTTPS_URL_START);
             postingPermitted.setValue(true);
@@ -266,7 +274,9 @@ public class ProfileDetailModel extends ViewModel {
         }
     }
     void updateProfile(Profile mProfile) {
+        mProfile.setId(profileId.getValue());
         mProfile.setName(profileName.getValue());
+        mProfile.setOrderNo(orderNo.getValue());
         mProfile.setUrl(url.getValue());
         mProfile.setPermitPosting(postingPermitted.getValue());
         mProfile.setShowCommentsByDefault(showCommentsByDefault.getValue());
@@ -282,9 +292,9 @@ public class ProfileDetailModel extends ViewModel {
         mProfile.setApiVersion(apiVersion.getValue()
                                          .toInt());
         HledgerVersion version = detectedVersion.getValue();
-        mProfile.setDetectedVersionPre_1_19(version.isPre_1_20_1());
-        mProfile.setDetectedVersionMajor(version.getMajor());
-        mProfile.setDetectedVersionMinor(version.getMinor());
+        mProfile.setDetectedVersionPre_1_19(version != null && version.isPre_1_20_1());
+        mProfile.setDetectedVersionMajor(version != null ? version.getMajor() : -1);
+        mProfile.setDetectedVersionMinor(version != null ? version.getMinor() : -1);
     }
     synchronized public void triggerVersionDetection() {
         if (versionDetectionThread != null)
@@ -293,6 +303,9 @@ public class ProfileDetailModel extends ViewModel {
         versionDetectionThread = new VersionDetectionThread(this);
         versionDetectionThread.start();
     }
+    public LiveData<Long> getProfileId() {
+        return profileId;
+    }
     static class VersionDetectionThread extends Thread {
         static final int TARGET_PROCESS_DURATION = 1000;
         private final Pattern versionPattern =
@@ -325,8 +338,9 @@ public class ProfileDetailModel extends ViewModel {
                 if (m.matches()) {
                     int major = Integer.parseInt(Objects.requireNonNull(m.group(1)));
                     int minor = Integer.parseInt(Objects.requireNonNull(m.group(2)));
-                    final boolean hasPatch = m.groupCount() >= 3;
-                    int patch = hasPatch ? Integer.parseInt(Objects.requireNonNull(m.group(3))) : 0;
+                    final String patchText = m.group(3);
+                    final boolean hasPatch = patchText != null;
+                    int patch = hasPatch ? Integer.parseInt(patchText) : 0;
 
                     return hasPatch ? new HledgerVersion(major, minor, patch)
                                     : new HledgerVersion(major, minor);