this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Fix old columns mode setting wrongly applied

Deprecate it more now

+11 -38
+3 -2
src/components/nav-menu.jsx
··· 35 35 // User may choose pin or not to pin Following 36 36 // If user doesn't pin Following, we show it in the menu 37 37 const showFollowing = 38 - (snapStates.settings.shortcutsColumnsMode || 39 - snapStates.settings.shortcutsViewMode === 'multi-column') && 38 + (snapStates.settings.shortcutsViewMode === 'multi-column' || 39 + (!snapStates.settings.shortcutsViewMode && 40 + snapStates.settings.shortcutsColumnsMode)) && 40 41 !snapStates.shortcuts.find((pin) => pin.type === 'following'); 41 42 42 43 const bindLongPress = useLongPress(
-27
src/components/shortcuts-settings.jsx
··· 300 300 ); 301 301 })} 302 302 </div> 303 - {/* <select 304 - value={snapStates.settings.shortcutsViewMode || 'float-button'} 305 - onChange={(e) => { 306 - states.settings.shortcutsViewMode = e.target.value; 307 - }} 308 - > 309 - <option value="float-button">Floating button</option> 310 - <option value="multi-column">Multi-column</option> 311 - <option value="tab-menu-bar">Tab/Menu bar </option> 312 - </select> */} 313 - {/* <p> 314 - <details> 315 - <summary class="insignificant"> 316 - Experimental Multi-column mode 317 - </summary> 318 - <label> 319 - <input 320 - type="checkbox" 321 - checked={snapStates.settings.shortcutsColumnsMode} 322 - onChange={(e) => { 323 - states.settings.shortcutsColumnsMode = e.target.checked; 324 - }} 325 - />{' '} 326 - Show shortcuts in multiple columns instead of the floating button. 327 - </label> 328 - </details> 329 - </p> */} 330 303 {shortcuts.length > 0 ? ( 331 304 <ol class="shortcuts-list" ref={shortcutsListParent}> 332 305 {shortcuts.filter(Boolean).map((shortcut, i) => {
+2 -2
src/components/shortcuts.jsx
··· 25 25 return null; 26 26 } 27 27 if ( 28 - settings.shortcutsColumnsMode || 29 - settings.shortcutsViewMode === 'multi-column' 28 + settings.shortcutsViewMode === 'multi-column' || 29 + (!settings.shortcutsViewMode && settings.shortcutsColumnsMode) 30 30 ) { 31 31 return null; 32 32 }
+3 -2
src/pages/home.jsx
··· 35 35 36 36 return ( 37 37 <> 38 - {(snapStates.settings.shortcutsColumnsMode || 39 - snapStates.settings.shortcutsViewMode === 'multi-column') && 38 + {(snapStates.settings.shortcutsViewMode === 'multi-column' || 39 + (!snapStates.settings.shortcutsViewMode && 40 + snapStates.settings.shortcutsColumnsMode)) && 40 41 !!snapStates.shortcuts?.length ? ( 41 42 <Columns /> 42 43 ) : (
+3 -5
src/utils/states.js
··· 71 71 store.account.get('settings-autoRefresh') ?? false; 72 72 states.settings.shortcutsViewMode = 73 73 store.account.get('settings-shortcutsViewMode') ?? null; 74 - states.settings.shortcutsColumnsMode = 75 - store.account.get('settings-shortcutsColumnsMode') ?? false; 74 + if (store.account.get('settings-shortcutsColumnsMode')) { 75 + states.settings.shortcutsColumnsMode = true; 76 + } 76 77 states.settings.boostsCarousel = 77 78 store.account.get('settings-boostsCarousel') ?? true; 78 79 states.settings.contentTranslation = ··· 98 99 } 99 100 if (path.join('.') === 'settings.boostsCarousel') { 100 101 store.account.set('settings-boostsCarousel', !!value); 101 - } 102 - if (path.join('.') === 'settings.shortcutsColumnsMode') { 103 - store.account.set('settings-shortcutsColumnsMode', !!value); 104 102 } 105 103 if (path.join('.') === 'settings.shortcutsViewMode') { 106 104 store.account.set('settings-shortcutsViewMode', value);