Improved notification. Sync improvements.

app/src/main/java/com/ivalentin/gm/AlarmReceiver.java

@@ -71,28 +71,15 @@ public class AlarmReceiver extends BroadcastReceiver {
 					//Get non-language-dependant fields
 					String notification = o.substring(o.indexOf("<notification>") + 14, o.indexOf("</notification>"));
 					String id = notification.substring(notification.indexOf("<id>") + 4, notification.indexOf("</id>"));
-					String action = notification.substring(notification.indexOf("<id>") + 4, notification.indexOf("</id>"));
+					String action = notification.substring(notification.indexOf("<action>") + 8, notification.indexOf("</action>"));
 
 					//Is the notification seen already?
 					if(!settings.getBoolean(GM.NOTIFICATION_SEEN_ + id, false)){
 
-						//If not, get language dependant values
-						String currLang = Locale.getDefault().getDisplayLanguage();
-						String text, title;
-						switch (currLang){
-							case "es":
-								title = notification.substring(notification.indexOf("<title_es>") + 10, notification.indexOf("</title_es>"));
-								text = notification.substring(notification.indexOf("<text_es>") + 9, notification.indexOf("</text_es>"));
-								break;
-							case "eu":
-								title = notification.substring(notification.indexOf("<title_eu>") + 10, notification.indexOf("</title_eu>"));
-								text = notification.substring(notification.indexOf("<text_eu>") + 9, notification.indexOf("</text_eu>"));
-								break;
-							default:
-								title = notification.substring(notification.indexOf("<title_en>") + 10, notification.indexOf("</title_en>"));
-								text = notification.substring(notification.indexOf("<text_en>") + 9, notification.indexOf("</text_en>"));
-								break;
-						}
+						String lang = GM.getLang();
+						String title = notification.substring(notification.indexOf("<title_" + lang + ">") + 10, notification.indexOf("</title_" + lang + ">"));
+						String text = notification.substring(notification.indexOf("<text_" + lang + ">") + 9, notification.indexOf("</text_" + lang + ">"));
+
 
 						//Get the notification manager ready
 						NotificationManager mNotificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
@@ -168,6 +155,9 @@ public class AlarmReceiver extends BroadcastReceiver {
 			editor.putString(GM.PREF_GM_LOCATION, new SimpleDateFormat("yyyyMMddHHmmss").format(Calendar.getInstance().getTime()));
 	    	editor.apply();
 		}
+
+		//Perform a background sync
+		new Sync(context).execute();
     }
 
     /**

app/src/main/java/com/ivalentin/gm/AlbumLayout.java

@@ -132,7 +132,7 @@ public class AlbumLayout extends Fragment {
 			//Count comments
 			Cursor cursorComments = db.rawQuery("SELECT id FROM photo_comment WHERE photo = " + imageCursor.getString(0) + ";", null);
 			TextView tvCommentsLeft = (TextView) entry.findViewById(R.id.tv_row_album_comments_left);
-			tvCommentsLeft.setText(cursorComments.getCount());
+			tvCommentsLeft.setText(Integer.toString(cursorComments.getCount()));
 			cursorComments.close();
 
 			//Set onClickListener
@@ -197,7 +197,7 @@ public class AlbumLayout extends Fragment {
 				//Count comments
 				cursorComments = db.rawQuery("SELECT id FROM photo_comment WHERE photo = " + imageCursor.getString(0) + ";", null);
 				TextView tvCommentsRight = (TextView) entry.findViewById(R.id.tv_row_album_comments_right);
-				tvCommentsRight.setText(cursorComments.getCount());
+				tvCommentsRight.setText(Integer.toString(cursorComments.getCount()));
 				cursorComments.close();
 
 				//Set onClickListener

app/src/main/java/com/ivalentin/gm/GM.java

@@ -65,16 +65,51 @@ public final class GM {
 	 * Constant to set extras on the main intent.
 	 */
 	static final String EXTRA_ACTION = "action";
-	
+
+	/**
+	 * Value for {@see GM.EXTRA_ACTION} that opens a notification as text.
+	 */
+	static final String EXTRA_ACTION_TEXT = "text";
+
+	/**
+	 * Value for {@see GM.EXTRA_ACTION} that opens the lablanca section.
+	 */
+	static final String EXTRA_ACTION_LABLANCA = "lablanca";
+
 	/**
-	 * Value for {@see GM.EXTRA_ACTION} that opens the oficial schedule.
+	 * Value for {@see GM.EXTRA_ACTION} that opens the official schedule.
 	 */
-	static final String EXTRA_ACTION_SCHEDULE = "schedule";
+	static final String EXTRA_ACTION_CITYSCHEDULE = "cityschedule";
 	
 	/**
 	 * Value for {@see GM.EXTRA_ACTION} that opens the GM schedule.
 	 */
-	static final String EXTRA_ACTION_GM = "gm";
+	static final String EXTRA_ACTION_GMSCHEDULE = "gmschedule";
+
+	/**
+	 * Value for {@see GM.EXTRA_ACTION} that opens the location secton.
+	 */
+	static final String EXTRA_ACTION_LOCATION = "location";
+
+	/**
+	 * Value for {@see GM.EXTRA_ACTION} that opens the around section.
+	 */
+	static final String EXTRA_ACTION_AROUND = "around";
+
+	/**
+	 * Value for {@see GM.EXTRA_ACTION} that opens the blog.
+	 */
+	static final String EXTRA_ACTION_BLOG = "blog";
+
+	/**
+	 * Value for {@see GM.EXTRA_ACTION} that opens the activities section.
+	 */
+	static final String EXTRA_ACTION_ACTIVITIES = "activities";
+
+	/**
+	 * Value for {@see GM.EXTRA_ACTION} that opens the gallery section.
+	 */
+	static final String EXTRA_ACTION_GALLERY = "gallery";
 	
 	/**
 	 * Constant for section "Home".

app/src/main/java/com/ivalentin/gm/MainActivity.java

@@ -11,6 +11,7 @@ import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.app.Dialog;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.drawable.Drawable;
@@ -165,10 +166,31 @@ public class MainActivity extends Activity{//} implements LocationListener{
 	    String actionTitle = getIntent().getStringExtra(GM.EXTRA_TITLE);
 
 		//Set an alarm for notifications..
-	    alarm = new AlarmReceiver();
-		alarm.setAlarm(this);
-		alarm.onReceive(this, this.getIntent());
-		
+		//Wait a little
+		final Intent intent = this.getIntent();
+		final Context context = this;
+
+		Thread t = new Thread() {
+
+			@Override
+			public void run() {
+				try {
+					Thread.sleep(20000);
+					runOnUiThread(new Runnable() {
+						@Override
+						public void run() {
+							alarm = new AlarmReceiver();
+							alarm.setAlarm(context);
+							alarm.onReceive(context, intent);
+						}
+					});
+				} catch (InterruptedException e) {
+				}
+			}
+		};
+
+		t.start();
+
 		//Remove title bar.
 	    this.requestWindowFeature(Window.FEATURE_NO_TITLE);
 	    super.onCreate(savedInstanceState);
@@ -325,63 +347,141 @@ public class MainActivity extends Activity{//} implements LocationListener{
 		    				dialog.dismiss();
 		    			}
 		    		});
-					
+
+					//Set the icon
+					dialogIcon = getResources().getDrawable(R.drawable.ic_launcher);
+					dialogIcon.setBounds(0, 0, (int) (tvDialogTitle.getTextSize() * 1.4), (int) (tvDialogTitle.getTextSize() * 1.4));
+					tvDialogTitle.setCompoundDrawables(dialogIcon, null, null, null);
+					tvDialogTitle.setCompoundDrawablePadding(20);
+
+					//Get preferences
+					int festivals = preferences.getInt(GM.PREF_DB_FESTIVALS, 0);
+
 					//Set the action button
 					btDialogAction = (Button) dialog.findViewById(R.id.bt_dialog_notification_action);
 					if (action != null){
+						Log.e("Acton", action);
 						switch (action) {
 
-							//TODO: In here, load the icon the same way I do with photos
-							//If the notification action opens the GM schedule
-							case GM.EXTRA_ACTION_GM:
-								//Set the icon
-								dialogIcon = getResources().getDrawable(R.drawable.icon_gm);
-								dialogIcon.setBounds(0, 0, (int) (tvDialogTitle.getTextSize() * 1.4), (int) (tvDialogTitle.getTextSize() * 1.4));
-								tvDialogTitle.setCompoundDrawables(dialogIcon, null, null, null);
-								tvDialogTitle.setCompoundDrawablePadding(20);
+							case GM.EXTRA_ACTION_LABLANCA:
 
 								//Set up the action button
 								btDialogAction.setVisibility(View.VISIBLE);
-								btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_gm));
+								btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_lablanca));
 								btDialogAction.setOnClickListener(new OnClickListener() {
 									@Override
 									public void onClick(View v) {
 										dialog.dismiss();
-										loadSection(GM.SECTION_LABLANCA_GM_SCHEDULE, false);
+										loadSection(GM.SECTION_LABLANCA, false);
 									}
 								});
-								//}
 								break;
 
-							//If the notification action opens the city schedule
-							case GM.EXTRA_ACTION_SCHEDULE:
-								//Set the icon
-								dialogIcon = getResources().getDrawable(R.drawable.icon_program);
-								dialogIcon.setBounds(0, 0, (int) (tvDialogTitle.getTextSize() * 1.4), (int) (tvDialogTitle.getTextSize() * 1.4));
-								tvDialogTitle.setCompoundDrawables(dialogIcon, null, null, null);
-								tvDialogTitle.setCompoundDrawablePadding(20);
+							case GM.EXTRA_ACTION_LOCATION:
 
+								//TODO: Check for a recent location!
 								//Set up the action button
 								btDialogAction.setVisibility(View.VISIBLE);
-								btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_schedule));
+								btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_location));
 								btDialogAction.setOnClickListener(new OnClickListener() {
 									@Override
 									public void onClick(View v) {
 										dialog.dismiss();
-										loadSection(GM.SECTION_LABLANCA_SCHEDULE, false);
+										loadSection(GM.SECTION_LOCATION, false);
 									}
 								});
-								//}
+								break;
+
+							case GM.EXTRA_ACTION_BLOG:
+
+								//Set up the action button
+								btDialogAction.setVisibility(View.VISIBLE);
+								btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_blog));
+								btDialogAction.setOnClickListener(new OnClickListener() {
+									@Override
+									public void onClick(View v) {
+										dialog.dismiss();
+										loadSection(GM.SECTION_BLOG, false);
+									}
+								});
+								break;
+
+							case GM.EXTRA_ACTION_ACTIVITIES:
+
+								//Set up the action button
+								btDialogAction.setVisibility(View.VISIBLE);
+								btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_activities));
+								btDialogAction.setOnClickListener(new OnClickListener() {
+									@Override
+									public void onClick(View v) {
+										dialog.dismiss();
+										loadSection(GM.SECTION_ACTIVITIES, false);
+									}
+								});
+								break;
+
+							case GM.EXTRA_ACTION_GALLERY:
+
+								//Set up the action button
+								btDialogAction.setVisibility(View.VISIBLE);
+								btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_gallery));
+								btDialogAction.setOnClickListener(new OnClickListener() {
+									@Override
+									public void onClick(View v) {
+										dialog.dismiss();
+										loadSection(GM.SECTION_GALLERY, false);
+									}
+								});
+								break;
+
+							case GM.EXTRA_ACTION_GMSCHEDULE:
+
+								if (festivals == 1) {
+									//Set up the action button
+									btDialogAction.setVisibility(View.VISIBLE);
+									btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_gmschedule));
+									btDialogAction.setOnClickListener(new OnClickListener() {
+										@Override
+										public void onClick(View v) {
+											dialog.dismiss();
+											loadSection(GM.SECTION_LABLANCA_GM_SCHEDULE, false);
+										}
+									});
+								}
+								break;
+
+							case GM.EXTRA_ACTION_CITYSCHEDULE:
+								if (festivals == 1) {
+									//Set up the action button
+									btDialogAction.setVisibility(View.VISIBLE);
+									btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_cityschedule));
+									btDialogAction.setOnClickListener(new OnClickListener() {
+										@Override
+										public void onClick(View v) {
+											dialog.dismiss();
+											loadSection(GM.SECTION_LABLANCA_SCHEDULE, false);
+										}
+									});
+								}
+								break;
+
+							case GM.EXTRA_ACTION_AROUND:
+								if (festivals == 1) {
+									//Set up the action button
+									btDialogAction.setVisibility(View.VISIBLE);
+									btDialogAction.setText(this.getApplicationContext().getString(R.string.notification_action_around));
+									btDialogAction.setOnClickListener(new OnClickListener() {
+										@Override
+										public void onClick(View v) {
+											dialog.dismiss();
+											loadSection(GM.SECTION_LABLANCA_AROUND, false);
+										}
+									});
+								}
 								break;
 
 							//If the notification is just text
 							default:
-								//Set the icon
-								dialogIcon = getResources().getDrawable(R.drawable.icon_about);
-								dialogIcon.setBounds(0, 0, (int) (tvDialogTitle.getTextSize() * 1.4), (int) (tvDialogTitle.getTextSize() * 1.4));
-								tvDialogTitle.setCompoundDrawables(dialogIcon, null, null, null);
-								tvDialogTitle.setCompoundDrawablePadding(20);
-
 								//Hide action button
 								btDialogAction.setVisibility(View.GONE);
 						}

app/src/main/java/com/ivalentin/gm/SettingsLayout.java

@@ -189,43 +189,7 @@ public class SettingsLayout extends Fragment{
 				}
 			}	
 		});
-		
-		//Set click listener for the "Name" preference
-		rlAccountName.setOnClickListener(new OnClickListener(){
-			@Override
-			public void onClick(View v) {
-				LayoutInflater inflater = (LayoutInflater) view.getContext().getSystemService( Context.LAYOUT_INFLATER_SERVICE );
-				View dialogLayout = inflater.inflate(R.layout.dialog_change_username, null);
-				AlertDialog.Builder builder = new AlertDialog.Builder(view.getContext());
-				builder.setTitle(view.getContext().getString(R.string.settings_account_message_title));
-				// Set up the input
-				final EditText input = (EditText) dialogLayout.findViewById(R.id.et_change_username);
-				builder.setView(dialogLayout);
-
-				// Set up the buttons
-				builder.setPositiveButton(view.getContext().getString(R.string.settings_account_message_save), new DialogInterface.OnClickListener() { 
-				    @Override
-				    public void onClick(DialogInterface dialog, int which) {
-				        userName = input.getText().toString();
-				        tvAccountName.setText(userName);
-				        SharedPreferences preferences = view.getContext().getSharedPreferences(GM.PREF, Context.MODE_PRIVATE);
-						SharedPreferences.Editor editor = preferences.edit();
-						editor.putString(GM.USER_NAME, userName);
-						editor.commit();
-				    }
-				});
-				builder.setNegativeButton(view.getContext().getString(R.string.settings_account_message_cancel), new DialogInterface.OnClickListener() {
-				    @Override
-				    public void onClick(DialogInterface dialog, int which) {
-				        dialog.cancel();
-				    }
-				});
 
-				builder.show();
-			}
-		});
-		
-		
 		return view;
 	}
 }

app/src/main/java/com/ivalentin/gm/Sync.java

@@ -15,6 +15,7 @@ import android.view.View.OnClickListener;
 import android.view.Window;
 import android.widget.Button;
 import android.widget.ProgressBar;
+import android.widget.TextView;
 
 /**
  * AsyncTask that synchronizes the online database to the device.
@@ -31,6 +32,10 @@ public class Sync extends AsyncTask<Void, Void, Void> {
 	private MainActivity activity;
 	private boolean fg;
 	private int newVersion;
+	private String strings[];
+	private boolean doProgress = false;
+	private long millis = 0;
+	TextView tv;
 	
 	
 	/**
@@ -41,8 +46,18 @@ public class Sync extends AsyncTask<Void, Void, Void> {
 	protected void onPreExecute(){
 		if (pbSync != null)
 			pbSync.setVisibility(View.VISIBLE);
-		if (dialog != null){
+		if (dialog != null) {
 			dialog.show();
+			strings = new String[5];
+			strings[0] = myContextRef.getString(R.string.dialog_sync_text_0);
+			strings[1] = myContextRef.getString(R.string.dialog_sync_text_1);
+			strings[2] = myContextRef.getString(R.string.dialog_sync_text_2);
+			strings[3] = myContextRef.getString(R.string.dialog_sync_text_3);
+			strings[4] = myContextRef.getString(R.string.dialog_sync_text_4);
+			tv = (TextView) dialog.findViewById(R.id.tv_dialog_sync_text);
+			int idx = 0 + (int) (Math.random() * ((4) + 1));
+			tv.setText(strings[idx]);
+			doProgress = true;
 		}
 		Log.d("Sync", "Starting full sync");
 	}
@@ -87,7 +102,11 @@ public class Sync extends AsyncTask<Void, Void, Void> {
 		}
 		Log.d("Sync", "Full sync finished");
 	}
-	
+
+	public Sync(Activity myContextRef){
+		this.myContextRef = myContextRef;
+	}
+
     /**
      * Called when the AsyncTask is created.
      * 
@@ -129,7 +148,20 @@ public class Sync extends AsyncTask<Void, Void, Void> {
         pbSync = null;
         fg = false;
     }
-	
+
+	@Override
+	protected void onProgressUpdate(Void...progress) {
+		//Log.e("UPDATE", "UP");
+		if (doProgress){
+			if (millis + 500 < System.currentTimeMillis()) {
+				millis = System.currentTimeMillis();
+				int idx = 0 + (int) (Math.random() * ((4) + 1));
+				//Log.e("String", strings[idx]);
+				tv.setText(strings[idx]);
+			}
+		}
+	}
+
 	/**
 	 * The sweet stuff. Actually performs the sync. 
 	 * 
@@ -138,6 +170,8 @@ public class Sync extends AsyncTask<Void, Void, Void> {
 	@Override
 	protected Void doInBackground(Void... params) {
 
+		publishProgress();
+
 		//Gets the remote page.
     	FetchURL fu;
 
@@ -157,6 +191,8 @@ public class Sync extends AsyncTask<Void, Void, Void> {
 		
 		//Get the file
 		try{
+			publishProgress();
+
 			String user = preferences.getString(GM.USER_NAME, "");
 			String code = preferences.getString(GM.USER_CODE, "");
 			int dbVersion = preferences.getInt(GM.PREF_DB_VERSION, GM.DEFAULT_PREF_DB_VERSION);
@@ -164,8 +200,10 @@ public class Sync extends AsyncTask<Void, Void, Void> {
 			fu.Run(GM.SERVER + "/app/sync.php?user=" + user + "&code=" + code + "&fg=" + fg + "&v=" + dbVersion);
 			//All the info
 			o = fu.getOutput().toString();
+			publishProgress();
 		}
 		catch(Exception ex){
+			publishProgress();
 			Log.e("Sync error", "Error fetching remote file: " + ex.toString());
 			success = false;
 		}
@@ -174,6 +212,8 @@ public class Sync extends AsyncTask<Void, Void, Void> {
 
 		if (success){
 
+			publishProgress();
+
 			//Parse the contents of the page
 			//Check if the database is synced
 			if (o.contains("<synced>1</synced>")){
@@ -215,6 +255,8 @@ public class Sync extends AsyncTask<Void, Void, Void> {
 								queryValues = "(";
 								while (row.contains(">,")) {
 
+										publishProgress();
+
 										try {
 											if (row.length() < 5) {
 												break;

app/src/main/res/drawable/arrowbutton.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Shape for blue-ish arrow buttons -->
-
-<shape 
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<gradient
-		android:startColor="@color/arrow_button_start"
-		android:centerColor="@color/arrow_button_center"
-		android:endColor="@color/arrow_button_start"
-		android:angle="270" />
-	<corners 
-		android:radius="5dp" />
-	<stroke 
-		android:width="2px"
-		android:color="@color/arrow_button_border" />
-</shape>

app/src/main/res/drawable/arrowbuttonpressed.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Shape for blue-ish arrow buttons when pressed -->
-
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-	android:shape="rectangle">
-	<gradient
-		android:startColor="@color/arrow_button_start_pressed"
-		android:centerColor="@color/arrow_button_center_pressed"
-		android:endColor="@color/arrow_button_start_pressed"
-		android:angle="270" />
-		<corners
-		    android:radius="5dp" />
-		<stroke
-		    android:width="2px"
-		    android:color="@color/arrow_button_border" />
-	</shape>

app/src/main/res/drawable/arrowbuttonselector.xml

@@ -1,13 +0,0 @@
-<!-- Selector for the arrow buttons -->
-
-<selector
-    xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-	    android:state_focused="true"
-	    android:drawable="@drawable/arrowbutton"/>
-	<item
-	    android:state_pressed="true"
-	    android:drawable="@drawable/arrowbuttonpressed" />
-	<item
-	    android:drawable="@drawable/arrowbutton" />
-</selector>

app/src/main/res/drawable/background_app.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Shape for the slider menu -->
-
-<selector
-    xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-	    <shape>
-	        <gradient
-	            android:angle="90"
-	            android:centerY="10%"
-	            android:centerX="0.1"
-	            android:startColor="@color/background_app_gradient"
-	            android:endColor="@color/background_app"
-	            android:type="linear" />
-	    </shape>
-	</item>
-</selector>

app/src/main/res/drawable/background_menu.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Shape for the slider menu -->
-
-<selector
-    xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-	    <shape>
-	        <gradient
-	            android:angle="0"
-	            android:centerY="10%"
-	            android:centerX="0.1"
-	            android:startColor="@color/background_menu_gradient"
-	            android:endColor="@color/background_menu"
-	            android:type="linear" />
-	    </shape>
-	</item>
-</selector>

app/src/main/res/drawable/datebar.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Shape for the date selector bar -->
-
-<selector
-    xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
-	    <shape>
-	        <gradient
-	            android:angle="90"
-	            android:centerY="10%"
-	            android:centerX="0.1"
-	            android:startColor="@color/background_date_gradient"
-	            android:endColor="@color/background_date"
-	            android:type="linear" />
-	    </shape>
-	</item>
-</selector>

app/src/main/res/layout/dialog_around.xml

@@ -22,7 +22,7 @@
             android:layout_marginStart="25dp"
             android:layout_marginTop="5dp"
             android:layout_weight=".5"
-            android:background="@drawable/arrowbutton"
+            android:background="@drawable/button_selector"
             android:minHeight="40dp"
             android:text="@string/schedule_close" />
 

app/src/main/res/layout/dialog_change_username.xml

@@ -1,22 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <TextView
-        android:id="@+id/textView1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/settings_account_message_text" />
-
-    <EditText
-        android:id="@+id/et_change_username"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ems="10"
-        android:inputType="textPersonName" >
-
-        <requestFocus />
-    </EditText>
-
-</LinearLayout>

app/src/main/res/layout/dialog_notification.xml

@@ -1,30 +1,19 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/background_app"
+    android:background="@drawable/section"
     android:orientation="vertical"
-    android:padding="5dp" >
+    android:padding="7dp" >
 
     <TextView
         android:id="@+id/tv_dialog_notification_title"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:layout_marginTop="10dp"
         android:ellipsize="end"
-        android:gravity="center_horizontal"
         android:maxLines="2"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textColor="@color/text_dialog"
-        android:textSize="25sp" />
-
-    <TextView
-        android:id="@+id/tv_dialog_notification_separator"
-        android:layout_width="fill_parent"
-        android:layout_height="1dp"
-        android:layout_below="@id/tv_dialog_notification_title"
-        android:layout_margin="15dp"
-        android:background="@color/black" />
+        android:textAppearance="@android:style/TextAppearance.Large"
+        android:text="Title"/>
 
     <LinearLayout
         android:id="@+id/ll_dialog_notification_buttons"
@@ -32,22 +21,27 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:gravity="center_horizontal"
-        android:orientation="horizontal" >
+        android:orientation="vertical" >
 
         <Button
             android:id="@+id/bt_dialog_notification_action"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
-            android:background="@drawable/arrowbutton" />
+            android:background="@drawable/button_selector"
+            android:text="Action"
+            android:textColor="@color/input_text_color"
+            android:textStyle="bold"/>
 
         <Button
             android:id="@+id/bt_dialog_notification_close"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
-            android:background="@drawable/arrowbutton"
-            android:text="@string/notification_close" />
+            android:background="@drawable/button_selector"
+            android:text="@string/notification_close"
+            android:textColor="@color/input_text_color"
+            android:textStyle="bold"/>
 
     </LinearLayout>
 
@@ -56,20 +50,22 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_above="@id/ll_dialog_notification_buttons"
-        android:layout_below="@id/tv_dialog_notification_separator" >
+        android:layout_below="@id/tv_dialog_notification_title"
+        >
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:orientation="vertical"
+            android:background="@drawable/entry">
 
             <TextView
                 android:id="@+id/tv_dialog_notification_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="12dp"
-                android:textColor="@color/text_dialog"
-                android:textSize="18sp" />
+                android:layout_margin="7dp"
+                android:textAppearance="@android:style/TextAppearance.Medium"
+                android:text="Text"/>
 
         </LinearLayout>
     </ScrollView>

app/src/main/res/layout/dialog_prices.xml

@@ -1,485 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/background_app"
-    android:paddingBottom="5dp" >
-
-    <Button
-        android:id="@+id/bt_dialog_prices_close"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="false"
-        android:layout_marginBottom="10dp"
-        android:background="@drawable/arrowbutton"
-        android:minHeight="48dp"
-        android:minWidth="95dp"
-        android:text="@string/prices_close" />
-
-	<ScrollView
-	    android:id="@+id/scrollView1"
-	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent"
-	    android:layout_above="@id/bt_dialog_prices_close"
-	    android:layout_alignParentTop="true"
-	    android:fadingEdge="vertical"
-	    android:fadingEdgeLength="30dp"
-	    android:padding="0dp"
-	    android:requiresFadingEdge="vertical" >
-	
-	    <LinearLayout
-	        android:layout_width="match_parent"
-	        android:layout_height="wrap_content"
-	        android:layout_marginEnd="6dp"
-	        android:layout_marginLeft="6dp"
-	        android:layout_marginRight="6dp"
-	        android:layout_marginStart="6dp"
-	        android:orientation="vertical" >
-	
-	        <TextView
-	            android:id="@+id/textView1"
-	            android:layout_width="fill_parent"
-	            android:layout_height="wrap_content"
-	            android:text="@string/prices_title"
-	            android:textAppearance="@android:style/TextAppearance.Large"
-	            android:textColor="@color/text_dialog"
-	            android:textSize="30sp"
-	            android:textStyle="bold" />
-	
-	        <TextView
-	            android:id="@+id/textView2"
-	            android:layout_width="fill_parent"
-	            android:layout_height="wrap_content"
-	            android:layout_marginTop="15dp"
-	            android:background="@drawable/home_section_title"
-	            android:padding="3dp"
-	            android:text="@string/prices_section_days"
-	            android:textAppearance="?android:attr/textAppearanceMedium"
-	            android:textColor="@color/text_dialog"
-	            android:textSize="20sp" />
-	        
-	        <TableLayout
-	            android:layout_width="match_parent"
-	            android:layout_height="wrap_content"
-	            android:layout_marginEnd="10dp"
-	            android:layout_marginLeft="10dp"
-	            android:layout_marginRight="10dp"
-	            android:layout_marginStart="10dp"
-	            android:layout_marginTop="20dp"
-	            android:shrinkColumns="0" >
-
-	            <TableRow
-	                android:id="@+id/tableRow4"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:layout_marginBottom="8dp"
-	                android:layout_marginTop="8dp" >
-
-	                <TextView
-	                    android:id="@+id/tv_prices_day_name_0"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-
-	                <TextView
-	                    android:id="@+id/tv_prices_day_price_0"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:layout_gravity="center_vertical"
-	                    android:layout_marginLeft="10dp"
-	                    android:layout_marginStart="10dp"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-
-	            </TableRow>
-
-	            <TableRow
-	                android:id="@+id/TableRow01"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:layout_marginBottom="8dp"
-	                android:layout_marginTop="8dp" >
-
-	                <TextView
-	                    android:id="@+id/tv_prices_day_name_1"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-
-	                <TextView
-	                    android:id="@+id/tv_prices_day_price_1"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:layout_gravity="center_vertical"
-	                    android:layout_marginLeft="10dp"
-	                    android:layout_marginStart="10dp"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-
-	            </TableRow>
-
-	            <TableRow
-	                android:id="@+id/TableRow02"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:layout_marginBottom="8dp"
-	                android:layout_marginTop="8dp" >
-
-	                <TextView
-	                    android:id="@+id/tv_prices_day_name_2"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-
-	                <TextView
-	                    android:id="@+id/tv_prices_day_price_2"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:layout_gravity="center_vertical"
-	                    android:layout_marginLeft="10dp"
-	                    android:layout_marginStart="10dp"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-
-	            </TableRow>
-
-	            <TableRow
-	                android:id="@+id/TableRow03"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:layout_marginBottom="8dp"
-	                android:layout_marginTop="8dp" >
-
-	                <TextView
-	                    android:id="@+id/tv_prices_day_name_3"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-
-	                <TextView
-	                    android:id="@+id/tv_prices_day_price_3"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:layout_gravity="center_vertical"
-	                    android:layout_marginLeft="10dp"
-	                    android:layout_marginStart="10dp"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-
-	            </TableRow>
-
-	            <TableRow
-	                android:id="@+id/TableRow04"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:layout_marginBottom="8dp"
-	                android:layout_marginTop="8dp" >
-
-	                <TextView
-	                    android:id="@+id/tv_prices_day_name_4"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-
-	                <TextView
-	                    android:id="@+id/tv_prices_day_price_4"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:layout_gravity="center_vertical"
-	                    android:layout_marginLeft="10dp"
-	                    android:textColor="@color/text_dialog"
-	                    android:layout_marginStart="10dp"
-	                    android:textSize="17sp" />
-
-	            </TableRow>
-
-	            <TableRow
-	                android:id="@+id/TableRow05"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:layout_marginBottom="8dp"
-	                android:layout_marginTop="8dp" >
-
-	                <TextView
-	                    android:id="@+id/tv_prices_day_name_5"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-
-	                <TextView
-	                    android:id="@+id/tv_prices_day_price_5"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:layout_gravity="center_vertical"
-	                    android:layout_marginLeft="10dp"
-	                    android:layout_marginStart="10dp"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-
-	            </TableRow>
-	
-	        </TableLayout>
-	        
-	        <TextView
-	            android:layout_width="fill_parent"
-	            android:layout_height="wrap_content"
-	            android:layout_marginTop="35dp"
-	            android:background="@drawable/home_section_title"
-	            android:padding="3dp"
-	            android:text="@string/prices_section_packs"
-	            android:textAppearance="?android:attr/textAppearanceMedium"
-	            android:textColor="@color/text_dialog"
-	            android:textSize="20sp" />
-
-	        <TableLayout
-	            android:layout_width="match_parent"
-	            android:layout_height="wrap_content"
-	            android:layout_marginEnd="10dp"
-	            android:layout_marginLeft="10dp"
-	            android:layout_marginRight="10dp"
-	            android:layout_marginStart="10dp"
-	            android:layout_marginTop="20dp"
-	            android:shrinkColumns="0" >
-
-	            <TableRow
-	                android:id="@+id/tableRow1"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:layout_marginBottom="8dp"
-	                android:layout_marginTop="8dp" >
-
-	                <TextView
-	                    android:id="@+id/tv_prices_offer_name_0"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-
-	                <TextView
-	                    android:id="@+id/tv_prices_offer_price_0"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:layout_gravity="center_vertical"
-	                    android:layout_marginLeft="10dp"
-	                    android:layout_marginStart="10dp"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-	            </TableRow>
-
-	            <TableRow
-	                android:id="@+id/tableRow2"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:layout_marginBottom="8dp"
-	                android:layout_marginTop="8dp" >
-
-	                <TextView
-	                    android:id="@+id/tv_prices_offer_name_1"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-
-	                <TextView
-	                    android:id="@+id/tv_prices_offer_price_1"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:layout_gravity="center_vertical"
-	                    android:layout_marginLeft="10dp"
-	                    android:layout_marginStart="10dp"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-	            </TableRow>
-
-	            <TableRow
-	                android:id="@+id/tableRow3"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:layout_marginBottom="8dp"
-	                android:layout_marginTop="8dp" >
-
-	                <TextView
-	                    android:id="@+id/tv_prices_offer_name_2"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-
-	                <TextView
-	                    android:id="@+id/tv_prices_offer_price_2"
-	                    android:layout_width="wrap_content"
-	                    android:layout_height="wrap_content"
-	                    android:layout_gravity="center_vertical"
-	                    android:layout_marginLeft="10dp"
-	                    android:layout_marginStart="10dp"
-	                    android:textColor="@color/text_dialog"
-	                    android:textSize="17sp" />
-	            </TableRow>
-	        </TableLayout>
-
-	        <TextView
-	            android:layout_width="fill_parent"
-	            android:layout_height="wrap_content"
-	            android:layout_marginTop="35dp"
-	            android:background="@drawable/home_section_title"
-	            android:padding="3dp"
-	            android:text="@string/prices_section_calculator"
-	            android:textAppearance="?android:attr/textAppearanceMedium"
-	            android:textColor="@color/text_dialog"
-	            android:textSize="20sp" />
-
-	        <LinearLayout
-	            android:layout_width="match_parent"
-	            android:layout_height="wrap_content"
-	            android:layout_marginEnd="10dp"
-	            android:layout_marginLeft="10dp"
-	            android:layout_marginRight="10dp"
-	            android:layout_marginStart="10dp"
-	            android:layout_marginTop="20dp"
-	            android:orientation="vertical" >
-
-	            <TextView
-	                android:id="@+id/textView3"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:textColor="@color/text_dialog"
-	                android:text="@string/prices_calculator" />
-
-	            <CheckBox
-	                android:id="@+id/cb_dialog_prices_0"
-	                android:textColor="@color/text_dialog"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content" />
-	            
-	            <CheckBox
-	                android:id="@+id/cb_dialog_prices_1"
-	                android:textColor="@color/text_dialog"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content" />
-	            
-	            <CheckBox
-	                android:id="@+id/cb_dialog_prices_2"
-	                android:textColor="@color/text_dialog"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content" />
-	            
-	            <CheckBox
-	                android:id="@+id/cb_dialog_prices_3"
-	                android:textColor="@color/text_dialog"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content" />
-	            
-	            <CheckBox
-	                android:id="@+id/cb_dialog_prices_4"
-	                android:textColor="@color/text_dialog"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content" />
-	            
-	            <CheckBox
-	                android:id="@+id/cb_dialog_prices_5"
-	                android:textColor="@color/text_dialog"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content" />
-
-	            <TextView
-	                android:id="@+id/tv_dialog_prices_total"
-	                android:textColor="@color/text_dialog"
-	                android:layout_width="fill_parent"
-	                android:layout_height="wrap_content"
-	                android:gravity="center_horizontal"
-	                android:text="@string/prices_total_0"
-	                android:textAppearance="?android:attr/textAppearanceMedium"
-	                android:textSize="18sp" />
-
-	        </LinearLayout>
-
-	        <TextView
-	            android:layout_width="fill_parent"
-	            android:layout_height="wrap_content"
-	            android:textColor="@color/text_dialog"
-	            android:layout_marginTop="35dp"
-	            android:background="@drawable/home_section_title"
-	            android:padding="3dp"
-	            android:text="@string/prices_section_howto"
-	            android:textAppearance="?android:attr/textAppearanceMedium"
-	            android:textSize="20sp" />
-
-	        <LinearLayout
-	            android:layout_width="match_parent"
-	            android:layout_height="wrap_content"
-	            android:layout_marginBottom="20dp"
-	            android:layout_marginEnd="10dp"
-	            android:layout_marginLeft="10dp"
-	            android:layout_marginRight="10dp"
-	            android:layout_marginStart="10dp"
-	            android:layout_marginTop="20dp"
-	            android:orientation="vertical" >
-
-	            <TextView
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:textColor="@color/text_dialog"
-	                android:text="@string/prices_howto_0" />
-	            
-	            <TextView
-	                android:layout_width="fill_parent"
-	                android:layout_height="wrap_content"
-	                android:layout_marginTop="15dp"
-	                android:gravity="center_horizontal"
-	                android:text="@string/prices_howto_1"
-	                android:textColor="@color/text_dialog"
-	                android:textStyle="italic" />
-	            
-	            <TextView
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:layout_marginTop="15dp"
-	                android:textColor="@color/text_dialog"
-	                android:text="@string/prices_howto_2" />
-	            
-	            <TextView
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:layout_marginTop="15dp"
-	                android:textColor="@color/text_dialog"
-	                android:text="@string/prices_howto_3" />
-
-	            <TextView
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:layout_marginTop="15dp"
-	                android:text="@string/prices_howto_4"
-	                android:textColor="@color/text_dialog" />
-	            
-	            <TextView
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:layout_marginTop="15dp"
-	                android:text="@string/prices_contact_text"
-	                android:textColor="@color/text_dialog" />
-
-	            <Button
-	                android:id="@+id/bt_dialog_prices_contact"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:layout_gravity="center_horizontal"
-	                android:layout_marginBottom="10dp"
-	                android:layout_marginTop="10dp"
-	                android:background="@drawable/arrowbutton"
-	                android:padding="5dp"
-	                android:text="@string/prices_contact_button" />
-
-	        </LinearLayout>
-	
-	    </LinearLayout>
-	
-	</ScrollView>
-
-</RelativeLayout>

app/src/main/res/layout/dialog_sync.xml

@@ -1,43 +1,26 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@drawable/background_app"
-    android:orientation="vertical" >
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:background="@drawable/section"
+              android:orientation="vertical"
+              android:padding="7dp">
 
     <TextView
         android:id="@+id/textView1"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="15dp"
-        android:gravity="center_horizontal"
         android:text="@string/dialog_sync_title"
-        android:textColor="@color/text_dialog"
-        android:textSize="30sp" />
+        android:textAppearance="@android:style/TextAppearance.Large"/>
 
     <TextView
-        android:id="@+id/textView2"
-        android:layout_width="fill_parent"
-        android:layout_height="1dp"
-        android:layout_margin="15dp"
-        android:background="@color/black" />
-
-    <TextView
-        android:id="@+id/textView3"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="15dp"
-        android:text="@string/dialog_sync_text"
-        android:textColor="@color/text_dialog"
-        android:textSize="20sp" />
-
-    <TextView
-        android:id="@+id/textView4"
+        android:id="@+id/tv_dialog_sync_text"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="15dp"
-        android:text="@string/dialog_sync_internet"
-        android:textColor="@color/text_dialog"
-        android:textSize="20sp" />
+        android:text="@string/dialog_sync_text_0"
+        android:textAppearance="@android:style/TextAppearance.Medium"
+        android:background="@drawable/entry"
+        android:padding="7dp"
+        android:layout_marginTop="10dp"/>
 
     <RelativeLayout
         android:layout_width="fill_parent"

app/src/main/res/layout/dialog_sync_failed.xml

@@ -2,7 +2,7 @@
     xmlns:android1="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:background="@drawable/background_app"
+    android:background="@drawable/section"
     android:orientation="vertical"
     android1:paddingBottom="10dp" >
 
@@ -10,44 +10,36 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android1:layout_alignParentTop="true"
-        android:orientation="vertical" >
+        android:orientation="vertical"
+        android:padding="7dp">
 
         <TextView
-            android:id="@+id/textView1"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="15dp"
-            android:gravity="center_horizontal"
             android:text="@string/dialog_sync_failed_title"
-            android:textColor="@color/text_dialog"
-            android:textSize="30sp" />
+            android:textAppearance="@android:style/TextAppearance.Large"
+            android:layout_marginBottom="10dp"/>
 
         <TextView
-            android:id="@+id/textView2"
-            android:layout_width="fill_parent"
-            android:layout_height="1dp"
-            android:layout_margin="15dp"
-            android:background="@color/black" />
-
-        <TextView
-            android:id="@+id/textView3"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="15dp"
             android:text="@string/dialog_sync_failed_text"
-            android:textColor="@color/text_dialog"
-            android:textSize="20sp" />
+            android:background="@drawable/entry"
+            android:padding="7dp"
+            android:textAppearance="@android:style/TextAppearance.Medium"/>
 
     </LinearLayout>
 
     <Button
-        android1:id="@+id/bt_dialog_sync_failed_close"
-        android1:layout_width="wrap_content"
-        android1:layout_height="wrap_content"
-        android1:layout_alignParentBottom="true"
-        android1:layout_centerHorizontal="true"
-        android1:layout_margin="5dp"
-        android1:background="@drawable/arrowbutton"
-        android1:text="@string/dialog_sync_failed_close" />
+        android:id="@+id/bt_dialog_sync_failed_close"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_margin="5dp"
+        android:text="@string/dialog_sync_failed_close"
+        android:background="@drawable/button_selector"
+        android:textStyle="bold"
+        android:textColor="@color/input_text_color"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 
 </RelativeLayout>

app/src/main/res/layout/fragment_layout_home.xml

@@ -525,7 +525,7 @@
 						android:adjustViewBounds="true"
 						android:contentDescription="@string/social_mail"
 						android:maxWidth="50dp"
-						android:src="@drawable/social_mail"/>
+						android:src="@drawable/social_phone"/>
 
 					<ImageView
 						android:id="@+id/iv_home_section_social_mail"

app/src/main/res/layout/fragment_layout_location.xml

@@ -50,7 +50,7 @@
 		    android:layout_height="wrap_content"
 		    android:layout_gravity="center_horizontal"
 		    android:layout_marginTop="30dp"
-		    android:background="@drawable/arrowbutton"
+		    android:background="@drawable/button_selector"
 		    android:paddingLeft="10dp"
 		    android:paddingRight="10dp"
 		    android:paddingStart="10dp"

app/src/main/res/values/strings.xml

@@ -276,14 +276,24 @@
 	<!-- Notification dialog strings -->
 	
 	<string name="notification_close">Close</string>
-	<string name="notification_action_schedule">Open festival schedule</string>
-	<string name="notification_action_gm">Open Margolariak Schedule</string>
+	<string name="notification_action_lablanca"> Open La Blanca </string>
+	<string name="notification_action_gmschedule"> Open Margolari schedule </string>
+	<string name="notification_action_cityschedule"> Open city schedule </string>
+	<string name="notification_action_location"> Show location </string>
+	<string name="notification_action_around"> Show events </string>
+	<string name="notification_action_blog"> Open blog </string>
+	<string name="notification_action_activities"> Open activities </string>
+	<string name="notification_action_gallery"> Open gallery </string>
 	
 	
 	<!-- Sync dialog strings -->
 	
 	<string name="dialog_sync_title">Fetching content</string>
-	<string name="dialog_sync_text">Downloading the latest content.</string>
+	<string name="dialog_sync_text_0">Locating Don Margolo...</string>
+	<string name="dialog_sync_text_1">Starting up the van...</string>
+	<string name="dialog_sync_text_2">Serving kalimotxos...</string>
+	<string name="dialog_sync_text_3">\"...tu eres el piloto...\"</string>
+	<string name="dialog_sync_text_4">Afinando la tuba...</string>
 	<string name="dialog_sync_internet">You must have an active network connection the first time you run this app.</string>
 	<string name="dialog_sync_failed_title">Synchronization failed</string>
 	<string name="dialog_sync_failed_text">Couldn\'t download content.\n\nMake sure you have a network connection and try again.</string>