diff --git a/android/app/src/main/java/com/perforvnm/MainActivity.kt b/android/app/src/main/java/com/perforvnm/MainActivity.kt index 577c1aa..2304eb0 100644 --- a/android/app/src/main/java/com/perforvnm/MainActivity.kt +++ b/android/app/src/main/java/com/perforvnm/MainActivity.kt @@ -129,9 +129,7 @@ class MainActivity : Activity() { val rectangleView = RectangleView(this) - val sdp30 = resources.getDimensionPixelSize(resources.getIdentifier("_30sdp", "dimen", getPackageName())) - - val layoutParams = LayoutParams(LayoutParams.WRAP_CONTENT, sdp30) + val layoutParams = LayoutParams(LayoutParams.WRAP_CONTENT, resources.getDimensionPixelSize(resources.getIdentifier("_30sdp", "dimen", getPackageName()))) layoutParams.gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL rectangleView.layoutParams = layoutParams @@ -152,11 +150,10 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp88 = resources.getDimensionPixelSize(resources.getIdentifier("_88sdp", "dimen", getPackageName())) val sdpminus3 = resources.getDimensionPixelSize(resources.getIdentifier("_minus3sdp", "dimen", getPackageName())) layoutParamsStart.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsStart.setMargins(sdp88, 0, 0, sdpminus3) + layoutParamsStart.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_88sdp", "dimen", getPackageName())), 0, 0, sdpminus3) buttonStart.layoutParams = layoutParamsStart @@ -183,10 +180,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp161 = resources.getDimensionPixelSize(resources.getIdentifier("_161sdp", "dimen", getPackageName())) - layoutParamsAbout.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsAbout.setMargins(sdp161, 0, 0, sdpminus3) + layoutParamsAbout.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_161sdp", "dimen", getPackageName())), 0, 0, sdpminus3) buttonAbout.layoutParams = layoutParamsAbout @@ -207,10 +202,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp233 = resources.getDimensionPixelSize(resources.getIdentifier("_233sdp", "dimen", getPackageName())) - layoutParamsSettings.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsSettings.setMargins(sdp233, 0, 0, sdpminus3) + layoutParamsSettings.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_233sdp", "dimen", getPackageName())), 0, 0, sdpminus3) buttonSettings.layoutParams = layoutParamsSettings @@ -231,10 +224,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp320 = resources.getDimensionPixelSize(resources.getIdentifier("_320sdp", "dimen", getPackageName())) - layoutParamsSaves.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsSaves.setMargins(sdp320, 0, 0, sdpminus3) + layoutParamsSaves.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_320sdp", "dimen", getPackageName())), 0, 0, sdpminus3) buttonSaves.layoutParams = layoutParamsSaves @@ -280,9 +271,7 @@ class MainActivity : Activity() { val rectangleView = RectangleView(this) - val sdp30 = resources.getDimensionPixelSize(resources.getIdentifier("_30sdp", "dimen", getPackageName())) - - val layoutParamsRectangle = LayoutParams(LayoutParams.WRAP_CONTENT, sdp30) + val layoutParamsRectangle = LayoutParams(LayoutParams.WRAP_CONTENT, resources.getDimensionPixelSize(resources.getIdentifier("_30sdp", "dimen", getPackageName()))) layoutParamsRectangle.gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL rectangleView.layoutParams = layoutParamsRectangle @@ -304,6 +293,7 @@ class MainActivity : Activity() { ) val sdp88 = resources.getDimensionPixelSize(resources.getIdentifier("_88sdp", "dimen", getPackageName())) + val sdpminus3 = resources.getDimensionPixelSize(resources.getIdentifier("_minus3sdp", "dimen", getPackageName())) layoutParamsStart.gravity = Gravity.BOTTOM or Gravity.START @@ -334,10 +324,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp161 = resources.getDimensionPixelSize(resources.getIdentifier("_161sdp", "dimen", getPackageName())) - layoutParamsAbout.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsAbout.setMargins(sdp161, 0, 0, sdpminus3) + layoutParamsAbout.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_161sdp", "dimen", getPackageName())), 0, 0, sdpminus3) buttonAbout.layoutParams = layoutParamsAbout @@ -354,10 +342,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp233 = resources.getDimensionPixelSize(resources.getIdentifier("_233sdp", "dimen", getPackageName())) - layoutParamsSettings.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsSettings.setMargins(sdp233, 0, 0, sdpminus3) + layoutParamsSettings.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_233sdp", "dimen", getPackageName())), 0, 0, sdpminus3) buttonSettings.layoutParams = layoutParamsSettings @@ -378,10 +364,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp320 = resources.getDimensionPixelSize(resources.getIdentifier("_320sdp", "dimen", getPackageName())) - layoutParamsSaves.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsSaves.setMargins(sdp320, 0, 0, sdpminus3) + layoutParamsSaves.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_320sdp", "dimen", getPackageName())), 0, 0, sdpminus3) buttonSaves.layoutParams = layoutParamsSaves @@ -391,11 +375,9 @@ class MainActivity : Activity() { frameLayout.addView(buttonSaves) - val ssp15 = resources.getDimension(com.intuit.ssp.R.dimen._15ssp) - val buttonBack = Button(this) buttonBack.text = "Back" - buttonBack.setTextSize(TypedValue.COMPLEX_UNIT_PX, ssp15) + buttonBack.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(com.intuit.ssp.R.dimen._15ssp)) buttonBack.setTextColor(0xFFFFFFFF.toInt()) buttonBack.background = null @@ -404,10 +386,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp73 = resources.getDimensionPixelSize(resources.getIdentifier("_73sdp", "dimen", getPackageName())) - layoutParamsBack.gravity = Gravity.TOP or Gravity.START - layoutParamsBack.setMargins(sdp73, 0, 0, 0) + layoutParamsBack.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_73sdp", "dimen", getPackageName())), 0, 0, 0) buttonBack.layoutParams = layoutParamsBack @@ -424,8 +404,6 @@ class MainActivity : Activity() { frameLayout.addView(buttonBack) - val ssp11 = resources.getDimension(com.intuit.ssp.R.dimen._11ssp) - val textView = TextView(this) textView.text = SpannableStringBuilder().apply { append("The PerforVNM 1.0.0\n\nMade with ") @@ -437,7 +415,7 @@ class MainActivity : Activity() { }, length - "PerforVNM".length, length, 0) append(" 1.22.0 (code generator), 1.20.0 (generated code).\n\nThis is our example visual novel, made by @ThePedroo") } - textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, ssp11) + textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(com.intuit.ssp.R.dimen._11ssp)) textView.setTextColor(0xFFFFFFFF.toInt()) val layoutParamsText = LayoutParams( @@ -445,10 +423,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp53 = resources.getDimensionPixelSize(resources.getIdentifier("_53sdp", "dimen", getPackageName())) - layoutParamsText.gravity = Gravity.TOP or Gravity.START - layoutParamsText.setMargins(sdp88, sdp53, 0, 0) + layoutParamsText.setMargins(sdp88, resources.getDimensionPixelSize(resources.getIdentifier("_53sdp", "dimen", getPackageName())), 0, 0) textView.layoutParams = layoutParamsText textView.startAnimation(animationTexts) @@ -494,9 +470,7 @@ class MainActivity : Activity() { val rectangleView = RectangleView(this) - val sdp30 = resources.getDimensionPixelSize(resources.getIdentifier("_30sdp", "dimen", getPackageName())) - - val layoutParamsRectangle = LayoutParams(LayoutParams.WRAP_CONTENT, sdp30) + val layoutParamsRectangle = LayoutParams(LayoutParams.WRAP_CONTENT, resources.getDimensionPixelSize(resources.getIdentifier("_30sdp", "dimen", getPackageName()))) layoutParamsRectangle.gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL rectangleView.layoutParams = layoutParamsRectangle @@ -517,11 +491,10 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp88 = resources.getDimensionPixelSize(resources.getIdentifier("_88sdp", "dimen", getPackageName())) val sdpminus3 = resources.getDimensionPixelSize(resources.getIdentifier("_minus3sdp", "dimen", getPackageName())) layoutParamsStart.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsStart.setMargins(sdp88, 0, 0, sdpminus3) + layoutParamsStart.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_88sdp", "dimen", getPackageName())), 0, 0, sdpminus3) buttonStart.layoutParams = layoutParamsStart @@ -548,10 +521,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp161 = resources.getDimensionPixelSize(resources.getIdentifier("_161sdp", "dimen", getPackageName())) - layoutParamsAbout.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsAbout.setMargins(sdp161, 0, 0, sdpminus3) + layoutParamsAbout.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_161sdp", "dimen", getPackageName())), 0, 0, sdpminus3) buttonAbout.layoutParams = layoutParamsAbout @@ -572,10 +543,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp233 = resources.getDimensionPixelSize(resources.getIdentifier("_233sdp", "dimen", getPackageName())) - layoutParamsSettings.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsSettings.setMargins(sdp233, 0, 0, sdpminus3) + layoutParamsSettings.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_233sdp", "dimen", getPackageName())), 0, 0, sdpminus3) buttonSettings.layoutParams = layoutParamsSettings @@ -592,10 +561,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp320 = resources.getDimensionPixelSize(resources.getIdentifier("_320sdp", "dimen", getPackageName())) - layoutParamsSaves.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsSaves.setMargins(sdp320, 0, 0, sdpminus3) + layoutParamsSaves.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_320sdp", "dimen", getPackageName())), 0, 0, sdpminus3) buttonSaves.layoutParams = layoutParamsSaves @@ -605,11 +572,9 @@ class MainActivity : Activity() { frameLayout.addView(buttonSaves) - val ssp15 = resources.getDimension(com.intuit.ssp.R.dimen._15ssp) - val buttonBack = Button(this) buttonBack.text = "Back" - buttonBack.setTextSize(TypedValue.COMPLEX_UNIT_PX, ssp15) + buttonBack.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(com.intuit.ssp.R.dimen._15ssp)) buttonBack.setTextColor(0xFFFFFFFF.toInt()) buttonBack.background = null @@ -618,10 +583,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp73 = resources.getDimensionPixelSize(resources.getIdentifier("_73sdp", "dimen", getPackageName())) - layoutParamsBack.gravity = Gravity.TOP or Gravity.START - layoutParamsBack.setMargins(sdp73, 0, 0, 0) + layoutParamsBack.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_73sdp", "dimen", getPackageName())), 0, 0, 0) buttonBack.layoutParams = layoutParamsBack @@ -650,11 +613,10 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp149 = resources.getDimensionPixelSize(resources.getIdentifier("_149sdp", "dimen", getPackageName())) val sdp53 = resources.getDimensionPixelSize(resources.getIdentifier("_53sdp", "dimen", getPackageName())) layoutParamsText.gravity = Gravity.TOP or Gravity.START - layoutParamsText.setMargins(sdp149, sdp53, 0, 0) + layoutParamsText.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_149sdp", "dimen", getPackageName())), sdp53, 0, 0) textViewTextSpeed.layoutParams = layoutParamsText textViewTextSpeed.startAnimation(animationTexts) @@ -686,6 +648,7 @@ class MainActivity : Activity() { ) val sdp135 = resources.getDimensionPixelSize(resources.getIdentifier("_135sdp", "dimen", getPackageName())) + val sdp77 = resources.getDimensionPixelSize(resources.getIdentifier("_77sdp", "dimen", getPackageName())) layoutParamsSeekBar.gravity = Gravity.TOP or Gravity.START @@ -796,10 +759,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp111 = resources.getDimensionPixelSize(resources.getIdentifier("_111sdp", "dimen", getPackageName())) - layoutParamsTextSEffectVolume.gravity = Gravity.TOP or Gravity.START - layoutParamsTextSEffectVolume.setMargins(sdp443, sdp111, 0, 0) + layoutParamsTextSEffectVolume.setMargins(sdp443, resources.getDimensionPixelSize(resources.getIdentifier("_111sdp", "dimen", getPackageName())), 0, 0) textViewSEffectVolume.layoutParams = layoutParamsTextSEffectVolume textViewSEffectVolume.startAnimation(animationTexts) @@ -863,10 +824,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp166 = resources.getDimensionPixelSize(resources.getIdentifier("_166sdp", "dimen", getPackageName())) - layoutParamsTextSceneMusic.gravity = Gravity.TOP or Gravity.START - layoutParamsTextSceneMusic.setMargins(sdp443, sdp166, 0, 0) + layoutParamsTextSceneMusic.setMargins(sdp443, resources.getDimensionPixelSize(resources.getIdentifier("_166sdp", "dimen", getPackageName())), 0, 0) textViewSceneMusic.layoutParams = layoutParamsTextSceneMusic textViewSceneMusic.startAnimation(animationTexts) @@ -895,10 +854,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp190 = resources.getDimensionPixelSize(resources.getIdentifier("_190sdp", "dimen", getPackageName())) - layoutParamsSeekBarSceneMusic.gravity = Gravity.TOP or Gravity.START - layoutParamsSeekBarSceneMusic.setMargins(sdp432, sdp190, 0, 0) + layoutParamsSeekBarSceneMusic.setMargins(sdp432, resources.getDimensionPixelSize(resources.getIdentifier("_190sdp", "dimen", getPackageName())), 0, 0) seekBarSceneMusic.layoutParams = layoutParamsSeekBarSceneMusic seekBarSceneMusic.startAnimation(animationTexts) @@ -958,9 +915,7 @@ class MainActivity : Activity() { val rectangleView = RectangleView(this) - val sdp30 = resources.getDimensionPixelSize(resources.getIdentifier("_30sdp", "dimen", getPackageName())) - - val layoutParamsRectangle = LayoutParams(LayoutParams.WRAP_CONTENT, sdp30) + val layoutParamsRectangle = LayoutParams(LayoutParams.WRAP_CONTENT, resources.getDimensionPixelSize(resources.getIdentifier("_30sdp", "dimen", getPackageName()))) layoutParamsRectangle.gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL rectangleView.layoutParams = layoutParamsRectangle @@ -981,11 +936,10 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp88 = resources.getDimensionPixelSize(resources.getIdentifier("_88sdp", "dimen", getPackageName())) val sdpminus3 = resources.getDimensionPixelSize(resources.getIdentifier("_minus3sdp", "dimen", getPackageName())) layoutParamsStart.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsStart.setMargins(sdp88, 0, 0, sdpminus3) + layoutParamsStart.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_88sdp", "dimen", getPackageName())), 0, 0, sdpminus3) buttonStart.layoutParams = layoutParamsStart @@ -1012,10 +966,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp161 = resources.getDimensionPixelSize(resources.getIdentifier("_161sdp", "dimen", getPackageName())) - layoutParamsAbout.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsAbout.setMargins(sdp161, 0, 0, sdpminus3) + layoutParamsAbout.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_161sdp", "dimen", getPackageName())), 0, 0, sdpminus3) buttonAbout.layoutParams = layoutParamsAbout @@ -1036,10 +988,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp233 = resources.getDimensionPixelSize(resources.getIdentifier("_233sdp", "dimen", getPackageName())) - layoutParamsSettings.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsSettings.setMargins(sdp233, 0, 0, sdpminus3) + layoutParamsSettings.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_233sdp", "dimen", getPackageName())), 0, 0, sdpminus3) buttonSettings.layoutParams = layoutParamsSettings @@ -1060,20 +1010,16 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp320 = resources.getDimensionPixelSize(resources.getIdentifier("_320sdp", "dimen", getPackageName())) - layoutParamsSaves.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsSaves.setMargins(sdp320, 0, 0, sdpminus3) + layoutParamsSaves.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_320sdp", "dimen", getPackageName())), 0, 0, sdpminus3) buttonSaves.layoutParams = layoutParamsSaves frameLayout.addView(buttonSaves) - val ssp15 = resources.getDimension(com.intuit.ssp.R.dimen._15ssp) - val buttonBack = Button(this) buttonBack.text = "Back" - buttonBack.setTextSize(TypedValue.COMPLEX_UNIT_PX, ssp15) + buttonBack.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(com.intuit.ssp.R.dimen._15ssp)) buttonBack.setTextColor(0xFFFFFFFF.toInt()) buttonBack.background = null @@ -1082,10 +1028,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp73 = resources.getDimensionPixelSize(resources.getIdentifier("_73sdp", "dimen", getPackageName())) - layoutParamsBack.gravity = Gravity.TOP or Gravity.START - layoutParamsBack.setMargins(sdp73, 0, 0, 0) + layoutParamsBack.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_73sdp", "dimen", getPackageName())), 0, 0, 0) buttonBack.layoutParams = layoutParamsBack @@ -1135,9 +1079,10 @@ class MainActivity : Activity() { } val sdp100 = resources.getDimensionPixelSize(resources.getIdentifier("_100sdp", "dimen", getPackageName())) - val sdp70 = resources.getDimensionPixelSize(resources.getIdentifier("_70sdp", "dimen", getPackageName())) - val layoutParamsSavesBackground = LayoutParams( +val sdp70 = resources.getDimensionPixelSize(resources.getIdentifier("_70sdp", "dimen", getPackageName())) + +val layoutParamsSavesBackground = LayoutParams( sdp100, sdp70 ) @@ -1384,10 +1329,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp23 = resources.getDimensionPixelSize(resources.getIdentifier("_23sdp", "dimen", getPackageName())) - layoutParamsMenu.gravity = Gravity.TOP or Gravity.START - layoutParamsMenu.setMargins(sdp15, sdp23, 0, 0) + layoutParamsMenu.setMargins(sdp15, resources.getDimensionPixelSize(resources.getIdentifier("_23sdp", "dimen", getPackageName())), 0, 0) buttonMenu.layoutParams = layoutParamsMenu @@ -1433,10 +1376,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp120 = resources.getDimensionPixelSize(resources.getIdentifier("_120sdp", "dimen", getPackageName())) - layoutParamsSubScenes.gravity = Gravity.CENTER_HORIZONTAL - layoutParamsSubScenes.setMargins(0, sdp120, 0, 0) + layoutParamsSubScenes.setMargins(0, resources.getDimensionPixelSize(resources.getIdentifier("_120sdp", "dimen", getPackageName())), 0, 0) buttonSubScenes.layoutParams = layoutParamsSubScenes @@ -1457,10 +1398,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp150 = resources.getDimensionPixelSize(resources.getIdentifier("_150sdp", "dimen", getPackageName())) - layoutParamsSubScenes2.gravity = Gravity.CENTER_HORIZONTAL - layoutParamsSubScenes2.setMargins(0, sdp150, 0, 0) + layoutParamsSubScenes2.setMargins(0, resources.getDimensionPixelSize(resources.getIdentifier("_150sdp", "dimen", getPackageName())), 0, 0) buttonSubScenes2.layoutParams = layoutParamsSubScenes2 @@ -1492,10 +1431,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp20 = resources.getDimensionPixelSize(resources.getIdentifier("_20sdp", "dimen", getPackageName())) - layoutParams_Pedro.gravity = Gravity.CENTER - layoutParams_Pedro.setMargins(sdp20, 0, 0, 0) + layoutParams_Pedro.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_20sdp", "dimen", getPackageName())), 0, 0, 0) imageView_Pedro.layoutParams = layoutParams_Pedro @@ -1524,10 +1461,8 @@ class MainActivity : Activity() { frameLayout.addView(rectangleViewSpeech) - val ssp9 = resources.getDimension(com.intuit.ssp.R.dimen._9ssp) - val textViewSpeech = TextView(this) - textViewSpeech.setTextSize(TypedValue.COMPLEX_UNIT_PX, ssp9) + textViewSpeech.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(com.intuit.ssp.R.dimen._9ssp)) textViewSpeech.setTextColor(0xFFFFFFFF.toInt()) val layoutParamsSpeech = LayoutParams( @@ -1535,10 +1470,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp270 = resources.getDimensionPixelSize(resources.getIdentifier("_270sdp", "dimen", getPackageName())) - layoutParamsSpeech.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL - layoutParamsSpeech.setMargins(0, sdp270, 0, 0) + layoutParamsSpeech.setMargins(0, resources.getDimensionPixelSize(resources.getIdentifier("_270sdp", "dimen", getPackageName())), 0, 0) textViewSpeech.layoutParams = layoutParamsSpeech @@ -1583,11 +1516,9 @@ class MainActivity : Activity() { frameLayout.addView(rectangleViewAuthor) - val ssp13 = resources.getDimension(com.intuit.ssp.R.dimen._13ssp) - val textViewAuthor = TextView(this) textViewAuthor.text = "Pedro" - textViewAuthor.setTextSize(TypedValue.COMPLEX_UNIT_PX, ssp13) + textViewAuthor.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(com.intuit.ssp.R.dimen._13ssp)) textViewAuthor.setTextColor(0xFFFFFFFF.toInt()) val layoutParamsAuthor = LayoutParams( @@ -1595,10 +1526,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp155 = resources.getDimensionPixelSize(resources.getIdentifier("_155sdp", "dimen", getPackageName())) - layoutParamsAuthor.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsAuthor.setMargins(sdp155, 0, 0, sdp53) + layoutParamsAuthor.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_155sdp", "dimen", getPackageName())), 0, 0, sdp53) textViewAuthor.layoutParams = layoutParamsAuthor @@ -1661,10 +1590,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp23 = resources.getDimensionPixelSize(resources.getIdentifier("_23sdp", "dimen", getPackageName())) - layoutParamsMenu.gravity = Gravity.TOP or Gravity.START - layoutParamsMenu.setMargins(sdp15, sdp23, 0, 0) + layoutParamsMenu.setMargins(sdp15, resources.getDimensionPixelSize(resources.getIdentifier("_23sdp", "dimen", getPackageName())), 0, 0) buttonMenu.layoutParams = layoutParamsMenu @@ -1702,10 +1629,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp46 = resources.getDimensionPixelSize(resources.getIdentifier("_46sdp", "dimen", getPackageName())) - layoutParamsBack.gravity = Gravity.TOP or Gravity.START - layoutParamsBack.setMargins(sdp15, sdp46, 0, 0) + layoutParamsBack.setMargins(sdp15, resources.getDimensionPixelSize(resources.getIdentifier("_46sdp", "dimen", getPackageName())), 0, 0) buttonBack.layoutParams = layoutParamsBack @@ -1757,10 +1682,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp20 = resources.getDimensionPixelSize(resources.getIdentifier("_20sdp", "dimen", getPackageName())) - layoutParams_Pedro.gravity = Gravity.CENTER - layoutParams_Pedro.setMargins(sdp20, 0, 0, 0) + layoutParams_Pedro.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_20sdp", "dimen", getPackageName())), 0, 0, 0) imageView_Pedro.layoutParams = layoutParams_Pedro @@ -1779,10 +1702,8 @@ class MainActivity : Activity() { frameLayout.addView(rectangleViewSpeech) - val ssp9 = resources.getDimension(com.intuit.ssp.R.dimen._9ssp) - val textViewSpeech = TextView(this) - textViewSpeech.setTextSize(TypedValue.COMPLEX_UNIT_PX, ssp9) + textViewSpeech.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(com.intuit.ssp.R.dimen._9ssp)) textViewSpeech.setTextColor(0xFFFFFFFF.toInt()) val layoutParamsSpeech = LayoutParams( @@ -1790,10 +1711,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp270 = resources.getDimensionPixelSize(resources.getIdentifier("_270sdp", "dimen", getPackageName())) - layoutParamsSpeech.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL - layoutParamsSpeech.setMargins(0, sdp270, 0, 0) + layoutParamsSpeech.setMargins(0, resources.getDimensionPixelSize(resources.getIdentifier("_270sdp", "dimen", getPackageName())), 0, 0) textViewSpeech.layoutParams = layoutParamsSpeech @@ -1824,11 +1743,9 @@ class MainActivity : Activity() { frameLayout.addView(rectangleViewAuthor) - val ssp13 = resources.getDimension(com.intuit.ssp.R.dimen._13ssp) - val textViewAuthor = TextView(this) textViewAuthor.text = "Pedro" - textViewAuthor.setTextSize(TypedValue.COMPLEX_UNIT_PX, ssp13) + textViewAuthor.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(com.intuit.ssp.R.dimen._13ssp)) textViewAuthor.setTextColor(0xFFFFFFFF.toInt()) val layoutParamsAuthor = LayoutParams( @@ -1836,10 +1753,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp155 = resources.getDimensionPixelSize(resources.getIdentifier("_155sdp", "dimen", getPackageName())) - layoutParamsAuthor.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsAuthor.setMargins(sdp155, 0, 0, sdp53) + layoutParamsAuthor.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_155sdp", "dimen", getPackageName())), 0, 0, sdp53) textViewAuthor.layoutParams = layoutParamsAuthor @@ -1893,10 +1808,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp23 = resources.getDimensionPixelSize(resources.getIdentifier("_23sdp", "dimen", getPackageName())) - layoutParamsMenu.gravity = Gravity.TOP or Gravity.START - layoutParamsMenu.setMargins(sdp15, sdp23, 0, 0) + layoutParamsMenu.setMargins(sdp15, resources.getDimensionPixelSize(resources.getIdentifier("_23sdp", "dimen", getPackageName())), 0, 0) buttonMenu.layoutParams = layoutParamsMenu @@ -1934,10 +1847,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp46 = resources.getDimensionPixelSize(resources.getIdentifier("_46sdp", "dimen", getPackageName())) - layoutParamsBack.gravity = Gravity.TOP or Gravity.START - layoutParamsBack.setMargins(sdp15, sdp46, 0, 0) + layoutParamsBack.setMargins(sdp15, resources.getDimensionPixelSize(resources.getIdentifier("_46sdp", "dimen", getPackageName())), 0, 0) buttonBack.layoutParams = layoutParamsBack @@ -1976,10 +1887,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp20 = resources.getDimensionPixelSize(resources.getIdentifier("_20sdp", "dimen", getPackageName())) - layoutParams_Pedro.gravity = Gravity.CENTER - layoutParams_Pedro.setMargins(sdp20, 0, 0, 0) + layoutParams_Pedro.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_20sdp", "dimen", getPackageName())), 0, 0, 0) imageView_Pedro.layoutParams = layoutParams_Pedro @@ -2008,10 +1917,8 @@ class MainActivity : Activity() { frameLayout.addView(rectangleViewSpeech) - val ssp9 = resources.getDimension(com.intuit.ssp.R.dimen._9ssp) - val textViewSpeech = TextView(this) - textViewSpeech.setTextSize(TypedValue.COMPLEX_UNIT_PX, ssp9) + textViewSpeech.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(com.intuit.ssp.R.dimen._9ssp)) textViewSpeech.setTextColor(0xFFFFFFFF.toInt()) val layoutParamsSpeech = LayoutParams( @@ -2019,10 +1926,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp270 = resources.getDimensionPixelSize(resources.getIdentifier("_270sdp", "dimen", getPackageName())) - layoutParamsSpeech.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL - layoutParamsSpeech.setMargins(0, sdp270, 0, 0) + layoutParamsSpeech.setMargins(0, resources.getDimensionPixelSize(resources.getIdentifier("_270sdp", "dimen", getPackageName())), 0, 0) textViewSpeech.layoutParams = layoutParamsSpeech @@ -2067,11 +1972,9 @@ class MainActivity : Activity() { frameLayout.addView(rectangleViewAuthor) - val ssp13 = resources.getDimension(com.intuit.ssp.R.dimen._13ssp) - val textViewAuthor = TextView(this) textViewAuthor.text = "Pedro" - textViewAuthor.setTextSize(TypedValue.COMPLEX_UNIT_PX, ssp13) + textViewAuthor.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(com.intuit.ssp.R.dimen._13ssp)) textViewAuthor.setTextColor(0xFFFFFFFF.toInt()) val layoutParamsAuthor = LayoutParams( @@ -2079,10 +1982,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp155 = resources.getDimensionPixelSize(resources.getIdentifier("_155sdp", "dimen", getPackageName())) - layoutParamsAuthor.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsAuthor.setMargins(sdp155, 0, 0, sdp53) + layoutParamsAuthor.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_155sdp", "dimen", getPackageName())), 0, 0, sdp53) textViewAuthor.layoutParams = layoutParamsAuthor @@ -2145,10 +2046,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp23 = resources.getDimensionPixelSize(resources.getIdentifier("_23sdp", "dimen", getPackageName())) - layoutParamsMenu.gravity = Gravity.TOP or Gravity.START - layoutParamsMenu.setMargins(sdp15, sdp23, 0, 0) + layoutParamsMenu.setMargins(sdp15, resources.getDimensionPixelSize(resources.getIdentifier("_23sdp", "dimen", getPackageName())), 0, 0) buttonMenu.layoutParams = layoutParamsMenu @@ -2186,10 +2085,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp46 = resources.getDimensionPixelSize(resources.getIdentifier("_46sdp", "dimen", getPackageName())) - layoutParamsBack.gravity = Gravity.TOP or Gravity.START - layoutParamsBack.setMargins(sdp15, sdp46, 0, 0) + layoutParamsBack.setMargins(sdp15, resources.getDimensionPixelSize(resources.getIdentifier("_46sdp", "dimen", getPackageName())), 0, 0) buttonBack.layoutParams = layoutParamsBack @@ -2232,10 +2129,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp20 = resources.getDimensionPixelSize(resources.getIdentifier("_20sdp", "dimen", getPackageName())) - layoutParams_Pedro.gravity = Gravity.CENTER - layoutParams_Pedro.setMargins(sdp20, 0, 0, 0) + layoutParams_Pedro.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_20sdp", "dimen", getPackageName())), 0, 0, 0) imageView_Pedro.layoutParams = layoutParams_Pedro @@ -2264,10 +2159,8 @@ class MainActivity : Activity() { frameLayout.addView(rectangleViewSpeech) - val ssp9 = resources.getDimension(com.intuit.ssp.R.dimen._9ssp) - val textViewSpeech = TextView(this) - textViewSpeech.setTextSize(TypedValue.COMPLEX_UNIT_PX, ssp9) + textViewSpeech.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(com.intuit.ssp.R.dimen._9ssp)) textViewSpeech.setTextColor(0xFFFFFFFF.toInt()) val layoutParamsSpeech = LayoutParams( @@ -2275,10 +2168,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp270 = resources.getDimensionPixelSize(resources.getIdentifier("_270sdp", "dimen", getPackageName())) - layoutParamsSpeech.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL - layoutParamsSpeech.setMargins(0, sdp270, 0, 0) + layoutParamsSpeech.setMargins(0, resources.getDimensionPixelSize(resources.getIdentifier("_270sdp", "dimen", getPackageName())), 0, 0) textViewSpeech.layoutParams = layoutParamsSpeech @@ -2323,11 +2214,9 @@ class MainActivity : Activity() { frameLayout.addView(rectangleViewAuthor) - val ssp13 = resources.getDimension(com.intuit.ssp.R.dimen._13ssp) - val textViewAuthor = TextView(this) textViewAuthor.text = "Pedro" - textViewAuthor.setTextSize(TypedValue.COMPLEX_UNIT_PX, ssp13) + textViewAuthor.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(com.intuit.ssp.R.dimen._13ssp)) textViewAuthor.setTextColor(0xFFFFFFFF.toInt()) val layoutParamsAuthor = LayoutParams( @@ -2335,10 +2224,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp155 = resources.getDimensionPixelSize(resources.getIdentifier("_155sdp", "dimen", getPackageName())) - layoutParamsAuthor.gravity = Gravity.BOTTOM or Gravity.START - layoutParamsAuthor.setMargins(sdp155, 0, 0, sdp53) + layoutParamsAuthor.setMargins(resources.getDimensionPixelSize(resources.getIdentifier("_155sdp", "dimen", getPackageName())), 0, 0, sdp53) textViewAuthor.layoutParams = layoutParamsAuthor @@ -2401,10 +2288,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp23 = resources.getDimensionPixelSize(resources.getIdentifier("_23sdp", "dimen", getPackageName())) - layoutParamsMenu.gravity = Gravity.TOP or Gravity.START - layoutParamsMenu.setMargins(sdp15, sdp23, 0, 0) + layoutParamsMenu.setMargins(sdp15, resources.getDimensionPixelSize(resources.getIdentifier("_23sdp", "dimen", getPackageName())), 0, 0) buttonMenu.layoutParams = layoutParamsMenu @@ -2442,10 +2327,8 @@ class MainActivity : Activity() { LayoutParams.WRAP_CONTENT ) - val sdp46 = resources.getDimensionPixelSize(resources.getIdentifier("_46sdp", "dimen", getPackageName())) - layoutParamsBack.gravity = Gravity.TOP or Gravity.START - layoutParamsBack.setMargins(sdp15, sdp46, 0, 0) + layoutParamsBack.setMargins(sdp15, resources.getDimensionPixelSize(resources.getIdentifier("_46sdp", "dimen", getPackageName())), 0, 0) buttonBack.layoutParams = layoutParamsBack diff --git a/src/helper.js b/src/helper.js index 400bba4..ea3109d 100644 --- a/src/helper.js +++ b/src/helper.js @@ -217,15 +217,15 @@ function getResource(page, resource) { if (cResource) return { definition: null, - inlined: `${cResource.type}${cResource.dp}`, - variable: `${cResource.type}${cResource.dp}`, + inlined: `__PERFORVNM_${resource.dp}_${resource.type}_INLINE__`, + variable: `__PERFORVNM_${resource.dp}_${resource.type}_VARIABLE__`, additionalSpace: '\n' } else { return { - definition: `val ${resource.type}${resource.dp} = resources.getDimensionPixelSize(resources.getIdentifier("_${resource.dp}${resource.type}", "dimen", getPackageName()))`, - inlined: `resources.getDimensionPixelSize(resources.getIdentifier("_${resource.dp}${resource.type}", "dimen", getPackageName()))`, - variable: `${resource.type}${resource.dp}`, + definition: `__PERFORVNM_${resource.dp}_${resource.type}_DEFINE__`, + inlined: `__PERFORVNM_${resource.dp}_${resource.type}_INLINE__`, + variable: `__PERFORVNM_${resource.dp}_${resource.type}_VARIABLE__`, additionalSpace: '\n\n' } } @@ -239,15 +239,15 @@ function getResource(page, resource) { if (cResource) return { definition: null, - inlined: `${cResource.type}${cResource.dp}`, - variable: `${cResource.type}${cResource.dp}`, + inlined: `__PERFORVNM_${resource.dp}_${resource.type}_INLINE__`, + variable: `__PERFORVNM_${resource.dp}_${resource.type}_VARIABLE__`, additionalSpace: '\n' } else { return { - definition: `val ${resource.type}${resource.dp} = resources.getDimension(com.intuit.ssp.R.dimen._${resource.dp}${resource.type})`, - inlined: `resources.getDimension(com.intuit.ssp.R.dimen.__${resource.dp}${resource.type})`, - variable: `${resource.type}${resource.dp}`, + definition: `__PERFORVNM_${resource.dp}_${resource.type}_DEFINE__`, + inlined: `__PERFORVNM_${resource.dp}_${resource.type}_INLINE__`, + variable: `__PERFORVNM_${resource.dp}_${resource.type}_VARIABLE__`, additionalSpace: '\n\n' } } @@ -263,6 +263,50 @@ function getMultipleResources(page, page2, resource) { return cResource } +function finalizeResources(page, code) { + page.resources.forEach((resource) => { + const defineRegex = new RegExp(`__PERFORVNM_${resource.dp}_${resource.type}_DEFINE__`, 'g') + const inlineRegex = new RegExp(`__PERFORVNM_${resource.dp}_${resource.type}_INLINE__`, 'g') + const variableRegex = new RegExp(`__PERFORVNM_${resource.dp}_${resource.type}_VARIABLE__`, 'g') + + const variableAmount = code.split(variableRegex).length - 1 + + if (variableAmount == 1) { + code = code.replace(defineRegex, '') + + if (resource.type == 'sdp') { + code = code.replace(variableRegex, `resources.getDimensionPixelSize(resources.getIdentifier("_${resource.dp}${resource.type}", "dimen", getPackageName()))`) + } else { + code = code.replace(variableRegex, `resources.getDimension(com.intuit.ssp.R.dimen._${resource.dp}${resource.type})`) + } + } + + let spaces = '' + for (let i = 0; i < resource.spaces; i++) { + spaces += ' ' + } + + if (resource.type == 'sdp') { + code = code.replace(defineRegex, `val ${resource.type}${resource.dp} = resources.getDimensionPixelSize(resources.getIdentifier("_${resource.dp}${resource.type}", "dimen", getPackageName()))\n\n${spaces}`) + code = code.replace(inlineRegex, `resources.getDimensionPixelSize(resources.getIdentifier("_${resource.dp}${resource.type}", "dimen", getPackageName()))`) + code = code.replace(variableRegex, `${resource.type}${resource.dp}`) + } else { + code = code.replace(defineRegex, `val ${resource.type}${resource.dp} = resources.getDimension(com.intuit.ssp.R.dimen._${resource.dp}${resource.type})\n\n${spaces}`) + code = code.replace(inlineRegex, `resources.getDimension(com.intuit.ssp.R.dimen._${resource.dp}${resource.type})`) + code = code.replace(variableRegex, `${resource.type}${resource.dp}`) + } + }) + + return code +} + +function finalizeMultipleResources(page, page2, code) { + code = finalizeResources(page, code) + code = finalizeResources(page2, code) + + return code +} + function hash(str) { let hash = 0, i = 0 @@ -299,6 +343,8 @@ export default { addMultipleResources, getResource, getMultipleResources, + finalizeResources, + finalizeMultipleResources, hash, getSceneId, removeAllDoubleLines diff --git a/src/menu.js b/src/menu.js index 7f2e010..8590801 100644 --- a/src/menu.js +++ b/src/menu.js @@ -299,10 +299,10 @@ function finalize(menu) { switch (custom.type) { case 'text': { const customTextSsp = helper.getResource(menu, { type: 'ssp', dp: custom.fontSize }) - menu = helper.addResource(menu, { type: 'ssp', dp: custom.fontSize }) + menu = helper.addResource(menu, { type: 'ssp', dp: custom.fontSize, spaces: 4 }) customCode += helper.codePrepare(` - ${customTextSsp.definition ? `${customTextSsp.definition}\n\n ` : ''}val textViewCustomText${index} = TextView(this) + ${customTextSsp.definition}val textViewCustomText${index} = TextView(this) textViewCustomText${index}.text = "${custom.text}" textViewCustomText${index}.setTextSize(TypedValue.COMPLEX_UNIT_PX, ${customTextSsp.variable}) textViewCustomText${index}.setTextColor(0xFF${custom.color}.toInt()) @@ -316,39 +316,32 @@ function finalize(menu) { switch (custom.position.side) { case 'left': case 'right': { - const definitions = [] + let definitions = '' let marginTopSdp = null if (custom.position.margins.top != 0) { marginTopSdp = helper.getResource(menu, { type: 'sdp', dp: custom.position.margins.top }) - menu = helper.addResource(menu, { type: 'sdp', dp: custom.position.margins.top }) + menu = helper.addResource(menu, { type: 'sdp', dp: custom.position.margins.top, spaces: 4 }) - if (marginTopSdp.definition) definitions.push( - helper.codePrepare(marginTopSdp.definition + marginTopSdp.additionalSpace, 0, 4, false) - ) + if (marginTopSdp.definition) definitions += marginTopSdp.definition } let marginSideSdp = null if (custom.position.margins.side != 0) { marginSideSdp = helper.getResource(menu, { type: 'sdp', dp: custom.position.margins.side }) - menu = helper.addResource(menu, { type: 'sdp', dp: custom.position.margins.side }) + menu = helper.addResource(menu, { type: 'sdp', dp: custom.position.margins.side, spaces: 4 }) - if (marginSideSdp.definition) definitions.push( - helper.codePrepare(marginSideSdp.definition + marginSideSdp.additionalSpace, 0, 4, false) - ) + if (marginSideSdp.definition) definitions += marginSideSdp.definition } - customCode += - definitions.join('\n') + - - helper.codePrepare(` - layoutParamsCustomText${index}.gravity = Gravity.TOP or Gravity.START - layoutParamsCustomText${index}.setMargins(${custom.position.margins.side != 0 ? marginSideSdp.variable : '0'}, 0, ${custom.position.margins.top != 0 ? marginTopSdp.variable : '0'}, 0) + customCode += helper.codePrepare(` + ${definitions}layoutParamsCustomText${index}.gravity = Gravity.TOP or Gravity.START + layoutParamsCustomText${index}.setMargins(${custom.position.margins.side != 0 ? marginSideSdp.variable : '0'}, 0, ${custom.position.margins.top != 0 ? marginTopSdp.variable : '0'}, 0) - textViewCustomText${index}.layoutParams = layoutParamsCustomText${index} + textViewCustomText${index}.layoutParams = layoutParamsCustomText${index} - frameLayout.addView(textViewCustomText${index})\n\n`, 12 - ) + frameLayout.addView(textViewCustomText${index})\n\n`, 10 + ) break } @@ -369,10 +362,10 @@ function finalize(menu) { } case 'button': { const customTextSsp = helper.getResource(menu, { type: 'ssp', dp: custom.fontSize }) - menu = helper.addResource(menu, { type: 'ssp', dp: custom.fontSize }) + menu = helper.addResource(menu, { type: 'ssp', dp: custom.fontSize, spaces: 4 }) customCode += helper.codePrepare(` - ${customTextSsp.definition ? `${customTextSsp.definition}\n\n ` : ''}val buttonCustomButton${index} = Button(this) + ${customTextSsp.definition}val buttonCustomButton${index} = Button(this) buttonCustomButton${index}.text = "${custom.text}" buttonCustomButton${index}.setTextSize(TypedValue.COMPLEX_UNIT_PX, ${customTextSsp.variable}) buttonCustomButton${index}.setTextColor(0xFF${custom.color}.toInt()) @@ -394,7 +387,7 @@ function finalize(menu) { } default: { const customHeight = helper.getResource(menu, { type: 'sdp', dp: custom.height }) - menu = helper.addResource(menu, { type: 'sdp', dp: custom.height }) + menu = helper.addResource(menu, { type: 'sdp', dp: custom.height, spaces: 4 }) if (customHeight.definition) customCode = customCode.replace('__PERFORVNM_OPTIMIZED_RESOURCE__', `\n\n ${customHeight.definition}__PERFORVNM_OPTIMIZED_RESOURCE__`) @@ -415,7 +408,7 @@ function finalize(menu) { } default: { const customWidth = helper.getResource(menu, { type: 'sdp', dp: custom.width }) - menu = helper.addResource(menu, { type: 'sdp', dp: custom.width }) + menu = helper.addResource(menu, { type: 'sdp', dp: custom.width, spaces: 4 }) if (customWidth.definition) customCode = customCode.replace('__PERFORVNM_OPTIMIZED_RESOURCE__', `\n\n ${customWidth.definition}`) @@ -429,39 +422,32 @@ function finalize(menu) { switch (custom.position.side) { case 'left': case 'right': { - const definitions = [] + let definitions = '' let marginTopSdp = null if (custom.position.margins.top != 0) { marginTopSdp = helper.getResource(menu, { type: 'sdp', dp: custom.position.margins.top }) - menu = helper.addResource(menu, { type: 'sdp', dp: custom.position.margins.top }) + menu = helper.addResource(menu, { type: 'sdp', dp: custom.position.margins.top, spaces: 4 }) - if (marginTopSdp.definition) definitions.push( - helper.codePrepare(marginTopSdp.definition, 0, 4, false) - ) + if (marginTopSdp.definition) definitions += marginTopSdp.definition } let marginSideSdp = null if (custom.position.margins.side != 0) { marginSideSdp = helper.getResource(menu, { type: 'sdp', dp: custom.position.margins.side }) - menu = helper.addResource(menu, { type: 'sdp', dp: custom.position.margins.side }) + menu = helper.addResource(menu, { type: 'sdp', dp: custom.position.margins.side, spaces: 4 }) - if (marginSideSdp.definition) definitions.push( - helper.codePrepare(marginSideSdp.definition, 0, 4, false) - ) + if (marginSideSdp.definition) definitions += marginSideSdp.definition } - customCode += - definitions.join('\n') + - - helper.codePrepare(` - layoutParamsCustomButton${index}.gravity = Gravity.TOP or Gravity.START - layoutParamsCustomButton${index}.setMargins(${custom.position.margins.side != 0 ? marginSideSdp.variable : '0'}, 0, ${custom.position.margins.top != 0 ? marginTopSdp.variable : '0'}, 0) + customCode += helper.codePrepare(` + ${definitions}layoutParamsCustomButton${index}.gravity = Gravity.TOP or Gravity.START + layoutParamsCustomButton${index}.setMargins(${custom.position.margins.side != 0 ? marginSideSdp.variable : '0'}, 0, ${custom.position.margins.top != 0 ? marginTopSdp.variable : '0'}, 0) - buttonCustomButton${index}.layoutParams = layoutParamsCustomButton${index} + buttonCustomButton${index}.layoutParams = layoutParamsCustomButton${index} - frameLayout.addView(buttonCustomButton${index})\n\n`, 12 - ) + frameLayout.addView(buttonCustomButton${index})\n\n`, 10 + ) break } @@ -500,7 +486,7 @@ function finalize(menu) { } default: { const customHeight = helper.getResource(menu, { type: 'sdp', dp: custom.height }) - menu = helper.addResource(menu, { type: 'sdp', dp: custom.height }) + menu = helper.addResource(menu, { type: 'sdp', dp: custom.height, spaces: 4 }) if (customHeight.definition) customCode = customCode.replace('__PERFORVNM_OPTIMIZED_RESOURCE__', `\n\n ${customHeight.definition}__PERFORVNM_OPTIMIZED_RESOURCE__${customHeight.additionalSpace}`) @@ -521,7 +507,7 @@ function finalize(menu) { } default: { const customWidth = helper.getResource(menu, { type: 'sdp', dp: custom.width }) - menu = helper.addResource(menu, { type: 'sdp', dp: custom.width }) + menu = helper.addResource(menu, { type: 'sdp', dp: custom.width, spaces: 4 }) if (customWidth.definition) customCode = customCode.replace('__PERFORVNM_OPTIMIZED_RESOURCE__', `\n\n ${customWidth.definition}${customWidth.additionalSpace}`) @@ -535,39 +521,32 @@ function finalize(menu) { switch (custom.position.side) { case 'left': case 'right': { - const definitions = [] + let definitions = '' let marginTopSdp = null if (custom.position.margins.top != 0) { marginTopSdp = helper.getResource(menu, { type: 'sdp', dp: custom.position.margins.top }) - menu = helper.addResource(menu, { type: 'sdp', dp: custom.position.margins.top }) + menu = helper.addResource(menu, { type: 'sdp', dp: custom.position.margins.top, spaces: 4 }) - if (marginTopSdp.definition) definitions.push( - helper.codePrepare(marginTopSdp.definition + marginTopSdp.additionalSpace, 0, 4, false) - ) + if (marginTopSdp.definition) definitions += marginTopSdp.definition } let marginSideSdp = null if (custom.position.margins.side != 0) { marginSideSdp = helper.getResource(menu, { type: 'sdp', dp: custom.position.margins.side }) - menu = helper.addResource(menu, { type: 'sdp', dp: custom.position.margins.side }) + menu = helper.addResource(menu, { type: 'sdp', dp: custom.position.margins.side, spaces: 4 }) - if (marginSideSdp.definition) definitions.push( - helper.codePrepare(marginSideSdp.definition + marginSideSdp.additionalSpace, 0, 4, false) - ) + if (marginSideSdp.definition) definitions += marginSideSdp.definition } - customCode += - definitions.join('\n') + - - helper.codePrepare(` - layoutParamsCustomRectangle${index}.gravity = Gravity.TOP or Gravity.START - layoutParamsCustomRectangle${index}.setMargins(${custom.position.margins.side != 0 ? marginSideSdp.variable : '0'}, 0, ${custom.position.margins.top != 0 ? marginTopSdp.variable : '0'}, 0) + customCode += helper.codePrepare(` + ${definitions}layoutParamsCustomRectangle${index}.gravity = Gravity.TOP or Gravity.START + layoutParamsCustomRectangle${index}.setMargins(${custom.position.margins.side != 0 ? marginSideSdp.variable : '0'}, 0, ${custom.position.margins.top != 0 ? marginTopSdp.variable : '0'}, 0) - rectangleViewCustomRectangle${index}.layoutParams = layoutParamsCustomRectangle${index} + rectangleViewCustomRectangle${index}.layoutParams = layoutParamsCustomRectangle${index} - frameLayout.addView(rectangleViewCustomRectangle${index})\n\n`, 12 - ) + frameLayout.addView(rectangleViewCustomRectangle${index})\n\n`, 10 + ) break } @@ -609,7 +588,7 @@ function finalize(menu) { } default: { const customHeight = helper.getResource(menu, { type: 'sdp', dp: custom.height }) - menu = helper.addResource(menu, { type: 'sdp', dp: custom.height }) + menu = helper.addResource(menu, { type: 'sdp', dp: custom.height, spaces: 4 }) if (customHeight.definition) customCode = customCode.replace('__PERFORVNM_OPTIMIZED_RESOURCE__', `\n\n ${customHeight.definition}__PERFORVNM_OPTIMIZED_RESOURCE__`) @@ -630,7 +609,7 @@ function finalize(menu) { } default: { const customWidth = helper.getResource(menu, { type: 'sdp', dp: custom.width }) - menu = helper.addResource(menu, { type: 'sdp', dp: custom.width }) + menu = helper.addResource(menu, { type: 'sdp', dp: custom.width, spaces: 4 }) if (customWidth.definition) customCode = customCode.replace('__PERFORVNM_OPTIMIZED_RESOURCE__', `\n\n ${customWidth.definition}`) @@ -643,39 +622,32 @@ function finalize(menu) { switch (custom.position.side) { case 'left': case 'right': { - const definitions = [] + let definitions = '' let marginTopSdp = null if (custom.position.margins.top != 0) { marginTopSdp = helper.getResource(menu, { type: 'sdp', dp: custom.position.margins.top }) - menu = helper.addResource(menu, { type: 'sdp', dp: custom.position.margins.top }) + menu = helper.addResource(menu, { type: 'sdp', dp: custom.position.margins.top, spaces: 4 }) - if (marginTopSdp.definition) definitions.push( - helper.codePrepare(marginSideSdp.definition, 0, 4, false) - ) + if (marginTopSdp.definition) definitions += marginTopSdp.definition } let marginSideSdp = null if (custom.position.margins.side != 0) { marginSideSdp = helper.getResource(menu, { type: 'sdp', dp: custom.position.margins.side }) - menu = helper.addResource(menu, { type: 'sdp', dp: custom.position.margins.side }) + menu = helper.addResource(menu, { type: 'sdp', dp: custom.position.margins.side, spaces: 4 }) - if (marginSideSdp.definition) definitions.push( - helper.codePrepare(marginSideSdp.definition, 0, 4, false) - ) + if (marginSideSdp.definition) definitions += marginSideSdp.definition } - customCode += - definitions.join('\n') + - - helper.codePrepare(` - layoutParamsCustomImage${index}.gravity = Gravity.TOP or Gravity.START - layoutParamsCustomImage${index}.setMargins(${custom.position.margins.side != 0 ? marginSideSdp.variable : '0'}, 0, ${custom.position.margins.top != 0 ? marginTopSdp.variable : '0'}, 0) + customCode += helper.codePrepare(` + ${definitions}layoutParamsCustomImage${index}.gravity = Gravity.TOP or Gravity.START + layoutParamsCustomImage${index}.setMargins(${custom.position.margins.side != 0 ? marginSideSdp.variable : '0'}, 0, ${custom.position.margins.top != 0 ? marginTopSdp.variable : '0'}, 0) - imageViewCustomImage${index}.layoutParams = layoutParamsCustomImage${index} + imageViewCustomImage${index}.layoutParams = layoutParamsCustomImage${index} - frameLayout.addView(imageViewCustomImage${index})\n\n`, 12 - ) + frameLayout.addView(imageViewCustomImage${index})\n\n`, 10 + ) break } @@ -697,6 +669,8 @@ function finalize(menu) { } }) + customCode = helper.finalizeResources(menu, customCode) + let mainCode = 'val sharedPreferences = getSharedPreferences("VNConfig", Context.MODE_PRIVATE)\n' if (menu.background.music) { @@ -733,25 +707,25 @@ function finalize(menu) { helper.replace(/__PERFORVNM_MENU__/g, mainCode) const sdp30Main = helper.getMultipleResources(menu, menu.pages.main, { type: 'sdp', dp: '30' }) - menu.pages.main = helper.addResource(menu.pages.main, { type: 'sdp', dp: '30' }) + menu.pages.main = helper.addResource(menu.pages.main, { type: 'sdp', dp: '30', spaces: 4 }) const ssp13Main = helper.getMultipleResources(menu, menu.pages.main, { type: 'ssp', dp: '13' }) - menu.pages.main = helper.addResource(menu.pages.main, { type: 'ssp', dp: '13' }) + menu.pages.main = helper.addResource(menu.pages.main, { type: 'ssp', dp: '13', spaces: 4 }) const sdp88Main = helper.getMultipleResources(menu, menu.pages.main, { type: 'sdp', dp: '88' }) - menu.pages.main = helper.addResource(menu.pages.main, { type: 'sdp', dp: '88' }) + menu.pages.main = helper.addResource(menu.pages.main, { type: 'sdp', dp: '88', spaces: 4 }) const sdpMinus3Main = helper.getMultipleResources(menu, menu.pages.main, { type: 'sdp', dp: 'minus3' }) - menu.pages.main = helper.addResource(menu.pages.main, { type: 'sdp', dp: 'minus3' }) + menu.pages.main = helper.addResource(menu.pages.main, { type: 'sdp', dp: 'minus3', spaces: 4 }) const sdp161Main = helper.getMultipleResources(menu, menu.pages.main, { type: 'sdp', dp: '161' }) - menu.pages.main = helper.addResource(menu.pages.main, { type: 'sdp', dp: '161' }) + menu.pages.main = helper.addResource(menu.pages.main, { type: 'sdp', dp: '161', spaces: 4 }) const sdp233Main = helper.getMultipleResources(menu, menu.pages.main, { type: 'sdp', dp: '233' }) - menu.pages.main = helper.addResource(menu.pages.main, { type: 'sdp', dp: '233' }) + menu.pages.main = helper.addResource(menu.pages.main, { type: 'sdp', dp: '233', spaces: 4 }) const sdp320Main = helper.getMultipleResources(menu, menu.pages.main, { type: 'sdp', dp: '320' }) - menu.pages.main = helper.addResource(menu.pages.main, { type: 'sdp', dp: '320' }) + menu.pages.main = helper.addResource(menu.pages.main, { type: 'sdp', dp: '320', spaces: 4 }) let menuCode = helper.codePrepare(` private fun menu() { @@ -766,7 +740,7 @@ function finalize(menu) { val rectangleView = RectangleView(this) - ${sdp30Main.definition ? `${sdp30Main.definition}\n\n ` : ''}val layoutParams = LayoutParams(LayoutParams.WRAP_CONTENT, ${sdp30Main.variable}) + ${sdp30Main.definition}val layoutParams = LayoutParams(LayoutParams.WRAP_CONTENT, ${sdp30Main.variable}) layoutParams.gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL rectangleView.layoutParams = layoutParams @@ -774,7 +748,7 @@ function finalize(menu) { frameLayout.addView(rectangleView) - ${ssp13Main.definition ? `${ssp13Main.definition}\n\n ` : ''}val buttonStart = Button(this) + ${ssp13Main.definition}val buttonStart = Button(this) buttonStart.text = "Start" buttonStart.setTextSize(TypedValue.COMPLEX_UNIT_PX, ${ssp13Main.variable}) buttonStart.setTextColor(0xFF${menu.footer.textColor}.toInt()) @@ -785,7 +759,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp88Main.definition ? `${sdp88Main.definition}${!sdpMinus3Main.definition ? '\n' : ''}\n ` : ''}${sdpMinus3Main.definition ? `${sdpMinus3Main.definition}\n\n ` : ''}layoutParamsStart.gravity = Gravity.BOTTOM or Gravity.START + ${sdp88Main.definition}${sdpMinus3Main.definition}layoutParamsStart.gravity = Gravity.BOTTOM or Gravity.START layoutParamsStart.setMargins(${sdp88Main.variable}, 0, 0, ${sdpMinus3Main.variable}) buttonStart.layoutParams = layoutParamsStart @@ -805,7 +779,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp161Main.definition ? `${sdp161Main.definition}\n\n ` : ''}layoutParamsAbout.gravity = Gravity.BOTTOM or Gravity.START + ${sdp161Main.definition}layoutParamsAbout.gravity = Gravity.BOTTOM or Gravity.START layoutParamsAbout.setMargins(${sdp161Main.variable}, 0, 0, ${sdpMinus3Main.variable}) buttonAbout.layoutParams = layoutParamsAbout @@ -827,7 +801,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp233Main.definition ? `${sdp233Main.definition}\n\n ` : ''}layoutParamsSettings.gravity = Gravity.BOTTOM or Gravity.START + ${sdp233Main.definition}layoutParamsSettings.gravity = Gravity.BOTTOM or Gravity.START layoutParamsSettings.setMargins(${sdp233Main.variable}, 0, 0, ${sdpMinus3Main.variable}) buttonSettings.layoutParams = layoutParamsSettings @@ -849,7 +823,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp320Main.definition ? `${sdp320Main.definition}\n\n ` : ''}layoutParamsSaves.gravity = Gravity.BOTTOM or Gravity.START + ${sdp320Main.definition}layoutParamsSaves.gravity = Gravity.BOTTOM or Gravity.START layoutParamsSaves.setMargins(${sdp320Main.variable}, 0, 0, ${sdpMinus3Main.variable}) buttonSaves.layoutParams = layoutParamsSaves @@ -861,6 +835,8 @@ function finalize(menu) { frameLayout.addView(buttonSaves)\n\n`, 2 ) + menuCode = helper.finalizeMultipleResources(menu, menu.pages.main, menuCode) + if (menu.custom.length != 0) { menuCode += customCode } @@ -894,37 +870,37 @@ function finalize(menu) { helper.replace('__PERFORVNM_CLASSES__', rectangleViewCode) const sdp30About = helper.getMultipleResources(menu, menu.pages.about, { type: 'sdp', dp: '30' }) - menu.pages.about = helper.addResource(menu.pages.about, { type: 'sdp', dp: '30' }) + menu.pages.about = helper.addResource(menu.pages.about, { type: 'sdp', dp: '30', spaces: 4 }) const ssp13About = helper.getMultipleResources(menu, menu.pages.about, { type: 'ssp', dp: '13' }) - menu.pages.about = helper.addResource(menu.pages.about, { type: 'ssp', dp: '13' }) + menu.pages.about = helper.addResource(menu.pages.about, { type: 'ssp', dp: '13', spaces: 4 }) const sdpMinus3About = helper.getMultipleResources(menu, menu.pages.about, { type: 'sdp', dp: 'minus3' }) - menu.pages.about = helper.addResource(menu.pages.about, { type: 'sdp', dp: 'minus3' }) + menu.pages.about = helper.addResource(menu.pages.about, { type: 'sdp', dp: 'minus3', spaces: 4 }) const sdp88About = helper.getMultipleResources(menu, menu.pages.about, { type: 'sdp', dp: '88' }) - menu.pages.about = helper.addResource(menu.pages.about, { type: 'sdp', dp: '88' }) + menu.pages.about = helper.addResource(menu.pages.about, { type: 'sdp', dp: '88', spaces: 4 }) const sdp53About = helper.getMultipleResources(menu, menu.pages.about, { type: 'sdp', dp: '53' }) - menu.pages.about = helper.addResource(menu.pages.about, { type: 'sdp', dp: '53' }) + menu.pages.about = helper.addResource(menu.pages.about, { type: 'sdp', dp: '53', spaces: 4 }) const sdp161About = helper.getMultipleResources(menu, menu.pages.about, { type: 'sdp', dp: '161' }) - menu.pages.about = helper.addResource(menu.pages.about, { type: 'sdp', dp: '161' }) + menu.pages.about = helper.addResource(menu.pages.about, { type: 'sdp', dp: '161', spaces: 4 }) const sdp233About = helper.getMultipleResources(menu, menu.pages.about, { type: 'sdp', dp: '233' }) - menu.pages.about = helper.addResource(menu.pages.about, { type: 'sdp', dp: '233' }) + menu.pages.about = helper.addResource(menu.pages.about, { type: 'sdp', dp: '233', spaces: 4 }) const sdp320About = helper.getMultipleResources(menu, menu.pages.about, { type: 'sdp', dp: '320' }) - menu.pages.about = helper.addResource(menu.pages.about, { type: 'sdp', dp: '320' }) + menu.pages.about = helper.addResource(menu.pages.about, { type: 'sdp', dp: '320', spaces: 4 }) const ssp15About = helper.getMultipleResources(menu, menu.pages.about, { type: 'ssp', dp: '15' }) - menu.pages.about = helper.addResource(menu.pages.about, { type: 'ssp', dp: '15' }) + menu.pages.about = helper.addResource(menu.pages.about, { type: 'ssp', dp: '15', spaces: 4 }) const sdp73About = helper.getMultipleResources(menu, menu.pages.about, { type: 'sdp', dp: '73' }) - menu.pages.about = helper.addResource(menu.pages.about, { type: 'sdp', dp: '73' }) + menu.pages.about = helper.addResource(menu.pages.about, { type: 'sdp', dp: '73', spaces: 4 }) const ssp11About = helper.getMultipleResources(menu, menu.pages.about, { type: 'ssp', dp: '11' }) - menu.pages.about = helper.addResource(menu.pages.about, { type: 'ssp', dp: '11' }) + menu.pages.about = helper.addResource(menu.pages.about, { type: 'ssp', dp: '11', spaces: 4 }) let aboutCode = helper.codePrepare(` private fun about(animate: Boolean) { @@ -960,7 +936,7 @@ function finalize(menu) { val rectangleView = RectangleView(this) - ${sdp30About.definition ? `${sdp30About.definition}\n\n ` : ''}val layoutParamsRectangle = LayoutParams(LayoutParams.WRAP_CONTENT, ${sdp30About.variable}) + ${sdp30About.definition}val layoutParamsRectangle = LayoutParams(LayoutParams.WRAP_CONTENT, ${sdp30About.variable}) layoutParamsRectangle.gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL rectangleView.layoutParams = layoutParamsRectangle @@ -968,7 +944,7 @@ function finalize(menu) { frameLayout.addView(rectangleView) - ${ssp13About.definition ? `${ssp13About.definition}\n\n ` : ''}val buttonStart = Button(this) + ${ssp13About.definition}val buttonStart = Button(this) buttonStart.text = "Start" buttonStart.setTextSize(TypedValue.COMPLEX_UNIT_PX, ${ssp13About.variable}) buttonStart.setTextColor(0xFF${menu.footer.textColor}.toInt()) @@ -979,7 +955,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp88About.definition ? `${sdp88About.definition}${!sdpMinus3About.definition ? '\n' : ''}\n ` : ''}${sdpMinus3About.definition ? `${sdpMinus3About.definition}\n\n ` : ''}layoutParamsStart.gravity = Gravity.BOTTOM or Gravity.START + ${sdp88About.definition}${sdpMinus3About.definition}layoutParamsStart.gravity = Gravity.BOTTOM or Gravity.START layoutParamsStart.setMargins(${sdp88About.variable}, 0, 0, ${sdpMinus3About.variable}) buttonStart.layoutParams = layoutParamsStart @@ -999,7 +975,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp161About.definition ? `${sdp161About.definition}\n\n ` : ''}layoutParamsAbout.gravity = Gravity.BOTTOM or Gravity.START + ${sdp161About.definition}layoutParamsAbout.gravity = Gravity.BOTTOM or Gravity.START layoutParamsAbout.setMargins(${sdp161About.variable}, 0, 0, ${sdpMinus3About.variable}) buttonAbout.layoutParams = layoutParamsAbout @@ -1017,7 +993,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp233About.definition ? `${sdp233About.definition}\n\n ` : ''}layoutParamsSettings.gravity = Gravity.BOTTOM or Gravity.START + ${sdp233About.definition}layoutParamsSettings.gravity = Gravity.BOTTOM or Gravity.START layoutParamsSettings.setMargins(${sdp233About.variable}, 0, 0, ${sdpMinus3About.variable}) buttonSettings.layoutParams = layoutParamsSettings @@ -1039,7 +1015,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp320About.definition ? `${sdp320About.definition}\n\n ` : ''}layoutParamsSaves.gravity = Gravity.BOTTOM or Gravity.START + ${sdp320About.definition}layoutParamsSaves.gravity = Gravity.BOTTOM or Gravity.START layoutParamsSaves.setMargins(${sdp320About.variable}, 0, 0, ${sdpMinus3About.variable}) buttonSaves.layoutParams = layoutParamsSaves @@ -1050,7 +1026,7 @@ function finalize(menu) { frameLayout.addView(buttonSaves) - ${ssp15About.definition ? `${ssp15About.definition}\n\n ` : ''}val buttonBack = Button(this) + ${ssp15About.definition}val buttonBack = Button(this) buttonBack.text = "Back" buttonBack.setTextSize(TypedValue.COMPLEX_UNIT_PX, ${ssp15About.variable}) buttonBack.setTextColor(0xFF${menu.backTextColor}.toInt()) @@ -1061,7 +1037,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp73About.definition ? `${sdp73About.definition}\n\n ` : ''}layoutParamsBack.gravity = Gravity.TOP or Gravity.START + ${sdp73About.definition}layoutParamsBack.gravity = Gravity.TOP or Gravity.START layoutParamsBack.setMargins(${sdp73About.variable}, 0, 0, 0) buttonBack.layoutParams = layoutParamsBack @@ -1079,7 +1055,7 @@ function finalize(menu) { frameLayout.addView(buttonBack) - ${ssp11About.definition ? `${ssp11About.definition}\n\n ` : ''}val textView = TextView(this) + ${ssp11About.definition}val textView = TextView(this) textView.text = SpannableStringBuilder().apply { append("${visualNovel.info.fullName} ${visualNovel.info.version}\\n\\nMade with ") append("PerforVNM") @@ -1107,7 +1083,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp53About.definition ? `${sdp53About.definition}\n\n ` : ''}layoutParamsText.gravity = Gravity.TOP or Gravity.START + ${sdp53About.definition}layoutParamsText.gravity = Gravity.TOP or Gravity.START layoutParamsText.setMargins(${sdp88About.variable}, ${sdp53About.variable}, 0, 0) textView.layoutParams = layoutParamsText @@ -1119,6 +1095,8 @@ function finalize(menu) { frameLayout.addView(textView)\n\n` ) + aboutCode = helper.finalizeMultipleResources(menu, menu.pages.about, aboutCode) + if (menu.custom.length != 0) { aboutCode += customCode } @@ -1132,64 +1110,64 @@ function finalize(menu) { const sdp30Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: '30' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '30' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '30', spaces: 4 }) const ssp13Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'ssp', dp: '13' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'ssp', dp: '13' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'ssp', dp: '13', spaces: 4 }) const sdp88Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: '88' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '88' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '88', spaces: 4 }) const sdpMinus3Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: 'minus3' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: 'minus3' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: 'minus3', spaces: 4 }) const sdp161Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: '161' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '161' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '161', spaces: 4 }) const sdp233Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: '233' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '233' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '233', spaces: 4 }) const sdp320Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: '320' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '320' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '320', spaces: 4 }) const ssp15Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'ssp', dp: '15' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'ssp', dp: '15' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'ssp', dp: '15', spaces: 4 }) const sdp73Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: '73' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '73' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '73', spaces: 4 }) const ssp16Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'ssp', dp: '16' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'ssp', dp: '16' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'ssp', dp: '16', spaces: 4 }) const sdp149Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: '149' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '149' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '149', spaces: 4 }) const sdp53Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: '53' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '53' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '53', spaces: 4 }) const sdp150Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: '150' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '150' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '150', spaces: 4 }) const sdp135Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: '135' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '135' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '135', spaces: 4 }) const sdp77Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: '77' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '77' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '77', spaces: 4 }) const sdp443Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: '443' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '443' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '443', spaces: 4 }) const sdp432Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: '432' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '432' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '432', spaces: 4 }) const sdp111Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: '111' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '111' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '111', spaces: 4 }) const sdp166Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: '166' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '166' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '166', spaces: 4 }) const sdp190Settings = helper.getMultipleResources(menu, menu.pages.settings, { type: 'sdp', dp: '190' }) - menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '190' }) + menu.pages.settings = helper.addResource(menu.pages.settings, { type: 'sdp', dp: '190', spaces: 4 }) let settingsCode = helper.codePrepare(` private fun settings(animate: Boolean) { @@ -1225,7 +1203,7 @@ function finalize(menu) { val rectangleView = RectangleView(this) - ${sdp30Settings.definition ? `${sdp30Settings.definition}\n\n ` : ''}val layoutParamsRectangle = LayoutParams(LayoutParams.WRAP_CONTENT, ${sdp30Settings.variable}) + ${sdp30Settings.definition}val layoutParamsRectangle = LayoutParams(LayoutParams.WRAP_CONTENT, ${sdp30Settings.variable}) layoutParamsRectangle.gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL rectangleView.layoutParams = layoutParamsRectangle @@ -1233,7 +1211,7 @@ function finalize(menu) { frameLayout.addView(rectangleView) - ${ssp13Settings.definition ? `${ssp13Settings.definition}\n\n ` : ''}val buttonStart = Button(this) + ${ssp13Settings.definition}val buttonStart = Button(this) buttonStart.text = "Start" buttonStart.setTextSize(TypedValue.COMPLEX_UNIT_PX, ${ssp13Settings.variable}) buttonStart.setTextColor(0xFF${menu.footer.textColor}.toInt()) @@ -1244,7 +1222,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp88Settings.definition ? `${sdp88Settings.definition}${!sdpMinus3Settings.definition ? '\n' : ''}\n ` : ''}${sdpMinus3Settings.definition ? `${sdpMinus3Settings.definition}\n\n ` : ''}layoutParamsStart.gravity = Gravity.BOTTOM or Gravity.START + ${sdp88Settings.definition}${sdpMinus3Settings.definition}layoutParamsStart.gravity = Gravity.BOTTOM or Gravity.START layoutParamsStart.setMargins(${sdp88Settings.variable}, 0, 0, ${sdpMinus3Settings.variable}) buttonStart.layoutParams = layoutParamsStart @@ -1264,7 +1242,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp161Settings.definition ? `${sdp161Settings.definition}\n\n ` : ''}layoutParamsAbout.gravity = Gravity.BOTTOM or Gravity.START + ${sdp161Settings.definition}layoutParamsAbout.gravity = Gravity.BOTTOM or Gravity.START layoutParamsAbout.setMargins(${sdp161Settings.variable}, 0, 0, ${sdpMinus3Settings.variable}) buttonAbout.layoutParams = layoutParamsAbout @@ -1286,7 +1264,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp233Settings.definition ? `${sdp233Settings.definition}\n\n ` : ''}layoutParamsSettings.gravity = Gravity.BOTTOM or Gravity.START + ${sdp233Settings.definition}layoutParamsSettings.gravity = Gravity.BOTTOM or Gravity.START layoutParamsSettings.setMargins(${sdp233Settings.variable}, 0, 0, ${sdpMinus3Settings.variable}) buttonSettings.layoutParams = layoutParamsSettings @@ -1304,7 +1282,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp320Settings.definition ? `${sdp320Settings.definition}\n\n ` : ''}layoutParamsSaves.gravity = Gravity.BOTTOM or Gravity.START + ${sdp320Settings.definition}layoutParamsSaves.gravity = Gravity.BOTTOM or Gravity.START layoutParamsSaves.setMargins(${sdp320Settings.variable}, 0, 0, ${sdpMinus3Settings.variable}) buttonSaves.layoutParams = layoutParamsSaves @@ -1315,7 +1293,7 @@ function finalize(menu) { frameLayout.addView(buttonSaves) - ${ssp15Settings.definition ? `${ssp15Settings.definition}\n\n ` : ''}val buttonBack = Button(this) + ${ssp15Settings.definition}val buttonBack = Button(this) buttonBack.text = "Back" buttonBack.setTextSize(TypedValue.COMPLEX_UNIT_PX, ${ssp15Settings.variable}) buttonBack.setTextColor(0xFF${menu.backTextColor}.toInt()) @@ -1326,7 +1304,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp73Settings.definition ? `${sdp73Settings.definition}\n\n ` : ''}layoutParamsBack.gravity = Gravity.TOP or Gravity.START + ${sdp73Settings.definition}layoutParamsBack.gravity = Gravity.TOP or Gravity.START layoutParamsBack.setMargins(${sdp73Settings.variable}, 0, 0, 0) buttonBack.layoutParams = layoutParamsBack @@ -1344,7 +1322,7 @@ function finalize(menu) { frameLayout.addView(buttonBack) - ${ssp16Settings.definition ? `${ssp16Settings.definition}\n\n ` : ''}val textViewTextSpeed = TextView(this) + ${ssp16Settings.definition}val textViewTextSpeed = TextView(this) textViewTextSpeed.text = "Text speed: " + textSpeed.toString() + "ms" textViewTextSpeed.setTextSize(TypedValue.COMPLEX_UNIT_PX, ${ssp16Settings.variable}) textViewTextSpeed.setTextColor(0xFF${menu.textColor}.toInt()) @@ -1354,7 +1332,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp149Settings.definition ? `${sdp149Settings.definition}${!sdp53Settings.definition ? '\n' : ''}\n ` : ''}${sdp53Settings.definition ? `${sdp53Settings.definition}\n\n ` : ''}layoutParamsText.gravity = Gravity.TOP or Gravity.START + ${sdp149Settings.definition}${sdp53Settings.definition}layoutParamsText.gravity = Gravity.TOP or Gravity.START layoutParamsText.setMargins(${sdp149Settings.variable}, ${sdp53Settings.variable}, 0, 0) textViewTextSpeed.layoutParams = layoutParamsText @@ -1379,12 +1357,12 @@ function finalize(menu) { seekBarTextSpeed.thumbOffset = 0 - ${sdp150Settings.definition ? `${sdp150Settings.definition}\n\n ` : ''}val layoutParamsSeekBar = LayoutParams( + ${sdp150Settings.definition}val layoutParamsSeekBar = LayoutParams( ${sdp150Settings.variable}, LayoutParams.WRAP_CONTENT ) - ${sdp135Settings.definition ? `${sdp135Settings.definition}${!sdp77Settings.definition ? '\n' : ''}\n ` : ''}${sdp77Settings.definition ? `${sdp77Settings.definition}\n\n ` : ''}layoutParamsSeekBar.gravity = Gravity.TOP or Gravity.START + ${sdp135Settings.definition}${sdp77Settings.definition}layoutParamsSeekBar.gravity = Gravity.TOP or Gravity.START layoutParamsSeekBar.setMargins(${sdp135Settings.variable}, ${sdp77Settings.variable}, 0, 0) seekBarTextSpeed.layoutParams = layoutParamsSeekBar @@ -1423,7 +1401,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp443Settings.definition ? `${sdp443Settings.definition}\n\n ` : ''}layoutParamsTextMusicVolume.gravity = Gravity.TOP or Gravity.START + ${sdp443Settings.definition}layoutParamsTextMusicVolume.gravity = Gravity.TOP or Gravity.START layoutParamsTextMusicVolume.setMargins(${sdp443Settings.variable}, ${sdp53Settings.variable}, 0, 0) textViewMusicVolume.layoutParams = layoutParamsTextMusicVolume @@ -1453,7 +1431,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp432Settings.definition ? `${sdp432Settings.definition}\n\n ` : ''}layoutParamsSeekBarMusicVolume.gravity = Gravity.TOP or Gravity.START + ${sdp432Settings.definition}layoutParamsSeekBarMusicVolume.gravity = Gravity.TOP or Gravity.START layoutParamsSeekBarMusicVolume.setMargins(${sdp432Settings.variable}, ${sdp77Settings.variable}, 0, 0) seekBarMusicVolume.layoutParams = layoutParamsSeekBarMusicVolume @@ -1488,7 +1466,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp111Settings.definition ? `${sdp111Settings.definition}\n\n ` : ''}layoutParamsTextSEffectVolume.gravity = Gravity.TOP or Gravity.START + ${sdp111Settings.definition}layoutParamsTextSEffectVolume.gravity = Gravity.TOP or Gravity.START layoutParamsTextSEffectVolume.setMargins(${sdp443Settings.variable}, ${sdp111Settings.variable}, 0, 0) textViewSEffectVolume.layoutParams = layoutParamsTextSEffectVolume @@ -1553,7 +1531,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp166Settings.definition ? `${sdp166Settings.definition}\n\n ` : ''}layoutParamsTextSceneMusic.gravity = Gravity.TOP or Gravity.START + ${sdp166Settings.definition}layoutParamsTextSceneMusic.gravity = Gravity.TOP or Gravity.START layoutParamsTextSceneMusic.setMargins(${sdp443Settings.variable}, ${sdp166Settings.variable}, 0, 0) textViewSceneMusic.layoutParams = layoutParamsTextSceneMusic @@ -1583,7 +1561,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp190Settings.definition ? `${sdp190Settings.definition}\n\n ` : ''}layoutParamsSeekBarSceneMusic.gravity = Gravity.TOP or Gravity.START + ${sdp190Settings.definition}layoutParamsSeekBarSceneMusic.gravity = Gravity.TOP or Gravity.START layoutParamsSeekBarSceneMusic.setMargins(${sdp432Settings.variable}, ${sdp190Settings.variable}, 0, 0) seekBarSceneMusic.layoutParams = layoutParamsSeekBarSceneMusic @@ -1609,6 +1587,8 @@ function finalize(menu) { })\n\n`, 2 ) + settingsCode = helper.finalizeMultipleResources(menu, menu.pages.settings, settingsCode) + if (menu.custom.length != 0) { settingsCode += customCode } @@ -1653,37 +1633,37 @@ function finalize(menu) { }) const sdp30Saves = helper.getMultipleResources(menu, menu.pages.saves, { type: 'sdp', dp: '30' }) - menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'sdp', dp: '30' }) + menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'sdp', dp: '30', spaces: 4 }) const ssp13Saves = helper.getMultipleResources(menu, menu.pages.saves, { type: 'ssp', dp: '13' }) - menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'ssp', dp: '13' }) + menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'ssp', dp: '13', spaces: 4 }) const sdpMinus3Saves = helper.getMultipleResources(menu, menu.pages.saves, { type: 'sdp', dp: 'minus3' }) - menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'sdp', dp: 'minus3' }) + menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'sdp', dp: 'minus3', spaces: 4 }) const sdp88Saves = helper.getMultipleResources(menu, menu.pages.saves, { type: 'sdp', dp: '88' }) - menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'sdp', dp: '88' }) + menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'sdp', dp: '88', spaces: 4 }) const sdp161Saves = helper.getMultipleResources(menu, menu.pages.saves, { type: 'sdp', dp: '161' }) - menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'sdp', dp: '161' }) + menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'sdp', dp: '161', spaces: 4 }) const sdp233Saves = helper.getMultipleResources(menu, menu.pages.saves, { type: 'sdp', dp: '233' }) - menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'sdp', dp: '233' }) + menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'sdp', dp: '233', spaces: 4 }) const sdp320Saves = helper.getMultipleResources(menu, menu.pages.saves, { type: 'sdp', dp: '320' }) - menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'sdp', dp: '320' }) + menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'sdp', dp: '320', spaces: 4 }) const ssp15Saves = helper.getMultipleResources(menu, menu.pages.saves, { type: 'ssp', dp: '15' }) - menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'ssp', dp: '15' }) + menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'ssp', dp: '15', spaces: 4 }) const sdp73Saves = helper.getMultipleResources(menu, menu.pages.saves, { type: 'sdp', dp: '73' }) - menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'sdp', dp: '73' }) + menu.pages.saves = helper.addResource(menu.pages.saves, { type: 'sdp', dp: '73', spaces: 4 }) const sdp100Saves = helper.getMultipleResources(menu, menu.pages.savesFor, { type: 'sdp', dp: '100' }) - menu.pages.saves = helper.addResource(menu.pages.savesFor, { type: 'sdp', dp: '100' }) + menu.pages.savesFor = helper.addResource(menu.pages.savesFor, { type: 'sdp', dp: '100' }) const sdp70Saves = helper.getMultipleResources(menu, menu.pages.savesFor, { type: 'sdp', dp: '70' }) - menu.pages.saves = helper.addResource(menu.pages.savesFor, { type: 'sdp', dp: '70' }) + menu.pages.savesFor = helper.addResource(menu.pages.savesFor, { type: 'sdp', dp: '70' }) let saverCode = helper.codePrepare(` private fun saves(animate: Boolean) { @@ -1719,7 +1699,7 @@ function finalize(menu) { val rectangleView = RectangleView(this) - ${sdp30Saves.definition ? `${sdp30Saves.definition}\n\n ` : ''}val layoutParamsRectangle = LayoutParams(LayoutParams.WRAP_CONTENT, ${sdp30Saves.variable}) + ${sdp30Saves.definition}val layoutParamsRectangle = LayoutParams(LayoutParams.WRAP_CONTENT, ${sdp30Saves.variable}) layoutParamsRectangle.gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL rectangleView.layoutParams = layoutParamsRectangle @@ -1727,7 +1707,7 @@ function finalize(menu) { frameLayout.addView(rectangleView) - ${ssp13Saves.definition ? `${ssp13Saves.definition}\n\n ` : ''}val buttonStart = Button(this) + ${ssp13Saves.definition}val buttonStart = Button(this) buttonStart.text = "Start" buttonStart.setTextSize(TypedValue.COMPLEX_UNIT_PX, ${ssp13Saves.variable}) buttonStart.setTextColor(0xFF${menu.footer.textColor}.toInt()) @@ -1738,7 +1718,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp88Saves.definition ? `${sdp88Saves.definition}${!sdpMinus3Saves.definition ? '\n' : ''}\n ` : ''}${sdpMinus3Saves.definition ? `${sdpMinus3Saves.definition}\n\n ` : ''}layoutParamsStart.gravity = Gravity.BOTTOM or Gravity.START + ${sdp88Saves.definition}${sdpMinus3Saves.definition}layoutParamsStart.gravity = Gravity.BOTTOM or Gravity.START layoutParamsStart.setMargins(${sdp88Saves.variable}, 0, 0, ${sdpMinus3Saves.variable}) buttonStart.layoutParams = layoutParamsStart @@ -1758,7 +1738,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp161Saves.definition ? `${sdp161Saves.definition}\n\n ` : ''}layoutParamsAbout.gravity = Gravity.BOTTOM or Gravity.START + ${sdp161Saves.definition}layoutParamsAbout.gravity = Gravity.BOTTOM or Gravity.START layoutParamsAbout.setMargins(${sdp161Saves.variable}, 0, 0, ${sdpMinus3Saves.variable}) buttonAbout.layoutParams = layoutParamsAbout @@ -1780,7 +1760,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp233Saves.definition ? `${sdp233Saves.definition}\n\n ` : ''}layoutParamsSettings.gravity = Gravity.BOTTOM or Gravity.START + ${sdp233Saves.definition}layoutParamsSettings.gravity = Gravity.BOTTOM or Gravity.START layoutParamsSettings.setMargins(${sdp233Saves.variable}, 0, 0, ${sdpMinus3Saves.variable}) buttonSettings.layoutParams = layoutParamsSettings @@ -1802,14 +1782,14 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp320Saves.definition ? `${sdp320Saves.definition}\n\n ` : ''}layoutParamsSaves.gravity = Gravity.BOTTOM or Gravity.START + ${sdp320Saves.definition}layoutParamsSaves.gravity = Gravity.BOTTOM or Gravity.START layoutParamsSaves.setMargins(${sdp320Saves.variable}, 0, 0, ${sdpMinus3Saves.variable}) buttonSaves.layoutParams = layoutParamsSaves frameLayout.addView(buttonSaves) - ${ssp15Saves.definition ? `${ssp15Saves.definition}\n\n ` : ''}val buttonBack = Button(this) + ${ssp15Saves.definition}val buttonBack = Button(this) buttonBack.text = "Back" buttonBack.setTextSize(TypedValue.COMPLEX_UNIT_PX, ${ssp15Saves.variable}) buttonBack.setTextColor(0xFF${menu.backTextColor}.toInt()) @@ -1820,7 +1800,7 @@ function finalize(menu) { LayoutParams.WRAP_CONTENT ) - ${sdp73Saves.definition ? `${sdp73Saves.definition}\n\n ` : ''}layoutParamsBack.gravity = Gravity.TOP or Gravity.START + ${sdp73Saves.definition}layoutParamsBack.gravity = Gravity.TOP or Gravity.START layoutParamsBack.setMargins(${sdp73Saves.variable}, 0, 0, 0) buttonBack.layoutParams = layoutParamsBack @@ -1870,7 +1850,7 @@ function finalize(menu) { savesBackground.setColor(0xFF000000.toInt()) } - ${sdp100Saves.definition ? `${sdp100Saves.definition}${!sdp70Saves.definition ? '\n' : ''}\n ` : ''}${sdp70Saves.definition ? `${sdp70Saves.definition}\n\n ` : ''}val layoutParamsSavesBackground = LayoutParams( + ${sdp100Saves.definition}${sdp70Saves.definition}val layoutParamsSavesBackground = LayoutParams( ${sdp100Saves.variable}, ${sdp70Saves.variable} ) @@ -1926,6 +1906,9 @@ function finalize(menu) { frameLayout.addView(scrollView)\n\n`, 2 ) + saverCode = helper.finalizeMultipleResources(menu, menu.pages.saves, saverCode) + saverCode = helper.finalizeMultipleResources(menu, menu.pages.savesFor, saverCode) + if (menu.custom.length != 0) { saverCode += customCode } diff --git a/src/scene.js b/src/scene.js index c641edf..5e62fae 100644 --- a/src/scene.js +++ b/src/scene.js @@ -594,26 +594,24 @@ function finalize(scene) { } case 'right': case 'left': { - let dpiFunctions = '' + let definitions = '' let marginSideSdp = null if (character.position.margins.side != 0) { marginSideSdp = helper.getResource(scene, { type: 'sdp', dp: character.position.margins.side }) - scene = helper.addResource(scene, { type: 'sdp', dp: character.position.margins.side }) + scene = helper.addResource(scene, { type: 'sdp', dp: character.position.margins.side, spaces: 4 }) - if (marginSideSdp.definition) dpiFunctions += helper.codePrepare(`${marginSideSdp.definition}\n`, 0, 4, false) + if (marginSideSdp.definition) definitions += marginSideSdp.definition } let marginTopSdp = null if (character.position.margins.top != 0) { marginTopSdp = helper.getResource(scene, { type: 'sdp', dp: character.position.margins.top }) - scene = helper.addResource(scene, { type: 'sdp', dp: character.position.margins.top }) + scene = helper.addResource(scene, { type: 'sdp', dp: character.position.margins.top, spaces: 4 }) - if (marginTopSdp.definition) dpiFunctions += helper.codePrepare(marginTopSdp.definition, 0, 4, false) + if (marginTopSdp.definition) definitions += marginTopSdp.definition } - if (marginSideSdp?.definition || marginTopSdp?.definition) dpiFunctions += '\n' - let layoutParams = helper.codePrepare(`layoutParams_${character.name}.setMargins(`, 0, 4, false) if (character.position.margins.side != 0 && character.position.side == 'left') { layoutParams += `${marginSideSdp.variable}, ` @@ -646,7 +644,7 @@ function finalize(scene) { )\n\n`, 6 ) + - dpiFunctions + + definitions + helper.codePrepare(`layoutParams_${character.name}.gravity = Gravity.CENTER\n`, 0, 4, false) + @@ -812,12 +810,12 @@ function finalize(scene) { if (scene.speech) { sdp53 = helper.getResource(scene, { type: 'sdp', dp: '53' }) - scene = helper.addResource(scene, { type: 'sdp', dp: '53' }) + scene = helper.addResource(scene, { type: 'sdp', dp: '53', spaces: 4 }) sceneCode += helper.codePrepare(` val rectangleViewSpeech = RectangleView(this) - ${sdp53.definition ? `${sdp53.definition}\n\n ` : ''}val layoutParamsRectangleSpeech = LayoutParams(LayoutParams.WRAP_CONTENT, ${sdp53.variable}) + ${sdp53.definition}val layoutParamsRectangleSpeech = LayoutParams(LayoutParams.WRAP_CONTENT, ${sdp53.variable}) layoutParamsRectangleSpeech.gravity = Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL rectangleViewSpeech.layoutParams = layoutParamsRectangleSpeech\n`, 2, 0, false @@ -847,15 +845,15 @@ function finalize(scene) { } const speechTextSsp = helper.getResource(scene, { type: 'ssp', dp: scene.speech.text.fontSize }) - scene = helper.addResource(scene, { type: 'ssp', dp: scene.speech.text.fontSize }) + scene = helper.addResource(scene, { type: 'ssp', dp: scene.speech.text.fontSize, spaces: 4 }) const sdp270 = helper.getResource(scene, { type: 'sdp', dp: '270' }) - scene = helper.addResource(scene, { type: 'sdp', dp: '270' }) + scene = helper.addResource(scene, { type: 'sdp', dp: '270', spaces: 4 }) sceneCode += helper.codePrepare(` frameLayout.addView(rectangleViewSpeech) - ${speechTextSsp.definition ? `${speechTextSsp.definition}\n\n ` : ''}val textViewSpeech = TextView(this) + ${speechTextSsp.definition}val textViewSpeech = TextView(this) textViewSpeech.setTextSize(TypedValue.COMPLEX_UNIT_PX, ${speechTextSsp.variable}) textViewSpeech.setTextColor(0xFF${scene.speech.text.color}.toInt()) @@ -864,7 +862,7 @@ function finalize(scene) { LayoutParams.WRAP_CONTENT ) - ${sdp270.definition ? `${sdp270.definition}\n\n ` : ''}layoutParamsSpeech.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL + ${sdp270.definition}layoutParamsSpeech.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL layoutParamsSpeech.setMargins(0, ${sdp270.variable}, 0, 0) textViewSpeech.layoutParams = layoutParamsSpeech @@ -906,14 +904,14 @@ function finalize(scene) { if (scene.speech.author.name) { const authorTextSsp = helper.getResource(scene, { type: 'ssp', dp: '13' }) - scene = helper.addResource(scene, { type: 'ssp', dp: '13' }) + scene = helper.addResource(scene, { type: 'ssp', dp: '13', spaces: 4 }) const sdp135 = helper.getResource(scene, { type: 'sdp', dp: '155' }) - scene = helper.addResource(scene, { type: 'sdp', dp: '155' }) + scene = helper.addResource(scene, { type: 'sdp', dp: '155', spaces: 4 }) sceneCode += helper.codePrepare(` - ${authorTextSsp.definition ? `${authorTextSsp.definition}\n\n ` : ''}val textViewAuthor = TextView(this) + ${authorTextSsp.definition}val textViewAuthor = TextView(this) textViewAuthor.text = "${scene.speech.author.name}" textViewAuthor.setTextSize(TypedValue.COMPLEX_UNIT_PX, ${authorTextSsp.variable}) textViewAuthor.setTextColor(0xFF${scene.speech.author.textColor}.toInt()) @@ -923,7 +921,7 @@ function finalize(scene) { LayoutParams.WRAP_CONTENT ) - ${sdp135.definition ? `${sdp135.definition}\n\n ` : ''}layoutParamsAuthor.gravity = Gravity.BOTTOM or Gravity.START + ${sdp135.definition}layoutParamsAuthor.gravity = Gravity.BOTTOM or Gravity.START layoutParamsAuthor.setMargins(${sdp135.variable}, 0, 0, ${sdp53.variable}) textViewAuthor.layoutParams = layoutParamsAuthor\n\n`, 4, 0, false @@ -1104,13 +1102,13 @@ function finalize(scene) { finishScene.push(helper.codePrepare('findViewById(android.R.id.content).setOnClickListener(null)', 0, 8, false)) const buttonSizeSsp = helper.getResource(scene, { type: 'ssp', dp: '8' }) - scene = helper.addResource(scene, { type: 'ssp', dp: '8' }) + scene = helper.addResource(scene, { type: 'ssp', dp: '8', spaces: 4 }) const sdp15 = helper.getResource(scene, { type: 'sdp', dp: '15' }) - scene = helper.addResource(scene, { type: 'sdp', dp: '15' }) + scene = helper.addResource(scene, { type: 'sdp', dp: '15', spaces: 4 }) sceneCode += helper.codePrepare(` - ${buttonSizeSsp.definition ? `${buttonSizeSsp.definition}\n\n ` : ''}val buttonSave = Button(this) + ${buttonSizeSsp.definition}val buttonSave = Button(this) buttonSave.text = "Save" buttonSave.setTextSize(TypedValue.COMPLEX_UNIT_PX, ${buttonSizeSsp.variable}) buttonSave.setTextColor(0xFF${scene.options.buttonsColor}.toInt()) @@ -1121,7 +1119,7 @@ function finalize(scene) { LayoutParams.WRAP_CONTENT ) - ${sdp15.definition ? `${sdp15.definition}\n\n ` : ''}layoutParamsSave.gravity = Gravity.TOP or Gravity.START + ${sdp15.definition}layoutParamsSave.gravity = Gravity.TOP or Gravity.START layoutParamsSave.setMargins(${sdp15.variable}, 0, 0, 0) buttonSave.layoutParams = layoutParamsSave @@ -1169,7 +1167,7 @@ function finalize(scene) { } const sdp23 = helper.getResource(scene, { type: 'sdp', dp: '23' }) - scene = helper.addResource(scene, { type: 'sdp', dp: '23' }) + scene = helper.addResource(scene, { type: 'sdp', dp: '23', spaces: 4 }) sceneCode += helper.codePrepare(` val newSave = "${JSON.stringify(JSON.stringify(sceneJson)).slice(1, -2)},\\"history\\":" + scenesToJson() + "}" @@ -1195,7 +1193,7 @@ function finalize(scene) { LayoutParams.WRAP_CONTENT ) - ${sdp23.definition ? `${sdp23.definition}\n\n ` : ''}layoutParamsMenu.gravity = Gravity.TOP or Gravity.START + ${sdp23.definition}layoutParamsMenu.gravity = Gravity.TOP or Gravity.START layoutParamsMenu.setMargins(${sdp15.variable}, ${sdp23.variable}, 0, 0) buttonMenu.layoutParams = layoutParamsMenu\n\n` @@ -1219,7 +1217,7 @@ ${finishScene.join('\n\n')} if (visualNovel.scenes.length != 0) { const sdp46 = helper.getResource(scene, { type: 'sdp', dp: '46' }) - scene = helper.addResource(scene, { type: 'sdp', dp: '46' }) + scene = helper.addResource(scene, { type: 'sdp', dp: '46', spaces: 4 }) sceneCode += helper.codePrepare(` val buttonBack = Button(this) @@ -1233,7 +1231,7 @@ ${finishScene.join('\n\n')} LayoutParams.WRAP_CONTENT ) - ${sdp46.definition ? `${sdp46.definition}\n\n ` : ''}layoutParamsBack.gravity = Gravity.TOP or Gravity.START + ${sdp46.definition}layoutParamsBack.gravity = Gravity.TOP or Gravity.START layoutParamsBack.setMargins(${sdp15.variable}, ${sdp46.variable}, 0, 0) buttonBack.layoutParams = layoutParamsBack\n\n`, 2 @@ -1278,13 +1276,13 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) if (scene.subScenes.length == 2) { const subScenesTextSsp = helper.getResource(scene, { type: 'ssp', dp: '12' }) - scene = helper.addResource(scene, { type: 'ssp', dp: '12' }) + scene = helper.addResource(scene, { type: 'ssp', dp: '12', spaces: 4 }) const sdp120 = helper.getResource(scene, { type: 'sdp', dp: '120' }) - scene = helper.addResource(scene, { type: 'sdp', dp: '120' }) + scene = helper.addResource(scene, { type: 'sdp', dp: '120', spaces: 4 }) sceneCode += helper.codePrepare(` - ${subScenesTextSsp.definition ? `${subScenesTextSsp.definition}\n\n ` : ''}val buttonSubScenes = Button(this) + ${subScenesTextSsp.definition}val buttonSubScenes = Button(this) buttonSubScenes.text = "${scene.subScenes[0].text}" buttonSubScenes.setTextSize(TypedValue.COMPLEX_UNIT_PX, ${subScenesTextSsp.variable}) buttonSubScenes.setTextColor(0xFF${scene.options.buttonsColor}.toInt()) @@ -1295,7 +1293,7 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) LayoutParams.WRAP_CONTENT ) - ${sdp120.definition ? `${sdp120.definition}\n\n ` : ''}layoutParamsSubScenes.gravity = Gravity.CENTER_HORIZONTAL + ${sdp120.definition}layoutParamsSubScenes.gravity = Gravity.CENTER_HORIZONTAL layoutParamsSubScenes.setMargins(0, ${sdp120.variable}, 0, 0) buttonSubScenes.layoutParams = layoutParamsSubScenes\n\n`, 2 @@ -1306,7 +1304,7 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) if (scene.subScenes[0].speech?.author?.name && scene.speech && !scene.speech?.author?.name && i + 1 != visualNovel.scenes.length - 1) functionParams.push('true') const sdp150 = helper.getResource(scene, { type: 'sdp', dp: '150' }) - scene = helper.addResource(scene, { type: 'sdp', dp: '150' }) + scene = helper.addResource(scene, { type: 'sdp', dp: '150', spaces: 4 }) sceneCode += helper.codePrepare(` buttonSubScenes.setOnClickListener { @@ -1326,7 +1324,7 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) LayoutParams.WRAP_CONTENT ) - ${sdp150.definition ? `${sdp150.definition}\n\n ` : ''}layoutParamsSubScenes2.gravity = Gravity.CENTER_HORIZONTAL + ${sdp150.definition}layoutParamsSubScenes2.gravity = Gravity.CENTER_HORIZONTAL layoutParamsSubScenes2.setMargins(0, ${sdp150.variable}, 0, 0) buttonSubScenes2.layoutParams = layoutParamsSubScenes2 @@ -1345,10 +1343,10 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) switch (custom.type) { case 'text': { const customTextSsp = helper.getResource(scene, { type: 'ssp', dp: custom.fontSize }) - scene = helper.addResource(scene, { type: 'ssp', dp: custom.fontSize }) + scene = helper.addResource(scene, { type: 'ssp', dp: custom.fontSize, spaces: 4 }) sceneCode += helper.codePrepare(` - ${customTextSsp.definition ? `${customTextSsp.definition}\n\n ` : ''}val textViewCustomText${index} = TextView(this) + ${customTextSsp.definition}val textViewCustomText${index} = TextView(this) textViewCustomText${index}.text = "${custom.text}" textViewCustomText${index}.setTextSize(TypedValue.COMPLEX_UNIT_PX, ${customTextSsp.variable}) textViewCustomText${index}.setTextColor(0xFF${custom.color}.toInt()) @@ -1362,39 +1360,32 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) switch (custom.position.side) { case 'left': case 'right': { - const definitions = [] + let definitions = '' let marginTopSdp = null if (custom.position.margins.top != 0) { marginTopSdp = helper.getResource(scene, { type: 'sdp', dp: custom.position.margins.top }) - scene = helper.addResource(scene, { type: 'sdp', dp: custom.position.margins.top }) + scene = helper.addResource(scene, { type: 'sdp', dp: custom.position.margins.top, spaces: 4 }) - if (marginTopSdp.definition) definitions.push( - helper.codePrepare(marginTopSdp.definition + marginTopSdp.additionalSpace, 0, 4, false) - ) + if (marginTopSdp.definition) definitions += marginTopSdp.definition } let marginSideSdp = null if (custom.position.margins.side != 0) { marginSideSdp = helper.getResource(scene, { type: 'sdp', dp: custom.position.margins.side }) - scene = helper.addResource(scene, { type: 'sdp', dp: custom.position.margins.side }) + scene = helper.addResource(scene, { type: 'sdp', dp: custom.position.margins.side, spaces: 4 }) - if (marginSideSdp.definition) definitions.push( - helper.codePrepare(marginSideSdp.definition + marginSideSdp.additionalSpace, 0, 4, false) - ) + if (marginSideSdp.definition) definitions += marginSideSdp.definition } - customCode += - definitions.join('\n') + - - helper.codePrepare(` - layoutParamsCustomText${index}.gravity = Gravity.TOP or Gravity.START - layoutParamsCustomText${index}.setMargins(${custom.position.margins.side != 0 ? marginSideSdp.variable : '0'}, 0, ${custom.position.margins.top != 0 ? marginTopSdp.variable : '0'}, 0) + customCode += helper.codePrepare(` + ${definitions}layoutParamsCustomText${index}.gravity = Gravity.TOP or Gravity.START + layoutParamsCustomText${index}.setMargins(${custom.position.margins.side != 0 ? marginSideSdp.variable : '0'}, 0, ${custom.position.margins.top != 0 ? marginTopSdp.variable : '0'}, 0) - textViewCustomText${index}.layoutParams = layoutParamsCustomText${index} + textViewCustomText${index}.layoutParams = layoutParamsCustomText${index} - frameLayout.addView(textViewCustomText${index})\n\n`, 12 - ) + frameLayout.addView(textViewCustomText${index})\n\n`, 10 + ) break } @@ -1415,10 +1406,10 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) } case 'button': { const customTextSsp = helper.getResource(scene, { type: 'ssp', dp: custom.fontSize }) - scene = helper.addResource(scene, { type: 'ssp', dp: custom.fontSize }) + scene = helper.addResource(scene, { type: 'ssp', dp: custom.fontSize, spaces: 4 }) sceneCode += helper.codePrepare(` - ${customTextSsp.definition ? `${customTextSsp.definition}\n\n ` : ''}val buttonCustomButton${index} = Button(this) + ${customTextSsp.definition}val buttonCustomButton${index} = Button(this) buttonCustomButton${index}.text = "${custom.text}" buttonCustomButton${index}.setTextSize(TypedValue.COMPLEX_UNIT_PX, ${customTextSsp.variable}) buttonCustomButton${index}.setTextColor(0xFF${custom.color}.toInt()) @@ -1440,7 +1431,7 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) } default: { const customHeight = helper.getResource(scene, { type: 'sdp', dp: custom.height }) - scene = helper.addResource(scene, { type: 'sdp', dp: custom.height }) + scene = helper.addResource(scene, { type: 'sdp', dp: custom.height, spaces: 4 }) if (customHeight.definition) sceneCode = sceneCode.replace('__PERFORVNM_OPTIMIZED_RESOURCE__', `\n\n ${customHeight.definition}__PERFORVNM_OPTIMIZED_RESOURCE__`) @@ -1461,7 +1452,7 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) } default: { const customWidth = helper.getResource(scene, { type: 'sdp', dp: custom.width }) - scene = helper.addResource(scene, { type: 'sdp', dp: custom.width }) + scene = helper.addResource(scene, { type: 'sdp', dp: custom.width, spaces: 4 }) if (customWidth.definition) sceneCode = sceneCode.replace('__PERFORVNM_OPTIMIZED_RESOURCE__', `\n\n ${customWidth.definition}`) @@ -1475,39 +1466,32 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) switch (custom.position.side) { case 'left': case 'right': { - const definitions = [] + let definitions = '' let marginTopSdp = null if (custom.position.margins.top != 0) { marginTopSdp = helper.getResource(scene, { type: 'sdp', dp: custom.position.margins.top }) - scene = helper.addResource(scene, { type: 'sdp', dp: custom.position.margins.top }) + scene = helper.addResource(scene, { type: 'sdp', dp: custom.position.margins.top, spaces: 4 }) - if (marginTopSdp.definition) definitions.push( - helper.codePrepare(marginTopSdp.definition, 0, 4, false) - ) + if (marginTopSdp.definition) definitions += marginTopSdp.definition } let marginSideSdp = null if (custom.position.margins.side != 0) { marginSideSdp = helper.getResource(scene, { type: 'sdp', dp: custom.position.margins.side }) - scene = helper.addResource(scene, { type: 'sdp', dp: custom.position.margins.side }) + scene = helper.addResource(scene, { type: 'sdp', dp: custom.position.margins.side, spaces: 4 }) - if (marginSideSdp.definition) definitions.push( - helper.codePrepare(marginSideSdp.definition, 0, 4, false) - ) + if (marginSideSdp.definition) definitions += marginSideSdp.definition } - sceneCode += - definitions.join('\n') + - - helper.codePrepare(` - layoutParamsCustomButton${index}.gravity = Gravity.TOP or Gravity.START - layoutParamsCustomButton${index}.setMargins(${custom.position.margins.side != 0 ? marginSideSdp.variable : '0'}, 0, ${custom.position.margins.top != 0 ? marginTopSdp.variable : '0'}, 0) + sceneCode += helper.codePrepare(` + ${definitions}layoutParamsCustomButton${index}.gravity = Gravity.TOP or Gravity.START + layoutParamsCustomButton${index}.setMargins(${custom.position.margins.side != 0 ? marginSideSdp.variable : '0'}, 0, ${custom.position.margins.top != 0 ? marginTopSdp.variable : '0'}, 0) - buttonCustomButton${index}.layoutParams = layoutParamsCustomButton${index} + buttonCustomButton${index}.layoutParams = layoutParamsCustomButton${index} - frameLayout.addView(buttonCustomButton${index})\n\n`, 12 - ) + frameLayout.addView(buttonCustomButton${index})\n\n`, 10 + ) break } @@ -1546,7 +1530,7 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) } default: { const customHeight = helper.getResource(scene, { type: 'sdp', dp: custom.height }) - scene = helper.addResource(scene, { type: 'sdp', dp: custom.height }) + scene = helper.addResource(scene, { type: 'sdp', dp: custom.height, spaces: 4 }) if (customHeight.definition) sceneCode = sceneCode.replace('__PERFORVNM_OPTIMIZED_RESOURCE__', `\n\n ${customHeight.definition}__PERFORVNM_OPTIMIZED_RESOURCE__${customHeight.additionalSpace}`) @@ -1567,9 +1551,9 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) } default: { const customWidth = helper.getResource(scene, { type: 'sdp', dp: custom.width }) - scene = helper.addResource(scene, { type: 'sdp', dp: custom.width }) + scene = helper.addResource(scene, { type: 'sdp', dp: custom.width, spaces: 4 }) - if (customWidth.definition) sceneCode = sceneCode.replace('__PERFORVNM_OPTIMIZED_RESOURCE__', `\n\n ${customWidth.definition}${customWidth.additionalSpace}`) + if (customWidth.definition) sceneCode = sceneCode.replace('__PERFORVNM_OPTIMIZED_RESOURCE__', `\n\n ${customWidth.definition}`) sceneCode += helper.codePrepare(`${customWidth.variable},\n`, 0, 6, false) } @@ -1581,39 +1565,32 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) switch (custom.position.side) { case 'left': case 'right': { - const definitions = [] + let definitions = '' let marginTopSdp = null if (custom.position.margins.top != 0) { marginTopSdp = helper.getResource(scene, { type: 'sdp', dp: custom.position.margins.top }) - scene = helper.addResource(scene, { type: 'sdp', dp: custom.position.margins.top }) + scene = helper.addResource(scene, { type: 'sdp', dp: custom.position.margins.top, spaces: 4 }) - if (marginTopSdp.definition) definitions.push( - helper.codePrepare(marginTopSdp.definition + marginTopSdp.additionalSpace, 0, 4, false) - ) + if (marginTopSdp.definition) definitions += marginTopSdp.definition } let marginSideSdp = null if (custom.position.margins.side != 0) { marginSideSdp = helper.getResource(scene, { type: 'sdp', dp: custom.position.margins.side }) - scene = helper.addResource(scene, { type: 'sdp', dp: custom.position.margins.side }) + scene = helper.addResource(scene, { type: 'sdp', dp: custom.position.margins.side, spaces: 4 }) - if (marginSideSdp.definition) definitions.push( - helper.codePrepare(marginSideSdp.definition + marginSideSdp.additionalSpace, 0, 4, false) - ) + if (marginSideSdp.definition) definitions += marginSideSdp.definition } - sceneCode += - definitions.join('\n') + - - helper.codePrepare(` - layoutParamsCustomRectangle${index}.gravity = Gravity.TOP or Gravity.START - layoutParamsCustomRectangle${index}.setMargins(${custom.position.margins.side != 0 ? marginSideSdp.variable : '0'}, 0, ${custom.position.margins.top != 0 ? marginTopSdp.variable : '0'}, 0) + sceneCode += helper.codePrepare(` + ${definitions}layoutParamsCustomRectangle${index}.gravity = Gravity.TOP or Gravity.START + layoutParamsCustomRectangle${index}.setMargins(${custom.position.margins.side != 0 ? marginSideSdp.variable : '0'}, 0, ${custom.position.margins.top != 0 ? marginTopSdp.variable : '0'}, 0) - rectangleViewCustomRectangle${index}.layoutParams = layoutParamsCustomRectangle${index} + rectangleViewCustomRectangle${index}.layoutParams = layoutParamsCustomRectangle${index} - frameLayout.addView(rectangleViewCustomRectangle${index})\n\n`, 12 - ) + frameLayout.addView(rectangleViewCustomRectangle${index})\n\n`, 10 + ) break } @@ -1655,7 +1632,7 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) } default: { const customHeight = helper.getResource(scene, { type: 'sdp', dp: custom.height }) - scene = helper.addResource(scene, { type: 'sdp', dp: custom.height }) + scene = helper.addResource(scene, { type: 'sdp', dp: custom.height, spaces: 4 }) if (customHeight.definition) sceneCode = sceneCode.replace('__PERFORVNM_OPTIMIZED_RESOURCE__', `\n\n ${customHeight.definition}__PERFORVNM_OPTIMIZED_RESOURCE__`) @@ -1676,7 +1653,7 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) } default: { const customWidth = helper.getResource(scene, { type: 'sdp', dp: custom.width }) - scene = helper.addResource(scene, { type: 'sdp', dp: custom.width }) + scene = helper.addResource(scene, { type: 'sdp', dp: custom.width, spaces: 4 }) if (customWidth.definition) sceneCode = sceneCode.replace('__PERFORVNM_OPTIMIZED_RESOURCE__', `\n\n ${customWidth.definition}`) @@ -1689,39 +1666,32 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) switch (custom.position.side) { case 'left': case 'right': { - const definitions = [] + let definitions = '' let marginTopSdp = null if (custom.position.margins.top != 0) { marginTopSdp = helper.getResource(scene, { type: 'sdp', dp: custom.position.margins.top }) - scene = helper.addResource(scene, { type: 'sdp', dp: custom.position.margins.top }) + scene = helper.addResource(scene, { type: 'sdp', dp: custom.position.margins.top, spaces: 4 }) - if (marginTopSdp.definition) definitions.push( - helper.codePrepare(marginSideSdp.definition, 0, 4, false) - ) + if (marginTopSdp.definition) definitions += marginTopSdp.definition } let marginSideSdp = null if (custom.position.margins.side != 0) { marginSideSdp = helper.getResource(scene, { type: 'sdp', dp: custom.position.margins.side }) - scene = helper.addResource(scene, { type: 'sdp', dp: custom.position.margins.side }) + scene = helper.addResource(scene, { type: 'sdp', dp: custom.position.margins.side, spaces: 4 }) - if (marginSideSdp.definition) definitions.push( - helper.codePrepare(marginSideSdp.definition, 0, 4, false) - ) + if (marginSideSdp.definition) definitions += marginSideSdp.definition } - sceneCode += - definitions.join('\n') + - - helper.codePrepare(` - layoutParamsCustomImage${index}.gravity = Gravity.TOP or Gravity.START - layoutParamsCustomImage${index}.setMargins(${custom.position.margins.side != 0 ? marginSideSdp.variable : '0'}, 0, ${custom.position.margins.top != 0 ? marginTopSdp.variable : '0'}, 0) + sceneCode += helper.codePrepare(` + ${definitions}layoutParamsCustomImage${index}.gravity = Gravity.TOP or Gravity.START + layoutParamsCustomImage${index}.setMargins(${custom.position.margins.side != 0 ? marginSideSdp.variable : '0'}, 0, ${custom.position.margins.top != 0 ? marginTopSdp.variable : '0'}, 0) - imageViewCustomImage${index}.layoutParams = layoutParamsCustomImage${index} + imageViewCustomImage${index}.layoutParams = layoutParamsCustomImage${index} - frameLayout.addView(imageViewCustomImage${index})\n\n`, 12 - ) + frameLayout.addView(imageViewCustomImage${index})\n\n`, 10 + ) break } @@ -1769,6 +1739,8 @@ ${finishScene.join('\n\n')}\n\n`, 2, 0) } } + sceneCode = helper.finalizeResources(scene, sceneCode) + if (scene.type == 'normal') visualNovel.scenes.push({ ...scene, code: sceneCode }) else visualNovel.subScenes.push({ ...scene, code: sceneCode })