Skip to content

Commit

Permalink
More layout constraint modifications
Browse files Browse the repository at this point in the history
  • Loading branch information
@leahlud
leahlud committed Jan 29, 2024
1 parent 77a8415 commit 962649c
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 47 deletions.
84 changes: 46 additions & 38 deletions app/src/main/res/layout/fragment_point_shop.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".view.leaderboard.LeaderboardFragment"
android:background="@color/nightBlue">
android:background="@color/witchyPurple">

<ImageView
android:layout_width="0dp"
Expand All @@ -31,16 +31,14 @@
android:id="@+id/title_textview_point_shop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="29dp"
android:layout_marginEnd="32dp"
android:layout_marginStart="35dp"
android:textSize="24sp"
android:gravity="start"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/guidelineTop"
android:fontFamily="@font/montserrat_bold"
android:textColor="@color/palePeach"
android:text="@string/pointshop"
/>
android:text="@string/pointshop" />

<TextView
android:id="@+id/total_coin_view"
Expand Down Expand Up @@ -90,59 +88,69 @@
android:id="@+id/imageview_point_shop_banner"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:src="@drawable/point_shop_banner"
android:layout_marginTop="20dp"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="16dp"
android:src="@drawable/point_shop_banner"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title_textview_point_shop"
/>
app:layout_constraintTop_toBottomOf="@+id/title_textview_point_shop" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerview_point_shop"
android:layout_height="match_parent"
android:layout_height="0dp"
android:layout_width="match_parent"
android:layout_marginTop="258dp"
android:layout_marginBottom="50dp"
android:layout_marginHorizontal="30dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/merchButton"
app:layout_constraintBottom_toBottomOf="parent"
android:paddingEnd="31dp"
android:paddingStart="31dp"
android:paddingBottom="30dp"
app:layout_constraintBottom_toBottomOf="@id/guidelineBottom"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />

<TextView
android:id="@+id/merchButton"
android:layout_width="165dp"
android:layout_height="45dp"
android:layout_marginTop="11dp"
app:layout_constraintTop_toBottomOf="@id/imageview_point_shop_banner"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="36dp"
android:gravity="center"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="5dp"
android:layout_marginTop="12dp"
android:background="@drawable/shop_selected_tab"
android:text="MERCH"
android:textSize="19sp"
android:fontFamily="@font/montserrat_bold"
android:textColor="@color/palePeach"
/>
android:gravity="center"
android:paddingVertical="10dp"
android:textColor="@color/white"
android:textSize="20sp"
app:layout_constraintEnd_toStartOf="@+id/guidelineSeparator"
app:layout_constraintStart_toStartOf="@+id/recyclerview_point_shop"
app:layout_constraintTop_toBottomOf="@id/imageview_point_shop_banner"
android:text="@string/merch" />

<TextView
android:id="@+id/raffleButton"
android:layout_width="165dp"
android:layout_height="45dp"
android:layout_marginTop="11dp"
app:layout_constraintTop_toBottomOf="@id/imageview_point_shop_banner"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="36dp"
android:gravity="center"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="5dp"
android:layout_marginTop="12dp"
android:fontFamily="@font/montserrat_bold"
android:textColor="@color/palePeach"
android:textSize="19sp"
android:text="RAFFLE"
/>
android:gravity="center"
android:paddingVertical="10dp"
android:textColor="@color/white"
android:textSize="20sp"
app:layout_constraintEnd_toEndOf="@+id/recyclerview_point_shop"
app:layout_constraintStart_toStartOf="@+id/guidelineSeparator"
app:layout_constraintTop_toBottomOf="@id/imageview_point_shop_banner"
android:text="@string/raffle" />

<androidx.constraintlayout.widget.Guideline
android:id="@+id/guidelineSeparator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.50" />

<androidx.constraintlayout.widget.Guideline
android:id="@+id/guidelineBottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.88" />

</androidx.constraintlayout.widget.ConstraintLayout>
21 changes: 12 additions & 9 deletions app/src/main/res/layout/shop_tile.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="10dp"
android:layout_marginBottom="20dp"
android:layout_marginBottom="12dp"
android:fontFamily="@font/montserrat_semi_bold"
android:gravity="center"
android:textColor="@color/darkForest"
Expand All @@ -53,26 +53,26 @@
tools:text="Super Long Test Shop Test Shop Name" />

<TextView
android:id="@+id/costandQuantityView"
android:id="@+id/costAndQuantityView"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/rounded_dark_forest_bg"
android:fontFamily="@font/montserrat_bold"
android:gravity="center"
android:maxLines="1"
app:layout_constraintBottom_toBottomOf="@id/coinImageView"
app:layout_constraintBottom_toBottomOf="@id/priceTextView"
app:layout_constraintEnd_toEndOf="@id/quantityTextView"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="@id/coinImageView"
app:layout_constraintTop_toTopOf="@+id/coinImageView"
app:layout_constraintTop_toTopOf="@+id/priceTextView"
app:layout_constraintVertical_bias="0.0" />

<ImageView
android:id="@+id/coinImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="2dp"
android:paddingStart="8dp"
android:layout_height="0dp"
android:paddingStart="10dp"
android:layout_marginVertical="3dp"
app:layout_constraintBottom_toBottomOf="@+id/priceTextView"
app:layout_constraintEnd_toStartOf="@+id/priceTextView"
app:layout_constraintHorizontal_chainStyle="packed"
Expand All @@ -84,7 +84,9 @@
android:id="@+id/priceTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="5dp"
android:paddingVertical="5dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="5dp"
android:fontFamily="@font/montserrat_bold"
android:textColor="@color/white"
android:textSize="14sp"
Expand Down Expand Up @@ -113,9 +115,10 @@
android:id="@+id/quantityTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:layout_marginStart="5dp"
android:fontFamily="@font/montserrat_regular"
android:paddingEnd="8dp"
android:paddingEnd="10dp"
android:textColor="@color/white"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/priceTextView"
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@
<string name="pointshop">POINT SHOP</string>
<string name="shopquantity">%d Left</string>
<string name="blank">---</string>
<string name="separator">|</string>
<string name="merch">MERCH</string>
<string name="raffle">RAFFLE</string>

<!-- Profile Fragment -->
<string name="profile">PROFILE</string>
Expand All @@ -92,4 +95,5 @@
<string name="scanner_not_logged_in_message">You must log in to use this feature! Go to the Profile tab to logout.</string>



</resources>

0 comments on commit 962649c

Please sign in to comment.