From 15787dee79bdc58900572e4ce0cd855c591bfe0d Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@woozle.org>
Date: Sat, 8 Dec 2012 18:21:12 -0700
Subject: [PATCH] Got it scaling right, finally.  Sheesh.

---
 Makefile            |  7 +++++--
 main.xml.m4         | 43 +++++++++++++++++++++++++++++++++++++++++++
 res/layout/main.xml | 14 --------------
 3 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 main.xml.m4
 delete mode 100644 res/layout/main.xml

diff --git a/Makefile b/Makefile
index 3429d9a..b220cb2 100644
--- a/Makefile
+++ b/Makefile
@@ -18,14 +18,17 @@ release-install: bin/PenaltyTimer-release.apk
 clean:
 	ant clean
 
+res/layout/main.xml: main.xml.m4
+	m4 $< > $@
+
 bin/PenaltyTimer-release.apk: bin/PenaltyTimer-release-unaligned.apk
 	$(ZIPALIGN) -f 4 $< $@
 	
 bin/PenaltyTimer-release-unaligned.apk: bin/PenaltyTimer-release-unsigned.apk
 	jarsigner -verbose -sigalg MD5withRSA -digestalg SHA1 -keystore $(KEYSTORE) -signedjar $@ $< $(ALIAS)
 
-bin/PenaltyTimer-release-unsigned.apk: src/org/woozle/penaltytimer/* res/*/*
+bin/PenaltyTimer-release-unsigned.apk: src/org/woozle/penaltytimer/* res/*/* res/layout/main.xml
 	ant release
 
-bin/PenaltyTimer-debug.apk: src/org/woozle/penaltytimer/* res/*/*
+bin/PenaltyTimer-debug.apk: src/org/woozle/penaltytimer/* res/*/* res/layout/main.xml
 	ant debug
diff --git a/main.xml.m4 b/main.xml.m4
new file mode 100644
index 0000000..f81110e
--- /dev/null
+++ b/main.xml.m4
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/main"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        >
+define(row, `<LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_weight="2"
+            android:orientation="horizontal"
+            >
+        <Button
+                android:id="@+id/$1"
+                android:text="★ $1"
+                android:textSize="24sp"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="fill_parent"
+                />
+        <Button
+                android:id="@+id/$2"
+                android:text="$2"
+                android:textSize="24sp"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="fill_parent"
+                />
+    </LinearLayout>')
+    row(jl, jr)
+    row(bl1, br1)
+    row(bl2, br2)
+    row(bl3, br3)
+    <Button 
+            android:id="@+id/pause"
+            android:text="Jam End"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_weight="2"
+            android:onClick="pauseButton"
+            />
+</LinearLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
deleted file mode 100644
index a51210b..0000000
--- a/res/layout/main.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/main"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical">
-    <Button 
-            android:id="@+id/pause"
-            android:text="Jam End"
-            android:layout_width="fill_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:onClick="pauseButton" />
-</LinearLayout>