Added readme

README.md

@@ -0,0 +1,9 @@
+ 
+Gasteizko Margolariak Android App
+===
+
+An Android app intended for members of <a href="http://margolariak.com/">Gasteizko Margolariak</a> in <a href="http://www.vitoria-gasteiz.org/">Vitoria-Gasteiz</a>, Spain.
+
+During the regional festival, it can help them find activities around the town, both hosted by Gasteizko Margolariak and other parties, as well as sugest them things to to when they are near places of interest.
+
+For the rest of the year, it helps users keep track of the activities organized by Gasteizko Margolariak, check the blog, and view and upload photos.

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

@@ -280,7 +280,7 @@ public class MainActivity extends AppCompatActivity implements LocationListener{
 			public void onClick(View v) { mLayout.toggleMenu(); }
 		});
 		
-		//Assign menu items and icons
+		//Assign menu items
 		TextView menuItem[] = new TextView[8];
 		menuItem[0] = (TextView) findViewById(R.id.menu_home);
 		menuItem[1] = (TextView) findViewById(R.id.menu_location);
@@ -297,6 +297,8 @@ public class MainActivity extends AppCompatActivity implements LocationListener{
 		menuLablancaItem[1] = (TextView) findViewById(R.id.menu_lablanca_gm_schedule);
 		menuLablancaItem[2] = (TextView) findViewById(R.id.menu_lablanca_around);
 
+		//Todo: Read settings and display needed menu entries
+
 		//Set click listers for menu items
 		menuItem[0].setOnClickListener(new OnClickListener() {
 			@Override

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

@@ -30,22 +30,31 @@
                 android:textAppearance="?android:attr/textAppearanceLarge"
 				android:textStyle="bold"
 				android:textColor="@color/menu_entry" />
-			<View
+
+			<LinearLayout
+				android:orientation="vertical"
 				android:layout_width="fill_parent"
-				android:layout_height="1dp"
-				android:background="@color/background_separator"/>
+				android:layout_height="wrap_content"
+				android:id="@+id/ll_menu_location"
+				android:visibility="gone">
 
-			<TextView
-                android:id="@+id/menu_location"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:layout_marginTop="10dp"
-				android:gravity="center_vertical"
-                android:text="@string/menu_location"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:textStyle="bold"
-				android:textColor="@color/menu_entry" />
+				<View
+                    android:layout_width="fill_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/background_separator"/>
+
+				<TextView
+                    android:id="@+id/menu_location"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center_vertical"
+                    android:text="@string/menu_location"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:textStyle="bold"
+                    android:textColor="@color/menu_entry" />
+			</LinearLayout>
 
 			<View
 				android:layout_width="fill_parent"
@@ -65,43 +74,46 @@
 				android:textColor="@color/menu_entry" />
 
             <TextView
-                android:id="@+id/menu_lablanca_schedule"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:layout_marginTop="10dp"
+				android:id="@+id/menu_lablanca_schedule"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="10dp"
+				android:layout_marginTop="10dp"
 				android:layout_marginStart="20dp"
 				android:layout_marginLeft="20dp"
-                android:gravity="center_vertical"
-                android:text="@string/menu_lablanca_schedule"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-				android:textColor="@color/menu_entry" />
+				android:gravity="center_vertical"
+				android:text="@string/menu_lablanca_schedule"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:textColor="@color/menu_entry"
+				android:visibility="gone"/>
 
             <TextView
-                android:id="@+id/menu_lablanca_gm_schedule"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:layout_marginTop="10dp"
+				android:id="@+id/menu_lablanca_gm_schedule"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="10dp"
+				android:layout_marginTop="10dp"
 				android:layout_marginStart="20dp"
 				android:layout_marginLeft="20dp"
-                android:gravity="center_vertical"
-                android:text="@string/menu_lablanca_gm_schedule"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-				android:textColor="@color/menu_entry" />
+				android:gravity="center_vertical"
+				android:text="@string/menu_lablanca_gm_schedule"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:textColor="@color/menu_entry"
+				android:visibility="gone"/>
 
             <TextView
-                android:id="@+id/menu_lablanca_around"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:layout_marginTop="10dp"
+				android:id="@+id/menu_lablanca_around"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="10dp"
+				android:layout_marginTop="10dp"
 				android:layout_marginStart="20dp"
 				android:layout_marginLeft="20dp"
-                android:gravity="center_vertical"
-                android:text="@string/menu_lablanca_around"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-				android:textColor="@color/menu_entry" />
+				android:gravity="center_vertical"
+				android:text="@string/menu_lablanca_around"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:textColor="@color/menu_entry"
+				android:visibility="gone"/>
 
 			<View
 				android:layout_width="fill_parent"

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

@@ -1,84 +1,114 @@
 <com.ivalentin.gm.CustomScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
+								   android:layout_width="fill_parent"
+								   android:layout_height="fill_parent"
+								   android:orientation="vertical"
+								   android:background="@color/background_app"
+								   android:padding="7dp">
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" >
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		>
     
 	    <LinearLayout
-	        android:id="@+id/ll_around_list"
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"
-	        android:orientation="vertical" >
-	
-	    </LinearLayout>
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:orientation="vertical"
+			android:background="@drawable/section">
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textAppearance="?android:attr/textAppearanceLarge"
+				android:text="@string/around_header"
+				android:id="@+id/textView6"/>
+
+			<LinearLayout
+				android:orientation="vertical"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent"
+				android:id="@+id/ll_around_list">
+			</LinearLayout>
+		</LinearLayout>
 
 	    <LinearLayout
-	        android:id="@+id/ll_around_no_events"
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"
-	        android:orientation="vertical"
-	        android:padding="18dp"
-	        android:visibility="gone" >
+			android:id="@+id/ll_around_no_events"
+			android:layout_width="fill_parent"
+			android:layout_height="match_parent"
+			android:orientation="vertical"
+			android:padding="7dp"
+			android:visibility="gone"
+			android:background="@drawable/section">
 
 	        <TextView
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
-	            android:layout_gravity="center_horizontal"
-	            android:layout_marginTop="20dp"
-	            android:gravity="center_horizontal"
+				android:gravity="center_horizontal"
 	            android:text="@string/around_no_events_0"
 	            android:textAppearance="?android:attr/textAppearanceLarge" />
 
 	        <TextView
-	            android:layout_width="wrap_content"
-	            android:layout_height="wrap_content"
-	            android:layout_gravity="center_horizontal"
-	            android:layout_marginTop="15dp"
-	            android:gravity="center_horizontal"
-	            android:text="@string/around_no_events_1" />
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginTop="15dp"
+				android:text="@string/around_no_events_1"
+				android:background="@drawable/entry"
+				android:padding="7dp"/>
 
 	        <Button
-	            android:id="@+id/bt_around_no_events"
-	            android:layout_width="wrap_content"
-	            android:layout_height="wrap_content"
-	            android:layout_gravity="center_horizontal"
-	            android:layout_marginTop="20dp"
-	            android:background="@drawable/arrowbutton"
-	            android:padding="6dp"
-	            android:text="@string/around_no_events_button" />
+				android:id="@+id/bt_around_no_events"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginTop="20dp"
+				android:background="@drawable/button_selector"
+				android:padding="6dp"
+				android:text="@string/around_no_events_button"
+				android:textColor="@color/input_button_color"
+				android:textStyle="bold"
+				android:layout_marginBottom="15dp"/>
 
 	    </LinearLayout>
 	    
 	    <LinearLayout
-	        android:id="@+id/ll_around_no_gps"
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"
-	        android:orientation="vertical"
-	        android:padding="18dp"
-	        android:visibility="gone" >
+			android:id="@+id/ll_around_no_gps"
+			android:layout_width="fill_parent"
+			android:layout_height="match_parent"
+			android:orientation="vertical"
+			android:padding="7dp"
+			android:visibility="gone"
+			android:background="@drawable/section">
 	        
 	        <TextView
 	            android:layout_width="wrap_content"
 	            android:layout_height="wrap_content"
-	            android:layout_gravity="center_horizontal"
-	            android:layout_marginTop="20dp"
-	            android:gravity="center_horizontal"
-	            android:text="@string/around_no_gps"
+				android:text="@string/around_no_gps"
 	            android:textAppearance="?android:attr/textAppearanceLarge" />
 
-	            <Button
-	                android:id="@+id/bt_around_no_gps"
-	                android:layout_width="wrap_content"
-	                android:layout_height="wrap_content"
-	                android:layout_gravity="center_horizontal"
-	                android:layout_marginTop="20dp"
-	                android:background="@drawable/arrowbutton"
-	                android:padding="6dp"
-	                android:text="@string/around_no_gps_button" />
+			<TextView
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginTop="15dp"
+				android:text="@string/around_no_gps_text"
+				android:background="@drawable/entry"
+				android:padding="7dp"
+				android:id="@+id/textView8"/>
+
+			<Button
+				android:id="@+id/bt_around_no_gps"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:layout_marginTop="20dp"
+				android:background="@drawable/button_selector"
+				android:padding="6dp"
+				android:text="@string/around_no_gps_button"
+				android:textStyle="bold"
+				android:textColor="@color/input_button_color"
+				android:layout_marginBottom="15dp"/>
 	
 	    </LinearLayout>
 	    

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

@@ -75,10 +75,12 @@
 
 	<!-- Around section string -->
 
+	<string name="around_header">Nearby events</string>
 	<string name="around_no_events_0">There are no upcoming events.</string>
 	<string name="around_no_events_1">Wait for the festivals te be closer, and you will see activities around you!</string>
 	<string name="around_no_events_button">Check out festivals schedule</string>
-	<string name="around_no_gps">Turn on GPS to be able to see events around you.</string>
+	<string name="around_no_gps">GPS turned off</string>
+	<string name="around_no_gps_text">Turn on GPS to be able to see events around you.</string>
 	<string name="around_no_gps_button">Open settings</string>
 	<string name="around_distance">%1$s %2$s away from you (About %3$s minutes walking)</string>
 

import-summary.txt

@@ -1,73 +0,0 @@
-ECLIPSE ANDROID PROJECT IMPORT SUMMARY
-======================================
-
-Manifest Merging:
------------------
-Your project uses libraries that provide manifests, and your Eclipse
-project did not explicitly turn on manifest merging. In Android Gradle
-projects, manifests are always merged (meaning that contents from your
-libraries' manifests will be merged into the app manifest. If you had
-manually copied contents from library manifests into your app manifest
-you may need to remove these for the app to build correctly.
-
-Ignored Files:
---------------
-The following files were *not* copied into the new Gradle project; you
-should evaluate whether these are still needed in your project and if
-so manually move them:
-
-* ic_launcher-web.png
-* proguard-project.txt
-
-Replaced Jars with Dependencies:
---------------------------------
-The importer recognized the following .jar files as third party
-libraries and replaced them with Gradle dependencies instead. This has
-the advantage that more explicit version information is known, and the
-libraries can be updated automatically. However, it is possible that
-the .jar file in your project was of an older version than the
-dependency we picked, which could render the project not compileable.
-You can disable the jar replacement in the import wizard and try again:
-
-android-support-v4.jar => com.android.support:support-v4:22.2.1
-android-support-v7-appcompat.jar => com.android.support:appcompat-v7:22.2.1
-
-Replaced Libraries with Dependencies:
--------------------------------------
-The importer recognized the following library projects as third party
-libraries and replaced them with Gradle dependencies instead. This has
-the advantage that more explicit version information is known, and the
-libraries can be updated automatically. However, it is possible that
-the source files in your project were of an older version than the
-dependency we picked, which could render the project not compileable.
-You can disable the library replacement in the import wizard and try
-again:
-
-android-support-v7-appcompat => [com.android.support:appcompat-v7:22.2.1]
-google-play-services_lib => [com.google.android.gms:play-services:+]
-
-Moved Files:
-------------
-Android Gradle projects use a different directory structure than ADT
-Eclipse projects. Here's how the projects were restructured:
-
-* AndroidManifest.xml => app/src/main/AndroidManifest.xml
-* assets/ => app/src/main/assets
-* lint.xml => app/lint.xml
-* res/ => app/src/main/res/
-* src/ => app/src/main/java/
-
-Next Steps:
------------
-You can now build the project. The Gradle project needs network
-connectivity to download dependencies.
-
-Bugs:
------
-If for some reason your project does not build, and you determine that
-it is due to a bug or limitation of the Eclipse to Gradle importer,
-please file a bug at http://b.android.com with category
-Component-Tools.
-
-(This import summary is for your information only, and can be deleted
-after import once you are satisfied with the results.)