diff --git a/changeAppSettings.sh b/changeAppSettings.sh index 5e0838734..3f8523132 100755 --- a/changeAppSettings.sh +++ b/changeAppSettings.sh @@ -475,6 +475,22 @@ if [ -n "$var" ] ; then fi fi +if [ -z "$TouchscreenKeysTheme" -o -z "$AUTO" ]; then +echo +echo "On-screen keys theme" +echo "1 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)" +echo "2 = Simple Theme by Beholder (white, with gamepad joystick)" +echo "3 = Sun by Sirea (yellow, with round joystick)" +echo "4 = Mystery by Gerstrong (unknown color, unknown joystick)" +echo "" +echo -n "($TouchscreenKeysTheme): " +read var +if [ -n "$var" ] ; then + TouchscreenKeysTheme="$var" + CHANGED=1 +fi +fi + if [ -z "$RedefinedKeysGamepad" -o -z "$AUTO" ]; then if [ -z "$RedefinedKeysGamepad" ]; then RedefinedKeysGamepad="$RedefinedKeysScreenKb" @@ -881,6 +897,13 @@ echo >> AndroidAppSettings.cfg echo "# Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu" >> AndroidAppSettings.cfg echo RedefinedKeysScreenKbNames=\"$RedefinedKeysScreenKbNames\" >> AndroidAppSettings.cfg echo >> AndroidAppSettings.cfg +echo "# On-screen keys theme" >> AndroidAppSettings.cfg +echo "# 1 = Ultimate Droid by Sean Stieber (green, with gamepad joystick)" >> AndroidAppSettings.cfg +echo "# 2 = Simple Theme by Beholder (white, with gamepad joystick)" >> AndroidAppSettings.cfg +echo "# 3 = Sun by Sirea (yellow, with round joystick)" >> AndroidAppSettings.cfg +echo "# 4 = Mystery by Gerstrong (unknown color, unknown joystick)" >> AndroidAppSettings.cfg +echo TouchscreenKeysTheme=$TouchscreenKeysTheme >> AndroidAppSettings.cfg +echo >> AndroidAppSettings.cfg echo "# Redefine gamepad keys to SDL keysyms, button order is:" >> AndroidAppSettings.cfg echo "# A B X Y L1 R1 L2 R2 LThumb RThumb" >> AndroidAppSettings.cfg echo RedefinedKeysGamepad=\"$RedefinedKeysGamepad\" >> AndroidAppSettings.cfg @@ -1298,6 +1321,7 @@ $SEDI "s|public static String DeleteFilesOnUpgrade = .*;|public static String De $SEDI "s/public static int AppTouchscreenKeyboardKeysAmount = .*;/public static int AppTouchscreenKeyboardKeysAmount = $AppTouchscreenKeyboardKeysAmount;/" project/src/Globals.java $SEDI "s/public static int AppTouchscreenKeyboardKeysAmountAutoFire = .*;/public static int AppTouchscreenKeyboardKeysAmountAutoFire = $AppTouchscreenKeyboardKeysAmountAutoFire;/" project/src/Globals.java $SEDI "s@public static String\\[\\] AppTouchscreenKeyboardKeysNames = .*;@public static String[] AppTouchscreenKeyboardKeysNames = \"$RedefinedKeysScreenKbNames\".split(\" \");@" project/src/Globals.java +$SEDI "s/public static int TouchscreenKeyboardTheme = .*;/public static int TouchscreenKeyboardTheme = $TouchscreenKeysTheme;/" project/src/Globals.java $SEDI "s/public static int StartupMenuButtonTimeout = .*;/public static int StartupMenuButtonTimeout = $StartupMenuButtonTimeout;/" project/src/Globals.java $SEDI "s/public static int AppMinimumRAM = .*;/public static int AppMinimumRAM = $AppMinimumRAM;/" project/src/Globals.java $SEDI "s/public static SettingsMenu.Menu HiddenMenuOptions .*;/public static SettingsMenu.Menu HiddenMenuOptions [] = { $HiddenMenuOptions1 };/" project/src/Globals.java diff --git a/project/jni/application/teeworlds/AndroidAppSettings.cfg b/project/jni/application/teeworlds/AndroidAppSettings.cfg index 8adefe24e..8c6eb7ee4 100644 --- a/project/jni/application/teeworlds/AndroidAppSettings.cfg +++ b/project/jni/application/teeworlds/AndroidAppSettings.cfg @@ -138,6 +138,13 @@ RedefinedKeysScreenKb="SPACE PAGEDOWN PAGEUP TAB RETURN RCTRL" # Names for on-screen keyboard keys, such as Fire, Jump, Run etc, separated by spaces, they are used in SDL config menu RedefinedKeysScreenKbNames="Jump Next_weapon Previous_weapon Show_scores Hook Fire" +# On-screen keys theme +# 1 = Ultimate Droid by Sean Stieber (green, with gamepad joystick) +# 2 = Simple Theme by Beholder (white, with gamepad joystick) +# 3 = Sun by Sirea (yellow, with round joystick) +# 4 = Mystery by Gerstrong (unknown color, unknown joystick) +TouchscreenKeysTheme=3 + # Redefine gamepad keys to SDL keysyms, button order is: # A B X Y L1 R1 L2 R2 LThumb RThumb RedefinedKeysGamepad="RETURN PAGEDOWN TAB T SPACE RCTRL RETURN RCTRL SPACE PAGEDOWN" @@ -202,7 +209,7 @@ AppCmdline='' # Here you may type readme text, which will be shown during startup. Format is: # Text in English, use \\\\n to separate lines^de:Text in Deutsch^ru:Text in Russian, and so on (that's four backslashes, nice isn't it?) -ReadmeText='Tap left joystick to launch hook\\\\nSwipe left joystick up or down to jump^ouya:' +ReadmeText='Tap left joystick to launch hook\\nSwipe left joystick up or down to jump^ouya:' # Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens # Minimum screen size that application supports: (s)mall / (m)edium / (l)arge