Skip to content

Commit ab4ae38

Browse files
intel478intel478
committed
read & write xml files;
added res files & folders to S.class; refactor app_icon.png;
1 parent d175313 commit ab4ae38

File tree

13 files changed

+269
-143
lines changed

13 files changed

+269
-143
lines changed

‎AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<application
2121
android:allowBackup="true"
22-
android:icon="@drawable/ic_launcher"
22+
android:icon="@drawable/app_icon"
2323
android:label="@string/appName"
2424
android:largeHeap="true"
2525
android:supportsRtl="true"

‎assets/ic_launcher.png

-16.4 KB
Binary file not shown.

‎res/drawable-hdpi/ic_launcher.png ‎res/drawable-hdpi/app_icon.png

File renamed without changes.

‎res/drawable-mdpi/ic_launcher.png ‎res/drawable-mdpi/app_icon.png

File renamed without changes.

‎res/drawable-xhdpi/ic_launcher.png ‎res/drawable-xhdpi/app_icon.png

File renamed without changes.

‎res/drawable-xxhdpi/ic_launcher.png ‎res/drawable-xxhdpi/app_icon.png

File renamed without changes.

‎res/layout/activity_self_compile.xml

+18-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<TextView
2121
android:layout_width="wrap_content"
2222
android:layout_height="wrap_content"
23-
android:text="You can change the appearance and functionality of this app.\nThe source code can be found on the SD card.\n\nShare the new app by simply placing your phone back to back with another Android phone (both having Android Beam enabled) and tap to send.\n"
23+
android:text="You can change the appearance and functionality of this app completely.\nThe source code can be found on the SD card.\n\nShare the new app by simply placing your phone back to back with another Android phone (both having Android Beam enabled), then tap to send.\n"
2424
android:textAppearance="?android:attr/textAppearanceSmall" />
2525

2626
<RelativeLayout
@@ -48,7 +48,7 @@
4848
<TextView
4949
android:layout_width="wrap_content"
5050
android:layout_height="wrap_content"
51-
android:text="\nChange icon &amp; name:\n"
51+
android:text="Change icon &amp; name:\n"
5252
android:textAppearance="?android:attr/textAppearanceMedium" />
5353

5454
<RelativeLayout
@@ -59,7 +59,7 @@
5959
android:id="@+id/btnAppIcon"
6060
android:layout_width="50dp"
6161
android:layout_height="50dp"
62-
android:onClick="btnPickIcon"
62+
android:onClick="btnAppIcon"
6363
android:scaleType="centerInside" />
6464

6565
<EditText
@@ -69,22 +69,34 @@
6969
android:layout_alignParentEnd="true"
7070
android:layout_centerVertical="true"
7171
android:layout_toEndOf="@+id/btnAppIcon"
72-
android:layout_toRightOf="@+id/btnAppIcon"
7372
android:ems="12"
7473
android:inputType="textCapWords" />
7574
</RelativeLayout>
7675

7776
<TextView
7877
android:layout_width="wrap_content"
7978
android:layout_height="wrap_content"
80-
android:text="\nChange colors:"
79+
android:text="\n\nChange theme &amp; colors:\n"
8180
android:textAppearance="?android:attr/textAppearanceMedium" />
8281

8382
<Spinner
8483
android:id="@+id/spnAppTheme"
8584
android:layout_width="match_parent"
8685
android:layout_height="wrap_content"
87-
tools:listitem="@android:layout/simple_spinner_item" />
86+
android:entries="@array/appThemes" />
87+
88+
<TextView
89+
android:layout_width="wrap_content"
90+
android:layout_height="wrap_content"
91+
android:text="\n\nChange package (no spaces):\n"
92+
android:textAppearance="?android:attr/textAppearanceMedium" />
93+
94+
<EditText
95+
android:id="@+id/txtAppPackage"
96+
android:layout_width="match_parent"
97+
android:layout_height="wrap_content"
98+
android:ems="12"
99+
android:inputType="text" />
88100
</LinearLayout>
89101
</ScrollView>
90102

‎res/values/strings.xml

+53-27
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,58 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33

4-
<string name="appName">SelfCompileApp</string>
5-
<string name="platform">android-18</string>
6-
<string name="keystore">Embedded.jks</string>
7-
<string name="keystorePw">android</string>
8-
<string name="certAlias">androiddebugkey</string>
9-
<string name="certPw">android</string>
10-
<string name="signatureAlgorithm">SHA1withRSA</string>
11-
<string name="btnMimicApp">Choose</string>
12-
<string name="btnReset">Reset</string>
13-
<string name="btnCancel">Cancel</string>
14-
<string name="btnInstall">Install</string>
15-
<string name="stsCancel">CANCELLING…</string>
16-
<string name="stsClean">REMOVE OLD FILES</string>
17-
<string name="stsUnpackSrc">UNPACK SOURCE CODE</string>
18-
<string name="stsUnpackDep">UNPACK DEPENDENCIES</string>
19-
<string name="runAidl">PROCESS INTERFACES</string>
20-
<string name="runAapt">PROCESS RESOURCES</string>
21-
<string name="compileJava">COMPILE SOURCE</string>
22-
<string name="dexLibs">PROCESS DEPENDENCIES</string>
23-
<string name="dexClasses">INTEGRATE DEPENDENCIES</string>
24-
<string name="buildApk">PACKAGE APP</string>
25-
<string name="addLibs">PACKAGE DEPENDENCIES</string>
26-
<string name="zipAssets">COMPRESSING RESOURCES</string>
27-
<string name="addAssets">PACKAGE RESOURCES</string>
28-
<string name="zipSign">PLACE SIGNATURE</string>
29-
<string name="zipAlign">OPTIMIZE APP</string>
30-
<string name="publishApk">PREPARE INSTALLATION</string>
4+
<string name="appName">SelfCompileApp</string>
5+
<string name="platform">android-18</string>
6+
<string name="keystore">Embedded.jks</string>
7+
<string name="keystorePw">android</string>
8+
<string name="certAlias">androiddebugkey</string>
9+
<string name="certPw">android</string>
10+
<string name="signatureAlgorithm">SHA1withRSA</string>
11+
<string name="btnMimicApp">Choose</string>
12+
<string name="btnReset">Reset</string>
13+
<string name="btnCancel">Cancel</string>
14+
<string name="btnInstall">Install</string>
15+
<string name="stsCancel">CANCELLING…</string>
16+
<string name="stsClean">REMOVE OLD FILES</string>
17+
<string name="stsUnpackSrc">UNPACK SOURCE CODE</string>
18+
<string name="stsUnpackDep">UNPACK DEPENDENCIES</string>
19+
<string name="runAidl">PROCESS INTERFACES</string>
20+
<string name="runAapt">PROCESS RESOURCES</string>
21+
<string name="compileJava">COMPILE SOURCE</string>
22+
<string name="dexLibs">PROCESS DEPENDENCIES</string>
23+
<string name="dexClasses">INTEGRATE DEPENDENCIES</string>
24+
<string name="buildApk">PACKAGE APP</string>
25+
<string name="addLibs">PACKAGE DEPENDENCIES</string>
26+
<string name="zipAssets">COMPRESSING RESOURCES</string>
27+
<string name="addAssets">PACKAGE RESOURCES</string>
28+
<string name="zipSign">PLACE SIGNATURE</string>
29+
<string name="zipAlign">OPTIMIZE APP</string>
30+
<string name="publishApk">PREPARE INSTALLATION</string>
31+
32+
<string-array name="appThemes">
33+
<item>android:Theme.DeviceDefault</item>
34+
<item>android:Theme.DeviceDefault.NoActionBar</item>
35+
<item>android:Theme.DeviceDefault.NoActionBar.Fullscreen</item>
36+
<item>android:Theme.DeviceDefault.Light</item>
37+
<item>android:Theme.DeviceDefault.Light.DarkActionBar</item>
38+
<item>android:Theme.DeviceDefault.Light.NoActionBar</item>
39+
<item>android:Theme.DeviceDefault.Light.NoActionBar.Fullscreen</item>
40+
<item>android:Theme.Holo</item>
41+
<item>android:Theme.Holo.NoActionBar</item>
42+
<item>android:Theme.Holo.NoActionBar.Fullscreen</item>
43+
<item>android:Theme.Holo.Light</item>
44+
<item>android:Theme.Holo.Light.DarkActionBar</item>
45+
<item>android:Theme.Holo.Light.NoActionBar</item>
46+
<item>android:Theme.Holo.Light.NoActionBar.Fullscreen</item>
47+
<item>android:Theme.Black</item>
48+
<item>android:Theme.Black.NoTitleBar</item>
49+
<item>android:Theme.Black.NoTitleBar.Fullscreen</item>
50+
<item>android:Theme.Light</item>
51+
<item>android:Theme.Light.NoTitleBar</item>
52+
<item>android:Theme.Light.NoTitleBar.Fullscreen</item>
53+
<item>android:Theme.Wallpaper</item>
54+
<item>android:Theme.Wallpaper.NoTitleBar</item>
55+
<item>android:Theme.Wallpaper.NoTitleBar.Fullscreen</item>
56+
</string-array>
3157

3258
</resources>

‎src/nl/tudelft/selfcompileapp/Aapt.java

+22-89
Original file line numberDiff line numberDiff line change
@@ -5,132 +5,65 @@
55
/**
66
* @author Tom Arn (www.t-arn.com)
77
*/
8-
class G {
9-
10-
static {
11-
stWorkDir = android.os.Environment.getExternalStorageDirectory().getPath() + "/.JNImain/";
12-
}
13-
14-
public static String stWorkDir;
15-
16-
// ===================================================================
17-
public static boolean fnCheckWorkDir()
18-
// ===================================================================
19-
{
20-
boolean ok = true;
21-
if (!new File(stWorkDir).exists()) {
22-
ok = false;
23-
System.err.println("Workdir missing");
24-
}
25-
return ok;
26-
}// fnCheckWorkDir
27-
28-
// ===================================================================
29-
public static boolean fnMakeLogDir()
30-
// ===================================================================
31-
{
32-
File dir;
33-
boolean ok = false;
34-
try {
35-
dir = new File(stWorkDir);
36-
if (!dir.exists())
37-
dir.mkdir();
38-
if (dir.isDirectory())
39-
ok = true;
40-
} catch (Exception e) {
41-
ok = false;
42-
}
43-
fnCheckWorkDir();
44-
return ok;
45-
} // fnMakeLogDir
46-
}
47-
48-
// ##################################################################
49-
public class Aapt
50-
// ##################################################################
51-
{
8+
public class Aapt {
529
private static boolean bInitialized = false;
5310

5411
private native int JNImain(String args);
5512

56-
// ===================================================================
57-
public Aapt()
58-
// ===================================================================
59-
{
60-
if (!bInitialized)
13+
public Aapt() {
14+
if (!bInitialized) {
6115
fnInit();
62-
} // constructor
63-
// ===================================================================
64-
65-
private static boolean fnInit()
66-
// ===================================================================
67-
{
68-
boolean ok = G.fnMakeLogDir();
69-
if (!ok) {
70-
System.err.println("Error mkdir: " + G.stWorkDir);
71-
return false;
7216
}
17+
}
18+
19+
public boolean isInitialized() {
20+
return bInitialized;
21+
}
22+
23+
private static boolean fnInit() {
7324
try {
7425
System.out.println("Loading native library aaptcomplete...");
7526
System.loadLibrary("aaptcomplete");
7627
bInitialized = true;
77-
ok = true;
28+
return true;
7829
} catch (Exception e) {
7930
System.err.println(e.getMessage());
80-
ok = false;
31+
return false;
8132
}
82-
return ok;
83-
} // fnInit
84-
// ===================================================================
33+
}
8534

86-
public synchronized int fnExecute(String args)
87-
// ===================================================================
88-
{
35+
public synchronized int fnExecute(String args) {
8936
int rc = 99;
90-
9137
System.out.println("Calling JNImain...");
9238
rc = JNImain(args.replace(' ', '\t'));
9339
System.out.println("Result from native lib=" + rc);
9440
fnGetNativeOutput();
9541
return rc;
96-
} // fnExecute
97-
// ===================================================================
42+
}
9843

99-
private void fnGetNativeOutput()
100-
// ===================================================================
101-
{
44+
private void fnGetNativeOutput() {
10245
LineNumberReader lnr;
10346
String st = "";
104-
10547
try {
106-
lnr = new LineNumberReader(new FileReader(G.stWorkDir + "native_stdout.txt"));
48+
lnr = new LineNumberReader(new FileReader(S.txtOut));
10749
st = "";
10850
while (st != null) {
10951
st = lnr.readLine();
11052
if (st != null)
11153
System.out.println(st);
112-
} // while
54+
}
11355
lnr.close();
114-
115-
lnr = new LineNumberReader(new FileReader(G.stWorkDir + "native_stderr.txt"));
56+
lnr = new LineNumberReader(new FileReader(S.txtErr));
11657
st = "";
11758
while (st != null) {
11859
st = lnr.readLine();
11960
if (st != null)
12061
System.err.println(st);
121-
} // while
62+
}
12263
lnr.close();
12364
} catch (Exception e) {
12465
System.err.println(e.getMessage());
12566
}
126-
} //
127-
// ===================================================================
67+
}
12868

129-
public boolean isInitialized()
130-
// ===================================================================
131-
{
132-
return bInitialized;
133-
} //
134-
// ===================================================================
135-
}
136-
// ##################################################################
69+
}

‎src/nl/tudelft/selfcompileapp/BuildTask.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ private void dexMerge() throws Exception {
108108
}
109109

110110
private void buildApk() throws Exception {
111-
// Do NOT use embedded JarSigner
111+
// Do NOT use ApkBuilder's embedded JarSigner
112112
PrivateKey privateKey = null;
113113
X509Certificate x509Cert = null;
114114

0 commit comments

Comments
 (0)