Commits

Fabian Leon committed 30e27dd Merge

Comments (0)

Files changed (15)

Add a comment to this file

Barcamp/res/drawable-hdpi/ic_favorite.png

Added
New image
Add a comment to this file

Barcamp/res/drawable-hdpi/ic_unfavorite.png

Added
New image
Add a comment to this file

Barcamp/res/drawable-mdpi/ic_favorite.png

Old
Old image
New
New image
Add a comment to this file

Barcamp/res/drawable-mdpi/ic_star.png

Removed
Old image
Add a comment to this file

Barcamp/res/drawable-mdpi/ic_unfavorite.png

Old
Old image
New
New image
Add a comment to this file

Barcamp/res/drawable-mdpi/ic_unstar.png

Removed
Old image

Barcamp/res/layout/details_unconference_screen.xml

 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/black"
-    android:padding="16dp" >
+    android:padding="10dp" >
 
-    <TextView
-        android:id="@+id/lab_name_unconference"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/app_name"
-        android:textSize="22sp"
-        android:textStyle="bold" />
+    <RelativeLayout
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
 
-    <ImageView
-        android:id="@+id/img_favorite"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignTop="@+id/lab_name_unconference"
-        android:layout_gravity="center_vertical"
-        android:adjustViewBounds="true"
-        android:contentDescription="@string/app_name"
-        android:src="@drawable/ic_unstar" />
+        <TextView
+            android:id="@+id/lab_name_unconference"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="@string/app_name"
+            android:textSize="22sp"
+            android:textStyle="bold" />
 
-    <View
-        android:id="@+id/line"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_below="@+id/img_favorite"
-        android:layout_marginTop="2dp"
-        android:background="@color/ligth_blue" />
+        <ImageView
+            android:id="@+id/img_favorite"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignTop="@+id/lab_name_unconference"
+            android:layout_gravity="center_vertical"
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/app_name"
+            android:src="@drawable/ic_unfavorite" />
+
+        <View
+            android:id="@+id/line"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/lab_name_unconference"
+            android:layout_marginTop="2dp"
+            android:background="@color/ligth_blue" />
 
-    <TextView
-        android:id="@+id/lab_schedule"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/line"
-        android:layout_marginTop="4dp"
-        android:text="@string/app_name"
-        android:textColor="@color/blue"
-        android:textSize="18sp" />
+        <TextView
+            android:id="@+id/lab_schedule"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/line"
+            android:layout_marginTop="4dp"
+            android:text="@string/app_name"
+            android:textColor="@color/blue"
+            android:textSize="18sp" />
 
-    <TextView
-        android:id="@+id/lab_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/lab_schedule"
-        android:layout_marginTop="4dp"
-        android:gravity="left"
-        android:text="@string/lab_programacion"
-        android:textSize="18sp" />
+        <TextView
+            android:id="@+id/lab_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/lab_schedule"
+            android:layout_marginTop="4dp"
+            android:gravity="left"
+            android:text="@string/lab_programacion"
+            android:textSize="18sp" />
 
-    <TextView
-        android:id="@+id/lab_speakers"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/lab_description"
-        android:layout_marginTop="4dp"
-        android:text="@string/title_activity_home"
-        android:textColor="@color/blue"
-        android:textSize="14sp" />
+        <TextView
+            android:id="@+id/lab_speakers"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/lab_description"
+            android:layout_marginTop="4dp"
+            android:text="@string/title_activity_home"
+            android:textColor="@color/blue"
+            android:textSize="14sp" />
 
-    <TextView
-        android:id="@+id/lab_keywords"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/lab_speakers"
-        android:layout_marginTop="4dp"
-        android:text="@string/title_activity_home"
-        android:textColor="@color/blue"
-        android:textSize="14sp" />
+        <TextView
+            android:id="@+id/lab_keywords"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/lab_speakers"
+            android:layout_marginTop="4dp"
+            android:text="@string/title_activity_home"
+            android:textColor="@color/blue"
+            android:textSize="14sp" />
+    </RelativeLayout>
 
-</RelativeLayout>
+</ScrollView>

Barcamp/res/layout/favorite_row.xml

         android:id="@+id/lab_place"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
+   		android:layout_alignBaseline="@+id/lab_hour"
         android:layout_alignParentRight="true"
         android:text="@string/app_name"
         android:textColor="@color/pink"
         android:id="@+id/lab_hour"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
+        android:layout_below="@+id/lab_name_unconference"
         android:text="@string/app_name"
         android:textColor="@color/blue"
         android:textSize="14sp" />

Barcamp/res/layout/favorites_panel.xml

         android:layout_marginLeft="10dp"
         android:layout_toRightOf="@+id/lab_favorite"
         android:contentDescription="@string/app_name"
-        android:src="@drawable/ic_star" />
+        android:src="@drawable/ic_favorite" />
 
     <ListView
         android:id="@id/android:list"

Barcamp/res/layout/home_screen.xml

 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:orientation="vertical" xmlns:app="http://schemas.android.com/apk/res/com.orleonsoft.android.barcamp">
+    android:orientation="vertical" >
 
     <include 
         android:id="@+id/action_bar"

Barcamp/res/layout/unconference_row.xml

         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/app_name"
+        android:layout_toLeftOf="@+id/img_favorite"
+        android:layout_alignParentLeft="true"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textColor="@android:color/white"
         android:textStyle="bold" />
+    
+    <ImageView
+        android:id="@+id/img_favorite"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:adjustViewBounds="true"
+        android:layout_marginRight="5dp"
+        android:contentDescription="@string/app_name"
+        android:src="@drawable/ic_favorite" />
 
     <TextView
         android:id="@+id/lab_speakers"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="@color/blue" />
 
-    <ImageView
-        android:id="@+id/img_favorite"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:adjustViewBounds="true"
-        android:contentDescription="@string/app_name"
-        android:src="@drawable/ic_favorite" />
+    
 
 </RelativeLayout>

Barcamp/res/layout/unconference_screen.xml

 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp" >
+    android:padding="5dp"
+   >
 
     <TextView
         android:id="@+id/lab_name_place"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Sala N"
+        android:text="@string/app_name"
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:textColor="@android:color/white"
         android:textStyle="bold" />
+    
+      <View
+            android:id="@+id/line"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/lab_name_place"
+            android:layout_marginTop="2dp"
+            android:background="@color/ligth_blue" />
 
     <ListView
         android:id="@id/android:list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/lab_name_place"
+        android:layout_below="@+id/line"
         android:drawSelectorOnTop="false" />
 
 </RelativeLayout>

Barcamp/src/com/orleonsoft/android/barcamp/HomeActivity.java

 
 		adapter = new PagerAdapter(getSupportFragmentManager());
 
-		//adapter.addFragment(new ListFavoritesFragment());
+		adapter.addFragment(new ListFavoritesFragment());
 		adapter.addFragment(mListSalasFragment);
 		adapter.addFragment(new TwitterFeedFragment());
 		adapter.addFragment(new PhotosFragment());

Barcamp/src/com/orleonsoft/android/barcamp/ListFavoritesFragment.java

 					.getName());
 			holder.place
 					.setText(mListUnconference.get(position).getNamePlace());
+			
+			holder.hour
+			.setText(mListUnconference.get(position).getSchedule());
 			return convertView;
 		}
 

Barcamp/src/com/orleonsoft/android/barcamp/UnconferenceDetailActivity.java

 					AppsConstants.Database.NAME_TABLE_PLACE,
 					new String[] { "Name" }, "_id = ?",
 					new String[] { mUnconference.getPlace() + "" }, null);
-			dbAdapter.close();
+			
 			if (cursor != null) {
 				if (cursor.moveToFirst()) {
 					mUnconference.setNamePlace(cursor.getString(0));
 				}
 			}
+			
+			dbAdapter.close();
 
 		}
 
 		mLabKeyWords.setText(mUnconference.getKeywords());
 		if (esFavorito) {
 			mImgFavorite.setImageBitmap(BitmapFactory.decodeResource(
-					getResources(), R.drawable.ic_star));
+					getResources(), R.drawable.ic_favorite));
 		} else {
 			mImgFavorite.setImageBitmap(BitmapFactory.decodeResource(
-					getResources(), R.drawable.ic_unstar));
+					getResources(), R.drawable.ic_unfavorite));
 		}
 	}
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.