-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '21-졸업-요건-ui' of https://github.com/FOR-GRAD/For-Grad-an…
- Loading branch information
Showing
7 changed files
with
111 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:shape="rectangle"> | ||
| <corners android:radius="20dp" /> | ||
| <solid android:color="#78000000" /> | ||
| </shape> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:backgroundTint="@null"> | ||
|
|
||
| <androidx.constraintlayout.widget.ConstraintLayout | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:background="@drawable/bg_dialog_black_47" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent"> | ||
|
|
||
| <TextView | ||
| android:id="@+id/textView_message" | ||
| style="@style/SemiBoldFont.16" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:gravity="center" | ||
| android:padding="21dp" | ||
| android:text="아직 이수되지 않은 학기 입니다." | ||
| android:textColor="@android:color/white" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent" /> | ||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||
| </androidx.constraintlayout.widget.ConstraintLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,57 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <androidx.constraintlayout.widget.ConstraintLayout | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content"> | ||
| <layout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto"> | ||
|
|
||
| <data> | ||
|
|
||
| <variable | ||
| name="vm" | ||
| type="umc.com.mobile.project.ui.gradInfo.viewmodel.GradeViewModel" /> | ||
|
|
||
| </data> | ||
|
|
||
| <androidx.constraintlayout.widget.ConstraintLayout | ||
| android:id="@+id/layout_1" | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="9dp" | ||
| android:layout_marginTop="5dp" | ||
| android:background="@drawable/bg_stroke_gray_radius_16_5" | ||
| android:paddingStart="27dp" | ||
| android:paddingTop="20dp" | ||
| android:paddingEnd="27dp" | ||
| android:paddingBottom="20dp" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent"> | ||
|
|
||
| <androidx.appcompat.widget.AppCompatTextView | ||
| android:id="@+id/tv_semester_content1" | ||
| style="@style/MediumFont.13" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="1-1" | ||
| android:textColor="@color/black" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent" /> | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content"> | ||
|
|
||
| <androidx.appcompat.widget.AppCompatTextView | ||
| android:id="@+id/tv_average_grade_content1" | ||
| style="@style/BoldFont.20" | ||
| android:layout_width="wrap_content" | ||
| <androidx.constraintlayout.widget.ConstraintLayout | ||
| android:id="@+id/layout_1" | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="13dp" | ||
| android:text="0.0" | ||
| android:textColor="@color/black" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| android:layout_marginStart="9dp" | ||
| android:layout_marginTop="5dp" | ||
| android:background="@drawable/bg_stroke_gray_radius_16_5" | ||
| android:paddingStart="27dp" | ||
| android:paddingTop="20dp" | ||
| android:paddingEnd="27dp" | ||
| android:paddingBottom="20dp" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@+id/tv_semester_content1" /> | ||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||
| app:layout_constraintTop_toTopOf="parent"> | ||
|
|
||
| <androidx.appcompat.widget.AppCompatTextView | ||
| android:id="@+id/tv_semester_content1" | ||
| style="@style/MediumFont.13" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="1-1" | ||
| android:textColor="@{vm.isNullCheckGrade ? @color/gray : @color/black}" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent" /> | ||
|
|
||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||
| <androidx.appcompat.widget.AppCompatTextView | ||
| android:id="@+id/tv_average_grade_content1" | ||
| style="@style/BoldFont.20" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="13dp" | ||
| android:text="0.0" | ||
| android:textColor="@{vm.isNullCheckGrade ? @color/gray : @color/black}" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@+id/tv_semester_content1" /> | ||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||
|
|
||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||
| </layout> |