calculator: rename android_calculator to android14

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/examples/calculator/Makefile b/examples/calculator/Makefile
index 8cb0968..21d74f8 100644 (file)
--- a/examples/calculator/Makefile
+++ b/examples/calculator/Makefile
@@ -18,29 +18,29 @@ bin/scientific: $(shell ${NITLS} -M scientific linux) ${NITC}
 # * scientific vs non-scientific
 # * android API 21+ vs under 21
 
-android: bin/calculator.apk bin/scientific.apk bin/calculator21.apk bin/scientific21.apk
+android: bin/calculator14.apk bin/scientific14.apk bin/calculator21.apk bin/scientific21.apk
 
-bin/calculator.apk: $(shell ${NITLS} -M src/android_calculator.nit) ${NITC} android/res/drawable-hdpi/icon.png
+bin/calculator14.apk: $(shell ${NITLS} -M src/android14.nit) ${NITC} android/res/drawable-hdpi/icon.png
        mkdir -p bin
-       ${NITC} -o $@ src/android_calculator.nit -D debug
+       ${NITC} -o $@ src/android14.nit -D debug
 
 bin/calculator21.apk: $(shell ${NITLS} -M src/android21) ${NITC} android/res/drawable-hdpi/icon.png
        mkdir -p bin
        ${NITC} -o $@ src/android21 -D debug
 
-bin/scientific.apk: $(shell ${NITLS} -M src/scientific src/android_calculator.nit) ${NITC} src/scientific/android/res/drawable-hdpi/icon.png
+bin/scientific14.apk: $(shell ${NITLS} -M src/scientific src/android14.nit) ${NITC} src/scientific/android/res/drawable-hdpi/icon.png
        mkdir -p bin
-       ${NITC} -o $@ src/scientific -m src/android_calculator.nit -D debug
+       ${NITC} -o $@ src/scientific -m src/android14.nit -D debug
 
 bin/scientific21.apk: $(shell ${NITLS} -M src/scientific src/android21) ${NITC} src/scientific/android/res/drawable-hdpi/icon.png
        mkdir -p bin
        ${NITC} -o $@ src/scientific -m src/android21 -D debug
 
-android-release: $(shell ${NITLS} -M src/scientific src/android_calculator.nit) ${NITC} android/res/drawable-hdpi/icon.png
+android-release: $(shell ${NITLS} -M src/scientific src/android14.nit) ${NITC} android/res/drawable-hdpi/icon.png
        mkdir -p bin
-       ${NITC} -o bin/calculator.apk src/android_calculator.nit --release
+       ${NITC} -o bin/calculator14.apk src/android14.nit --release
        ${NITC} -o bin/calculator21.apk src/android21 --release
-       ${NITC} -o bin/scientific.apk src/scientific -m src/android_calculator.nit --release
+       ${NITC} -o bin/scientific14.apk src/scientific -m src/android14.nit --release
        ${NITC} -o bin/scientific21.apk src/scientific -m src/android21 --release
 
 android/res/drawable-hdpi/icon.png: art/icon.svg ../../contrib/inkscape_tools/bin/svg_to_icons
@@ -54,8 +54,8 @@ src/scientific/android/res/drawable-hdpi/icon.png: art/icon-sci.svg ../../contri
 ../../contrib/inkscape_tools/bin/svg_to_icons:
        make -C ../../contrib/inkscape_tools/
 
-android-install: bin/calculator.apk
-       adb install -r bin/calculator.apk
+android-install: bin/calculator14.apk
+       adb install -r bin/calculator14.apk
 
 # ---
 # iOS

diff --git a/examples/calculator/src/android_calculator.nit b/examples/calculator/src/android14.nit
similarity index 97%
rename from examples/calculator/src/android_calculator.nit
rename to examples/calculator/src/android14.nit
index 8bdbdc8..8695c3b 100644 (file)
--- a/examples/calculator/src/android_calculator.nit
+++ b/examples/calculator/src/android14.nit
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Aesthetic adaptations for Android
-module android_calculator
+# Aesthetic adaptations for Android for API 14+
+module android14
 
 import calculator
 import android

diff --git a/examples/calculator/src/android21/android21.nit b/examples/calculator/src/android21/android21.nit
index 421bd1f..36d1025 100644 (file)
--- a/examples/calculator/src/android21/android21.nit
+++ b/examples/calculator/src/android21/android21.nit
@@ -20,7 +20,7 @@ module android21 is
        app_files
 end
 
-import android_calculator
+import android14
 
 redef class TextInput
        init do