From 13bd906a9ec667edc34e8ea8695985ea96d2bfa4 Mon Sep 17 00:00:00 2001 From: Jon Benson Date: Mon, 6 May 2013 18:46:59 +1000 Subject: [PATCH] Starting work on modifying mobile app action bar. --- .gitattributes | 22 +++++++++++++++++++ build.py | 4 ++++ mobile/res/menu/main.xml | 5 +++++ mobile/res/values/strings.xml | 1 + .../com/cradle/iitc_mobile/IITC_Mobile.java | 7 ++++++ 5 files changed, 39 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..412eeda7 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,22 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp +*.sln merge=union +*.csproj merge=union +*.vbproj merge=union +*.fsproj merge=union +*.dbproj merge=union + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/build.py b/build.py index a81bfe34..8cf81b1e 100755 --- a/build.py +++ b/build.py @@ -220,6 +220,10 @@ if buildMobile: # copy the user location script into the mobile folder. shutil.copy(os.path.join(outDir,"user-location.user.js"), "mobile/assets/user-location.user.js") # also copy plugins + try: + os.makedirs("mobile/assets/plugins") + except: + pass shutil.rmtree("mobile/assets/plugins") shutil.copytree(os.path.join(outDir,"plugins"), "mobile/assets/plugins", ignore=shutil.ignore_patterns('*.meta.js', 'force-https*')) diff --git a/mobile/res/menu/main.xml b/mobile/res/menu/main.xml index a80f271a..c7497591 100644 --- a/mobile/res/menu/main.xml +++ b/mobile/res/menu/main.xml @@ -27,4 +27,9 @@ android:showAsAction="ifRoom" android:title="@string/locate"> + + \ No newline at end of file diff --git a/mobile/res/values/strings.xml b/mobile/res/values/strings.xml index 28905280..0c8cdd72 100644 --- a/mobile/res/values/strings.xml +++ b/mobile/res/values/strings.xml @@ -3,6 +3,7 @@ IITC mobile Settings + Info Reload IITC Print Version Clear Cache diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java index af353f35..8227eeef 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java @@ -223,6 +223,7 @@ public class IITC_Mobile extends Activity { public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. getMenuInflater().inflate(R.menu.main, menu); + this.getActionBar().setHomeButtonEnabled(true); return true; } @@ -230,6 +231,9 @@ public class IITC_Mobile extends Activity { public boolean onOptionsItemSelected(MenuItem item) { // Handle item selection switch (item.getItemId()) { + case android.R.id.home: + iitc_view.loadUrl("javascript: window.smartphone.mapButton.click();"); + return true; case R.id.reload_button: this.loadUrl(intel_url); return true; @@ -272,6 +276,9 @@ public class IITC_Mobile extends Activity { intent.putExtra("iitc_version", iitc_view.getWebViewClient().getIITCVersion()); startActivity(intent); return true; + case R.id.info: + iitc_view.loadUrl("javascript: window.smartphone.sideButton.click();"); + return true; default: return super.onOptionsItemSelected(item); }