Commit 177252f3 authored by Robert Hitt's avatar Robert Hitt
Browse files

Added GMU colors. Also changed fav button a bit

parent 85a83210
......@@ -4,6 +4,7 @@
<modules>
<module fileurl="file://$PROJECT_DIR$/WhatsOpen.iml" filepath="$PROJECT_DIR$/WhatsOpen.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/whats-open-android.iml" filepath="$PROJECT_DIR$/whats-open-android.iml" />
</modules>
</component>
</project>
\ No newline at end of file
......@@ -72,10 +72,10 @@ public class FacilityListAdapter extends
}
if(facility.isFavorited()) {
holder.favoriteButton.setImageResource(R.drawable.ic_star_black_24dp);
holder.favoriteButton.setImageResource(R.drawable.favorite_button_on_24dp);
}
else {
holder.favoriteButton.setImageResource(R.drawable.ic_star_border_black_24dp);
holder.favoriteButton.setImageResource(R.drawable.favorite_button_off_24dp);
}
holder.data = facility;
......@@ -138,11 +138,11 @@ public class FacilityListAdapter extends
public void setFavorite(ImageButton favoriteButton) {
if(data.isFavorited()) {
favoriteButton.setImageResource(R.drawable.ic_star_border_black_24dp);
favoriteButton.setImageResource(R.drawable.favorite_button_off_24dp);
toggleFavoriteAsync(false);
}
else {
favoriteButton.setImageResource(R.drawable.ic_star_black_24dp);
favoriteButton.setImageResource(R.drawable.favorite_button_on_24dp);
toggleFavoriteAsync(true);
}
}
......
......@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/facilityText"
android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
android:fillColor="@color/favoriteButtonOff"
android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
</vector>
......@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/facilityText"
android:fillColor="@color/favoriteButtonOn"
android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
</vector>
......@@ -17,9 +17,10 @@
<ImageButton android:id="@+id/favorite_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/ic_star_border_black_24dp"
android:src="@drawable/favorite_button_off_24dp"
android:background="#00ffffff"
android:scaleType="fitCenter"
android:elevation="2dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"/>
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#3F51B5</color>
<color name="colorPrimaryDark">#303F9F</color>
<color name="colorPrimary">#006633</color>
<color name="colorPrimaryDark">#015429</color>
<color name="colorAccent">#FF4081</color>
<color name="facilityText">#757575</color>
<color name="favoriteButtonOff">#757575</color>
<color name="favoriteButtonOn">#E8B827</color>
<color name="facilityClosed">#E0E0E0</color>
<color name="facilityOpen">#FAFAFA</color>
</resources>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment