Merge branch 'pre-1.2-release'

* Multi-install Feature * Condense installer code to run in dedicated functions * Cleanup naming scheme to theme_xxxx.py * ReDo Restore Code * Remove traces of APK :( * LOTS of cleanup / makinging proper / tons of neat logic * Easter eggs??? Fake plastic ones maybe in this economy... * I'm sure, and I know im forgetting ALOT yes its been a few years. * TODO - V2 & V3?????!!!
Coltonton · Apr 16, 2023 · 8f61b99 · 8f61b99
1 parent 2563fc4
commit 8f61b99
Show file tree

Hide file tree

Showing 8 changed files with 626 additions and 600 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ Boot Logo Tools/OnePlus3TInjector/Thumbs.db
 test-theme-backups
 support/__pycache__
 contributed-themes/DEV
+mydev
 *.db
 *.DS_Store
 *.DS_Store

diff --git a/RELEASES.MD b/RELEASES.MD
@@ -1,10 +1,14 @@
-Version 2.0.0 (2021-XX-XX)
+Version 1.2.0 (2023-04-16)
 ========================
+* Multi-install Feature
 * Condense installer code to run in dedicated functions
 * Cleanup naming scheme to theme_xxxx.py
 * ReDo Restore Code
 * Remove traces of APK :(
-* TODO - Auto Logic Finish!!!
+* LOTS of cleanup / makinging proper / tons of neat logic
+* Easter eggs??? Fake plastic ones maybe in this economy...
+* I'm sure, and I know im forgetting ALOT yes its been a few years.
+* TODO - V2 & V3?????!!!
 
 
 Version 1.1.1 (2020-01-01)

diff --git a/support/support_functions.py b/support/support_functions.py
diff --git a/support/support_variables.py b/support/support_variables.py
@@ -1,10 +1,13 @@
 #!/usr/bin/python
 # ===================  Misc vars =================== ##
-SHOW_CONSOLE_OUTPUT = False                # Show the console output when 'make' is called?
+EON_CUSTOM_THEMES_VER = "1.2"              # This Softwares Version
+#SHOW_CONSOLE_OUTPUT = False                # Show the console output when 'make' is called?
 VERBOSE = False
 DEVMODE = False
 DEV_PLATFORM = ""
-EON_CUSTOM_THEMES_VER = "1.2"              # This Softwares Version
+VALID_BOOT_ANIMATIONS =  ['Boot Animation', 'Color Boot Animation', 'White Boot Animation']
+IS_AFFIRMATIVE_YES = ['yes', 'ye', 'y', '1', "j", "ja", "si", "s"]
+IS_AFFIRMATIVE_UNSURE = ['i guess', 'sure', 'fine', 'whatever', 'idk', 'why', "uh", "um", "...", "bite me", "eat my shorts"]
 
 # ==============  Backup related vars ============== ##
 BACKUPS_DIR = '/storage/emulated/0/theme-backups' if not DEVMODE else './test-theme-backups'
@@ -16,10 +19,10 @@
 MIN_SIM_THRESHOLD = 0.25      # user's input needs to be this percent or higher similar to a theme to select it
 
 # =========== Get OP Ver & Location vars =========== ##
-OP_VER = 0.1
-OP_LOC = ''
+OP_Version = 0.0
+OP_Location = ''
 
-# =================  Welcome Texts ================= ##
+# ===================== Texts ====================== ##
 WELCOME_TEXT = ['Created By: Colton (Brandon) S. EndLine \\n',
                 'Special Thanks to @ShaneSmiskol for all the help!!!',
                 'Free to use! Free to Edit! Free to integrate!',
@@ -41,13 +44,15 @@
                 "'cd /data && git clone https://github.com/Coltonton/eon-custom-themes.git'",
                 "Then cd exec /data/eon-custom-themes/install_theme.py",
                 ' to use the full program! Installing a theme manually',
-                'blocks this auto installer from overwriting!']
+                'blocks this auto installer from overwriting!',
+                'Version {}'.format(EON_CUSTOM_THEMES_VER)]
 RESTORE_WELCOME_TEXT = ['Created By: Colton (Brandon) S. EndLine \\n',
                 'Special Thanks to @ShaneSmiskol for all the help!!!',
                 'Free to use! Free to Edit! Free to integrate!',
                 'Design and contribute your themes today!',
                 '(See the developer folder in this repo)',
                 'It\'s your EON, do what you want!',
+                'Version {}'.format(EON_CUSTOM_THEMES_VER),
                 ' ',
                 '*NOTE* this is the backup & default restore program']
 UTIL_WELCOME_TEXT = ['Created By: Colton (Brandon) S. EndLine \\n',
@@ -56,15 +61,18 @@
                 'Design and contribute your themes today!',
                 '(See the developer folder in this repo)',
                 'It\'s your EON, do what you want!',
+                'Version {}'.format(EON_CUSTOM_THEMES_VER),
                 ' ',
                 '*NOTE* this is the theme utility program for misc functions']
-
-CLEANUP_TEXT = ['\n\nWelcome to the uninstall - cleanup utility',
+CLEANUP_TEXT = ['Welcome to the uninstall - cleanup utility',
+                'Version {}'.format(EON_CUSTOM_THEMES_VER),
+                ' ',
                     "I'm sad to see you go... :",
-                  '\nThis program removes the following files not stored in the main directory:',
+                  'This program removes the following files not stored in the main directory:',
                     '- WARNING!!!! ALL BACKUPS!!! Stored in /sdcard/theme-backups',
                     '- eon_custom_themes_self_installed.txt in /sdcard used as a marker to the auto installer',
-                  '\nIt does not remove:',
+                  ' ',
+                  'It does not remove:',
                     '- The main project directory',
                     "- Any installed themes, please run 'Restore Comma-default' from",
                     'this program to restore the comma-default boot logo and boot animation',