Allow editing multiple choice stat type options, dont rearrange entri…

…es when the date wasnt changed, fix bug with importing when there are overlaps between stat categories

android/app/build.gradle

@@ -139,8 +139,8 @@ android {
         applicationId "com.stat_tracker"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 12
-        versionName "0.5"
+        versionCode 13
+        versionName "0.5.1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

app/redux/mainSlice.ts

@@ -10,30 +10,74 @@ import {
   StatTypeVariant,
 } from '../shared/DataStructure';
 
-const verbose = true;
-
-const addEditEntry = (entries: IEntry[], entry: IEntry): IEntry[] => {
-  if (verbose) {
-    console.log('Adding or editing entry:');
+const addEditEntry = (entries: IEntry[], entry: IEntry, newEntry = false): IEntry[] => {
+  if (__DEV__) {
+    console.log(`${newEntry ? 'Adding' : 'Editing'} entry:`);
     console.log(JSON.stringify(entry, null, 2));
   }
 
-  const newEntries: IEntry[] = [];
+  let newEntries: IEntry[] = [];
   let inserted = false;
 
   if (entries.length > 0) {
-    for (let e of entries) {
-      if (!inserted && isNewerOrSameDate(entry.date, e.date)) {
-        newEntries.push(entry);
-        inserted = true;
+    if (newEntry) {
+      if (!isNewerOrSameDate(entry.date, entries[0].date)) {
+        for (let e of entries) {
+          if (!inserted && isNewerOrSameDate(entry.date, e.date)) {
+            if (__DEV__) console.log('Adding entry in the middle');
+            newEntries.push(entry);
+            inserted = true;
+          }
+          newEntries.push(e);
+        }
+
+        // If it's to become the very last element in the array of entries
+        if (!inserted) {
+          if (__DEV__) console.log('Adding entry at the bottom');
+          newEntries.push(entry);
+        }
+      } else {
+        if (__DEV__) console.log('Adding entry at the top');
+        entries.unshift(entry);
+        newEntries = entries;
       }
-      if (e.id !== entry.id) {
-        newEntries.push(e);
+    } else {
+      let differentDate = true;
+      const uneditedEntry = entries.find((el) => el.id === entry.id);
+
+      if (!!uneditedEntry.date === !!entry.date) {
+        differentDate =
+          !!uneditedEntry.date &&
+          (uneditedEntry.date.day !== entry.date.day ||
+            uneditedEntry.date.month !== entry.date.month ||
+            uneditedEntry.date.year !== entry.date.year);
       }
-    }
 
-    if (!inserted) newEntries.push(entry);
+      if (differentDate) {
+        for (let e of entries) {
+          if (!inserted && isNewerOrSameDate(entry.date, e.date)) {
+            if (__DEV__) console.log('Reordering the entry');
+            newEntries.push(entry);
+            inserted = true;
+          }
+          if (e.id !== entry.id) {
+            newEntries.push(e);
+          }
+        }
+
+        // If it's to become the very last element in the array of entries
+        if (!inserted) {
+          if (__DEV__) console.log('Reordering it to the bottom');
+          newEntries.push(entry);
+        }
+      } else {
+        if (__DEV__) console.log('Date is the same, not reordering');
+        newEntries = entries.map((el) => (el.id === entry.id ? entry : el));
+      }
+    }
   } else {
+    if (__DEV__) console.log('Adding first entry');
+    // When there are no entries in the array
     newEntries.push(entry);
   }
 
@@ -42,7 +86,7 @@ const addEditEntry = (entries: IEntry[], entry: IEntry): IEntry[] => {
 
 // The return value is whether or not the PB got updated
 const updateStatTypePB = (state: any, statType: IStatType, entry: IEntry): boolean => {
-  if (verbose) console.log(`Checking if entry ${entry.id} has the PB for stat type ${statType.name}`);
+  if (__DEV__) console.log(`Checking if entry ${entry.id} has the PB for stat type ${statType.name}`);
 
   let pbUpdated = false;
   const stat = entry.stats.find((el: IStat) => el.type === statType.id);
@@ -98,7 +142,7 @@ const updateStatTypePB = (state: any, statType: IStatType, entry: IEntry): boole
 };
 
 const checkPBFromScratch = (state: any, statType: IStatType) => {
-  if (verbose) console.log(`Checking PB from scratch for stat type ${statType.name}`);
+  if (__DEV__) console.log(`Checking PB from scratch for stat type ${statType.name}`);
 
   for (let i = state.entries.length - 1; i >= 0; i--) {
     updateStatTypePB(state, statType, state.entries[i]);
@@ -110,7 +154,7 @@ const updatePBs = (state: any, entry: IEntry, mode: 'add' | 'edit' | 'delete') =
 
   for (let statType of state.statTypes) {
     if (statType.trackPBs && statType.variant === StatTypeVariant.NUMBER) {
-      if (verbose) console.log(`Updating PB for stat type ${statType.name}`);
+      if (__DEV__) console.log(`Updating PB for stat type ${statType.name}`);
 
       let pbUpdated = false;
 
@@ -170,7 +214,7 @@ const updatePBs = (state: any, entry: IEntry, mode: 'add' | 'edit' | 'delete') =
 
       PBsUpdated = pbUpdated || PBsUpdated;
 
-      if (verbose) {
+      if (__DEV__) {
         if (pbUpdated) console.log('PB updated to: ', JSON.stringify(statType.pbs, null, 2));
         else console.log('PB not updated');
       }
@@ -241,7 +285,7 @@ const mainSlice = createSlice({
      * Entries
      */
     addEntry: (state, action: PayloadAction<IEntry>) => {
-      state.entries = addEditEntry(state.entries, action.payload);
+      state.entries = addEditEntry(state.entries, action.payload, true);
       SM.setData(state.statCategory.id, 'entries', state.entries);
 
       // Update PBs if needed

app/screens/AddEditEntry.tsx

@@ -131,7 +131,8 @@ const AddEditEntry = ({ navigation, route }) => {
         Alert.alert('Error', error, [{ text: 'Ok' }]);
       }
       return false;
-    } else return true;
+    }
+    return true;
   };
 
   // Assumes the stat type has a default value

app/screens/AddEditStatType.tsx

@@ -113,10 +113,16 @@ const AddEditStatType = ({ navigation, route }) => {
     } else if (variant === StatTypeVariant.NUMBER && isNaN(Number(defaultValue))) {
       Alert.alert('Error', 'The default value for a numeric stat type must be a number', [{ text: 'Ok' }]);
       return false;
-    } else if (variant === StatTypeVariant.MULTIPLE_CHOICE && !choicesAccepted) {
-      Alert.alert('Error', 'You must accept your options first', [{ text: 'Ok' }]);
-      return false;
-    } else return true;
+    } else if (variant === StatTypeVariant.MULTIPLE_CHOICE) {
+      if (!choicesAccepted) {
+        Alert.alert('Error', 'You must accept your options first', [{ text: 'Ok' }]);
+        return false;
+      } else if (!!passedData?.statType && choices.length < passedData.statType.choices.length) {
+        Alert.alert('Error', 'You cannot have fewer options than before', [{ text: 'Ok' }]);
+        return false;
+      }
+    }
+    return true;
   };
 
   const isValidChoices = (): boolean => {
@@ -129,11 +135,19 @@ const AddEditStatType = ({ navigation, route }) => {
     if (nonEmptyChoices.length >= 2) {
       setChoices(nonEmptyChoices);
       setChoicesAccepted(true);
+      if (defaultValue > nonEmptyChoices.length) {
+        setDefaultValue(0);
+      }
     } else {
       Alert.alert('Error', 'Please enter at least two choices', [{ text: 'Ok' }]);
     }
   };
 
+  const editChoices = () => {
+    setChoicesAccepted(false);
+    setChoices((prevChoices) => [...prevChoices, '']);
+  };
+
   const getChoicesOptions = (): ISelectOption[] => {
     return [
       {
@@ -258,9 +272,7 @@ const AddEditStatType = ({ navigation, route }) => {
                   onSelect={(value: number) => setDefaultValue(value)}
                 />
               </View>
-              {!passedData?.statType && (
-                <Button color="blue" title="Edit Options" onPress={() => setChoicesAccepted(false)} />
-              )}
+              <Button color="blue" title="Edit Options" onPress={editChoices} />
             </>
           ))}
         {getCanHaveMultipleValues() && (

app/shared/StorageManager.ts

@@ -3,7 +3,7 @@ import * as ScopedStorage from 'react-native-scoped-storage';
 import { formatDate } from './GlobalFunctions';
 import { IStatCategory, IBackupData, dataPoints } from './DataStructure';
 
-const verbose = true;
+const verbose = true && __DEV__;
 
 export const getData = async (categoryId: number, request: string) => {
   const key: string = categoryId + '_' + request;
@@ -141,6 +141,8 @@ export const importData = async (
     const data: IBackupData = JSON.parse(backupFile.data);
 
     if (verbose) {
+      console.log('Stat categories before import:');
+      console.log(JSON.stringify(statCategories, null, 2));
       console.log('Backup file data:');
       console.log(JSON.stringify(data, null, 2));
     }
@@ -173,14 +175,14 @@ export const importData = async (
         successMessage = successMessage.slice(0, -2);
       }
 
-      setStatCategories(data.statCategories);
-
       for (let i of dataPoints) {
         for (let statCategory of data.statCategories) {
           setData(statCategory.id, i, data[i][statCategory.id]);
         }
       }
 
+      setStatCategories([...statCategories, ...data.statCategories]);
+
       return { message: successMessage, error: '' };
     } else {
       return { error: 'Backup file is invalid', message: '' };

ios/Stat_Tracker.xcodeproj/project.pbxproj

@@ -485,7 +485,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Stat_Tracker/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -511,7 +511,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 12;
+				CURRENT_PROJECT_VERSION = 13;
 				INFOPLIST_FILE = Stat_Tracker/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

ios/Stat_Tracker/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.5</string>
+	<string>0.5.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>13</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true />
 	<key>NSAppTransportSecurity</key>

ios/Stat_TrackerTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.5</string>
+	<string>0.5.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>12</string>
+	<string>13</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Stat_Tracker",
-  "version": "0.5",
+  "version": "0.5.1",
   "private": true,
   "scripts": {
     "dev": "alacritty -e yarn emulator & alacritty -e yarn start && sleep 3 & alacritty -e yarn android &",