Skip to content

Commit

Permalink
[FIX/#11] manifest, fragment 조금 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
Marchbreeze committed Jan 4, 2024
1 parent 24d7571 commit 1cb53ba
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 86 deletions.
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@

<activity
android:name="com.going.presentation.todo.TodoActivity"
android:exported="true"
android:exported="false"
android:screenOrientation="portrait" />

<activity
android:name="com.going.presentation.onboarding.OnboardingProfileSettingActivity"
android:exported="true"
android:exported="false"
android:screenOrientation="portrait" />

<activity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package com.going.presentation.todo.ourtodo.todolist

import com.going.presentation.R
import com.going.presentation.databinding.FragmentOurTodoBinding
import com.going.presentation.databinding.FragmentOurTodoUncompleteBinding
import com.going.ui.base.BaseFragment
import dagger.hilt.android.AndroidEntryPoint

@AndroidEntryPoint
class OurTodoUncompleteFragment() : BaseFragment<FragmentOurTodoBinding>(R.layout.fragment_our_todo) {
class OurTodoUncompleteFragment() :
BaseFragment<FragmentOurTodoUncompleteBinding>(R.layout.fragment_our_todo_uncomplete) {

}
63 changes: 0 additions & 63 deletions presentation/src/main/res/layout/fragment_my_todo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,69 +11,6 @@
android:layout_height="match_parent"
android:background="@color/white_000">

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/toolbar_top_hat_detail"
android:layout_width="0dp"
android:layout_height="40dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

</androidx.constraintlayout.widget.ConstraintLayout>

<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/layout_hat_detail"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar_top_hat_detail">

<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar_hat_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/toolbar_hat_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:contentScrim="@android:color/transparent"
app:layout_scrollFlags="scroll|enterAlwaysCollapsed"
app:statusBarScrim="@android:color/transparent">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="false">

</androidx.constraintlayout.widget.ConstraintLayout>

</com.google.android.material.appbar.CollapsingToolbarLayout>

<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_hat_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:textSize="14sp"
app:tabIndicatorFullWidth="true"
app:tabRippleColor="@android:color/transparent"
app:tabSelectedTextColor="@color/black_000" />

</com.google.android.material.appbar.AppBarLayout>

<androidx.viewpager2.widget.ViewPager2
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/appbar_hat_detail" />

</androidx.coordinatorlayout.widget.CoordinatorLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

</layout>
21 changes: 2 additions & 19 deletions presentation/src/main/res/layout/fragment_our_todo_complete.xml
Original file line number Diff line number Diff line change
@@ -1,28 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<layout 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">
<layout xmlns:android="http://schemas.android.com/apk/res/android">

<data>

</data>

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_our_todo_complete"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white_000">

<androidx.recyclerview.widget.RecyclerView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:id="@+id/rv_our_todo_complete"
android:layout_marginTop="8dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginHorizontal="23dp"
tools:listitem="@layout/item_our_todo"/>

</androidx.constraintlayout.widget.ConstraintLayout>
android:layout_height="match_parent" />
</layout>
28 changes: 28 additions & 0 deletions presentation/src/main/res/layout/fragment_our_todo_uncomplete.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<layout 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">

<data>

</data>

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_our_todo_complete"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white_000">

<androidx.recyclerview.widget.RecyclerView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:id="@+id/rv_our_todo_complete"
android:layout_marginTop="8dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginHorizontal="23dp"
tools:listitem="@layout/item_our_todo"/>

</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

0 comments on commit 1cb53ba

Please sign in to comment.