Skip to content

Commit

Permalink
Design: 메인 ui 일부 작업 #1
Browse files Browse the repository at this point in the history
  • Loading branch information
@dkyuuum
dkyuuum committed Jan 8, 2024
1 parent 1882a3b commit c711e82
Show file tree
Hide file tree
Showing 6 changed files with 124 additions and 19 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/umc/com/mobile/project/ui/home/HomeFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class HomeFragment : Fragment() {
_binding = FragmentHomeBinding.inflate(inflater, container, false)

viewModel.text.observe(viewLifecycleOwner) {
binding.textHome.text = it
// binding.textHome.text = it
}
return binding.root
}
Expand Down
22 changes: 22 additions & 0 deletions app/src/main/res/drawable/bg_progressbar.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<corners android:radius="4dp"/>
<solid android:color="@color/text_gray"/>
</shape>
</item>

<item android:id="@android:id/progress"
android:top="1dp"
android:bottom="1dp"
android:left="1dp"
android:right="1dp">

<scale android:scaleWidth="100%">
<shape>
<corners android:radius="4dp"/>
<solid android:color="@color/white"/>
</shape>
</scale>
</item>
</layer-list>
3 changes: 1 addition & 2 deletions app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="?attr/actionBarSize">
android:layout_height="match_parent" >

<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/nav_view"
Expand Down
111 changes: 95 additions & 16 deletions app/src/main/res/layout/fragment_home.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
android:orientation="vertical">

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/linearLayoutCompat"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="50dp"
android:background="@drawable/bg_solid_blue_radius_70"
android:paddingBottom="50dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
Expand Down Expand Up @@ -63,6 +63,7 @@


<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/appCompatTextView3"
style="@style/SemiBoldFont.24"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -72,20 +73,98 @@
app:layout_constraintStart_toStartOf="@+id/appCompatTextView"
app:layout_constraintTop_toBottomOf="@+id/appCompatTextView" />

</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/appCompatImageView6"
android:layout_width="120dp"
android:layout_height="142dp"
android:layout_marginStart="8dp"
android:layout_marginTop="42dp"
android:src="@drawable/bg_solid_white_radius_25"
app:layout_constraintStart_toStartOf="@+id/appCompatTextView3"
app:layout_constraintTop_toBottomOf="@+id/appCompatTextView3" />

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_name"
style="@style/BoldFont.16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="34dp"
android:layout_marginTop="30dp"
android:text="임현서"
android:textColor="@color/white"
app:layout_constraintStart_toEndOf="@+id/appCompatImageView6"
app:layout_constraintTop_toTopOf="@+id/appCompatImageView6" />

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_stdId"
style="@style/BoldFont.16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="14dp"
android:layout_marginTop="30dp"
android:text="20200000"
android:textColor="@color/white"
app:layout_constraintStart_toEndOf="@+id/tv_name"
app:layout_constraintTop_toTopOf="@+id/appCompatImageView6" />

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_school"
style="@style/BoldFont.16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="34dp"
android:layout_marginTop="23dp"
android:text="한성대학교 부동산학과"
android:textColor="@color/white"
app:layout_constraintStart_toEndOf="@+id/appCompatImageView6"
app:layout_constraintTop_toBottomOf="@+id/tv_name" />

<!-- <TextView-->
<!-- android:id="@+id/text_home"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="8dp"-->
<!-- android:layout_marginTop="8dp"-->
<!-- android:layout_marginEnd="8dp"-->
<!-- android:textAlignment="center"-->
<!-- android:textSize="20sp"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_semester"
style="@style/BoldFont.16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="34dp"
android:layout_marginTop="13dp"
android:text="2학년 2학기 재학중"
android:textColor="@color/white"
app:layout_constraintStart_toEndOf="@+id/appCompatImageView6"
app:layout_constraintTop_toBottomOf="@+id/tv_school" />

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_graduate_title"
style="@style/MediumFont.14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="68dp"
android:text="졸업까지"
android:textColor="@color/white"
app:layout_constraintStart_toStartOf="@+id/appCompatImageView6"
app:layout_constraintTop_toBottomOf="@+id/appCompatImageView6" />

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_graduate_content"
style="@style/BoldFont.30"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="D - 720"
android:textColor="@color/white"
app:layout_constraintStart_toStartOf="@+id/appCompatImageView6"
app:layout_constraintTop_toBottomOf="@+id/tv_graduate_title" />

<androidx.appcompat.widget.LinearLayoutCompat
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="20dp"
android:layout_marginTop="50dp"
android:layout_marginEnd="20dp"
android:background="@drawable/bg_progressbar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_graduate_content" />

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.core.widget.NestedScrollView>
1 change: 1 addition & 0 deletions app/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<color name="default_dark">#7D7D7D</color>
<color name="gray">#D9D9D9</color>
<color name="text_gray">#B6B6B6</color>
<color name="pink">#FFB9B9</color>

<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values/text.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
</style>

<!-- Bold Style -->
<style name="BoldFont.30" parent="BoldFont">
<item name="android:textSize">30sp</item>
</style>

<style name="BoldFont.22" parent="BoldFont">
<item name="android:textSize">22sp</item>
</style>
Expand Down

0 comments on commit c711e82

Please sign in to comment.