fix: settings page styling

android/app/src/main/assets/index.android.bundle

@@ -1223,7 +1223,7 @@ __d((function(g,r,i,a,m,e,d){var l=r(d[0]);Object.defineProperty(e,"__esModule",
 __d((function(g,_r,_i,_a,m,_e,d){var e=_r(d[0]);Object.defineProperty(_e,"__esModule",{value:!0}),_e.default=void 0;var t=e(_r(d[1])),n=(function(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!=typeof e&&"function"!=typeof e)return{default:e};var n=u(t);if(n&&n.has(e))return n.get(e);var r={__proto__:null},o=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var a in e)if("default"!==a&&{}.hasOwnProperty.call(e,a)){var l=o?Object.getOwnPropertyDescriptor(e,a):null;l&&(l.get||l.set)?Object.defineProperty(r,a,l):r[a]=e[a]}return r.default=e,n&&n.set(e,r),r})(_r(d[2])),r=_r(d[3]),o=_r(d[4]);function u(e){if("function"!=typeof WeakMap)return null;var t=new WeakMap,n=new WeakMap;return(u=function(e){return e?n:t})(e)}var a=function(e){var u,a,l,f=(0,n.useState)(e.countdownFrom?e.countdownFrom-Date.now():0),c=(0,t.default)(f,2),i=c[0],s=c[1],p=(0,n.useRef)(i),v=function(e){return String(e).padStart(2,'0')};return(0,n.useEffect)((function(){var t=setInterval((function(){p.current-=(0,_r(d[6]).secondsToMilliseconds)(1),p.current<0?clearInterval(t):(s(p.current),e.onChange&&e.onChange(p.current))}),(0,_r(d[6]).secondsToMilliseconds)(1));return function(){clearInterval(t)}}),[]),e.isHidden?null:(0,o.jsx)(r.Text,{style:e.style,children:(u=(0,_r(d[5]).floor)(i%864e5/36e5),a=(0,_r(d[5]).floor)(i%36e5/6e4),l=(0,_r(d[5]).floor)(i%6e4/1e3),v(u)+':'+v(a)+':'+v(l))})};_e.default=a}),1104,[1,26,153,2,194,653,654]);
 __d((function(g,_r,_i,_a,m,_e,d){var e=_r(d[0]);Object.defineProperty(_e,"__esModule",{value:!0}),_e.default=void 0;var t=e(_r(d[1])),n=(function(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!=typeof e&&"function"!=typeof e)return{default:e};var n=S(t);if(n&&n.has(e))return n.get(e);var l={__proto__:null},r=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var s in e)if("default"!==s&&{}.hasOwnProperty.call(e,s)){var a=r?Object.getOwnPropertyDescriptor(e,s):null;a&&(a.get||a.set)?Object.defineProperty(l,s,a):l[s]=e[s]}return l.default=e,n&&n.set(e,l),l})(_r(d[2])),l=_r(d[3]),r=e(_r(d[4])),s=e(_r(d[5])),a=e(_r(d[6])),i=e(_r(d[7])),o=e(_r(d[8])),u=e(_r(d[9])),c=e(_r(d[10])),f=e(_r(d[11])),p=e(_r(d[12])),x=e(_r(d[13])),y=e(_r(d[14])),h=_r(d[15]);function S(e){if("function"!=typeof WeakMap)return null;var t=new WeakMap,n=new WeakMap;return(S=function(e){return e?n:t})(e)}var j=function(){var e,S=(0,s.default)().t,j=(0,_r(d[16]).useTeleport)().teleport,w=(0,_r(d[16]).useAppDispatch)(),T=(0,_r(d[17]).useNavigate)(),b=(0,c.default)().samples,v=(0,_r(d[16]).useAppSelector)(_r(d[18]).selectors.getLockedSamples,_r(d[19]).isEqual),M=(0,_r(d[16]).useAppSelector)(_r(d[18]).selectors.getGlobal,_r(d[19]).isEqual),k=(0,n.useState)(String(M.ui.useBPM)),_=(0,t.default)(k,2),P=_[0],O=_[1],C=(0,n.useState)(!1),A=(0,t.default)(C,2),V=A[0],B=A[1],D=(0,n.useState)(!1),W=(0,t.default)(D,2),R=W[0],E=W[1],F=(0,_r(d[19]).isEmpty)(v),I=(0,n.useState)(!1),N=(0,t.default)(I,2),z=N[0],K=N[1],L=_r(d[20]).config.keepRewards,q=_r(d[20]).config.resetRewards,H=(0,_r(d[21]).hoursToMilliseconds)(q),G=(0,_r(d[21]).hoursToMilliseconds)(L),J=F&&!z,Q=null!=(e=M.rewardedAt)&&e.samples?M.rewardedAt.samples+H:null,U=function(e){var t=Math.trunc(Number(e));(t<1||(0,_r(d[19]).isEmpty)(t)&&!(0,_r(d[19]).isNumber)(t)||(0,_r(d[19]).isNaN)(t))&&(t=1),t>_r(d[20]).maxBPM&&(t=_r(d[20]).maxBPM),O(String(t)),w(_r(d[18]).actions.updateBPM(t))},X=function(){if(!M.ui.showAds)return E(!1),void j((0,h.jsx)(x.default,{clearDelayMS:(0,_r(d[21]).secondsToMilliseconds)(5),children:(0,h.jsx)(l.Text,{style:[o.default.alertText,{fontSize:14}],children:S('modal.no_ads')})}));if(J){var e=Q?Q-G:null;j((0,h.jsxs)(x.default,{clearDelayMS:(0,_r(d[21]).secondsToMilliseconds)(5),children:[(0,h.jsx)(l.Text,{style:[o.default.alertText,{fontSize:14}],children:S('modal.keep_rewards')}),(0,h.jsx)(y.default,{countdownFrom:e,style:o.default.alertTimerText})]}))}else l.Keyboard.dismiss(),T('/rewarded/samples')};return(0,h.jsx)(l.ScrollView,{style:{flex:1},contentContainerStyle:i.default.scrollDeviceContainer,showsVerticalScrollIndicator:!1,bounces:!1,children:(0,h.jsxs)(l.SafeAreaView,{style:i.default.safe,children:[(0,h.jsx)(y.default,{countdownFrom:Q,onChange:function(e){e<=G&&!z&&K(!0)},isHidden:!0}),(0,h.jsx)(l.View,{style:u.default.navigation,children:(0,h.jsx)(_r(d[17]).Link,{to:"/",underlayColor:a.default.transparent,disabled:R,onPress:function(){l.Keyboard.dismiss()},children:(0,h.jsx)(l.Animated.View,{style:u.default.closeIconWrapper,children:(0,h.jsx)(r.default,{style:u.default.closeIcon})})})}),(0,h.jsxs)(l.View,{style:u.default.menuWrapper,children:[(0,h.jsxs)(l.View,{style:u.default.bpmWrapper,children:[(0,h.jsx)(l.Text,{style:u.default.menuTitle,children:S('settings.bpm')}),(0,h.jsx)(l.TextInput,{style:_r(d[22]).textInputStyle.input,maxLength:3,onChangeText:function(e){return O(e)},onSubmitEditing:function(){return U(P)},onBlur:function(){return U(P)},value:P,placeholderTextColor:a.default.grayBlue,keyboardType:"numeric",multiline:!1})]}),(0,h.jsx)(p.default,{value:M.ui.useTimeSig||{hihat:'Free',snare:'Free',kick:'Free'},isOpen:V,onOpen:function(){return B(!0)},onClose:function(){return B(!1)},onSelect:function(e){B(!1),w(_r(d[18]).actions.updateTimeSig(e))},onRewardedClick:function(){if(!M.ui.showAds)return B(!1),void j((0,h.jsx)(x.default,{clearDelayMS:(0,_r(d[21]).secondsToMilliseconds)(5),children:(0,h.jsx)(l.Text,{style:[o.default.alertText,{fontSize:14}],children:S('modal.no_ads')})}));l.Keyboard.dismiss(),T('/rewarded/pro-features')},unlockedPro:M.unlockedPro||!1}),(0,h.jsxs)(l.View,{style:u.default.soundWrapper,children:[(0,h.jsx)(f.default,{title:S('settings.sound'),value:(0,_r(d[19]).get)(M.ui.useSample,'label','Acoustic'),options:b,isOpen:R,onOpen:function(){return E(!0)},onClose:function(){return E(!1)},onSelect:function(e){E(!1),w(_r(d[18]).actions.updateSelectedSample(e))},onRewardedClick:X,compareSamples:M.unlockedSamples}),_r(d[20]).config.ads&&(0,h.jsx)(l.TouchableHighlight,{onPress:X,disabled:V||R,underlayColor:a.default.grayBlue,style:u.default.btnRewardScreen,children:(0,h.jsx)(l.Text,{style:u.default.btnRewardScreenText,children:S(F?'settings.keep_rewards':'settings.more_samples')})})]})]}),(0,h.jsx)(l.View,{style:i.default.adSpace})]})})};_e.default=j}),1105,[1,26,153,2,1106,967,460,1073,1081,1107,1053,1102,1108,1084,1104,194,1024,1056,1029,653,1031,654,1083]);
 __d((function(g,r,i,a,m,e,d){var l=r(d[0]);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;l(r(d[1]));var c=r(d[2]);var t=function(l){return(0,c.jsxs)(r(d[3]).Svg,{viewBox:"0 0 206 309",style:l.style,children:[(0,c.jsx)(r(d[3]).Path,{fill:"#0E123C",d:"M9.6,299.4L9.6,299.4c12.8,12.8,33.4,12.8,46.2,0l98.7-98.7l0,0l23.1-23.1c12.8-12.8,12.8-33.4,0-46.2l-23.1-23.1l0,0L55.8,9.6C43-3.2,22.4-3.2,9.6,9.6l0,0C-3.2,22.4-3.2,43,9.6,55.8l98.7,98.7l0,0L9.6,253.2C-3.2,266-3.2,286.7,9.6,299.4z"}),(0,c.jsxs)(r(d[3]).G,{children:[(0,c.jsx)(r(d[3]).Circle,{fill:"#DFE2EC",cx:"300.6",cy:"154.5",r:"51.5"}),(0,c.jsx)(r(d[3]).Circle,{fill:"#DFE2EC",cx:"300.6",cy:"257.5",r:"51.5"}),(0,c.jsx)(r(d[3]).Circle,{fill:"#DFE2EC",cx:"403.6",cy:"154.5",r:"51.5"}),(0,c.jsx)(r(d[3]).Circle,{fill:"#DFE2EC",cx:"300.6",cy:"51.5",r:"51.5"})]}),(0,c.jsx)(r(d[3]).Rect,{x:"-291.1",y:"66.3",transform:"matrix(0.7071 -0.7071 0.7071 0.7071 -121.3943 -100.3392)",fill:"#0E123C",width:"218.5",height:"60.1"}),(0,c.jsx)(r(d[3]).Rect,{x:"-211.9",y:"99.2",transform:"matrix(0.7071 -0.7071 0.7071 0.7071 -200.6323 -67.5649)",fill:"#0E123C",width:"60.1",height:"218.5"})]})};e.default=t}),1106,[1,153,194,461]);
-__d((function(g,r,i,a,m,e,d){var t=r(d[0]);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o=r(d[1]),l=t(r(d[2])),n=o.StyleSheet.create({navigation:{alignItems:'flex-end',display:'flex',flexDirection:'row',height:r(d[3]).isTablet?'6%':'8%',justifyContent:'space-between',marginTop:r(d[3]).isiPhone?0:'5%',width:r(d[3]).isTablet?'80%':'100%'},closeIconWrapper:{height:'80%',aspectRatio:.5},closeIcon:{height:'100%',aspectRatio:.5},menuWrapper:{alignItems:'flex-end',display:'flex',flex:1,gap:100,justifyContent:'flex-start',maxHeight:750,width:r(d[3]).isTablet?'80%':'100%'},menuTitle:{color:l.default.primaryDark,fontFamily:r(d[4]).Font.semiBold,fontSize:18,marginBottom:10,marginRight:10,textAlign:'left',textTransform:'uppercase'},bpmWrapper:{alignItems:'flex-end',display:'flex',flexShrink:1,justifyContent:'space-between',marginTop:'5%'},soundWrapper:{display:'flex'},btnRewardScreen:{backgroundColor:l.default.primaryDark,borderBottomColor:l.default.grayBlue,borderBottomWidth:3,borderLeftColor:l.default.grayBlue,borderLeftWidth:1,borderRadius:15,borderRightColor:l.default.grayBlue,borderRightWidth:1,marginTop:20,marginBottom:'15%',paddingHorizontal:15,paddingVertical:8},btnRewardScreenText:{color:l.default.white,fontFamily:r(d[4]).Font.semiBold,fontSize:18,textAlign:'center'}});e.default=n}),1107,[1,2,460,535,957]);
+__d((function(g,r,i,a,m,e,d){var t=r(d[0]);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o=r(d[1]),l=t(r(d[2])),n=o.StyleSheet.create({navigation:{alignItems:'flex-end',display:'flex',flexDirection:'row',height:r(d[3]).isTablet?'6%':'8%',justifyContent:'space-between',marginTop:r(d[3]).isiPhone?0:'5%',width:r(d[3]).isTablet?'80%':'100%'},closeIconWrapper:{height:'80%',aspectRatio:.5},closeIcon:{height:'100%',aspectRatio:.5},menuWrapper:{alignItems:'flex-end',display:'flex',flex:1,gap:r(d[3]).deviceHeight/12,justifyContent:'flex-start',maxHeight:700,width:r(d[3]).isTablet?'80%':'100%'},menuTitle:{color:l.default.primaryDark,fontFamily:r(d[4]).Font.semiBold,fontSize:18,marginBottom:10,marginRight:10,textAlign:'left',textTransform:'uppercase'},bpmWrapper:{alignItems:'flex-end',display:'flex',flexShrink:1,justifyContent:'space-between',marginTop:'5%'},soundWrapper:{display:'flex'},btnRewardScreen:{backgroundColor:l.default.primaryDark,borderBottomColor:l.default.grayBlue,borderBottomWidth:3,borderLeftColor:l.default.grayBlue,borderLeftWidth:1,borderRadius:15,borderRightColor:l.default.grayBlue,borderRightWidth:1,marginTop:20,marginBottom:'15%',paddingHorizontal:15,paddingVertical:8},btnRewardScreenText:{color:l.default.white,fontFamily:r(d[4]).Font.semiBold,fontSize:18,textAlign:'center'}});e.default=n}),1107,[1,2,460,535,957]);
 __d((function(g,r,i,a,m,e,d){var t=r(d[0]);Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var l=t(r(d[1])),n=r(d[2]),s=t(r(d[3])),u=t(r(d[4])),c=t(r(d[5])),o=t(r(d[6])),S=t(r(d[7])),y=r(d[8]);var h=function(t){var h=(0,u.default)().t,x=(0,S.default)().timeSignatures,b=[{label:h('settings.time_sig_sections.all'),value:'all',disabled:!1},{label:h('settings.time_sig_sections.hihat'),value:r(d[9]).SoundKey.hihat,disabled:!t.unlockedPro},{label:h('settings.time_sig_sections.snare'),value:r(d[9]).SoundKey.snare,disabled:!t.unlockedPro},{label:h('settings.time_sig_sections.kick'),value:r(d[9]).SoundKey.kick,disabled:!t.unlockedPro}],v=function(l,n){return'all'===l.value?(0,r(d[10]).every)(t.value,(function(t){return t===n.value})):t.value[l.value]===n.value},p=function(l,n){l.disabled?t.onRewardedClick():t.onSelect({key:l.value,value:n.value})};return(0,y.jsxs)(y.Fragment,{children:[(0,y.jsxs)(n.View,{style:r(d[11]).timeSignatureSelectStyle.inputWrapper,children:[(0,y.jsx)(n.Text,{style:r(d[11]).timeSignatureSelectStyle.label,children:h('settings.time_sig')}),(0,y.jsxs)(n.TouchableOpacity,{disabled:t.isOpen||t.isDisabled,activeOpacity:.6,style:r(d[11]).timeSignatureSelectStyle.input,onPress:t.onOpen,children:[(0,r(d[10]).map)((0,r(d[10]).reject)(b,['value','all']),(function(l){return(0,y.jsxs)(n.View,{style:r(d[11]).timeSignatureSelectStyle.valueItem,children:[(0,y.jsxs)(n.Text,{style:r(d[11]).timeSignatureSelectStyle.inputTextLabel,children:[l.label,":"]}),(0,y.jsx)(n.Text,{style:r(d[11]).timeSignatureSelectStyle.inputText,children:t.value[l.value]})]},l.value)})),(0,y.jsx)(s.default,{style:r(d[11]).timeSignatureSelectStyle.inputIcon})]}),!t.unlockedPro&&(0,y.jsx)(n.TouchableHighlight,{style:[o.default.btnRewardScreen,{marginBottom:0}],onPress:t.onRewardedClick,underlayColor:c.default.grayBlue,children:(0,y.jsx)(n.Text,{style:o.default.btnRewardScreenText,children:h('settings.unlock_advanced')})})]}),(0,y.jsxs)(n.Modal,{animationType:"fade",visible:t.isOpen,onRequestClose:t.onClose,transparent:!0,children:[(0,y.jsx)(n.TouchableWithoutFeedback,{onPress:t.onClose,children:(0,y.jsx)(n.View,{style:r(d[11]).timeSignatureSelectStyle.listOverlay})}),(0,y.jsx)(n.View,{style:r(d[11]).timeSignatureSelectStyle.listWrapper,children:(0,y.jsx)(n.ScrollView,{showsVerticalScrollIndicator:!1,style:r(d[11]).timeSignatureSelectStyle.list,centerContent:!0,children:(0,r(d[10]).map)(b,(function(s){return(0,y.jsxs)(l.default.Fragment,{children:[(0,y.jsxs)(n.View,{style:r(d[11]).timeSignatureSelectStyle.listLabelWrapper,children:[(0,y.jsxs)(n.Text,{style:r(d[11]).timeSignatureSelectStyle.listLabel,children:["\u2022 ",s.label]}),s.disabled&&(0,y.jsx)(n.TouchableHighlight,{style:r(d[11]).timeSignatureSelectStyle.proWrapper,onPress:t.onRewardedClick,underlayColor:c.default.gray,children:(0,y.jsx)(n.Text,{style:r(d[11]).timeSignatureSelectStyle.proText,children:h('settings.advanced')})})]}),(0,y.jsx)(n.View,{style:r(d[11]).timeSignatureSelectStyle.listSection,children:(0,r(d[10]).map)(x,(function(t,l){var u=v(s,t);return(0,y.jsx)(n.TouchableOpacity,{activeOpacity:.6,style:[r(d[11]).timeSignatureSelectStyle.listItem,Object.assign({borderBottomColor:c.default.grayBlue+'80'},u&&{backgroundColor:c.default.primary+'40'})],onPress:function(){return p(s,t)},children:(0,y.jsx)(n.Text,{style:[r(d[11]).timeSignatureSelectStyle.listText,u?{color:c.default.black}:{}],children:t.label})},l)}))})]},s.value)}))})})]})]})};e.default=h}),1108,[1,153,2,1103,967,460,1107,1053,194,1109,653,1083]);
 __d((function(g,r,i,a,m,e,d){var n,t;Object.defineProperty(e,"__esModule",{value:!0}),e.SoundKey=e.PresetKey=void 0,e.SoundKey=n,(function(n){n.hihat="hihat",n.snare="snare",n.kick="kick"})(n||(e.SoundKey=n={})),e.PresetKey=t,(function(n){n.one="one",n.two="two",n.three="three"})(t||(e.PresetKey=t={}))}),1109,[]);
 __d((function(g,_r,_i,_a,m,_e,d){var e=_r(d[0]);Object.defineProperty(_e,"__esModule",{value:!0}),_e.default=void 0;e(_r(d[1]));var t=_r(d[2]),a=e(_r(d[3])),r=e(_r(d[4])),n=e(_r(d[5])),l=e(_r(d[6])),i=(function(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!=typeof e&&"function"!=typeof e)return{default:e};var a=o(t);if(a&&a.has(e))return a.get(e);var r={__proto__:null},n=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var l in e)if("default"!==l&&{}.hasOwnProperty.call(e,l)){var i=n?Object.getOwnPropertyDescriptor(e,l):null;i&&(i.get||i.set)?Object.defineProperty(r,l,i):r[l]=e[l]}return r.default=e,a&&a.set(e,r),r})(_r(d[7])),u=_r(d[8]);function o(e){if("function"!=typeof WeakMap)return null;var t=new WeakMap,a=new WeakMap;return(o=function(e){return e?a:t})(e)}var f=function(){var e=(0,_r(d[9]).useAppSelector)((function(e){return e}),_r(d[10]).isEqual),o={base00:n.default.transparent,base01:'#303030',base02:'#505050',base03:n.default.grayBlue,base04:'#d0d0d0',base05:'#e0e0e0',base06:'#f5f5f5',base07:n.default.black,base08:n.default.red,base09:n.default.orange,base0A:n.default.orange,base0B:n.default.orange,base0C:'#76c7b7',base0D:n.default.primary,base0E:'#d381c3',base0F:n.default.orange};return(0,u.jsxs)(t.SafeAreaView,{style:l.default.safe,children:[(0,u.jsx)(_r(d[11]).Link,{to:"/",style:l.default.exit,underlayColor:n.default.transparent,children:(0,u.jsx)(r.default,{fill:n.default.primaryDark})}),(0,u.jsx)(t.ScrollView,{style:{backgroundColor:n.default.whiteTransparent,borderRadius:10,flex:1,marginTop:i.deviceInfo.isiPhone?'18%':'22%',overflow:'hidden'},contentContainerStyle:l.default.scrollDeviceContainer,showsVerticalScrollIndicator:!0,children:(0,u.jsx)(a.default,{data:{utils:Object.assign({},i.deviceInfo,{deviceHeight:i.deviceHeight,deviceWidth:i.deviceWidth}),redux:e},theme:o,invertTheme:!1,shouldExpandNode:function(e){return(0,_r(d[10]).includes)(e,'utils')},hideRoot:!0})}),(0,u.jsx)(t.View,{style:l.default.adSpace})]})};_e.default=f}),1110,[1,153,2,1111,962,460,1073,535,194,1024,653,1056]);

app/styles/main.ts

@@ -26,7 +26,6 @@ const mainStyle = StyleSheet.create({
   },
   scrollDeviceContainer: {
     flexGrow: 1,
-    // minHeight: deviceHeight,
     width: '100%',
   },
   alert: {

app/styles/settings.ts

@@ -1,7 +1,7 @@
 import { StyleSheet } from 'react-native';
 import { Font } from '.';
 import colors from './colors';
-import { isTablet, isiPhone } from '../utils';
+import { deviceHeight, isTablet, isiPhone } from '../utils';
 
 const settingsStyle = StyleSheet.create({
   navigation: {
@@ -25,9 +25,9 @@ const settingsStyle = StyleSheet.create({
     alignItems: 'flex-end',
     display: 'flex',
     flex: 1,
-    gap: 100,
+    gap: deviceHeight / 12,
     justifyContent: 'flex-start',
-    maxHeight: 750,
+    maxHeight: 700,
     width: isTablet ? '80%' : '100%',
   },
   menuTitle: {