Small UI improvements

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

@@ -109,11 +109,10 @@ public class GalleryLayout extends Fragment{
             preview[2] = (ImageView) entry.findViewById(R.id.iv_row_gallery_2);
             preview[3] = (ImageView) entry.findViewById(R.id.iv_row_gallery_3);
 
-            //Set counter
-            Cursor cursorImage = db.rawQuery("SELECT id, file, width, height FROM photo, photo_album WHERE photo = id AND album = " + cursor.getString(0) + " ORDER BY random() LIMIT 4;", null);
-            TextView tvPhotoCounter = (TextView) entry.findViewById(R.id.tv_row_gallery_counter);
-            tvPhotoCounter.setText(String.format(getResources().getQuantityString(R.plurals.gallery_photo_count, cursorImage.getCount()), cursorImage.getCount()));
+            //Get db rows
+            Cursor cursorImage = db.rawQuery("SELECT id, file, width, height, count(id) FROM photo, photo_album WHERE photo = id AND album = " + cursor.getString(0) + " ORDER BY random() LIMIT 4;", null);
 
+            //Loop
             int i = 0;
             while (cursorImage.moveToNext()){
                 String image = cursorImage.getString(1);
@@ -136,6 +135,12 @@ public class GalleryLayout extends Fragment{
                 i ++;
 
             }
+
+            //Set photo counter
+			cursorImage.moveToFirst();
+            TextView tvPhotoCounter = (TextView) entry.findViewById(R.id.tv_row_gallery_counter);
+            tvPhotoCounter.setText(String.format(getResources().getQuantityString(R.plurals.gallery_photo_count, cursorImage.getInt(4), cursorImage.getInt(4))));
+
             cursorImage.close();
 
             //Set onCLickListener

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

@@ -367,7 +367,6 @@ public class ScheduleLayout extends Fragment implements OnMapReadyCallback{
 		//Get info about the event
 		SQLiteDatabase db = getActivity().openOrCreateDatabase(GM.DB_NAME, Context.MODE_PRIVATE, null);
 		String lang = GM.getLang();
-		//Cursor cursor = db.rawQuery("SELECT event.id, event.name, description, start, end, place.name, address, lat, lon, host FROM event, place WHERE place.id = event.place AND event.id = " + id + ";", null);
 		Cursor cursor = db.rawQuery("SELECT festival_event.id, title_" + lang + ", description_" + lang + ", place, start, end, name_" + lang + ", address_" + lang + ", lat, lon, host FROM festival_event, place WHERE place = place.id AND festival_event.id = " + id + ";", null);
 		if (cursor.getCount() > 0){
 			cursor.moveToNext();

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

@@ -12,7 +12,8 @@
         android:layout_alignParentTop="true"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textAppearance="@android:style/TextAppearance.Large"/>
+        android:textAppearance="@android:style/TextAppearance.Large"
+        android:textStyle="bold"/>
 
     <LinearLayout
         android:id="@+id/ll_dialog_notification_buttons"

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

@@ -44,7 +44,8 @@
             android:id="@+id/tv_dialog_schedule_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="@android:style/TextAppearance.Large"/>
+            android:textAppearance="@android:style/TextAppearance.Large"
+            android:textStyle="bold"/>
 
         <LinearLayout
             android:orientation="vertical"

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

@@ -12,7 +12,8 @@
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:maxLines="2"
-        android:textAppearance="@android:style/TextAppearance.Large"/>
+        android:textAppearance="@android:style/TextAppearance.Large"
+        android:textStyle="bold"/>
 
     <ScrollView
         android:layout_width="fill_parent"

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

@@ -10,7 +10,8 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:text="@string/dialog_sync_title"
-        android:textAppearance="@android:style/TextAppearance.Large"/>
+        android:textAppearance="@android:style/TextAppearance.Large"
+        android:textStyle="bold"/>
 
     <TextView
         android:id="@+id/tv_dialog_sync_text"

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

@@ -18,7 +18,8 @@
             android:layout_height="wrap_content"
             android:text="@string/dialog_sync_failed_title"
             android:textAppearance="@android:style/TextAppearance.Large"
-            android:layout_marginBottom="10dp"/>
+            android:layout_marginBottom="10dp"
+            android:textStyle="bold"/>
 
         <TextView
             android:layout_width="fill_parent"

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

@@ -26,7 +26,8 @@
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:text="@string/activity_future"
-                android:id="@+id/textView5" />
+                android:id="@+id/textView5"
+                android:textStyle="bold"/>
 
             <TextView
                 android:layout_width="fill_parent"
@@ -57,7 +58,8 @@
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:text="@string/activity_past"
-                android:id="@+id/textView7" />
+                android:id="@+id/textView7"
+                android:textStyle="bold"/>
 
             <LinearLayout
                 android:orientation="vertical"

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

@@ -20,7 +20,8 @@
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:text="Large Text"
-            android:id="@+id/tv_activity_future_title" />
+            android:id="@+id/tv_activity_future_title"
+            android:textStyle="bold"/>
 
         <LinearLayout
             android:orientation="vertical"
@@ -164,7 +165,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="@string/activity_schedule" />
+                android:text="@string/activity_schedule"
+                android:textStyle="bold"/>
 
             <LinearLayout
                 android:orientation="vertical"

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

@@ -20,7 +20,8 @@
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:text="Large Text"
-            android:id="@+id/tv_activity_past_title" />
+            android:id="@+id/tv_activity_past_title"
+            android:textStyle="bold"/>
 
         <LinearLayout
             android:orientation="vertical"

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

@@ -22,8 +22,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="Large Text"
-            android:id="@+id/tv_album_title" />
+            android:id="@+id/tv_album_title"
+            android:textStyle="bold"/>
 
         <WebView
             android:layout_width="fill_parent"

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

@@ -67,7 +67,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceLarge"
-                android:text="@string/gallery_albums" />
+                android:text="@string/gallery_albums"
+                android:textStyle="bold"/>
 
             <LinearLayout
                 android:orientation="vertical"

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

@@ -23,7 +23,8 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_location"
-				android:textAppearance="?android:attr/textAppearanceLarge"/>
+				android:textAppearance="?android:attr/textAppearanceLarge"
+				android:textStyle="bold"/>
 
 			<LinearLayout
                 android:id="@+id/ll_home_section_location_content"
@@ -84,7 +85,8 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_lablanca"
-				android:textAppearance="?android:attr/textAppearanceLarge"/>
+				android:textAppearance="?android:attr/textAppearanceLarge"
+				android:textStyle="bold"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_lablanca_content"
@@ -114,7 +116,8 @@
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_gmschedule"
 				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:layout_marginBottom="10dp"/>
+				android:layout_marginBottom="10dp"
+				android:textStyle="bold"/>
 
 			<LinearLayout
 				android:orientation="vertical"
@@ -187,7 +190,8 @@
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_cityschedule"
 				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:layout_marginBottom="10dp"/>
+				android:layout_marginBottom="10dp"
+				android:textStyle="bold"/>
 
 			<LinearLayout
 				android:orientation="vertical"
@@ -259,7 +263,8 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_around"
-				android:textAppearance="?android:attr/textAppearanceLarge"/>
+				android:textAppearance="?android:attr/textAppearanceLarge"
+				android:textStyle="bold"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_around_content"
@@ -288,7 +293,8 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_activities_future"
-				android:textAppearance="?android:attr/textAppearanceLarge"/>
+				android:textAppearance="?android:attr/textAppearanceLarge"
+				android:textStyle="bold"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_activities_future_content"
@@ -314,7 +320,8 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_blog"
-				android:textAppearance="?android:attr/textAppearanceLarge"/>
+				android:textAppearance="?android:attr/textAppearanceLarge"
+				android:textStyle="bold"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_blog_content"
@@ -340,7 +347,8 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_gallery"
-				android:textAppearance="?android:attr/textAppearanceLarge"/>
+				android:textAppearance="?android:attr/textAppearanceLarge"
+				android:textStyle="bold"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_gallery_content"
@@ -489,7 +497,8 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_activities_past"
-				android:textAppearance="?android:attr/textAppearanceLarge"/>
+				android:textAppearance="?android:attr/textAppearanceLarge"
+				android:textStyle="bold"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_activities_past_content"
@@ -515,7 +524,8 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:text="@string/home_section_social"
-				android:textAppearance="?android:attr/textAppearanceLarge"/>
+				android:textAppearance="?android:attr/textAppearanceLarge"
+				android:textStyle="bold"/>
 
 			<LinearLayout
 				android:id="@+id/ll_home_section_social_content"

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

@@ -24,7 +24,8 @@
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:text="@string/lablanca_title"
-                android:id="@+id/textView10"/>
+                android:id="@+id/textView10"
+                android:textStyle="bold"/>
 
             <LinearLayout
                 android:orientation="horizontal"
@@ -68,7 +69,7 @@
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceLarge"
                 android:text="@string/lablanca_schedule"
-                />
+                android:textStyle="bold"/>
 
             <LinearLayout
                 android:orientation="horizontal"
@@ -121,7 +122,8 @@
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceLarge"
                     android:text="@string/lablanca_prices"
-                    android:id="@+id/textView12"/>
+                    android:id="@+id/textView12"
+                    android:textStyle="bold"/>
 
                 <LinearLayout
                     android:orientation="vertical"

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

@@ -19,7 +19,8 @@
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:text="@string/lablanca_title"
-            android:id="@+id/textView10"/>
+            android:id="@+id/textView10"
+            android:textStyle="bold"/>
 
         <TextView
             android:layout_width="fill_parent"

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

@@ -18,7 +18,8 @@
 			android:layout_height="wrap_content"
 			android:textAppearance="@android:style/TextAppearance.Large"
 			android:text="@string/menu_location"
-			android:id="@+id/textView2"/>
+			android:id="@+id/textView2"
+			android:textStyle="bold"/>
 
 		<LinearLayout
 			android:orientation="vertical"

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

@@ -19,8 +19,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="Large Text"
-            android:id="@+id/tv_photo_title"/>
+            android:id="@+id/tv_photo_title"
+            android:textStyle="bold"/>
 
         <LinearLayout
             android:orientation="vertical"
@@ -53,7 +53,8 @@
                 android:text="Small Text"
                 android:id="@+id/tv_photo_date"
                 android:layout_marginStart="15dp"
-                android:layout_marginBottom="15dp"/>
+                android:layout_marginBottom="15dp"
+                android:textStyle="italic"/>
 
             <LinearLayout
                 android:orientation="horizontal"

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

@@ -20,7 +20,8 @@
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:text="Large Text"
-            android:id="@+id/tv_post_title" />
+            android:id="@+id/tv_post_title"
+            android:textStyle="bold"/>
 
         <LinearLayout
             android:orientation="vertical"

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

@@ -9,14 +9,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="Large Text"
-        android:id="@+id/tv_row_activity_future_title" />
+        android:id="@+id/tv_row_activity_future_title"
+        />
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="@android:style/TextAppearance.Medium"
-        android:text="Medium Text"
         android:id="@+id/tv_row_activity_future_date"
         android:textStyle="italic"
         android:layout_margin="6dp" />
@@ -94,7 +93,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         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_past.xml

@@ -14,14 +14,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="Large Text"
             android:id="@+id/tv_row_activity_past_title" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="Small Text"
             android:id="@+id/tv_row_activity_past_date"
             android:gravity="end"
             android:layout_marginStart="20dp"
@@ -31,7 +29,6 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="New Text"
         android:id="@+id/tv_row_activity_past_hidden"
         android:visibility="gone" />
 
@@ -52,7 +49,6 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="New Text"
             android:id="@+id/tv_row_activity_past_text"
             android:layout_weight=".7"
             android:textAppearance="@android:style/TextAppearance.Medium"

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

@@ -10,7 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAppearance="@android:style/TextAppearance.Medium"
-        android:text="Medium Text"
         android:id="@+id/tv_row_activity_itinerary_time"
         android:layout_weight=".8"
         android:textStyle="bold"
@@ -20,7 +19,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="Medium Text"
         android:id="@+id/tv_row_activity_itinerary_id"
         android:visibility="gone"/>
 
@@ -59,14 +57,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             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:style/TextAppearance.Medium"
-            android:text="Medium Text"
             android:id="@+id/tv_row_activity_itinerary_description"
             android:textStyle="italic" />
 
@@ -96,7 +92,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textAppearance="@android:style/TextAppearance.Small"
-                    android:text="Small Text"
                     android:id="@+id/tv_row_activity_itinerary_place"
                     android:layout_gravity="center_vertical" />
 
@@ -104,7 +99,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textAppearance="@android:style/TextAppearance.Small"
-                    android:text="Small Text"
                     android:id="@+id/tv_row_activity_itinerary_address"
                     android:layout_gravity="center_vertical"
                     android:textStyle="italic" />

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

@@ -11,7 +11,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="Large Text"
         android:id="@+id/tv_row_blog_title" />
 
     <TextView
@@ -38,7 +37,6 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="New Text"
             android:id="@+id/tv_row_blog_text"
             android:layout_weight=".7"
             android:textAppearance="@android:style/TextAppearance.Medium"
@@ -64,7 +62,6 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="Small Text"
             android:id="@+id/tv_row_blog_date"
             android:layout_weight=".5" />
 
@@ -72,7 +69,6 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="Small Text"
             android:id="@+id/tv_row_blog_details"
             android:layout_weight=".5"
             android:gravity="end" />

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

@@ -91,7 +91,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="@android:style/TextAppearance.Large"
-        android:text="Large Text"
         android:id="@+id/tv_row_gallery_title"
         android:layout_marginTop="15dp"
         android:layout_gravity="center_horizontal" />
@@ -100,9 +99,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="@android:style/TextAppearance.Medium"
-        android:text="Medium Text"
         android:id="@+id/tv_row_gallery_counter"
-        android:layout_gravity="center_horizontal" />
+        android:layout_gravity="center_horizontal"
+        android:textStyle="italic"/>
 
     <TextView
         android:layout_width="wrap_content"

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

@@ -9,14 +9,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:text="Large Text"
         android:id="@+id/tv_row_home_blog_title" />
 
     <TextView
         android:layout_width="fill_parent"
         android:layout_height="0dp"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:text="Small Text"
         android:id="@+id/tv_row_home_blog_date"
         android:layout_weight=".5" />
 
@@ -44,7 +42,6 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="New Text"
             android:id="@+id/tv_row_home_blog_text"
             android:layout_weight=".7"
             android:textAppearance="@android:style/TextAppearance.Medium"

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

@@ -82,8 +82,8 @@
 
             <ImageView
                 android:contentDescription="@string/app_cdesc"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
                 android:id="@+id/iv_row_schedule_pinpoint"
                 android:src="@drawable/pinpoint"
                 android:layout_marginStart="10dp"/>