Several improvements for upcaming activities, city schedule and gm schedule sections.

app/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.ivalentin.margolariak"
-    android:versionCode="8"
-    android:versionName="2.0" >
+    android:versionCode="9"
+    android:versionName="2.0-alpha02" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

app/src/main/java/com/ivalentin/margolariak/ActivityFutureLayout.java

@@ -110,7 +110,7 @@ public class ActivityFutureLayout extends Fragment {
         cursor.close();
 
         //Get itinerary
-        Cursor cursorItinerary = db.rawQuery("SELECT id, activity_schedule.name_" + currLang + " AS name, description_" + currLang + " AS description, start, place.name_" + currLang + " AS placename, address_" + currLang + " AS address, lat, lon FROM activity_schedule, place WHERE activity_schedule.place = place.id AND activity = " + id + ";", null);
+        Cursor cursorItinerary = db.rawQuery("SELECT activity_itinerary.id, activity_itinerary.name_" + currLang + " AS name, description_" + currLang + " AS description, start, place.name_" + currLang + " AS placename, address_" + currLang + " AS address, lat, lon FROM activity_itinerary, place WHERE activity_itinerary.place = place.id AND activity = " + id + ";", null);
         if (cursorItinerary.getCount() <= 0){
             LinearLayout sch = (LinearLayout) view.findViewById(R.id.ll_activity_future_schedule);
             sch.setVisibility(View.GONE);
@@ -125,32 +125,32 @@ public class ActivityFutureLayout extends Fragment {
 
                 //Set time
                 TextView tvSchTime = (TextView) entry.findViewById(R.id.tv_row_activity_itinerary_time);
-                tvSchTime.setText(cursor.getString(3).substring(11, 16));
+                tvSchTime.setText(cursorItinerary.getString(3).substring(11, 16));
 
                 //Set title
                 TextView tvSchTitle = (TextView) entry.findViewById(R.id.tv_row_activity_itinerary_title);
-                tvSchTitle.setText(cursor.getString(1));
+                tvSchTitle.setText(cursorItinerary.getString(1));
 
                 //Set description
                 TextView tvSchDescription = (TextView) entry.findViewById(R.id.tv_row_activity_itinerary_description);
-                if (!cursor.getString(1).equals(cursor.getString(2))){
+                if (!cursorItinerary.getString(1).equals(cursorItinerary.getString(2))){
                     tvSchDescription.setVisibility(View.GONE);
                 }
                 else {
-                    tvSchTitle.setText(cursor.getString(2));
+                    tvSchTitle.setText(cursorItinerary.getString(2));
                 }
 
                 //Set place
                 TextView tvSchPlace = (TextView) entry.findViewById(R.id.tv_row_activity_itinerary_place);
-                tvSchPlace.setText(cursor.getString(4));
+                tvSchPlace.setText(cursorItinerary.getString(4));
 
                 //Set address
                 TextView tvSchAddress = (TextView) entry.findViewById(R.id.tv_row_activity_itinerary_address);
-                if (!cursor.getString(4).equals(cursor.getString(5))){
+                if (!cursorItinerary.getString(4).equals(cursorItinerary.getString(5))){
                     tvSchAddress.setVisibility(View.GONE);
                 }
                 else {
-                    tvSchAddress.setText(cursor.getString(5));
+                    tvSchAddress.setText(cursorItinerary.getString(5));
                 }
 
                 //TODO: Add an onclick listener on image that shows a map

app/src/main/java/com/ivalentin/margolariak/HomeLayout.java

@@ -750,7 +750,7 @@ public class HomeLayout extends Fragment implements LocationListener{
 						Fragment fragment = new ActivityFutureLayout();
 						Bundle bundle = new Bundle();
 						//Pass post id
-						int id = Integer.parseInt(((TextView) v.findViewById(R.id.tv_row_activity_future_hidden)).getText().toString());
+						int id = Integer.parseInt(((TextView) v.findViewById(R.id.tv_row_home_activity_hidden)).getText().toString());
 						bundle.putInt("activity", id);
 						fragment.setArguments(bundle);
 

app/src/main/java/com/ivalentin/margolariak/ScheduleLayout.java

@@ -266,11 +266,9 @@ public class ScheduleLayout extends Fragment implements OnMapReadyCallback{
 		}
 		Cursor cursor = db.rawQuery(query, null);
 
-		//If there are entries, clear the list
+		//Clear the list
 		list = (LinearLayout) view.findViewById(R.id.ll_schedule_list);
-		if (cursor.getCount() > 0) {
-			list.removeAllViews();
-		}
+		list.removeAllViews();
 
 		while (cursor.moveToNext()) {
 			eventCount++;
@@ -308,7 +306,7 @@ public class ScheduleLayout extends Fragment implements OnMapReadyCallback{
 			//Set icon
 			if (schedule == GM.SECTION_LABLANCA_GM_SCHEDULE) {
 				ImageView pinPoint = (ImageView) entry.findViewById(R.id.iv_row_schedule_pinpoint);
-				pinPoint.setImageResource(getResources().getIdentifier("com.ivalentin.gm:drawable/pinpoint_gm", null, null));
+				pinPoint.setImageResource(getResources().getIdentifier("com.ivalentin.margolariak:drawable/pinpoint_gm", null, null));
 			}
 
 

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

@@ -15,17 +15,19 @@
         android:layout_margin="7dp"
         android:padding="7dp" >
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="Large Text"
+            android:id="@+id/tv_activity_future_title" />
+
         <LinearLayout
-            android:orientation="horizontal"
+            android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="Large Text"
-                android:id="@+id/tv_activity_future_title" />
+            android:layout_height="match_parent"
+            android:background="@drawable/entry"
+            android:padding="7dp" >
 
             <TextView
                 android:layout_width="fill_parent"
@@ -34,15 +36,7 @@
                 android:text="Large Text"
                 android:id="@+id/tv_activity_future_date"
                 android:layout_gravity="end"
-                android:gravity="end" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/entry"
-            android:padding="7dp" >
+                android:gravity="center_horizontal" />
 
             <ImageView
                 android:layout_width="wrap_content"
@@ -104,7 +98,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_margin="15dp"
-                android:layout_gravity="center_horizontal">
+                android:layout_gravity="center_horizontal"
+                android:background="@color/album_border"
+                >
 
                 <TableRow
                     android:layout_width="wrap_content"
@@ -113,17 +109,21 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textAppearance="@android:style/TextAppearance.Medium"
                         android:text="@string/activity_city"
-                        android:layout_margin="5dp"
-                        android:gravity="end"/>
+                        android:gravity="end"
+                        android:background="#ffffff"
+                        android:layout_margin="1dp"
+                        android:padding="4dp"/>
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textAppearance="@android:style/TextAppearance.Medium"
                         android:id="@+id/tv_activity_future_city"
-                        android:layout_margin="5dp" />
+                        android:layout_margin="1dp"
+                        android:background="#ffffff"
+                        android:padding="4dp"/>
                 </TableRow>
 
                 <TableRow
@@ -133,40 +133,46 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textAppearance="@android:style/TextAppearance.Medium"
                         android:text="@string/activity_price"
-                        android:layout_margin="5dp"
-                        android:gravity="end" />
+                        android:layout_margin="1dp"
+                        android:gravity="end"
+                        android:background="#ffffff"
+                        android:padding="4dp"/>
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textAppearance="@android:style/TextAppearance.Medium"
                         android:id="@+id/tv_activity_future_price"
-                        android:layout_margin="5dp" />
+                        android:layout_margin="1dp"
+                        android:background="#ffffff"
+                        android:padding="4dp"/>
                 </TableRow>
             </TableLayout>
 
+        </LinearLayout>
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="15dp"
+            android:id="@+id/ll_activity_future_schedule">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:text="@string/activity_schedule" />
+
             <LinearLayout
                 android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="15dp"
-                android:id="@+id/ll_activity_future_schedule">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceLarge"
-                    android:text="@string/activity_schedule" />
-
-                <LinearLayout
-                    android:orientation="vertical"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:id="@+id/ll_activity_future_schedule_list"/>
-            </LinearLayout>
-
+                android:id="@+id/ll_activity_future_schedule_list"
+                android:background="@drawable/entry"
+                android:padding="7dp"/>
         </LinearLayout>
 
     </LinearLayout>

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

@@ -9,7 +9,7 @@
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:background="@drawable/section"
         android:layout_margin="7dp">
 

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

@@ -15,11 +15,11 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textAppearance="@android:style/TextAppearance.Medium"
         android:text="Medium Text"
         android:id="@+id/tv_row_activity_future_date"
         android:textStyle="italic"
-        android:layout_margin="5dp" />
+        android:layout_margin="6dp" />
 
     <LinearLayout
         android:orientation="horizontal"
@@ -54,7 +54,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textAppearance="@android:style/TextAppearance.Medium"
                     android:text="@string/activity_city"
                     android:gravity="end"
                     android:padding="4dp" />
@@ -62,7 +62,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textAppearance="@android:style/TextAppearance.Medium"
                     android:id="@+id/tv_row_activity_future_city"
                     android:padding="4dp" />
             </TableRow>
@@ -74,7 +74,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textAppearance="@android:style/TextAppearance.Medium"
                     android:text="@string/activity_price"
                     android:gravity="end"
                     android:padding="4dp" />
@@ -82,7 +82,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textAppearance="@android:style/TextAppearance.Medium"
                     android:id="@+id/tv_row_activity_future_price"
                     android:padding="4dp" />
             </TableRow>
@@ -93,7 +93,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textAppearance="@android:style/TextAppearance.Medium"
         android:text="Medium Text"
         android:id="@+id/tv_row_activity_future_text"
         android:layout_margin="7dp" />

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

@@ -9,7 +9,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textAppearance="@android:style/TextAppearance.Medium"
         android:text="Medium Text"
         android:id="@+id/tv_row_activity_itinerary_time"
         android:layout_weight=".8"
@@ -50,14 +50,14 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textAppearance="@android:style/TextAppearance.Large"
             android:text="Large Text"
             android:id="@+id/tv_row_activity_itinerary_title" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textAppearance="@android:style/TextAppearance.Medium"
             android:text="Medium Text"
             android:id="@+id/tv_row_activity_itinerary_description"
             android:textStyle="italic" />
@@ -87,7 +87,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textAppearance="@android:style/TextAppearance.Small"
                     android:text="Small Text"
                     android:id="@+id/tv_row_activity_itinerary_place"
                     android:layout_gravity="center_vertical" />
@@ -95,7 +95,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textAppearance="@android:style/TextAppearance.Small"
                     android:text="Small Text"
                     android:id="@+id/tv_row_activity_itinerary_address"
                     android:layout_gravity="center_vertical"

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

@@ -72,7 +72,8 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="2"
-            android:textAppearance="@android:style/TextAppearance.Medium"/>
+            android:textAppearance="@android:style/TextAppearance.Medium"
+            android:textStyle="italic"/>
 
         <LinearLayout
             android:orientation="horizontal"