Skip to content

Commit

Permalink
Fixed blurry images and refined UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@leahlud
leahlud committed Sep 27, 2023
1 parent e2d84e5 commit c6ba419
Show file tree
Hide file tree
Showing 7 changed files with 68 additions and 38 deletions.
Binary file modified app/src/main/res/drawable-v24/ic_building_marker_outline.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-v24/ic_clock.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-v24/ic_map_marker_outline.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable/ic_exit_button.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions app/src/main/res/drawable/rounded_cloudmist_top.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape android:shape="rectangle"
xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/cloudMist" />
<corners android:topLeftRadius="25dp" android:topRightRadius="25dp"/>
</shape>
31 changes: 16 additions & 15 deletions app/src/main/res/layout/event_tile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,14 @@

<ImageView
android:id="@+id/event_time_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_clock"
android:layout_width="18dp"
android:layout_height="0dp"
android:layout_marginTop="1dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:src="@drawable/ic_clock"
app:layout_constraintBottom_toBottomOf="@+id/eventTimeSpanText"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/eventType" />
app:layout_constraintTop_toTopOf="@+id/eventTimeSpanText" />


<TextView
Expand All @@ -145,13 +146,13 @@

<ImageView
android:id="@+id/sponsored_marker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_building_marker_outline"
android:layout_width="18dp"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginTop="9dp"
app:layout_constraintBottom_toBottomOf="@+id/sponsoredTextView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/event_time_icon" />
app:layout_constraintTop_toTopOf="@+id/sponsoredTextView"
app:srcCompat="@drawable/ic_building_marker_outline" />

<TextView
android:id="@+id/sponsoredTextView"
Expand All @@ -171,13 +172,13 @@

<ImageView
android:id="@+id/map_marker"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_map_marker_outline"
android:layout_width="18dp"
android:layout_height="0dp"
android:layout_marginStart="15dp"
android:layout_marginTop="8dp"
app:layout_constraintBottom_toBottomOf="@+id/locationTextView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sponsored_marker"/>
app:layout_constraintTop_toTopOf="@+id/locationTextView"
app:srcCompat="@drawable/ic_map_marker_outline" />

<TextView
android:id="@+id/locationTextView"
Expand Down
69 changes: 46 additions & 23 deletions app/src/main/res/layout/fragment_event_info.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,30 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cloudMist">
android:layout_height="match_parent">

<ImageView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="0dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/home_bg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/textView2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="35dp"
android:background="@drawable/rounded_cloudmist_top"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<ImageButton
android:id="@+id/favorites_button"
Expand All @@ -19,15 +41,16 @@

<ImageButton
android:id="@+id/exit_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="35dp"
android:layout_height="35dp"
android:layout_marginStart="10dp"
android:background="@null"
android:layout_marginStart="22dp"
android:gravity="center_vertical"
android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.075"
app:layout_constraintTop_toTopOf="@+id/textView2"
app:layout_constraintVertical_bias="0.03"
app:srcCompat="@drawable/ic_exit_button" />

<TextView
Expand Down Expand Up @@ -67,13 +90,14 @@

<ImageView
android:id="@+id/event_time_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_clock"
android:layout_width="18dp"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginTop="9dp"
android:layout_marginTop="1dp"
android:src="@drawable/ic_clock"
app:layout_constraintBottom_toBottomOf="@+id/event_time"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/event_points" />
app:layout_constraintTop_toTopOf="@+id/event_time" />

<TextView
android:id="@+id/event_time"
Expand All @@ -95,13 +119,13 @@

<ImageView
android:id="@+id/sponsoredIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_building_marker_outline"
android:layout_width="18dp"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
app:layout_constraintBottom_toBottomOf="@+id/event_sponsor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/event_time_icon" />
app:layout_constraintTop_toTopOf="@+id/event_sponsor"
app:srcCompat="@drawable/ic_building_marker_outline" />

<TextView
android:id="@+id/event_sponsor"
Expand All @@ -121,13 +145,13 @@

<ImageView
android:id="@+id/location_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_map_marker_outline"
android:layout_width="18dp"
android:layout_height="0dp"
android:layout_marginStart="15dp"
android:layout_marginTop="8dp"
app:layout_constraintBottom_toBottomOf="@+id/event_location"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sponsoredIcon" />
app:layout_constraintTop_toTopOf="@+id/event_location"
app:srcCompat="@drawable/ic_map_marker_outline" />

<TextView
android:id="@+id/event_location"
Expand Down Expand Up @@ -199,6 +223,5 @@
app:layout_constraintTop_toBottomOf="@+id/map_constraint_layout"
tools:text="@string/lorem_ipsum" />


</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit c6ba419

Please sign in to comment.