Merge pull request #84 from FOR-GRAD/14-커리어

14 커리어
FOR-GRAD · Feb 13, 2024 · 0d94bb3 · 0d94bb3
2 parents 9fa99c7 + b9550af
commit 0d94bb3
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 3 deletions.
diff --git a/app/src/main/res/layout/fragment_career_activity.xml b/app/src/main/res/layout/fragment_career_activity.xml
@@ -84,6 +84,7 @@
                     android:paddingStart="18dp"
                     android:paddingTop="14dp"
                     android:paddingBottom="10dp"
+                    android:singleLine="true"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />

diff --git a/app/src/main/res/layout/fragment_career_add_activity.xml b/app/src/main/res/layout/fragment_career_add_activity.xml
@@ -42,6 +42,7 @@
             android:paddingStart="18dp"
             android:paddingTop="11dp"
             android:paddingBottom="10dp"
+            android:singleLine="true"
             android:text="@={vm.title}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/fragment_career_add_certificate.xml b/app/src/main/res/layout/fragment_career_add_certificate.xml
@@ -42,6 +42,7 @@
             android:paddingStart="18dp"
             android:paddingTop="11dp"
             android:paddingBottom="10dp"
+            android:singleLine="true"
             android:text="@={vm.title}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/fragment_career_add_contest.xml b/app/src/main/res/layout/fragment_career_add_contest.xml
@@ -42,6 +42,7 @@
             android:paddingStart="18dp"
             android:paddingTop="11dp"
             android:paddingBottom="10dp"
+            android:singleLine="true"
             android:text="@={vm.title}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/fragment_career_add_volunteer.xml b/app/src/main/res/layout/fragment_career_add_volunteer.xml
@@ -42,6 +42,7 @@
             android:paddingStart="18dp"
             android:paddingTop="11dp"
             android:paddingBottom="10dp"
+            android:singleLine="true"
             android:text="@={vm.title}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -73,6 +74,7 @@
             android:paddingStart="18dp"
             android:paddingTop="11dp"
             android:paddingBottom="10dp"
+            android:singleLine="true"
             android:text="@={vm.hour}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/fragment_career_certificate.xml b/app/src/main/res/layout/fragment_career_certificate.xml
@@ -84,6 +84,7 @@
                     android:paddingStart="18dp"
                     android:paddingTop="14dp"
                     android:paddingBottom="10dp"
+                    android:singleLine="true"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />

diff --git a/app/src/main/res/layout/fragment_career_contest.xml b/app/src/main/res/layout/fragment_career_contest.xml
@@ -84,6 +84,7 @@
                     android:paddingStart="18dp"
                     android:paddingTop="14dp"
                     android:paddingBottom="10dp"
+                    android:singleLine="true"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />

diff --git a/app/src/main/res/layout/fragment_career_edit_activity.xml b/app/src/main/res/layout/fragment_career_edit_activity.xml
@@ -98,6 +98,7 @@
                     android:paddingStart="18dp"
                     android:paddingTop="11dp"
                     android:paddingBottom="10dp"
+                    android:singleLine="true"
                     android:text="@={vm.title}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -120,12 +121,12 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dp"
-                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="10dp"
                     android:text="업로드"
                     android:textAppearance="@style/MediumFont.10"
                     android:textColor="@color/black"
-                    app:layout_constraintStart_toEndOf="@+id/tv_career_edit_activity_file"
-                    app:layout_constraintBottom_toBottomOf="@+id/tv_career_edit_activity_file" />
+                    app:layout_constraintBottom_toBottomOf="@+id/tv_career_edit_activity_file"
+                    app:layout_constraintEnd_toEndOf="@+id/et_career_edit_activity_file" />
 
                 <androidx.appcompat.widget.AppCompatEditText
                     android:id="@+id/et_career_edit_activity_file"

diff --git a/app/src/main/res/layout/fragment_career_edit_certificate.xml b/app/src/main/res/layout/fragment_career_edit_certificate.xml
@@ -98,6 +98,7 @@
                     android:paddingStart="18dp"
                     android:paddingTop="11dp"
                     android:paddingBottom="10dp"
+                    android:singleLine="true"
                     android:text="@={vm.title}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/fragment_career_edit_contest.xml b/app/src/main/res/layout/fragment_career_edit_contest.xml
@@ -98,6 +98,7 @@
                     android:paddingStart="18dp"
                     android:paddingTop="11dp"
                     android:paddingBottom="10dp"
+                    android:singleLine="true"
                     android:text="@={vm.title}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/fragment_career_edit_volunteer.xml b/app/src/main/res/layout/fragment_career_edit_volunteer.xml
@@ -98,6 +98,7 @@
                     android:paddingStart="18dp"
                     android:paddingTop="11dp"
                     android:paddingBottom="10dp"
+                    android:singleLine="true"
                     android:text="@={vm.title}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -129,6 +130,7 @@
                     android:paddingStart="18dp"
                     android:paddingTop="11dp"
                     android:paddingBottom="10dp"
+                    android:singleLine="true"
                     android:text="@={vm.hour}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/fragment_career_volunteer.xml b/app/src/main/res/layout/fragment_career_volunteer.xml
@@ -84,6 +84,7 @@
                     android:paddingStart="18dp"
                     android:paddingTop="14dp"
                     android:paddingBottom="10dp"
+                    android:singleLine="true"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />