diff --git a/fix_alarm_settings_final.py b/fix_alarm_settings_final.py deleted file mode 100644 index 972310900..000000000 --- a/fix_alarm_settings_final.py +++ /dev/null @@ -1,13 +0,0 @@ -import sys - -path = 'app/src/main/java/com/best/deskclock/settings/AlarmSettingsFragment.java' -with open(path, 'r') as f: - content = f.read() - -# Add to onPreferenceChange -if 'case KEY_HOLIDAY_DATA_URL -> {' not in content: - content = content.replace('switch (preference.getKey()) {', - 'switch (preference.getKey()) {\\n case KEY_HOLIDAY_DATA_URL -> {\\n String url = (String) newValue;\\n SettingsDAO.setHolidayDataUrl(mPrefs, url);\\n mHolidayDataUrlPref.setSummary(url);\\n return true;\\n }') - -with open(path, 'w') as f: - f.write(content) diff --git a/fix_alarm_settings_v2.py b/fix_alarm_settings_v2.py deleted file mode 100644 index 5f8520c82..000000000 --- a/fix_alarm_settings_v2.py +++ /dev/null @@ -1,32 +0,0 @@ -import sys - -path = 'app/src/main/java/com/best/deskclock/settings/AlarmSettingsFragment.java' -with open(path, 'r') as f: - content = f.read() - -# Add missing imports -required_imports = [ - 'import androidx.preference.Preference;', - 'import androidx.preference.SwitchPreferenceCompat;', - 'import androidx.preference.ListPreference;', - 'import androidx.preference.EditTextPreference;', - 'import com.best.deskclock.settings.custompreference.AlarmSnoozeDurationPreference;', - 'import com.best.deskclock.settings.custompreference.AlarmVolumePreference;', - 'import com.best.deskclock.settings.custompreference.AutoSilenceDurationPreference;', - 'import com.best.deskclock.settings.custompreference.CustomListPreference;', - 'import com.best.deskclock.settings.custompreference.CustomPreference;', - 'import com.best.deskclock.settings.custompreference.CustomPreferenceCategory;', - 'import com.best.deskclock.settings.custompreference.CustomSeekbarPreference;', - 'import com.best.deskclock.settings.custompreference.CustomSwitchPreference;', - 'import com.best.deskclock.settings.custompreference.VibrationPatternPreference;', - 'import com.best.deskclock.settings.custompreference.VibrationStartDelayPreference;', - 'import com.best.deskclock.settings.custompreference.VolumeCrescendoDurationPreference;' -] - -import_insertion_point = 'package com.best.deskclock.settings;' -for imp in required_imports: - if imp not in content: - content = content.replace(import_insertion_point, import_insertion_point + '\\n' + imp) - -with open(path, 'w') as f: - f.write(content) diff --git a/fix_alarm_settings_v3.py b/fix_alarm_settings_v3.py deleted file mode 100644 index d8b22ca77..000000000 --- a/fix_alarm_settings_v3.py +++ /dev/null @@ -1,43 +0,0 @@ -import sys - -path = 'app/src/main/java/com/best/deskclock/settings/AlarmSettingsFragment.java' -with open(path, 'r') as f: - lines = f.readlines() - -new_lines = [] -for line in lines: - if line.startswith('package com.best.deskclock.settings;'): - new_lines.append(line) - new_lines.append('import androidx.preference.Preference;\n') - new_lines.append('import androidx.preference.SwitchPreferenceCompat;\n') - new_lines.append('import androidx.preference.ListPreference;\n') - new_lines.append('import androidx.preference.EditTextPreference;\n') - new_lines.append('import com.best.deskclock.settings.custompreference.AlarmSnoozeDurationPreference;\n') - new_lines.append('import com.best.deskclock.settings.custompreference.AlarmVolumePreference;\n') - new_lines.append('import com.best.deskclock.settings.custompreference.AutoSilenceDurationPreference;\n') - new_lines.append('import com.best.deskclock.settings.custompreference.CustomListPreference;\n') - new_lines.append('import com.best.deskclock.settings.custompreference.CustomPreference;\n') - new_lines.append('import com.best.deskclock.settings.custompreference.CustomPreferenceCategory;\n') - new_lines.append('import com.best.deskclock.settings.custompreference.CustomSeekbarPreference;\n') - new_lines.append('import com.best.deskclock.settings.custompreference.CustomSwitchPreference;\n') - new_lines.append('import com.best.deskclock.settings.custompreference.VibrationPatternPreference;\n') - new_lines.append('import com.best.deskclock.settings.custompreference.VibrationStartDelayPreference;\n') - new_lines.append('import com.best.deskclock.settings.custompreference.VolumeCrescendoDurationPreference;\n') - elif not line.strip().startswith('import androidx.preference.') and \ - not line.strip().startswith('import com.best.deskclock.settings.custompreference.') and \ - 'illegal character' not in line: - new_lines.append(line) - -# Remove duplicates if any -final_lines = [] -seen = set() -for line in new_lines: - if line.startswith('import ') or line.startswith('package '): - if line not in seen: - final_lines.append(line) - seen.add(line) - else: - final_lines.append(line) - -with open(path, 'w') as f: - f.writelines(final_lines) diff --git a/fix_alarm_settings_v4.py b/fix_alarm_settings_v4.py deleted file mode 100644 index 4980a8d1d..000000000 --- a/fix_alarm_settings_v4.py +++ /dev/null @@ -1,47 +0,0 @@ -import sys - -path = 'app/src/main/java/com/best/deskclock/settings/AlarmSettingsFragment.java' -with open(path, 'r') as f: - content = f.read() - -# Fix the broken package line -content = content.replace('package com.best.deskclock.settings;\\nimport androidx.preference.EditTextPreference;\\nimport androidx.preference.ListPreference;\\nimport androidx.preference.SwitchPreferenceCompat;', - 'package com.best.deskclock.settings;') - -# Clean up imports -import_list = [ - 'package com.best.deskclock.settings;', - 'import androidx.preference.Preference;', - 'import androidx.preference.SwitchPreferenceCompat;', - 'import androidx.preference.ListPreference;', - 'import androidx.preference.EditTextPreference;', - 'import com.best.deskclock.settings.custompreference.AlarmSnoozeDurationPreference;', - 'import com.best.deskclock.settings.custompreference.AlarmVolumePreference;', - 'import com.best.deskclock.settings.custompreference.AutoSilenceDurationPreference;', - 'import com.best.deskclock.settings.custompreference.CustomListPreference;', - 'import com.best.deskclock.settings.custompreference.CustomPreference;', - 'import com.best.deskclock.settings.custompreference.CustomPreferenceCategory;', - 'import com.best.deskclock.settings.custompreference.CustomSeekbarPreference;', - 'import com.best.deskclock.settings.custompreference.CustomSwitchPreference;', - 'import com.best.deskclock.settings.custompreference.VibrationPatternPreference;', - 'import com.best.deskclock.settings.custompreference.VibrationStartDelayPreference;', - 'import com.best.deskclock.settings.custompreference.VolumeCrescendoDurationPreference;' -] - -lines = content.splitlines() -new_lines = [] -skip_imports = False -for line in lines: - if line.startswith('package '): - new_lines.extend(import_list) - skip_imports = True - continue - if skip_imports: - if line.startswith('import ') or not line.strip(): - continue - else: - skip_imports = False - new_lines.append(line) - -with open(path, 'w') as f: - f.write('\\n'.join(new_lines)) diff --git a/fix_keys_and_defaults.py b/fix_keys_and_defaults.py deleted file mode 100644 index ef24f9bb8..000000000 --- a/fix_keys_and_defaults.py +++ /dev/null @@ -1,41 +0,0 @@ -import sys - -keys_path = 'app/src/main/java/com/best/deskclock/settings/PreferencesKeys.java' -with open(keys_path, 'r') as f: - keys_content = f.read() - -missing_keys = [ - ('KEY_ALARM_DIGITAL_CLOCK_FONT_SIZE', '"key_alarm_digital_clock_font_size"'), - ('KEY_DISPLAY_ALARM_SECOND_HAND', '"key_display_alarm_second_hand"'), - ('KEY_TIMER_AUTO_SILENCE_DURATION', '"key_timer_auto_silence_duration"'), - ('KEY_TIMER_ADD_TIME_BUTTON_VALUE', '"key_timer_add_time_button_value"') -] - -for key, val in missing_keys: - if key not in keys_content: - keys_content = keys_content.replace('}', f' public static final String {key} = {val};\n}}') - -with open(keys_path, 'w') as f: - f.write(keys_content) - -defaults_path = 'app/src/main/java/com/best/deskclock/settings/PreferencesDefaultValues.java' -with open(defaults_path, 'r') as f: - defaults_content = f.read() - -missing_defaults = [ - ('DEFAULT_ALARM_DIGITAL_CLOCK_FONT_SIZE', '70', 'int'), - ('DEFAULT_DISPLAY_ALARM_SECOND_HAND', 'true', 'boolean'), - ('DEFAULT_TIMER_AUTO_SILENCE_DURATION', '30', 'int'), - ('DEFAULT_TIMER_ADD_TIME_BUTTON_VALUE', '60', 'int'), - ('DEFAULT_TIMER_AUTO_SILENCE', '"30"', 'String'), - ('DEFAULT_TIME_TO_ADD_TO_TIMER', '"1"', 'String'), - ('DEFAULT_ALARM_VOLUME_CRESCENDO_DURATION', '0', 'int'), - ('DEFAULT_TIMER_VOLUME_CRESCENDO_DURATION', '0', 'int') -] - -for key, val, type_name in missing_defaults: - if key not in defaults_content: - defaults_content = defaults_content.replace('}', f' public static final {type_name} {key} = {val};\n}}') - -with open(defaults_path, 'w') as f: - f.write(defaults_content) diff --git a/fix_viewholder_v2.py b/fix_viewholder_v2.py deleted file mode 100644 index 36b9e3703..000000000 --- a/fix_viewholder_v2.py +++ /dev/null @@ -1,47 +0,0 @@ -import sys - -path = 'app/src/main/java/com/best/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java' -with open(path, 'r') as f: - content = f.read() - -# Add missing initialization in constructor -if 'holidayOption = itemView.findViewById(R.id.holiday_option);' not in content: - content = content.replace('duplicate = itemView.findViewById(R.id.duplicate);', - 'duplicate = itemView.findViewById(R.id.duplicate);\n holidayOption = itemView.findViewById(R.id.holiday_option);') - -# Fix bindHolidayOption -if 'private void bindHolidayOption' not in content: - bind_holiday_method = ''' - private void bindHolidayOption(Context context, Alarm alarm) { - holidayOption.setVisibility(VISIBLE); - holidayOption.setTypeface(mGeneralTypeface); - switch (alarm.holidayOption) { - case com.best.deskclock.holiday.HolidayUtils.HOLIDAY_OPTION_SKIP_HOLIDAY -> - holidayOption.setText(context.getString(R.string.holiday_option_skip_holiday)); - case com.best.deskclock.holiday.HolidayUtils.HOLIDAY_OPTION_BIG_SMALL_DA -> - holidayOption.setText(context.getString(R.string.holiday_option_big_small_da)); - case com.best.deskclock.holiday.HolidayUtils.HOLIDAY_OPTION_BIG_SMALL_XIAO -> - holidayOption.setText(context.getString(R.string.holiday_option_big_small_xiao)); - case com.best.deskclock.holiday.HolidayUtils.HOLIDAY_OPTION_SINGLE_DAY_OFF -> - holidayOption.setText(context.getString(R.string.holiday_option_single_day_off)); - default -> holidayOption.setText(context.getString(R.string.holiday_option_none)); - } - } -''' - # Insert before onAnimateChange - content = content.replace(' @Override\n public Animator onAnimateChange', bind_holiday_method + '\n @Override\n public Animator onAnimateChange') - -# Call bindHolidayOption in onBindItemView -if 'bindHolidayOption(context, alarm);' not in content: - content = content.replace('bindDeleteAndDuplicateButtons();', 'bindDeleteAndDuplicateButtons();\n bindHolidayOption(context, alarm);') - -# Add click listener for holiday option in constructor -if 'holidayOption.setOnClickListener' not in content: - content = content.replace('duplicate.setOnClickListener(v -> {', - '''holidayOption.setOnClickListener(v -> - getAlarmTimeClickHandler().onHolidayOptionClicked(getItemHolder().item)); - - duplicate.setOnClickListener(v -> {''') - -with open(path, 'w') as f: - f.write(content)