Merge pull request #6 from ciopper90/restilyng

Restilyng

AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="it.gaiacri.mobile"
     android:versionCode="1"
-    android:versionName="0.6.7" >
+    android:versionName="@string/app_version" >
 
     <uses-sdk
         android:minSdkVersion="8"
@@ -11,11 +11,12 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
 
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
-        android:logo="@drawable/ic_home"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity

README.md

@@ -1,9 +1,10 @@
 ## gaia-android (aka Gaia Mobile)
 
 Questo è il progetto per lo sviluppo di un'applicazione per Android che mira ad unire le capacità delle API di Gaia e le potenzialità dei dispositivi mobili Android.
-Per compilare il progetto e richiesto di importare le librerie:
-[Android Support V7](https://developer.android.com/tools/support-library/setup.html)
-[AndroidBootstrap](https://github.com/Bearded-Hen/Android-Bootstrap)
+Per compilare il progetto e richiesto di importare le librerie:<br>
+[Android Support V7](https://developer.android.com/tools/support-library/setup.html)<br>
+[AndroidBootstrap](https://github.com/Bearded-Hen/Android-Bootstrap)<br>
+[Crouton](https://github.com/keyboardsurfer/Crouton)
 
 
 ### Collaborare

res/layout/activity_about.xml

@@ -0,0 +1,61 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    tools:context=".AboutAttivita" >
+     <TextView
+        android:id="@+id/about_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/gaia_red"
+        android:textStyle="bold"
+        android:layout_margin="5dp"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+     <TextView
+         android:id="@+id/textView1"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:textAppearance="?android:attr/textAppearanceLarge" />
+     <TextView
+         android:id="@+id/about_licenza"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:layout_margin="5dp"
+         android:textAppearance="?android:attr/textAppearanceMedium" />
+     <TextView
+         android:id="@+id/textView1"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:textAppearance="?android:attr/textAppearanceLarge" />
+     <TextView
+         android:id="@+id/textView1"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:textAppearance="?android:attr/textAppearanceLarge" />
+     <TextView
+         android:id="@+id/about_portale_gaia"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:layout_margin="5dp"
+         android:textAppearance="?android:attr/textAppearanceMedium" />
+     <TextView
+         android:id="@+id/about_gaia"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:layout_margin="5dp"
+         android:textAppearance="?android:attr/textAppearanceMedium" />
+     <TextView
+         android:id="@+id/about_gaia_mobile"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:layout_margin="5dp"
+         android:textAppearance="?android:attr/textAppearanceMedium" />
+     <TextView
+         android:id="@+id/about_gaia_privacy"
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content"
+         android:layout_margin="5dp"
+         android:textAppearance="?android:attr/textAppearanceMedium" />
+
+</LinearLayout>

res/layout/activity_menu_principale.xml

@@ -60,6 +60,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/venti2"
+                android:paddingBottom="10dp"
                 android:text="Attendere..."
                 android:gravity="center"
                 android:textAlignment="center"
@@ -69,9 +70,8 @@
                 android:id="@+id/tv_comitato"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingBottom="@dimen/venti2"
 				android:gravity="center"
-                android:text="Caricamento in corso."
+                android:text="@string/menu_comunicazioni"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="#CC0000" />
 

res/layout/activity_rubrica_delegati.xml

@@ -3,6 +3,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".RubricaDelegati" >
+    <ListView
+        android:id="@+id/listRubrica"
+        android:listSelector="@android:color/transparent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+    </ListView>
 
 
 </RelativeLayout>

res/layout/drawer_list_item.xml

@@ -15,8 +15,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_marginLeft="12dp"
-            android:layout_marginRight="12dp"
-            android:src="@drawable/ic_launcher_" />
+            android:layout_marginRight="12dp"/>
 
         <TextView
             android:id="@+id/menurow_title"

res/layout/ns_menu_row.xml

@@ -15,8 +15,7 @@
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_marginLeft="12dp"
-            android:layout_marginRight="12dp"
-            android:src="@drawable/ic_launcher_" />
+            android:layout_marginRight="12dp" />
 
         <TextView
             android:id="@+id/menurow_title"

res/layout/ns_menu_row_counter.xml

@@ -18,8 +18,7 @@
             android:layout_marginLeft="12dp"
             android:layout_marginTop="4dp"
             android:layout_marginRight="12dp"
-            android:textSize="24sp"
-            android:src="@drawable/ic_launcher_" />
+            android:textSize="24sp" />
 
         <TextView
             android:id="@+id/menurow_title"

res/layout/riga_attivita.xml

@@ -1,21 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     android:orientation="vertical" >
 
     <TextView
         android:id="@+id/textViewList"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="10dip"
+        android:layout_marginLeft="10dip"
         android:textSize="22sp" />
+
+    <TextView
+        android:id="@+id/textViewListData"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dip"
+        android:textSize="16sp"/>
 
     <TextView
         android:id="@+id/textViewListUrl"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="10dip"
+        android:layout_marginLeft="15dip"
         android:textSize="12sp"/>
 
 </LinearLayout>

res/layout/riga_delegati.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
+    xmlns:fontawesometext="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+    <ImageView
+        android:id="@+id/rubrica_avatar"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:src="@drawable/ic_launcher" />
+
+    <TextView
+        android:id="@+id/rubrica_nome"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_marginLeft="2dp"
+        android:layout_toRightOf="@+id/rubrica_avatar"
+        android:text="prova"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/rubrica_ruoli"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/rubrica_nome"
+        android:layout_marginLeft="2dp"
+        android:layout_toRightOf="@+id/rubrica_avatar"
+        android:text="prova"
+        android:textSize="18sp" />
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="5dp" >
+
+        <com.beardedhen.androidbootstrap.BootstrapButton
+    		android:id="@+id/rubrica_email"
+    		android:layout_width="wrap_content"
+    		android:layout_height="wrap_content"
+    		android:layout_centerVertical="true"
+    		android:enabled="true"
+    		android:layout_marginLeft="2dp"
+    		android:layout_toRightOf="@+id/rubrica_chiama"
+    		bootstrapbutton:bb_type="info"
+    		bootstrapbutton:bb_icon_right="fa-envelope"
+    		bootstrapbutton:bb_roundedCorners="true"/>
+
+        <com.beardedhen.androidbootstrap.BootstrapButton
+    		android:id="@+id/rubrica_chiama"
+    		android:layout_width="wrap_content"
+    		android:layout_height="wrap_content"
+    		android:layout_centerVertical="true"
+    		android:layout_marginRight="2dp"
+    		android:enabled="true"
+    		bootstrapbutton:bb_type="info"
+    		bootstrapbutton:bb_icon_right="fa-phone"
+    		bootstrapbutton:bb_roundedCorners="true"/>
+
+    </RelativeLayout>
+
+
+
+</RelativeLayout>

res/layout/riga_posta.xml

@@ -9,15 +9,23 @@
         android:textStyle="bold"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="5dip"
+        android:layout_marginLeft="5dp"
         android:textSize="20sp" />
 
     <TextView
         android:id="@+id/posta_mittente"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="5dip"
+        android:layout_marginLeft="5dp"
         android:textSize="16sp"/>
+
+    <TextView
+        android:id="@+id/posta_data"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:textSize="16sp"/>
+
     <TextView
         android:id="@+id/posta_id"
         android:layout_width="wrap_content"

res/values/arrays.xml

@@ -15,6 +15,7 @@
     </string-array>       
     <string-array name="ns_menu_items_setting">
         <item>ns_menu_setting_logout</item>
+        <item>ns_menu_setting_about</item>
     </string-array>
 
     <array name="ns_menu_items_icon">
@@ -26,6 +27,7 @@
         <item>ns_menu_feedback_supporto_icon</item>
         <item>ns_menu_feedback_giudizi_icon</item>
         <item>ns_menu_setting_logout_icon</item>
+        <item>ns_menu_setting_about_icon</item>
     </array>
 
 </resources>

res/values/string.xml

@@ -2,19 +2,22 @@
 <resources>
 
     <string name="app_name">Gaia Mobile</string>
-    <string name="hello_world">Hello world!</string>
+    <string name="app_version">1.0.0</string>
     <string name="menu_settings">Settings</string>
     <string name="caricamento">Caricamento in corso</string>
+    <string name="menu_comunicazioni">Ultime 20 Comunicazioni:</string>
 
     <string name="posta_mittente_gaia">Notifica Gaia</string>
     <string name="posta_destinatario_supporto">Supporto Gaia</string>
 
     <string name="title_activity_menu_principale">Benvenuto</string>
     <string name="title_activity_elenco_attivita">Calendario</string>
-    <string name="title_activity_display_attivita">Visualizzazione Turni</string>
+    <string name="title_activity_display_attivita">Dettagli attivita\'</string>
     <string name="title_activity_login_user">Gaia Mobile</string>
-    <string name="title_activity_rubrica_delegati">Rubrica Delegati</string>
+    <string name="title_activity_rubrica_delegati">Rubrica Referenti</string>
     <string name="title_activity_miei_turni">Miei Turni</string>
+    <string name="title_activity_rubrica_volontari">Rubrica Volontari</string>
+    <string name="title_activity_setting_about">About</string>
 
     <string name="partecipa_confermata">Concessa</string>
     <string name="partecipa_attesa">In attesa</string>
@@ -26,8 +29,7 @@
 	<string name="attivita_comitato">Comitato di </string>
 
 
-	<string name="login_sessione">Controllo Sessione</string>
-	<string name="login_download_dati">Caricamento Dati</string>
+	<string name="login_connessione">Connessione a Gaia..</string>
 
 	<string name="turni_navigazione">Navigazione con Maps</string>
 	<string name="turni_partecipa">Partecipa</string>
@@ -75,6 +77,7 @@
 	<string name="error_internet_si">Riprova</string>
 	<string name="error_internet_no">Esci</string>
 	<string name="error_turn_confirmed">Turno gia\' confermato. Contattare Referente per cancellarsi!</string>
+	<string name="error_comitato">ci risulta che non hai selezionato alcun Comitato di appartenenza. Fino a che non avrai scelto il comitato di cui fai parte (dal portale web) e non sarai stato approvato dal tuo presidente non potrai utilizzare le funzionalità di Gaia Mobile.</string>
 
 
 	<string name="drawer_open">Menu</string>
@@ -89,11 +92,12 @@
 	<string name="ns_menu_home_page">Benvenuto</string>
 	<string name="ns_menu_attivita_elenco">Calendario</string>
     <string name="ns_menu_attivita_miei">Miei Turni</string>
-    <string name="ns_menu_rubrica_delegati">Delegati</string>
+    <string name="ns_menu_rubrica_delegati">Referenti</string>
     <string name="ns_menu_rubrica_volontari">Volontari</string>
     <string name="ns_menu_feedback_supporto">Supporto</string>
     <string name="ns_menu_feedback_giudizi">Feedback</string>
     <string name="ns_menu_setting_logout">Logout</string>
+    <string name="ns_menu_setting_about">About</string>
 
     <string name="ns_menu_home_page_icon">&#xf0e7;</string>
 	<string name="ns_menu_attivita_elenco_icon">&#xf073;</string>
@@ -103,5 +107,10 @@
     <string name="ns_menu_feedback_supporto_icon">&#xf0e0;</string>
     <string name="ns_menu_feedback_giudizi_icon">&#xf003;</string>
     <string name="ns_menu_setting_logout_icon">&#xf00d;</string> 
+    <string name="ns_menu_setting_about_icon">&#xf129;</string> 
+
+    <string name="icon_phone">&#xf095;</string>
+    <string name="icon_email">&#xf0e0;</string>
+
 
 </resources>