Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit 6964487

Browse files
borisfborisf
committed
dark scheme fixes
1 parent 552db52 commit 6964487

File tree

6 files changed

+42
-41
lines changed

6 files changed

+42
-41
lines changed

‎ClassySharkWS/src/com/google/classyshark/gui/panel/displayarea/DisplayArea.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -283,13 +283,13 @@ public void displayClass(List<Translator.ELEMENT> elements) {
283283
StyleConstants.setForeground(style, theme.getAnnotationsColor());
284284
break;
285285
case XML_TAG:
286-
StyleConstants.setForeground(style, theme.getDefaultColor());
286+
StyleConstants.setForeground(style, theme.getIdentifiersColor());
287287
break;
288288
case XML_ATTR_NAME:
289-
StyleConstants.setForeground(style, theme.getIdentifiersColor());
289+
StyleConstants.setForeground(style, theme.getKeyWordsColor());
290290
break;
291291
case XML_ATTR_VALUE:
292-
StyleConstants.setForeground(style, theme.getAnnotationsColor());
292+
StyleConstants.setForeground(style, theme.getDefaultColor());
293293
break;
294294
default:
295295
StyleConstants.setForeground(style, Color.LIGHT_GRAY);
@@ -313,7 +313,7 @@ public void displaySharkey() {
313313
Document doc = jTextPane.getStyledDocument();
314314

315315
try {
316-
StyleConstants.setForeground(style, theme.getDefaultColor());
316+
StyleConstants.setForeground(style, theme.getIdentifiersColor());
317317
StyleConstants.setFontSize(style, 13);
318318
StyleConstants.setFontFamily(style, "Menlo");
319319

‎ClassySharkWS/src/com/google/classyshark/gui/theme/dark/DarkColorScheme.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ private DarkColorScheme() {}
88

99
static final Color BACKGROUND = new Color(32,32,32);
1010
static final Color BACKGROUND_LIGHT = new Color(46, 48,50);
11-
static final Color DEFAULT = new Color(131, 148, 150);
12-
static final Color KEYWORDS = new Color(181, 137, 0);
13-
static final Color IDENTIFIERS = new Color(133, 153, 0);
11+
static final Color IDENTIFIERS = new Color(0xFF, 0xFF, 0x80);
12+
static final Color DEFAULT = new Color(0xd8, 0xd8, 0xd8);
13+
static final Color KEYWORDS = new Color(133, 153, 0);
1414
static final Color ANNOTATIONS = new Color(108, 113, 196);
1515
static final Color SELECTION_BG = new Color(7, 56, 66);
1616
static final Color NAMES = new Color(88, 110, 117);

‎ClassySharkWS/src/com/google/classyshark/gui/theme/dark/DarkTheme.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ public DarkTheme() {
2929
mappingsIcon = new ImageIcon(getClass().getResource(MAPPING_ICON_PATH));
3030
settingsIcon = new ImageIcon(getClass().getResource(SETTINGS_ICON_PATH));
3131

32-
UIManager.put("MenuItem.foreground", DEFAULT);
32+
// TODO was default need to change names
33+
UIManager.put("MenuItem.foreground", IDENTIFIERS);
3334
}
3435

3536
@Override
@@ -112,13 +113,13 @@ public void applyTo(Component component) {
112113
if (shallBeLighter(component)) {
113114
component.setBackground(BACKGROUND_LIGHT);
114115
} else if (component instanceof JLabel) {
115-
component.setForeground(DEFAULT);
116+
component.setForeground(IDENTIFIERS);
116117
}else {
117118
component.setBackground(BACKGROUND);
118119
}
119120

120121
if(component instanceof JTextField) {
121-
component.setForeground(KEYWORDS);
122+
component.setForeground(IDENTIFIERS);
122123
}
123124
}
124125

‎ClassySharkWS/src/com/google/classyshark/silverghost/translator/apk/ApkTranslator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void apply() {
7777
+ dexData.nativeMethodsCount
7878
+ "\nabstract methods: "
7979
+ dexData.abstractMethodsCount + "\n",
80-
TAG.ANNOTATION);
80+
TAG.DOCUMENT);
8181
elements.add(element);
8282
}
8383

@@ -88,7 +88,7 @@ public void apply() {
8888

8989
Collections.sort(apkAnalysis.nativeLibs);
9090
for (String nativeLib : apkAnalysis.nativeLibs) {
91-
element = new ELEMENT(nativeLib, TAG.ANNOTATION);
91+
element = new ELEMENT(nativeLib, TAG.DOCUMENT);
9292
elements.add(element);
9393
}
9494
}

‎ClassySharkWS/src/com/google/classyshark/silverghost/translator/dex/DexInfoTranslator.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -64,35 +64,35 @@ public void apply() {
6464
DexBackedDexFile dataPack = (DexBackedDexFile) dxFile;
6565

6666
ELEMENT element = new ELEMENT("\nclasses: " + dataPack.getClassCount(),
67-
TAG.ANNOTATION);
67+
TAG.MODIFIER);
6868
elements.add(element);
69-
element = new ELEMENT("\nstrings: " + dataPack.getStringCount(), TAG.ANNOTATION);
69+
element = new ELEMENT("\nstrings: " + dataPack.getStringCount(), TAG.DOCUMENT);
7070
elements.add(element);
71-
element = new ELEMENT("\ntypes: " + dataPack.getTypeCount(), TAG.ANNOTATION);
71+
element = new ELEMENT("\ntypes: " + dataPack.getTypeCount(), TAG.DOCUMENT);
7272
elements.add(element);
73-
element = new ELEMENT("\nprotos: " + dataPack.getProtoCount(), TAG.ANNOTATION);
73+
element = new ELEMENT("\nprotos: " + dataPack.getProtoCount(), TAG.DOCUMENT);
7474
elements.add(element);
75-
element = new ELEMENT("\nfields: " + dataPack.getFieldCount(), TAG.ANNOTATION);
75+
element = new ELEMENT("\nfields: " + dataPack.getFieldCount(), TAG.DOCUMENT);
7676
elements.add(element);
77-
element = new ELEMENT("\nmethods: " + dataPack.getMethodCount(), TAG.DOCUMENT);
77+
element = new ELEMENT("\nmethods: " + dataPack.getMethodCount(), TAG.IDENTIFIER);
7878
elements.add(element);
7979

80-
element = new ELEMENT("\n\nClasses with Native Calls\n", TAG.DOCUMENT);
80+
element = new ELEMENT("\n\nClasses with Native Calls\n", TAG.MODIFIER);
8181
elements.add(element);
8282

8383
ApkTranslator.DexData dexData = ApkTranslator.fillAnalysis(index,
8484
classesDex);
8585

8686
for (String nativeMethodsClass : dexData.nativeMethodsClasses) {
87-
element = new ELEMENT(nativeMethodsClass + "\n", TAG.ANNOTATION);
87+
element = new ELEMENT(nativeMethodsClass + "\n", TAG.DOCUMENT);
8888
elements.add(element);
8989
}
9090

91-
element = new ELEMENT("\nClasses with Abstract Calls\n", TAG.DOCUMENT);
91+
element = new ELEMENT("\nClasses with Abstract Calls\n", TAG.MODIFIER);
9292
elements.add(element);
9393

9494
for (String abstractMethodsClass : dexData.abstractClasses) {
95-
element = new ELEMENT(abstractMethodsClass + "\n", TAG.XML_ATTR_NAME);
95+
element = new ELEMENT(abstractMethodsClass + "\n", TAG.DOCUMENT);
9696
elements.add(element);
9797
}
9898
} catch (Exception e) {

‎ClassySharkWS/src/com/google/classyshark/silverghost/translator/java/JavaTranslator.java

+19-19
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ private static void fillImports(QualifiedTypesMap namesMapper, List<ELEMENT> wor
171171
List<String> imports = namesMapper.getFullTypes();
172172
for (String importStr : imports) {
173173
words.add(new ELEMENT("\nimport ", TAG.MODIFIER));
174-
words.add(new ELEMENT(importStr + ";", TAG.IDENTIFIER));
174+
words.add(new ELEMENT(importStr + ";", TAG.DOCUMENT));
175175
}
176176

177177
words.add(new ELEMENT("\n\n", TAG.IDENTIFIER));
@@ -237,9 +237,9 @@ private static void fillFields(MetaObject.FieldInfo[] fields,
237237

238238
words.add(new ELEMENT("\n " + Modifier.toString(md) + " ", TAG.MODIFIER));
239239
words.add(new ELEMENT(namesMapper.getTypeNull(field.typeName) + " ",
240-
TAG.IDENTIFIER));
240+
TAG.MODIFIER));
241241

242-
words.add(new ELEMENT(field.name, TAG.DOCUMENT));
242+
words.add(new ELEMENT(field.name, TAG.IDENTIFIER));
243243
words.add(new ELEMENT(field.genericStr, TAG.DOCUMENT));
244244
words.add(new ELEMENT(";", TAG.DOCUMENT));
245245
}
@@ -260,20 +260,20 @@ private static void fillCtors(MetaObject.ConstructorInfo[] constructors,
260260
words.add(new ELEMENT(x, TAG.IDENTIFIER));
261261

262262
MetaObject.ParameterInfo parameterTypes[] = constructor.parameterTypes;
263-
words.add(new ELEMENT("(", TAG.IDENTIFIER));
263+
words.add(new ELEMENT("(", TAG.DOCUMENT));
264264
if (parameterTypes.length > 0) {
265265
for (int j = 0; j < parameterTypes.length; j++) {
266266
words.add(new ELEMENT(
267267
namesMapper.getTypeNull(parameterTypes[j].parameterStr),
268-
TAG.IDENTIFIER));
268+
TAG.DOCUMENT));
269269
words.add(new ELEMENT(parameterTypes[j].genericStr, TAG.DOCUMENT));
270270
if (j < (parameterTypes.length - 1)) {
271-
words.add(new ELEMENT(", ", TAG.IDENTIFIER));
272-
words.add(new ELEMENT("\n ", TAG.IDENTIFIER));
271+
words.add(new ELEMENT(", ", TAG.DOCUMENT));
272+
words.add(new ELEMENT("\n ", TAG.DOCUMENT));
273273
}
274274
}
275275
}
276-
words.add(new ELEMENT(") { ... }\n", TAG.IDENTIFIER));
276+
words.add(new ELEMENT(") { ... }\n", TAG.DOCUMENT));
277277
}
278278
}
279279

@@ -296,31 +296,31 @@ private static void fillMethods(MetaObject.MethodInfo[] methods,
296296

297297
words.add(new ELEMENT(" " + Modifier.toString(md) + " ", TAG.MODIFIER));
298298
words.add(new ELEMENT(namesMapper.getTypeNull(method.returnType) + " ",
299-
TAG.IDENTIFIER));
300-
words.add(new ELEMENT(method.genericReturnType, TAG.IDENTIFIER));
301-
words.add(new ELEMENT(method.name, TAG.DOCUMENT));
299+
TAG.DOCUMENT));
300+
words.add(new ELEMENT(method.genericReturnType, TAG.DOCUMENT));
301+
words.add(new ELEMENT(method.name, TAG.IDENTIFIER));
302302

303303
MetaObject.ParameterInfo parameterTypes[] = method.parameterTypes;
304-
words.add(new ELEMENT("(", TAG.IDENTIFIER));
304+
words.add(new ELEMENT("(", TAG.DOCUMENT));
305305
if (parameterTypes.length > 0) {
306306
for (int j = 0; j < parameterTypes.length; j++) {
307307
words.add(new ELEMENT(
308308
namesMapper.getType(parameterTypes[j].parameterStr),
309-
TAG.IDENTIFIER));
309+
TAG.DOCUMENT));
310310
words.add(new ELEMENT(parameterTypes[j].genericStr, TAG.DOCUMENT));
311311
if (j < (parameterTypes.length - 1)) {
312-
words.add(new ELEMENT(", ", TAG.IDENTIFIER));
313-
words.add(new ELEMENT("\n ", TAG.IDENTIFIER));
312+
words.add(new ELEMENT(", ", TAG.DOCUMENT));
313+
words.add(new ELEMENT("\n ", TAG.DOCUMENT));
314314
}
315315
}
316316
}
317317

318-
words.add(new ELEMENT(") ", TAG.IDENTIFIER));
318+
words.add(new ELEMENT(") ", TAG.DOCUMENT));
319319

320320
MetaObject.ExceptionInfo[] exceptionTypes = method.exceptionTypes;
321321

322322
if (exceptionTypes.length > 0) {
323-
words.add(new ELEMENT(" throws ", TAG.IDENTIFIER));
323+
words.add(new ELEMENT(" throws ", TAG.MODIFIER));
324324

325325
for (MetaObject.ExceptionInfo aXType : exceptionTypes) {
326326
words.add(new ELEMENT(namesMapper.getType(aXType.exceptionStr),
@@ -330,9 +330,9 @@ private static void fillMethods(MetaObject.MethodInfo[] methods,
330330
}
331331
words.remove(words.size() - 1);
332332
}
333-
words.add(new ELEMENT("{ ... }\n", TAG.IDENTIFIER));
333+
words.add(new ELEMENT("{ ... }\n", TAG.DOCUMENT));
334334
}
335-
words.add(new ELEMENT("\n} ", TAG.IDENTIFIER));
335+
words.add(new ELEMENT("\n} ", TAG.DOCUMENT));
336336
}
337337

338338
public static void testJar() {

0 commit comments

Comments
 (0)