Dirty hack to improve size computation for hypotheses.

diff --git a/mainActivity/AndroidManifest.xml b/mainActivity/AndroidManifest.xml
index 4eb25ff3316c03749726c32c8c60eb762319bb9d..b9b6088c16e4f532f15f9423dbe4afeb04489ee9 100755 (executable)
--- a/mainActivity/AndroidManifest.xml
+++ b/mainActivity/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.furt.myapplication" >
     <uses-sdk
-        android:minSdkVersion="19"
+        android:minSdkVersion="16"
         android:targetSdkVersion="19" />
     <uses-permission android:name="android.permission.INTERNET" />
     <application

diff --git a/mainActivity/bin/AndroidManifest.xml b/mainActivity/bin/AndroidManifest.xml
index 1e9366734167a557aa68293b904fc41aad081fc8..b9b6088c16e4f532f15f9423dbe4afeb04489ee9 100644 (file)
--- a/mainActivity/bin/AndroidManifest.xml
+++ b/mainActivity/bin/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.furt.myapplication" >
     <uses-sdk
-        android:minSdkVersion="19"
+        android:minSdkVersion="16"
         android:targetSdkVersion="19" />
     <uses-permission android:name="android.permission.INTERNET" />
     <application
@@ -30,6 +30,7 @@
             android:exported="false"/>
         <activity
             android:name=".download_page"
+            android:configChanges="orientation|screenSize">
             android:label="@string/listEs" >
         </activity>
         <activity

diff --git a/mainActivity/bin/classes.dex b/mainActivity/bin/classes.dex
index 6c653250a9f66bc8037c0224044fe90ce8ff24ac..2655b97a657bba718d683c4b3c9857bfb65daa0c 100644 (file)
Binary files a/mainActivity/bin/classes.dex and b/mainActivity/bin/classes.dex differ

diff --git a/mainActivity/bin/dexedLibs/android-support-v4-70fb0600066156aa2b6d08c87cc768e7.jar b/mainActivity/bin/dexedLibs/android-support-v4-70fb0600066156aa2b6d08c87cc768e7.jar
index 03919cb784189da3906cf95e42ac7c54b1b966e6..5c061d964f31172b399b11fc1084f6b089f7be4e 100644 (file)
Binary files a/mainActivity/bin/dexedLibs/android-support-v4-70fb0600066156aa2b6d08c87cc768e7.jar and b/mainActivity/bin/dexedLibs/android-support-v4-70fb0600066156aa2b6d08c87cc768e7.jar differ

diff --git a/mainActivity/bin/mainActivity.apk b/mainActivity/bin/mainActivity.apk
index d3f871c9af9a3598e16ac502293fce4cf02de7e4..e59dcc249b8d6a671c43e4b43e1f257519a69c01 100644 (file)
Binary files a/mainActivity/bin/mainActivity.apk and b/mainActivity/bin/mainActivity.apk differ

diff --git a/mainActivity/bin/resources.ap_ b/mainActivity/bin/resources.ap_
index 15a9ba054c320260fd16bd70ae192000b3b8875d..cb80daa276bb2e40b39eab4e3691b2777a1f8152 100644 (file)
Binary files a/mainActivity/bin/resources.ap_ and b/mainActivity/bin/resources.ap_ differ

diff --git a/mainActivity/res/layout/.activity_my.xml.swp b/mainActivity/res/layout/.activity_my.xml.swp
deleted file mode 100644 (file)
index 477157c..0000000
Binary files a/mainActivity/res/layout/.activity_my.xml.swp and /dev/null differ

diff --git a/mainActivity/src/com/example/furt/myapplication/touchnodeHandler.java b/mainActivity/src/com/example/furt/myapplication/touchnodeHandler.java
index 002fb00a2020bc831a9b6aff7eb4d79b286c41f4..237a7cd3d563c9189725d965ed93b012e756e47d 100755 (executable)
--- a/mainActivity/src/com/example/furt/myapplication/touchnodeHandler.java
+++ b/mainActivity/src/com/example/furt/myapplication/touchnodeHandler.java
@@ -82,17 +82,17 @@ public class touchnodeHandler implements View.OnClickListener {
             final TextView newT=new TextView(view.getContext());
             RelativeLayout.LayoutParams myP=new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
             newT.setText(n.NodeHP.get(i).HP.toString());
-            newT.setTextSize(TypedValue.COMPLEX_UNIT_SP,30);
+            newT.setTextSize(20);
             newT.setId(DrawActivity.globalId++);
             if (i==0) //prima ipotesi: sarà il leftID per le successive
                 leftID=newT.getId();
             myP.setMargins(50,0,0,0);
             float thisSize;
-            p.setTextSize(30);
+            p.setTextSize(20);
             thisSize=p.measureText(newT.getText().toString()); //misuro la larghezza dell'ipotesi inserita
             thisSize+=thisSize*0.2; //con un'approssimazione per eccesso del 20%
             sum+=thisSize; //aggiungo alla somma totale la larghezza di questa ipotesi e della spaziatura
-            sum+=50;
+            sum+=100;
             if (sum>(DrawActivity.v.widthPixels+20)) //ho superato la larghezza dello schermo: devo andare a capo
             {
                 sum=thisSize; //il nuovo nodo è il primo della nuova riga