mavenized

.gitignore

@@ -8,3 +8,5 @@ out
 .DS_Store
 generated
 nbproject/private
+target
+

iphone/pom.xml

@@ -0,0 +1,96 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>de.tisoft.kinderlieder</groupId>
+	<artifactId>iphone</artifactId>
+	<version>1.4-SNAPSHOT</version>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.xmlvm</groupId>
+			<artifactId>objc-compat-lib</artifactId>
+			<version>0.1-SNAPSHOT</version>
+			<scope>system</scope>
+			<systemPath>${xmlvm.sdk.path}/dist/lib/objc-compat.jar</systemPath>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>com.pyx4me</groupId>
+				<artifactId>proguard-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>proguard</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<obfuscate>false</obfuscate>
+					<libs>
+						<lib>${xmlvm.sdk.path}/lib/harmony6-build.jar</lib>
+					</libs>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>prepare</id>
+						<phase>package</phase>
+						<configuration>
+							<tasks>
+								<echo message="package phase" />
+								<unzip src="target/${build.finalName}.jar" dest="target/extracted/classes">
+									<patternset>
+										<include name="**/*.class" />
+									</patternset>
+								</unzip>
+								<unzip src="target/${build.finalName}.jar" dest="target/extracted/resources">
+									<patternset>
+										<exclude name="**/*.class" />
+										<exclude name="META-INF/**" />
+									</patternset>
+								</unzip>
+							</tasks>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>de.tisoft.xmlvm</groupId>
+				<artifactId>xmlvm-maven-plugin</artifactId>
+				<version>0.0.1-SNAPSHOT</version>
+				<executions>
+					<execution>
+						<id>generate</id>
+						<goals>
+							<goal>generate-xmlvm</goal>
+						</goals>
+						<phase>package</phase>
+						<configuration>
+							<app_name>Kinderlieder</app_name>
+							<xcodeProject>ios</xcodeProject>
+							<bundleIdentifier>de.tisoft.kinderlieder</bundleIdentifier>
+							<target>iphonec</target>
+							<in>${project.build.directory}/extracted/classes</in>
+							<out>${project.build.directory}</out>
+							<resources>
+								<resource>extracted/resources/</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+		</plugins>
+	</build>
+</project>

iphone/proguard.conf

@@ -0,0 +1,25 @@
+-dontoptimize
+
+-keepattributes *Annotation*
+
+# Keep Main Applications
+-keepclasseswithmembers class my.kinderlieder.Main {
+	public static void main(java.lang.String[]);
+}
+
+
+# Also keep - Enumerations. Keep special static methods that are required in
+# enumeration classes.
+-keepclassmembers class * extends java.lang.Enum {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+# Keep names - Native method names. Keep all native class/method names.
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+# Keep xmlvm stuff
+-keep class * extends org.xmlvm.iphone.* {
+}

src/java/my/kinderlieder/Main.java → iphone/src/main/java/my/kinderlieder/Main.java

@@ -25,7 +25,7 @@ public static AVAudioPlayer getAudioPlayer() {
 
     @Override
     public void applicationDidFinishLaunching(UIApplication app) {
-        final UIWindow window = new UIWindow(UIScreen.mainScreen().getBounds());
+        final UIWindow window = new UIWindow(org.xmlvm.iphone.UIScreen.mainScreen().getBounds());
 
         File f = new File(NSBundle.mainBundle().pathForResource("info", "html")).getParentFile();//can't get directory path on iOS 3.2 directly
 

src/java/my/kinderlieder/PdfViewVontroller.java → iphone/src/main/java/my/kinderlieder/PdfViewVontroller.java

@@ -80,7 +80,7 @@ public void clicked() {
                 setToolbarItems(new ArrayList<UIBarButtonItem>(buttonsPlay));
             }
         });
-        repeat=false;
+        repeat = false;
         Main.getAudioPlayer().setNumberOfLoops(0);
         repeatButton = new UIBarButtonItem(UIImage.imageNamed("repeat.png"), UIBarButtonItemStyle.Plain, new UIBarButtonItemDelegate() {
             public void clicked() {

src/java/my/kinderlieder/RootViewController.java → iphone/src/main/java/my/kinderlieder/RootViewController.java

@@ -17,14 +17,14 @@ public void raiseEvent(UIControl sender, int uiControlEvent) {
                 getNavigationController().pushViewController(infoController, true);
             }
         }, UIControlEvent.TouchUpInside);
-        final UIButton shopButton = UIButton.buttonWithType(UIButtonType.Custom);
+        final UIButton shopButton = UIButton.buttonWithType(UIButtonType.InfoLight);
         shopButton.setTitle("Shop", UIControlState.Normal);
         shopButton.addTarget(new UIControlDelegate() {
-             public void raiseEvent(UIControl sender, int uiControlEvent) {
-                 UIViewController shopController = new ShopViewController(window);
-                 getNavigationController().pushViewController(shopController, true);
-             }
-         }, UIControlEvent.TouchUpInside);
+            public void raiseEvent(UIControl sender, int uiControlEvent) {
+                UIViewController shopController = new ShopViewController(window);
+                getNavigationController().pushViewController(shopController, true);
+            }
+        }, UIControlEvent.TouchUpInside);
         setToolbarItems(new ArrayList<UIBarButtonItem>(Arrays.asList(new UIBarButtonItem(infoButton), new UIBarButtonItem(shopButton))));
         setView(mainView);
         mainView.setDataSource(new UITableViewDataSource() {
@@ -49,7 +49,7 @@ public void didSelectRowAtIndexPath(UITableView tableview, NSIndexPath indexPath
                 final UIViewController pdfViewController = new PdfViewVontroller(songInfo, window);
                 getNavigationController().setToolbarHidden(false, true);
                 getNavigationController().pushViewController(pdfViewController, true);
-            }            
+            }
         });
 
     }

src/java/my/kinderlieder/ShopViewController.java → iphone/src/main/java/my/kinderlieder/ShopViewController.java

@@ -56,10 +56,10 @@ public void clickedButtonAtIndex(UIAlertView alertView, int buttonIndex) {
         setView(infoView);
 
         try {
-            URL url=new URL("http://192.168.178.23:8080/api/products");
-            BufferedReader br=new BufferedReader(new InputStreamReader(url.openStream()));
+            URL url = new URL("http://192.168.178.23:8080/api/products");
+            BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
             String line;
-            while((line=br.readLine())!=null){
+            while ((line = br.readLine()) != null) {
                 System.out.println(line);
             }
         } catch (MalformedURLException e) {

src/java/my/kinderlieder/SongInfo.java → iphone/src/main/java/my/kinderlieder/SongInfo.java

@@ -6,8 +6,8 @@ public class SongInfo {
     public final String m4aPath;
 
     public SongInfo(String name, String pdfPath, String m4aPath) {
-        this.name=name;
-        this.pdfPath=pdfPath;
+        this.name = name;
+        this.pdfPath = pdfPath;
         this.m4aPath = m4aPath;
     }
 }

iphone/src/main/resources/kinderlieder.properties

@@ -0,0 +1,49 @@
+01_-_Kinder_wollen_singen_-_Alle_meine_Entchen.ly
+02_-_Kinder_wollen_singen_-_Alle_Voegel_sind_schon_da.ly
+03_-_Kinder_wollen_singen_-_Auf_der_Mauer_auf_der_Lauer.ly
+04_-_Kinder_wollen_singen_-_Auf_unsrer_Wiese_gehet_was.ly
+05_-_Kinder_wollen_singen_-_Backe_backe_Kuchen.ly
+06_-_Kinder_wollen_singen_-_Bruder_Jakob.ly
+07_-_Kinder_wollen_singen_-_Das_Wandern_ist_des_Muellers_Lust.ly
+08_-_Kinder_wollen_singen_-_Der_Kuckuck_und_der_Esel.ly
+09_-_Kinder_wollen_singen_-_Die_Affen_rasen_durch_den_Wald.ly
+10_-_Kinder_wollen_singen_-_Der_Mond_ist_aufgegangen.ly
+11_-_Kinder_wollen_singen_-_Die_Gedanken_sind_frei.ly
+12_-_Kinder_wollen_singen_-_Die_Handwerker.ly
+13_-_Kinder_wollen_singen_-_Die_Vogelhochzeit.ly
+14_-_Kinder_wollen_singen_-_3_Chinesen_mit_dem_Kontrabass.ly
+15_-_Kinder_wollen_singen_-_Ein_Maennlein_steht_im_Walde.ly
+16_-_Kinder_wollen_singen_-_Es_klappert_die_Muehle_am_rauschenden_Bach.ly
+17_-_Kinder_wollen_singen_-_Es_tanzt_ein_Bi-Ba-Butzemann.ly
+18_-_Kinder_wollen_singen_-_Es_war_eine_Mutter.ly
+19_-_Kinder_wollen_singen_-_Froh_zu_sein_bedarf_es_wenig.ly
+20_-_Kinder_wollen_singen_-_Gruen_gruen_gruen_sind_alle_meine_Kleider.ly
+21_-_Kinder_wollen_singen_-_Fuchs_Du_hast_die_Gans_gestohlen.ly
+22_-_Kinder_wollen_singen_-_Hoppe_hoppe_Reiter.ly
+23_-_Kinder_wollen_singen_-_Haenschen_Klein.ly
+24_-_Kinder_wollen_singen_-_Haensel_und_Gretel.ly
+25_-_Kinder_wollen_singen_-_Haeschen_in_der_Grube.ly
+26_-_Kinder_wollen_singen_-_Ich_geh_mit_meiner_Laterne.ly
+27_-_Kinder_wollen_singen_-_Ihr_Kinderlein_kommet.ly
+28_-_Kinder_wollen_singen_-_Jack_sass_in_der_Kueche.ly
+29_-_Kinder_wollen_singen_-_Jetzt_fahrn_wir_uebern_see.ly
+30_-_Kinder_wollen_singen_-_Kommt_ein_Vogel_geflogen.ly
+31_-_Kinder_wollen_singen_-_Kuckuck_Kuckuck_rufts_aus_dem_Wald.ly
+32_-_Kinder_wollen_singen_-_Lasst_uns_froh_und_munter_sein.ly
+33_-_Kinder_wollen_singen_-_Laterne_Laterne.ly
+34_-_Kinder_wollen_singen_-_Leise_rieselt_der_Schnee.ly
+35_-_Kinder_wollen_singen_-_Lirum_Larum_Loeffelstiel.ly
+36_-_Kinder_wollen_singen_-_Dornroeschen_war_ein_schoenes_Kind.ly
+37_-_Kinder_wollen_singen_-_Morgen_Kinder_wirds_was_geben.ly
+38_-_Kinder_wollen_singen_-_O_du_lieber_Augustin.ly
+39_-_Kinder_wollen_singen_-_O_Tannenbaum.ly
+40_-_Kinder_wollen_singen_-_Sankt_Martin_Sankt_Martin.ly
+41_-_Kinder_wollen_singen_-_Schlaf_Kindlein_schlaf.ly
+42_-_Kinder_wollen_singen_-_Schneefloeckchen_Weissroeckchen.ly
+43_-_Kinder_wollen_singen_-_Still_still_still.ly
+44_-_Kinder_wollen_singen_-_Stille_Nacht_heilige_Nacht.ly
+45_-_Kinder_wollen_singen_-_Summ_summ_summ.ly
+46_-_Kinder_wollen_singen_-_Taler_Taler__du_musst_wandern.ly
+47_-_Kinder_wollen_singen_-_Weisst_du_wieviel_Sternlein_stehen.ly
+48_-_Kinder_wollen_singen_-_Wer_hat_die_schoensten_Schaefchen.ly
+49_-_Kinder_wollen_singen_-_Widele_wedele.ly