Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feat/#26] 시연을 위한 비율 코딩 #35

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Feat/#26] 시연을 위한 비율 코딩 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/com/snowflowerthon/snowman/ui/archive/ArchiveFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class ArchiveFragment : Fragment() {

private fun setAdapter(reviewList: List<VoteHistory>) {
val gridAdapter = GridAdapter(reviewList)
val gridLayoutManager = GridLayoutManager(activity, 2)
val gridLayoutManager = GridLayoutManager(activity, 3)

binding.rvArchive.adapter = gridAdapter
binding.rvArchive.layoutManager = gridLayoutManager
Expand Down
106 changes: 57 additions & 49 deletions app/src/main/res/layout/fragment_home.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,62 +50,63 @@
<!-- 현재 시간, 기온, 날짜 -->
<ImageView
android:id="@+id/iv_currentPenguin"
android:layout_width="241dp"
android:layout_height="427dp"
android:layout_width="150dp"
android:layout_height="match_parent"
android:src="@drawable/img_base"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_location" />
<ImageView
android:id="@+id/iv_current_hand"
android:layout_width="241dp"
android:layout_height="427dp"
android:layout_width="150dp"
android:layout_height="match_parent"
android:src="@drawable/img_empty"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_location" />
<ImageView
android:id="@+id/iv_current_topWear"
android:layout_width="241dp"
android:layout_height="427dp"
android:layout_width="150dp"
android:layout_height="match_parent"
android:src="@drawable/img_empty"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_location" />
<ImageView
android:id="@+id/iv_current_headWear"
android:layout_width="241dp"
android:layout_height="427dp"
android:layout_width="150dp"
android:layout_height="match_parent"
android:src="@drawable/img_empty"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_location" />
<ImageView
android:id="@+id/iv_current_outerWear"
android:layout_width="241dp"
android:layout_height="427dp"
android:layout_width="150dp"
android:layout_height="match_parent"
android:src="@drawable/img_empty"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_location" />

<ImageView
android:id="@+id/iv_current_neckWear"
android:layout_width="241dp"
android:layout_height="427dp"
android:layout_width="150dp"
android:layout_height="match_parent"
android:src="@drawable/img_empty"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_location" />

<TextView
android:id="@+id/tv_location"
android:includeFontPadding="false"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="78dp"
android:layout_marginTop="40dp"
android:textColor="@color/white"
app:layout_constraintEnd_toEndOf="parent"
style="@style/H1"
style="@style/H2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

Expand All @@ -114,7 +115,7 @@
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/iv_currentPenguin">
app:layout_constraintTop_toBottomOf="@+id/tv_location">


<ImageView
Expand Down Expand Up @@ -144,8 +145,7 @@
android:layout_width="match_parent"
android:layout_height="240dp"
android:layout_marginBottom="4dp"
app:layout_constraintBottom_toBottomOf="parent"
tools:layout_editor_absoluteX="-27dp">
app:layout_constraintBottom_toBottomOf="parent">

<LinearLayout
android:layout_width="wrap_content"
Expand All @@ -159,10 +159,12 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:layout_marginEnd="20dp">

<TextView
style="@style/Caption1"
android:includeFontPadding="false"
android:textColor="@color/BlueDark40"
android:id="@+id/tv_nextInfoText1"
android:layout_width="wrap_content"
Expand All @@ -172,6 +174,7 @@

<TextView
style="@style/H4"
android:includeFontPadding="false"
android:textColor="@color/BlueDark40"
android:id="@+id/tv_temperature1"
android:layout_width="wrap_content"
Expand All @@ -183,34 +186,34 @@

<ImageView
android:id="@+id/iv_nextPenguin1"
android:layout_width="117dp"
android:layout_height="170dp"
android:layout_width="80dp"
android:layout_height="120dp"
android:gravity="center"
android:src="@drawable/img_base" />

<ImageView
android:id="@+id/iv_topWear1"
android:layout_width="117dp"
android:layout_height="170dp"
android:layout_width="80dp"
android:layout_height="120dp"
android:gravity="center"
android:src="@drawable/img_empty" />
<ImageView
android:id="@+id/iv_headWear1"
android:layout_width="117dp"
android:layout_height="170dp"
android:layout_width="80dp"
android:layout_height="120dp"
android:gravity="center"
android:src="@drawable/img_empty" />

<ImageView
android:id="@+id/iv_outerWear1"
android:layout_width="117dp"
android:layout_height="170dp"
android:layout_width="80dp"
android:layout_height="120dp"
android:gravity="center"
android:src="@drawable/img_empty" />
<ImageView
android:id="@+id/iv_neckWear1"
android:layout_width="117dp"
android:layout_height="170dp"
android:layout_width="80dp"
android:layout_height="120dp"
android:gravity="center"
android:src="@drawable/img_empty" />
</FrameLayout>
Expand All @@ -221,11 +224,13 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:layout_marginEnd="20dp">


<TextView
style="@style/Caption1"
android:includeFontPadding="false"
android:textColor="@color/BlueDark40"
android:id="@+id/tv_nextInfoText2"
android:layout_width="wrap_content"
Expand All @@ -238,6 +243,7 @@

<TextView
style="@style/H4"
android:includeFontPadding="false"
android:textColor="@color/BlueDark40"
android:id="@+id/tv_temperature2"
android:layout_width="wrap_content"
Expand All @@ -250,34 +256,34 @@

<ImageView
android:id="@+id/iv_nextPenguin2"
android:layout_width="117dp"
android:layout_height="170dp"
android:layout_width="80dp"
android:layout_height="120dp"
android:gravity="center"
android:src="@drawable/img_base" />

<ImageView
android:id="@+id/iv_topWear2"
android:layout_width="117dp"
android:layout_height="170dp"
android:layout_width="80dp"
android:layout_height="120dp"
android:gravity="center"
android:src="@drawable/img_empty" />
<ImageView
android:id="@+id/iv_headWear2"
android:layout_width="117dp"
android:layout_height="170dp"
android:layout_width="80dp"
android:layout_height="120dp"
android:gravity="center"
android:src="@drawable/img_empty" />

<ImageView
android:id="@+id/iv_outerWear2"
android:layout_width="117dp"
android:layout_height="170dp"
android:layout_width="80dp"
android:layout_height="120dp"
android:gravity="center"
android:src="@drawable/img_empty" />
<ImageView
android:id="@+id/iv_neckWear2"
android:layout_width="117dp"
android:layout_height="170dp"
android:layout_width="80dp"
android:layout_height="120dp"
android:gravity="center"
android:src="@drawable/img_empty" />
</FrameLayout>
Expand All @@ -293,6 +299,7 @@
<TextView
style="@style/Caption1"
android:textColor="@color/BlueDark40"
android:includeFontPadding="false"
android:id="@+id/tv_nextInfoText3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -305,6 +312,7 @@
style="@style/H4"
android:textColor="@color/BlueDark40"
android:id="@+id/tv_temperature3"
android:includeFontPadding="false"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"/>
Expand All @@ -315,34 +323,34 @@

<ImageView
android:id="@+id/iv_nextPenguin3"
android:layout_width="117dp"
android:layout_height="170dp"
android:layout_width="80dp"
android:layout_height="120dp"
android:gravity="center"
android:src="@drawable/img_base" />

<ImageView
android:id="@+id/iv_topWear3"
android:layout_width="117dp"
android:layout_height="170dp"
android:layout_width="80dp"
android:layout_height="120dp"
android:gravity="center"
android:src="@drawable/img_empty" />
<ImageView
android:id="@+id/iv_headWear3"
android:layout_width="117dp"
android:layout_height="170dp"
android:layout_width="80dp"
android:layout_height="120dp"
android:gravity="center"
android:src="@drawable/img_empty" />

<ImageView
android:id="@+id/iv_outerWear3"
android:layout_width="117dp"
android:layout_height="170dp"
android:layout_width="80dp"
android:layout_height="120dp"
android:gravity="center"
android:src="@drawable/img_empty" />
<ImageView
android:id="@+id/iv_neckWear3"
android:layout_width="117dp"
android:layout_height="170dp"
android:layout_width="80dp"
android:layout_height="120dp"
android:gravity="center"
android:src="@drawable/img_empty" />
</FrameLayout>
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/fragment_inner.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

<ImageButton
android:id="@+id/btn_long_shirt"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="90dp"
android:layout_height="90dp"
android:background="@drawable/selector_resource"
android:scaleType="fitCenter"
android:clickable="true"
Expand All @@ -28,8 +28,8 @@

<ImageButton
android:id="@+id/btn_long_neat"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="90dp"
android:layout_height="90dp"
android:background="@drawable/selector_resource"
android:scaleType="fitCenter"
android:clickable="true"
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/fragment_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

<ImageButton
android:id="@+id/btn_ear"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="90dp"
android:layout_height="90dp"
android:background="@drawable/selector_resource"
android:scaleType="fitCenter"
android:clickable="true"
Expand All @@ -39,8 +39,8 @@

<ImageButton
android:id="@+id/btn_none"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="90dp"
android:layout_height="90dp"
android:background="@drawable/selector_resource"
android:scaleType="fitCenter"
android:clickable="true"
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/fragment_muffler.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

<ImageButton
android:id="@+id/btn_muffler"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="90dp"
android:layout_height="90dp"
android:background="@drawable/selector_resource"
android:scaleType="fitCenter"
android:clickable="true"
Expand All @@ -28,8 +28,8 @@

<ImageButton
android:id="@+id/btn_none"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="90dp"
android:layout_height="90dp"
android:background="@drawable/selector_resource"
android:scaleType="fitCenter"
android:clickable="true"
Expand Down
Loading