merge: fix conflict

This commit is contained in:
fuwaa 2022-07-23 09:08:06 +08:00
commit 1025308693
No known key found for this signature in database
GPG key ID: 2E4F5DC11DE1D654
3 changed files with 24 additions and 19 deletions

View file

@ -456,7 +456,8 @@ defaultColorScheme = {
initialSettings = Object.keys(defaultColorScheme);
// loop through all the keys in the defaultColorScheme object
// and set the value of the key to the value of the key in the defaultColorScheme object
// and set the value of the key to the value of the key in the
// defaultColorScheme object
chrome.runtime.onInstalled.addListener(() => {
initialSettings.forEach((initialSetting) => {
var key = {};

View file

@ -1,21 +1,24 @@
with open('schemeGroups.js', 'a') as f:
x = open('colors.txt', 'r')
prev_line = ''
prevComparison = ''
with open("schemeGroups.js", "a") as f:
x = open("colors.txt", "r")
prev_line = ""
prevComparison = ""
groupNumber = 0
for current_line in x:
value = current_line.split("=>")[0].strip()
varName = current_line.split("=>")[0].strip().replace("#", "")
if prev_line.split("=>")[0].strip() != current_line.split("=>")[0].strip():
if prev_line.split("=>")[0].strip() != current_line.split(
"=>")[0].strip():
if prevComparison != value[0:7]:
groupNumber += 1
alphaValue = 0
f.write(']\n\n// color group: ' + str(groupNumber) + ' | default color: ' +
value + '\nexport var cg' + str(groupNumber) + '_' + varName + ' = [\n')
f.write("]\n\n// color group: " + str(groupNumber) +
" | default color: " + value + "\nexport var cg" +
str(groupNumber) + "_" + varName + " = [\n")
else:
f.write(']\n\n// color group: ' + str(groupNumber) + ' | default color: ' +
value + '\nexport var cg' + str(groupNumber) + 'a_' + value[7:9] + ' = [\n')
f.write("]\n\n// color group: " + str(groupNumber) +
" | default color: " + value + "\nexport var cg" +
str(groupNumber) + "a_" + value[7:9] + " = [\n")
f.write('"' + current_line.split("=>")[1].strip() + '",\n')
prev_line = current_line
prevComparison = value[0:7]

View file

@ -1,10 +1,11 @@
with open('formatted.txt', 'a') as f:
x = open('colors.txt','r')
prev_line = ''
with open("formatted.txt", "a") as f:
x = open("colors.txt", "r")
prev_line = ""
for current_line in x:
if prev_line.split("=>")[0].strip() != current_line.split("=>")[0].strip():
f.write('\n')
if prev_line.split("=>")[0].strip() != current_line.split(
"=>")[0].strip():
f.write("\n")
f.write(current_line)
prev_line = current_line