Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	app/src/main/res/layout/activity_main.xml
  • Loading branch information
zinaheng committed Apr 24, 2021
2 parents aa238f6 + bcacccb commit efe151d
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,14 @@

<Spinner
android:id="@+id/drSpin"
android:layout_width="176dp"
android:layout_height="46dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/mapView2"
android:layout_alignStart="@+id/searchbutton"
android:layout_alignTop="@+id/searchbutton"
android:layout_alignParentEnd="true"
android:layout_marginStart="39dp"
android:layout_marginTop="15dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="0dp"
android:layout_marginStart="61dp"
android:layout_marginTop="14dp"
android:layout_marginBottom="23dp"
android:visibility="visible"
tools:visibility="visible" />
</RelativeLayout>

0 comments on commit efe151d

Please sign in to comment.