Iñigo Valentin 8 лет назад
Родитель
Сommit
ba8f6fad9b

+ 1 - 3
app/src/main/java/com/ivalentin/margolariak/GM.java

@@ -928,9 +928,7 @@ final class GM {
 		/**
 		 * URL of the server.
 		 */
-		//static final String SERVER = "https://margolariak.com";
-		//static final String SERVER = "http://192.168.1.101";
-		static final String SERVER = "http://47.61.32.194:8101";
+		static final String SERVER = "https://margolariak.com";
 	}
 
 	/**

+ 2 - 2
app/src/main/java/com/ivalentin/margolariak/ScheduleLayout.java

@@ -109,7 +109,7 @@ public class ScheduleLayout extends Fragment{
 			cursor = db.rawQuery("SELECT DISTINCT date(start) AS daydate FROM festival_event_gm WHERE strftime('%Y', start) = '" + year + "' AND strftime('%H', start) > '06' ORDER BY daydate;", null);
 		}
 		else{
-			cursor = db.rawQuery("SELECT DISTINCT date(start) AS daydate FROM festival_event_vity WHERE strftime('%Y', start) = '" + year + "' AND strftime('%H', start) > '06' ORDER BY daydate;", null);
+			cursor = db.rawQuery("SELECT DISTINCT date(start) AS daydate FROM festival_event_city WHERE strftime('%Y', start) = '" + year + "' AND strftime('%H', start) > '06' ORDER BY daydate;", null);
 		}
 
 
@@ -324,7 +324,7 @@ public class ScheduleLayout extends Fragment{
 
 			//Set address
 			tvRowAddress = (TextView) entry.findViewById(R.id.tv_row_schedule_address);
-			if (cursor.getString(7) == null || cursor.getString(7).length() <= 0 || cursor.getString(7).equals(cursor.getString(6))) {
+			if (cursor.getString(7) == null || cursor.getString(7).length() <= 0 || cursor.getString(7).equalsIgnoreCase(cursor.getString(6))) {
 				tvRowAddress.setVisibility(View.GONE);
 			}
 			else {

+ 2 - 2
app/src/main/res/layout/row_activity_past.xml

@@ -60,7 +60,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:id="@+id/tv_row_activity_past_text"
-                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textAppearance="@android:style/TextAppearance.Medium"
                 android:layout_margin="5dp"
                 android:maxLines="4"
                 android:minHeight="30dp"/>
@@ -78,4 +78,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>

+ 2 - 1
app/src/main/res/layout/row_schedule.xml

@@ -107,7 +107,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
                     android:textAppearance="@android:style/TextAppearance.Small"
-                    android:textColor="#000000"/>
+                    android:textColor="@color/schedule_place"/>
 
                 <TextView
                     android:id="@+id/tv_row_schedule_address"
@@ -115,6 +115,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center_vertical"
                     android:textStyle="italic"
+                    android:textColor="@color/schedule_address"
                     android:textAppearance="@android:style/TextAppearance.Small"/>
             </LinearLayout>
         </LinearLayout>

+ 5 - 1
app/src/main/res/values/color.xml

@@ -41,11 +41,15 @@
     <!-- Color for maps -->
     <color name="map_border">#0077ff</color>
     <color name="map_background">#ffffff</color>
-    <color name="map_route">#0022aaaa</color>
+    <color name="map_route">#0022aa</color>
 
     <!--Colors for album covers -->
     <color name="album_border">#111111</color>
     <color name="album_background">#aaaaaa</color>
 
+    <!-- Color for schedule rows -->
+    <color name="schedule_place">#555577</color>
+    <color name="schedule_address">#8888aa</color>
+
 </resources>