Merge pull request #1514 from moneymanagerex/v19

auto transaction number per behavior settings
moneymanagerex · Jan 12, 2024 · 5aaff3f · 5aaff3f
2 parents b1bea2a + dabc2cd
commit 5aaff3f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -27,9 +27,9 @@ android {
 
     defaultConfig {
         applicationId "com.money.manager.ex"
-        versionCode 1011
+        versionCode 1012
         //versionName getVersionAsDate() + "." + versionCode
-        versionName "2024.01.10"
+        versionName "2024.01.12"
         // $applicationId
         setProperty("archivesBaseName", "ammx-$versionName")
 

diff --git a/app/src/main/java/com/money/manager/ex/settings/BehaviourSettings.java b/app/src/main/java/com/money/manager/ex/settings/BehaviourSettings.java
@@ -83,6 +83,9 @@ public void setSmsTransStatusNotification(boolean status) {
         set(PreferenceConstants.PREF_SMS_TRANS_STATUS_NOTIFICATION, status);
     }
 
+    public boolean getAutoTransactionNumber(){
+        return get(R.string.pref_auto_transaction_number, false);
+    }
     public Boolean getShowTutorial() {
         return get(R.string.pref_show_tutorial, true);
     }

diff --git a/app/src/main/java/com/money/manager/ex/transactions/EditTransactionCommonFunctions.java b/app/src/main/java/com/money/manager/ex/transactions/EditTransactionCommonFunctions.java
@@ -64,6 +64,7 @@
 import com.money.manager.ex.domainmodel.Payee;
 import com.money.manager.ex.servicelayer.AccountService;
 import com.money.manager.ex.settings.AppSettings;
+import com.money.manager.ex.settings.BehaviourSettings;
 import com.money.manager.ex.utils.MmxDate;
 import com.money.manager.ex.utils.MmxDateTimeUtils;
 import com.shamanland.fonticon.FontIconView;
@@ -706,7 +707,7 @@ public void onClick(View v) {
             }
         });
 
-        if (!transactionEntity.hasId()) {
+        if (!transactionEntity.hasId() && (new BehaviourSettings(getContext()).getAutoTransactionNumber())) {
             viewHolder.btnTransNumber.callOnClick();
         }
     }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -782,4 +782,6 @@
     <string name="pref_anonymous_usage">prefanonymoususage</string>
     <string name="summary_anonymous_usage">Enable to help us sending anonymous data about MMEX usage</string>
     <string name="title_anonymous_usage">Send anonymous usage data</string>
+    <string name="pref_auto_transaction_number">prefautotransactionnumber</string>
+    <string name="title_auto_transaction_number">Auto populate transaction number</string>
 </resources>
diff --git a/app/src/main/res/xml/preferences_behaviour.xml b/app/src/main/res/xml/preferences_behaviour.xml
@@ -68,6 +68,12 @@
         android:summary="@string/summary_sms_trans_status_notification"
         android:title="@string/title_sms_trans_status_notification" />
 
+    <SwitchPreferenceCompat
+        android:icon="@null"
+        android:defaultValue="false"
+        android:key="@string/pref_auto_transaction_number"
+        android:title="@string/title_auto_transaction_number" />
+
     <SwitchPreferenceCompat
         android:icon="@null"
         android:defaultValue="true"