-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #18 from teamcadi/taeho
Save: 불필요한 파일 제거
- Loading branch information
Showing
12 changed files
with
154 additions
and
367 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
5 changes: 2 additions & 3 deletions
5
app/src/main/java/com/example/noogabab/presentation/ui/main/timeline/TimelineAdapter.kt
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
12 changes: 0 additions & 12 deletions
12
app/src/main/java/com/example/noogabab/presentation/ui/tempmain/TempMainActivity.kt
This file was deleted.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -1,95 +1,130 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
|
|
||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical" | ||
| android:paddingBottom="20dp"> | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:orientation="horizontal"> | ||
|
|
||
| <TextView | ||
| android:id="@+id/txt_timeline_time" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center" | ||
| android:layout_marginRight="16dp" | ||
| android:fontFamily="@font/noto_sans_cjkkr_medium" | ||
| android:gravity="center" | ||
| android:lineSpacingExtra="9sp" | ||
| android:textColor="#3d3d3d" | ||
| android:textSize="18sp" | ||
| android:textStyle="normal" | ||
| tools:text="17:30" /> | ||
|
|
||
| <FrameLayout | ||
| android:layout_width="20dp" | ||
| android:layout_height="20dp" | ||
| android:layout_gravity="center"> | ||
|
|
||
| <ImageView | ||
| android:id="@+id/img_timeline" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center" | ||
| tools:srcCompat="@drawable/ic_bab_timeline" /> | ||
| </FrameLayout> | ||
|
|
||
| <FrameLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="12dp"> | ||
|
|
||
| <androidx.cardview.widget.CardView | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center" | ||
| android:layout_margin="8dp" | ||
| app:cardCornerRadius="10dp" | ||
| app:cardElevation="3dp"> | ||
|
|
||
| <TextView | ||
| android:id="@+id/txt_timeline_content" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:layout_marginStart="10dp" | ||
| android:fontFamily="@font/noto_sans_cjkkr_medium" | ||
| android:gravity="center_vertical" | ||
| android:lineSpacingExtra="8sp" | ||
| android:textColor="#4a3319" | ||
| android:textSize="16sp" | ||
| android:textStyle="normal" | ||
| tools:text="밥" /> | ||
|
|
||
| </androidx.cardview.widget.CardView> | ||
| </FrameLayout> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:orientation="horizontal"> | ||
|
|
||
|
|
||
| <TextView | ||
| android:id="@+id/txt_ine_sub_content" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginStart="113dp" | ||
| android:layout_weight="1" | ||
| android:lineSpacingExtra="6sp" | ||
| android:textColor="#707070" | ||
| android:textSize="13sp" | ||
| android:textStyle="normal" | ||
| tools:text="나 홍길동" /> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
|
|
||
| </LinearLayout> | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
|
|
||
| <androidx.constraintlayout.widget.ConstraintLayout | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content"> | ||
|
|
||
| <!-- Placeholder --> | ||
| <View | ||
| android:id="@+id/center_of_image" | ||
| android:layout_width="1dp" | ||
| android:layout_height="1dp" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintHorizontal_bias="0.2" | ||
| app:layout_constraintTop_toTopOf="@id/txt_timeline_time" | ||
| app:layout_constraintBottom_toBottomOf="@id/txt_timeline_time" /> | ||
|
|
||
| <!-- Image --> | ||
| <ImageView | ||
| android:id="@+id/img_timeline" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| app:layout_constraintTop_toTopOf="@id/center_of_image" | ||
| app:layout_constraintBottom_toBottomOf="@id/center_of_image" | ||
| app:layout_constraintStart_toStartOf="@id/center_of_image" | ||
| app:layout_constraintEnd_toEndOf="@id/center_of_image" | ||
| tools:srcCompat="@drawable/ic_bab_timeline" | ||
| android:contentDescription="@string/description_timeline_dot" /> | ||
|
|
||
| <!-- Divider upper --> | ||
| <View | ||
| android:id="@+id/div_timeline_upper" | ||
| android:layout_width="1dp" | ||
| android:layout_height="0dp" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:layout_constraintStart_toStartOf="@id/img_timeline" | ||
| app:layout_constraintEnd_toEndOf="@id/img_timeline" | ||
| app:layout_constraintBottom_toTopOf="@id/img_timeline" | ||
| android:background="?android:attr/listDivider" /> | ||
|
|
||
| <!-- Divider lower --> | ||
| <View | ||
| android:id="@+id/div_timeline_lower" | ||
| android:layout_width="1dp" | ||
| android:layout_height="0dp" | ||
| app:layout_constraintTop_toBottomOf="@id/img_timeline" | ||
| app:layout_constraintStart_toStartOf="@id/img_timeline" | ||
| app:layout_constraintEnd_toEndOf="@id/img_timeline" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| android:background="?android:attr/listDivider" /> | ||
|
|
||
| <!-- Time --> | ||
| <TextView | ||
| android:id="@+id/txt_timeline_time" | ||
| app:layout_constraintTop_toBottomOf="@id/txt_timeline_day" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:textColor="#3d3d3d" | ||
| android:textSize="18sp" | ||
| android:textStyle="normal" | ||
| android:fontFamily="@font/noto_sans_cjkkr_medium" | ||
| android:lineSpacingExtra="9sp" | ||
| tools:text="17:30" /> | ||
|
|
||
| <!-- Day --> | ||
| <TextView | ||
| android:id="@+id/txt_timeline_day" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| app:layout_constraintTop_toTopOf="parent" | ||
| app:layout_constraintStart_toStartOf="@id/txt_timeline_time" | ||
| android:gravity="center" | ||
| android:textSize="16sp" | ||
| android:textStyle="bold" | ||
| android:textColor="#3d3d3d" | ||
| android:fontFamily="@font/noto_sans_cjkkr_medium" | ||
| tools:text="100일 전" /> | ||
|
|
||
| <!-- Content wrapper --> | ||
|
|
||
| <!-- Sub content --> | ||
| <androidx.cardview.widget.CardView | ||
| android:id="@+id/crd_timeline_content_wrapper" | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginVertical="8dp" | ||
| android:layout_marginStart="16dp" | ||
| android:layout_marginEnd="8dp" | ||
| app:cardCornerRadius="10dp" | ||
| app:cardElevation="3dp" | ||
| app:layout_constraintBottom_toBottomOf="@id/txt_timeline_time" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toEndOf="@id/center_of_image" | ||
| app:layout_constraintTop_toTopOf="@id/txt_timeline_time"> | ||
|
|
||
| <!-- Content --> | ||
| <TextView | ||
| android:id="@+id/txt_timeline_content" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:layout_marginStart="10dp" | ||
| android:fontFamily="@font/noto_sans_cjkkr_medium" | ||
| android:lineSpacingExtra="8sp" | ||
| android:textColor="#4a3319" | ||
| android:textSize="16sp" | ||
| android:textStyle="normal" | ||
| tools:text="밥" /> | ||
|
|
||
| </androidx.cardview.widget.CardView> | ||
|
|
||
| <TextView | ||
| android:id="@+id/txt_timeline_sub_content" | ||
| android:layout_width="0dp" | ||
| android:layout_height="wrap_content" | ||
| app:layout_constraintStart_toStartOf="@id/crd_timeline_content_wrapper" | ||
| app:layout_constraintTop_toBottomOf="@id/crd_timeline_content_wrapper" | ||
| app:layout_constraintEnd_toEndOf="@id/crd_timeline_content_wrapper" | ||
| android:layout_marginStart="10dp" | ||
| android:lineSpacingExtra="6sp" | ||
| android:textColor="#707070" | ||
| android:textSize="13sp" | ||
| android:textStyle="normal" | ||
| android:fontFamily="@font/noto_sans_cjkkr_medium" | ||
| tools:text="나 홍길동" /> | ||
|
|
||
| </androidx.constraintlayout.widget.ConstraintLayout> |
Oops, something went wrong.