ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-01-05 17:45:52 +01:00
Code Issues Projects Releases Wiki Activity

removes hacky @*android fix

Browse Source 
Updates unit-tests to actually use AOSP drawables/layouts/anims, instead of using 3rd party ones.
This commit is contained in:
Connor Tumbleson 2013-06-05 12:36:24 -05:00
parent a4a22a2961
commit 9f03d7d35c
10 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResArrayValue.java
View File

@ -49,11 +49,9 @@ public class ResArrayValue extends ResBagValue implements
ResResource res) throws IOException, AndrolibException {
String type = getType();
type = (type == null ? "" : type + "-") + "array";
// reference array (04 10 2012, BurgerZ)
if ("reference-array".equals(type)) {
type = "string-array";
}
// reference array (04 10 2012, BurgerZ)
serializer.startTag(null, type);
serializer.attribute(null, "name", res.getResSpec().getName());
for (int i = 0; i < mItems.length; i++) {

1
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResReferenceValue.java
View File

@ -50,7 +50,6 @@ public class ResReferenceValue extends ResIntValue {
// generate the beginning to fix @android
String mStart = (mTheme ? '?' : '@') + (newId ? "+" : "");
// mStart = mStart.replace("@android", "@*android");
return mStart
+ spec.getFullName(mPackage, mTheme

8
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java
View File

@ -42,11 +42,11 @@ public abstract class ResScalarValue extends ResValue implements
if (mRawValue != null) {
return mRawValue;
}
return encodeAsResXml().replace("@android:", "@*android:");
return encodeAsResXml();
}
public String encodeAsResXmlItemValue() throws AndrolibException {
return encodeAsResXmlValue().replace("@android:", "@*android:");
return encodeAsResXmlValue();
}
@Override
@ -54,11 +54,11 @@ public abstract class ResScalarValue extends ResValue implements
if (mRawValue != null) {
return mRawValue;
}
return encodeAsResXml().replace("@android:", "@*android:");
return encodeAsResXml();
}
public String encodeAsResXmlNonEscapedItemValue() throws AndrolibException {
return encodeAsResXmlValue().replace("@android:", "@*android:").replace("&amp;", "&").replace("&lt;","<");
return encodeAsResXmlValue().replace("&amp;", "&").replace("&lt;","<");
}
@Override

18
brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/anims.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<item name="test_anims1" type="anim">@*android:anim/grow_fade_in_from_bottom</item>
<item name="test_anims2" type="anim">@*android:anim/push_down_in</item>
<item name="test_anims3" type="anim">@*android:anim/push_down_out</item>
<item name="test_anims4" type="anim">@*android:anim/push_up_in</item>
<item name="test_anims5" type="anim">@*android:anim/push_up_out</item>
<item name="test_anims6" type="anim">@*android:anim/shrink_fade_out_from_bottom</item>
<item name="test_anims7" type="anim">@*android:anim/slide_out_down</item>
<item name="test_anims8" type="anim">@*android:anim/wallpaper_open_exit</item>
<item name="test_anims9" type="anim">@*android:anim/wallpaper_open_exit</item>
<item name="test_anims1" type="anim">@android:anim/bounce_interpolator</item>
<item name="test_anims2" type="anim">@android:anim/cycle_interpolator</item>
<item name="test_anims3" type="anim">@android:anim/decelerate_interpolator</item>
<item name="test_anims4" type="anim">@android:anim/fade_in</item>
<item name="test_anims5" type="anim">@android:anim/fade_out</item>
<item name="test_anims6" type="anim">@android:anim/linear_interpolator</item>
<item name="test_anims7" type="anim">@android:anim/overshoot_interpolator</item>
<item name="test_anims8" type="anim">@android:anim/slide_in_left</item>
<item name="test_anims9" type="anim">@android:anim/slide_out_right</item>
</resources>

2
brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/colors.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="test_color1">#ff123456</color>
<color name="test_color2">@*android:color/white</color>
<color name="test_color2">@android:color/white</color>
<color name="test_color3">#00000000</color>
</resources>

7
brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/drawables.xml
View File

@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<item name="test_drawable1" type="drawable">@*android:drawable/ab_bottom_solid_light_holo</item>
<item name="test_drawable2" type="drawable">@*android:drawable/btn_check_off_holo_light</item>
<item name="test_drawable3" type="drawable">@*android:drawable/btn_check_on_holo_light</item>
<item name="test_drawable4" type="drawable">@*android:drawable/btn_keyboard_key_fulltrans</item>
<item name="test_drawable5" type="drawable">#00000000</item>
<item name="test_drawable1" type="drawable">@android:drawable/btn_default</item>
<item name="test_drawable2" type="drawable">#00000000</item>
</resources>

8
brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/layouts.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<item name="test_layouts1" type="layout">@*android:layout/preference_header_item</item>
<item name="test_layouts2" type="layout">@*android:layout/preference_list_fragment</item>
<item name="test_layouts3" type="layout">@*android:layout/preference_widget_checkbox</item>
<item name="test_layouts4" type="layout">@*android:layout/preference_widget_switch</item>
<item name="test_layouts1" type="layout">@android:layout/activity_list_item</item>
<item name="test_layouts2" type="layout">@android:layout/browser_link_context_header</item>
<item name="test_layouts3" type="layout">@android:layout/simple_list_item_1</item>
<item name="test_layouts4" type="layout">@android:layout/simple_spinner_item</item>
</resources>

2
brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc001/styles.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="TextAppearance" parent="@*android:style/TextAppearance" />
<style name="TextAppearance" parent="@android:style/TextAppearance" />
<style name="TextAppearance.EditEvent_Label" parent="@style/TextAppearance">
<item name="android:gravity">center_vertical</item>
</style>

2
brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/values-mcc002/strings.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="test_reference1">@string/test1</string>
<string name="test_reference2">@*android:string/ok</string>
<string name="test_reference2">@android:string/ok</string>
<string name="test_reference3">?android:textStyle</string>
</resources>

2
brut.apktool/apktool-lib/src/test/resources/brut/apktool/testapp/res/xml/references.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<View xmlns:android="http://schemas.android.com/apk/res/android"
test1="@string/test1"
test2="@*android:string/ok"
test2="@android:string/ok"
test3="?android:textStyle"
/>