Skip to content

Commit

Permalink
Merge pull request #6 from DhruvamSharma/state3
Browse files Browse the repository at this point in the history
added logo. beautification.
  • Loading branch information
DhruvamSharma authored Jan 23, 2019
2 parents c8cfa4c + 602097f commit bb2fcda
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 3 deletions.
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:icon="@drawable/starbucks_logo"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:roundIcon="@drawable/starbucks_logo"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".ui.MainActivity">
Expand Down
Binary file added app/src/main/res/drawable/starbucks_card.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/starbucks_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 30 additions & 1 deletion app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,38 @@
android:layout_height="match_parent"
tools:context=".ui.MainActivity">

<ImageView
android:id="@+id/starbucks_card_image_iv"
android:layout_width="match_parent"
android:layout_height="300dp"
android:src="@drawable/starbucks_card"
android:scaleType="fitXY"

app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/price_tv"/>

<TextView
android:id="@+id/price_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/Base.TextAppearance.AppCompat.Display1"
android:textStyle="bold"
android:text="@string/price_text"

app:layout_constraintTop_toBottomOf="@id/starbucks_card_image_iv"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/main_list"/>

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/main_list"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="wrap_content"

app:layout_constraintTop_toBottomOf="@id/price_tv"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>

</androidx.constraintlayout.widget.ConstraintLayout>
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
<string name="app_name">RecyclerViewSeries</string>
<string name="content_description_cup_image">cup image</string>
<string name="random_placeholder_text">Random Placeholder Text</string>
<string name="price_text">₹ 920.00</string>
</resources>

0 comments on commit bb2fcda

Please sign in to comment.