Commit Graph

133 Commits

Author SHA1 Message Date
Ryszard Wiśniewski
4a0febd862 ResScalarValue: removed serializeXmlBody().
It didn't make much sense.
2011-12-02 02:49:46 +01:00
Ryszard Wiśniewski
8b6e02b41a ResXmlEncoders::findNonPositionalSubstitutions(): it now really finds non-positional substs only.
It was showing all substs including positional ones.
2011-12-02 02:41:21 +01:00
Ryszard Wiśniewski
3ed49c83cb Added tests for positional substitutions in string and string-array. 2011-12-02 02:21:07 +01:00
Ryszard Wiśniewski
2aa7a70b74 Updated smali to 1.3.0-brut6 . 2011-11-29 00:07:10 +01:00
Ryszard Wiśniewski
5d05136ab7 ApkDecoder.writeMetaFile(): don't write framework info if not decoding resources. 2011-11-10 00:11:47 +01:00
Ryszard Wiśniewski
fafc3f447c Added tests and support for -television qualifier (API13). 2011-11-05 18:13:12 +01:00
Ryszard Wiśniewski
8b285989d2 Added support for API13 resource qualifiers. 2011-11-05 02:12:56 +01:00
Ryszard Wiśniewski
4c01265009 Added tests for API13 resource qualifiers. 2011-11-05 01:49:45 +01:00
Ryszard Wiśniewski
46cdbd8f8d ARSCDecoder:readConfigFlags(): fixed format of logging of exceeding bytes. 2011-11-05 01:48:33 +01:00
Ryszard Wiśniewski
f056603d8c Hardcoded project.version in POMs, removed ${aversion} property.
Property substitution is not allowed in /project/parent/(groupId|artifactId|version) or in /project/(groupId|artifactId|version) - it sometimes works and sometimes not.
2011-11-05 00:52:42 +01:00
Ryszard Wiśniewski
269870bad6 ResXmlEncoders::findNonPositionalSubstitutions() : fixed a bug when string ends with percentage char. 2011-05-17 10:28:49 +02:00
Ryszard Wiśniewski
c74b2ab04f Added test for literal with percentage char at the end. 2011-05-17 10:26:36 +02:00
Ryszard Wiśniewski
0c428dd7c7 ResPluralsValue: now stores array of ResScalarValue instead of ResStringValue.
Plurals contain strings, but they could use e.g. references. It'll be safer to let them store any scalar value.
2011-05-17 10:01:21 +02:00
Ryszard Wiśniewski
b539c3c1a1 Add commit hash to a version name of snapshot builds. 2011-05-17 10:01:06 +02:00
Ryszard Wiśniewski
f52dccc010 pom.xml: do not filter android-framework.jar . 2011-05-15 20:30:54 +02:00
Ryszard Wiśniewski
e0a0769704 Androlib::getVersion() : read version from apktool.properties ." 2011-05-15 17:09:06 +02:00
Ryszard Wiśniewski
84a0972526 +apktool.properties +ApktoolProperties 2011-05-15 17:09:06 +02:00
Ryszard Wiśniewski
f1fed7a75e Moved <resource> from /apktool-lib/pom.xml to /pom.xml . 2011-05-15 17:09:06 +02:00
Ryszard Wiśniewski
ab95908908 pom.xml: added aversion property. 2011-05-15 17:09:06 +02:00
Ryszard Wiśniewski
06dfa4c95f Updated builtin framework to API 12 (Android v3.1). 2011-05-14 17:44:20 +02:00
Ryszard Wiśniewski
679078d962 ResXmlEncoders::encodeAsXmlValue() : fixes for style tags mixed up with spaces. 2011-05-14 13:17:59 +02:00
Ryszard Wiśniewski
549dc9e3f4 Updated test for literals with style tags - added some spaces. 2011-05-14 13:16:08 +02:00
Ryszard Wiśniewski
f53971f09f ResPluralsValue: don't encode values in constructor, but in serializeToResValuesXml().
This may speed up loading of frameworks.
2011-05-14 13:14:44 +02:00
Ryszard Wiśniewski
1042a72958 ResXmlEncoders: added findNonPositionalSubstitutions(), use it in hasMultipleNonPositionalSubstitutions(), enumerateNonPositionalSubstitutions(). 2011-05-14 12:02:02 +02:00
Ryszard Wiśniewski
316353f83f ResStringValue::encodeAsXmlValue() : enumerate non-positional substitutions. 2011-05-14 03:49:24 +02:00
Ryszard Wiśniewski
5363b7f470 ResScalarValue +serializeXmlBody() 2011-05-14 03:48:32 +02:00
Ryszard Wiśniewski
265ee7ceac ResXmlEncoders +hasMultipleNonPositionalSubstitutions() +enumerateNonPositionalSubstitutions() . 2011-05-14 03:47:41 +02:00
Ryszard Wiśniewski
19b5e2726a Removed unused imprt. 2011-05-14 02:32:29 +02:00
Ryszard Wiśniewski
113965e5b5 Added test for a literal with single substitution (should not add formatted="false"). 2011-05-14 02:00:54 +02:00
Ryszard Wiśniewski
27fd99ea8c Remove tmp files after running tests - accidentially broken in 28831ed . 2011-05-14 01:57:29 +02:00
Ryszard Wiśniewski
e59d3bf84a Added support for res/mipmap* . 2011-05-14 00:54:42 +02:00
Ryszard Wiśniewski
f175408823 Updated brut.apktool.smali to v1.2.6-brut5 . 2011-05-14 00:40:57 +02:00
Ryszard Wiśniewski
9fd97ca9a5 ResStringValue: added support for strings which require formatted="false". 2011-05-10 17:13:54 +02:00
Ryszard Wiśniewski
99882396b9 ResScalarValue +serializeExtraXmlAttrs() . 2011-05-10 17:12:27 +02:00
Ryszard Wiśniewski
0f251a0fd9 ResXmlEncoders::encodeAsXmlValue() : properly encode strings with styles and new lines. 2011-05-10 16:58:32 +02:00
Ryszard Wiśniewski
8dcbe6ead7 Added test for string literal with formatted="false". 2011-05-10 16:56:00 +02:00
Ryszard Wiśniewski
1e87038c39 Added a test for literal with mixed style tags and new lines. 2011-05-10 16:54:31 +02:00
Ryszard Wiśniewski
28831eda06 Moved ResValuesXmlSerializable to brut.androlib.res.xml package. 2011-05-09 11:25:45 +02:00
Ryszard Wiśniewski
e23bf8e70d Added ResXmlEncoders class and use it instead of encoding methods in AndrolibResources. 2011-05-09 11:23:16 +02:00
Ryszard Wiśniewski
30add278d5 ResScalarValue::encodeAsResXml*() : use raw value if there is one. 2011-05-09 11:19:00 +02:00
Ryszard Wiśniewski
31274e73dc ResXmlEncodable: splitted toResXmlFormat() into 2 methods: encodeAsResXmlAttr() and encodeAsResXmlValue(). 2011-05-09 11:17:50 +02:00
Ryszard Wiśniewski
b3866d034d ResAttr::convertToResXmlFormat() : now it returns null if it can't convert a value.
Since now this method was calling toResXmlFormat() on an unconvertable value and was always returning a string. But because of that calling object couldn't know, whether returned value is converted one or not.
2011-05-09 11:07:00 +02:00
Ryszard Wiśniewski
fc814c50d8 Removed some unused or obsolete imports and "implements" declarations. 2011-05-09 10:56:45 +02:00
Ryszard Wiśniewski
70834e2342 ResStringValue: use mRawValue instead of mValue. 2011-05-09 10:49:22 +02:00
Ryszard Wiśniewski
b0ad7517b7 ResValueFactory::factory() : decode TYPE_STRING values. 2011-05-09 10:46:52 +02:00
Ryszard Wiśniewski
5740064cee Extract and store raw value of ResScalarValue.
Many attr values in axml files store their raw string value. Now it's extracted, so any ResScalarValue could make some use of it.
2011-05-09 10:41:29 +02:00
Ryszard Wiśniewski
7d4edce7ee brut.androlib.res.data.value.ResXmlPrintable -> brut.androlib.res.xml.ResXmlEncodable . 2011-05-09 10:16:20 +02:00
Ryszard Wiśniewski
41134c6b91 Modified literals tests, so they enclose value in "" instead of escaping special chars. 2011-05-09 09:41:57 +02:00
Ryszard Wiśniewski
e70916dfcd Added test for "005" value in xml attr. 2011-05-09 09:39:49 +02:00
Ryszard Wiśniewski
e3b53d4f04 ResXmlSerializable -> ResValuesXmlSerializable, serializeToXml() -> serializeToResValuesXml(). 2011-05-07 20:08:41 +02:00
Ryszard Wiśniewski
a5a9693de9 Added tests for literals with consecutive spaces, new lines and style tags. 2011-05-07 13:29:51 +02:00
Ryszard Wiśniewski
7ebf00a828 testapp: made literals as simple as they can be.
Eg. \" in strings.xml and &quot; in literals.xml instead of \&quot; in both places.
2011-05-07 13:17:21 +02:00
Ryszard Wiśniewski
e338168ae2 testapp: made names of literals in strings.xml and literals.xml consistent. 2011-05-07 13:13:25 +02:00
Ryszard Wiśniewski
9612159d25 Updated android-framework.jar to API Level 11. 2011-05-03 23:01:48 +02:00
Ryszard Wiśniewski
945430d5aa Added support for -xlarge and -xhdpi qualifiers. 2011-05-03 20:21:23 +02:00
Ryszard Wiśniewski
130856ccb8 Added resource qualifiers test. 2011-05-03 20:20:39 +02:00
Ryszard Wiśniewski
102597ef4c Escape unicode chars in XML files. 2011-05-03 16:59:40 +02:00
Ryszard Wiśniewski
501a92d733 AndrolibResources +isPrintableChar() 2011-05-03 16:59:40 +02:00
Ryszard Wiśniewski
f041f091c5 Added tests for unicode literals. 2011-05-03 16:54:49 +02:00
Ryszard Wiśniewski
2ac33fd5e7 Sort framework ids before storing them in apktool.yml .
aapt command requires your to include frameworks in order.
2011-05-03 13:12:28 +02:00
Ryszard Wiśniewski
6c051148b5 AXmlResourceParser::getAttributeValue(): do not use raw value for color values. 2011-05-03 05:08:08 +02:00
Ryszard Wiśniewski
93af3fe56d Added a test for color value in XML attribute. 2011-05-03 05:07:06 +02:00
Ryszard Wiśniewski
fb5115e56d Escape '"' as '\&quot;' in XML files. 2011-05-03 04:50:54 +02:00
Ryszard Wiśniewski
5c3c1b5be3 Added tests for '\'' and '"' literals. 2011-05-03 04:49:20 +02:00
Ryszard Wiśniewski
76d8aa0abc AXmlResourceParser::getAttributeValue(): do not use raw value for references and styles. 2011-05-03 03:51:51 +02:00
Ryszard Wiśniewski
855f664d40 Disabled escaping of XML attr values.
They're already escaped in AXML files.
2011-05-03 03:32:41 +02:00
Ryszard Wiśniewski
90f789ff01 ExtXmlSerializer: added possibility to disable escaping of attr values. 2011-05-03 03:31:52 +02:00
Ryszard Wiśniewski
888c9082ce Added many new literal and reference tests. 2011-05-03 02:26:40 +02:00
Ryszard Wiśniewski
018c40b72a Changed encoding of generated XML files from UTF-8 to utf-8.
It's more consistent with Android SDK, because android command creates projects with "utf-8".
2011-05-03 01:11:49 +02:00
Ryszard Wiśniewski
edaa2e8163 Added cross-type resources tests.
E.g. <item type="integer" name="test">TEST</item> or <item type="string" name="test">#ffcc00</item> - they must be decoded as <item />.
2011-05-02 03:41:08 +02:00
Ryszard Wiśniewski
e4acfb34a2 Do not decode res-references as <item />.
So now they're decoded as e.g. <string name="test">@android:string/ok</string> instead of <item type="string" name="test">@android:string/ok</item>.
2011-05-02 03:35:03 +02:00
Ryszard Wiśniewski
d86909707b apktool-lib: added basic tests for resources building/decoding. 2011-05-02 02:05:46 +02:00
Ryszard Wiśniewski
e1f3ab852a Add new line at the end of decoded XML file. 2011-05-02 01:50:26 +02:00
Ryszard Wiśniewski
26cdc8299a Added ExtXmlSerializer interface. 2011-05-02 01:44:34 +02:00
Ryszard Wiśniewski
b11d41aefb XmlPullStreamDecoder: do not close streams after decode.
They're passed to XmlPullStreamDecoder, so should be managed by calling object.
2011-05-02 00:36:35 +02:00
Ryszard Wiśniewski
f05f264182 ResConfigFlags: added zero-padding of MCC qualifiers.
MCC must be 3-digits long. Official documentation does not specify that, but aapt throws errors if you create e.g. values-mcc1 dir.
2011-05-01 19:08:01 +02:00
Ryszard Wiśniewski
0bd967bacc Merge branch 'master' into arichnad 2011-04-26 03:22:37 +02:00
Ryszard Wiśniewski
68937b969e pom.xml: added root.basedir property. 2011-04-26 03:17:57 +02:00
adrian
253a95c98d minor: input file might not exist. 2011-04-26 02:09:36 +02:00
adrian
74ecd31a4d I get a null pointer exception if this isn't a resource. 2011-04-26 02:09:36 +02:00
Ryszard Wiśniewski
606cbb2197 lib/pom.xml: changed smaliVersion to 1.2.4-brut3 . 2011-01-19 20:49:46 +01:00
Ryszard Wiśniewski
855d521a1f lib/pom.xml: added smaliVersion property. 2011-01-19 20:48:59 +01:00
Ryszard Wiśniewski
a3ff517cc0 Prefixed lib and cli dir names with apktool- . 2011-01-18 01:55:38 +01:00