fix: Midi creation and removed hidden recording idea

Chimera-Studio · Mar 19, 2024 · 180714e · 180714e
1 parent 32d0bb9
commit 180714e
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 178 deletions.
diff --git a/app/assets/icons/Recordings.tsx b/app/assets/icons/Recordings.tsx
diff --git a/app/components/Body.tsx b/app/components/Body.tsx
@@ -9,7 +9,6 @@ import AdmobBanner from './elements/misc/AdmobBanner';
 import RewardsCountdown from './elements/misc/RewardsCountdown';
 import Guide from './screens/Guide';
 import Home from './screens/Home';
-import Library from './screens/Library';
 import Loading from './screens/Loading';
 import Rewarded from './screens/Rewarded';
 import Settings from './screens/Settings';
@@ -65,7 +64,6 @@ function Body() {
         <Routes>
           <Route index element={<Home />} />
           <Route path="/settings" element={<Settings />} />
-          <Route path="/library" element={<Library />} />
           <Route path="/guide" element={(<Guide />)} />
           <Route path="/state-tree" element={<StateTree />} />
           <Route path="/rewarded/:section" element={<Rewarded />} />

diff --git a/app/components/blocks/bottom/Bottom.tsx b/app/components/blocks/bottom/Bottom.tsx
@@ -85,91 +85,6 @@ function Bottom() {
     dispatch(beatActions.resetBeat());
   };
 
-  // const handleRecording = () => {};
-
-  /* Recording Functions - START */
-  /*
-  const startRec = async () => {
-    let findBeat = false;
-    for (let i in beats.hihat) {
-      if (
-        beats.hihat[i].checked === true ||
-        beats.snare[i].checked === true ||
-        beats.kick[i].checked === true
-      ) {
-        findBeat = true;
-        break;
-      }
-    }
-
-    let status = (await Audio.getPermissionsAsync()).granted;
-    if (status === true && isPlaying === false && findBeat === true) {
-      try {
-        await Audio.setAudioModeAsync({
-          allowsRecordingIOS: true,
-          playsInSilentModeIOS: true,
-          staysActiveInBackground: false,
-          shouldDuckAndroid: false,
-          playThroughEarpieceAndroid: false,
-          interruptionModeIOS: Audio.INTERRUPTION_MODE_IOS_DO_NOT_MIX,
-          interruptionModeAndroid:
-            Audio.INTERRUPTION_MODE_ANDROID_DO_NOT_MIX,
-        });
-
-        await recording.prepareToRecordAsync(RecordingOptions);
-        await recording.startAsync();
-
-        start();
-
-        isRecording = true;
-        setRecordingStatus(isRecording);
-      } catch (err) {
-        console.error(err);
-      }
-    } else if (status === true && isPlaying === true && findBeat === true) {
-      try {
-        await Audio.setAudioModeAsync({
-          allowsRecordingIOS: true,
-          playsInSilentModeIOS: true,
-          staysActiveInBackground: false,
-          shouldDuckAndroid: false,
-          playThroughEarpieceAndroid: true,
-          interruptionModeIOS: Audio.INTERRUPTION_MODE_IOS_DO_NOT_MIX,
-          interruptionModeAndroid:
-            Audio.INTERRUPTION_MODE_ANDROID_DO_NOT_MIX,
-        });
-
-        await recording.prepareToRecordAsync(RecordingOptions);
-        await recording.startAsync();
-
-        isRecording = true;
-        setRecordingStatus(isRecording);
-      } catch (err) {
-        console.error(err);
-      }
-    } else if (status === true && isPlaying === false && findBeat === false) {
-      alertDelay();
-    } else {
-      await Audio.requestPermissionsAsync();
-    }
-  };
-
-  const stopRec = async () => {
-    pause();
-
-    await recording.stopAndUnloadAsync();
-    setRecording(new Audio.Recording());
-    const uri = recording.getURI();
-
-    console.log(uri);
-    // Current Save Folder URL: /Users/dariodumlijan/Library/Developer/CoreSimulator/Devices/B54A7218-4990-45B7-925F-BC578F42FB29/data/Containers/Data/Application/13C70B38-FE6B-4F46-A0C0-CC95AE195051/Library/Caches/ExponentExperienceData/%40ddario%2FRitmo
-
-    isRecording = false;
-    setRecordingStatus(isRecording);
-  };
-  */
-  /* Recording Functions - END */
-
   return (
     <View style={bottomStyle.wrapper}>
       <View style={bottomStyle.wrapperBG}>
@@ -225,17 +140,6 @@ function Bottom() {
           >
             <Text style={bottomStyle.btnPrimaryText}>{t('bottom.actions.reset')}</Text>
           </TouchableHighlight>
-          {/* <TouchableHighlight
-            underlayColor={colors.grayBlue}
-            style={[bottomStyle.btnPrimary, bottomStyle.btnRecording]}
-            onPress={handleRecording}
-          >
-            <View
-              style={[bottomStyle.iconRecording, {
-                backgroundColor: global.ui.isRecording ? colors.white : colors.red,
-              }]}
-            />
-          </TouchableHighlight> */}
         </View>
       </View>
     </View>

diff --git a/app/components/blocks/navigation/Navigation.tsx b/app/components/blocks/navigation/Navigation.tsx
@@ -12,7 +12,6 @@ import { isEqual, map } from 'lodash';
 import Exit from '../../../assets/icons/Exit';
 import Export from '../../../assets/icons/Export';
 import Guide from '../../../assets/icons/Guide';
-import Recordings from '../../../assets/icons/Recordings';
 import Settings from '../../../assets/icons/Settings';
 import StateTree from '../../../assets/icons/StateTree';
 import useLocale from '../../../locales';
@@ -44,10 +43,10 @@ function Navigation() {
       visible: true,
     },
     {
-      path: 'library',
-      label: t('navigation.library'),
-      icon: <Recordings style={navigationStyle.icon} />,
-      visible: false,
+      path: 'export',
+      label: t('navigation.export'),
+      icon: <Export style={navigationStyle.icon} />,
+      visible: true,
     },
     {
       path: 'guide',
@@ -131,7 +130,7 @@ function Navigation() {
         <View style={navigationStyle.linksWrapper}>
           {map(links, (link) => (
             <React.Fragment key={link.path}>
-              {link.visible && (
+              {link.visible && link.path !== 'export' && (
                 <Link
                   style={navigationStyle.link}
                   underlayColor={colors.transparent}
@@ -144,14 +143,16 @@ function Navigation() {
                   </View>
                 </Link>
               )}
+              {link.visible && link.path === 'export' && (
+                <TouchableOpacity style={navigationStyle.link} activeOpacity={0.6} onPress={openMidiModal}>
+                  <View style={navigationStyle.button}>
+                    <Text style={navigationStyle.label}>{t('navigation.export')}</Text>
+                    <Export style={navigationStyle.icon} />
+                  </View>
+                </TouchableOpacity>
+              )}
             </React.Fragment>
           ))}
-          <TouchableOpacity style={navigationStyle.link} activeOpacity={0.6} onPress={openMidiModal}>
-            <View style={navigationStyle.button}>
-              <Text style={navigationStyle.label}>{t('navigation.export')}</Text>
-              <Export style={navigationStyle.icon} />
-            </View>
-          </TouchableOpacity>
         </View>
       </View>
     </>

diff --git a/app/components/screens/Library.tsx b/app/components/screens/Library.tsx
diff --git a/app/locales/en.json b/app/locales/en.json
@@ -8,10 +8,9 @@
     "title": "Redefine Beatmaking",
     "alert": "Nothing to export!",
     "settings": "Settings",
-    "library": "Library",
     "guide": "Guide",
     "state_tree": "State Tree",
-    "export": "Export MIDI"
+    "export": "Export"
   },
   "bottom": {
     "preset": {

diff --git a/app/midi/index.ts b/app/midi/index.ts
@@ -1,10 +1,14 @@
+import { Buffer } from 'buffer';
 import RNFS from 'react-native-fs';
 import Share from 'react-native-share';
 import { filter, forEach, times } from 'lodash';
 import MidiWriter from 'midi-writer-js';
 import type { Beat, Beats } from '../sound/beats';
 import type { TimeSignature } from '../store/globalStore';
 
+// @ts-ignore
+window.Buffer = Buffer; // HACK to fix midi-writer-js: Buffer is not defined
+
 type MidiNote = 'KSH' | 'KS' | 'KH' | 'SH' | 'K' | 'S' | 'H';
 type Note = MidiNote | 'R';
 type MidiLayout = MidiNote[];

diff --git a/app/store/globalStore.ts b/app/store/globalStore.ts
@@ -46,7 +46,6 @@ export type TimeSignature = {
 export type UI = {
   fileUri?: string,
   isPlaying: boolean,
-  isRecording: boolean,
   navigationOpen?: boolean,
   personalisedAds?: boolean,
   selectedReward?: Sample | null,
@@ -361,7 +360,6 @@ const resetBeat = (state: State): State => {
   return merge({}, state, {
     ui: {
       isPlaying: false,
-      isRecording: false,
       useBPM: 100,
       useTimeSig: {
         hihat: timeSig.value,
@@ -401,7 +399,6 @@ const loadPreset = (state: State, preset: Preset): State => ({
   ui: {
     ...state.ui,
     isPlaying: false,
-    isRecording: false,
     useBPM: preset.useBPM,
     useTimeSig: preset.useTimeSig,
   },
@@ -503,9 +500,11 @@ export const reducer = (state: any, action: ReduxAction) => {
       return merge({}, state, { ui: { isPlaying: false } });
 
     case GlobalTypes.GB_EXPORT_MIDI_FULFILLED:
-    case GlobalTypes.GB_EXPORT_MIDI_REJECTED:
       return exportMIDI(state, action.payload);
 
+    case GlobalTypes.GB_EXPORT_MIDI_REJECTED:
+      return state;
+
     case GlobalTypes.GB_DELETE_MIDI_FILE:
       return omit(state, 'ui.fileUri');
 

diff --git a/app/store/index.ts b/app/store/index.ts
@@ -47,7 +47,6 @@ const initialState = {
     ui: {
       showAds: true,
       isPlaying: false,
-      isRecording: false,
       useBPM: 100,
       useSample: sample,
       useTimeSig: {

diff --git a/app/styles/bottom.ts b/app/styles/bottom.ts
@@ -79,16 +79,6 @@ const bottomStyle = StyleSheet.create({
     fontSize: isTablet ? 20 : 16,
     textAlign: 'center',
   },
-  btnRecording: {
-    borderRadius: 10,
-    paddingHorizontal: 10,
-    paddingVertical: 10,
-  },
-  iconRecording: {
-    aspectRatio: 1 / 1,
-    borderRadius: 10,
-    width: 16,
-  },
 });
 
 export default bottomStyle;
diff --git a/app/utils/hooks.ts b/app/utils/hooks.ts
@@ -88,23 +88,12 @@ export const useReview = () => {
   return handleReview;
 };
 
-export type LocationInfo = {
-  current: string,
-  isHome: boolean,
-  isRewarded: boolean,
-  isSettings: boolean,
-  isGuide: boolean,
-  isLibrary: boolean,
-  isStateTree: boolean,
-};
-
-export const useLocationInfo = (): LocationInfo => {
+export const useLocationInfo = () => {
   const location = useLocation();
   const isHome = location.pathname === '/';
   const isRewarded = location.pathname.includes('/rewarded');
   const isSettings = location.pathname === '/settings';
   const isGuide = location.pathname === '/guide';
-  const isLibrary = location.pathname === '/library';
   const isStateTree = location.pathname === '/state-tree';
 
   return {
@@ -113,7 +102,6 @@ export const useLocationInfo = (): LocationInfo => {
     isRewarded,
     isSettings,
     isGuide,
-    isLibrary,
     isStateTree,
   };
 };