Skip to content

Commit

Permalink
#40 chore: 로그아웃, 마이페이지 등 결제 관련 코드 주석
Browse files Browse the repository at this point in the history
  • Loading branch information
@juhwankim-dev
juhwankim-dev committed Dec 7, 2023
1 parent fcdd4fa commit 234a464
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 51 deletions.
10 changes: 4 additions & 6 deletions ...tation/src/main/java/com/nextroom/nextroom/presentation/ui/adminmain/AdminMainFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ import androidx.navigation.fragment.findNavController
import com.nextroom.nextroom.domain.repository.StatisticsRepository
import com.nextroom.nextroom.presentation.base.BaseFragment
import com.nextroom.nextroom.presentation.databinding.FragmentAdminMainBinding
import com.nextroom.nextroom.presentation.extension.addMargin
import com.nextroom.nextroom.presentation.extension.safeNavigate
import com.nextroom.nextroom.presentation.extension.statusBarHeight
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch
import org.orbitmvi.orbit.viewmodel.observe
Expand Down Expand Up @@ -78,10 +76,10 @@ class AdminMainFragment : BaseFragment<FragmentAdminMainBinding>(FragmentAdminMa
// ivMyButton.setOnClickListener {
// goToMyPage()
// }
tvLogoutButton.apply {
addMargin(top = requireContext().statusBarHeight)
setOnClickListener { logout() }
}
// tvLogoutButton.apply {
// addMargin(top = requireContext().statusBarHeight)
// setOnClickListener { logout() }
// }
}

private fun render(state: AdminMainState) = with(binding) {
Expand Down
90 changes: 45 additions & 45 deletions presentation/src/main/res/layout/fragment_admin_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,63 +30,63 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!-- 결제 관련 -->
<!-- <TextView-->
<!-- android:id="@+id/tv_purchase_ticket_button"-->
<!-- style="@style/Pretendard.14.SemiBold"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginEnd="16dp"-->
<!-- android:background="@drawable/bg_secondary_button"-->
<!-- android:paddingHorizontal="16dp"-->
<!-- android:paddingVertical="6dp"-->
<!-- android:text="@string/purchase_ticket"-->
<!-- android:textColor="@color/White"-->
<!-- android:visibility="gone"-->
<!-- app:layout_constraintBottom_toBottomOf="@id/iv_my_button"-->
<!-- app:layout_constraintEnd_toStartOf="@id/iv_my_button"-->
<!-- app:layout_constraintTop_toTopOf="@id/iv_my_button"-->
<!-- tools:visibility="visible" />-->

<TextView
android:id="@+id/tv_purchase_ticket_button"
style="@style/Pretendard.14.SemiBold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:background="@drawable/bg_secondary_button"
android:paddingHorizontal="16dp"
android:paddingVertical="6dp"
android:text="@string/purchase_ticket"
android:textColor="@color/White"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/iv_my_button"
app:layout_constraintEnd_toStartOf="@id/iv_my_button"
app:layout_constraintTop_toTopOf="@id/iv_my_button"
tools:visibility="visible" />

<TextView
android:id="@+id/tv_logout_button"
style="@style/Pretendard.14.SemiBold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:background="@drawable/bg_secondary_button"
android:paddingHorizontal="16dp"
android:paddingVertical="6dp"
android:text="@string/logout_button"
android:textColor="@color/White"
app:layout_constraintBottom_toBottomOf="@id/iv_my_button"
app:layout_constraintEnd_toStartOf="@id/iv_my_button"
app:layout_constraintTop_toTopOf="@id/iv_my_button"
tools:visibility="visible" />
<!-- <TextView-->
<!-- android:id="@+id/tv_logout_button"-->
<!-- style="@style/Pretendard.14.SemiBold"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginEnd="16dp"-->
<!-- android:background="@drawable/bg_secondary_button"-->
<!-- android:paddingHorizontal="16dp"-->
<!-- android:paddingVertical="6dp"-->
<!-- android:text="@string/logout_button"-->
<!-- android:textColor="@color/White"-->
<!-- app:layout_constraintBottom_toBottomOf="@id/iv_my_button"-->
<!-- app:layout_constraintEnd_toStartOf="@id/iv_my_button"-->
<!-- app:layout_constraintTop_toTopOf="@id/iv_my_button"-->
<!-- tools:visibility="visible" />-->

<ImageView
android:id="@+id/iv_my_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_marginEnd="20dp"
android:contentDescription="@string/mypage_button_description"
android:src="@drawable/ic_my"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!-- <ImageView-->
<!-- android:id="@+id/iv_my_button"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="12dp"-->
<!-- android:layout_marginEnd="20dp"-->
<!-- android:contentDescription="@string/mypage_button_description"-->
<!-- android:src="@drawable/ic_my"-->
<!-- android:visibility="gone"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->

<TextView
android:id="@+id/tv_shop_name_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="46dp"
android:layout_marginTop="142dp"
android:includeFontPadding="false"
android:text="@string/admin_main_shop_name_label"
android:textAppearance="@style/Pretendard.32"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_purchase_ticket_button" />
app:layout_constraintTop_toTopOf="parent"/>

<TextView
android:id="@+id/tv_shop_name"
Expand Down

0 comments on commit 234a464

Please sign in to comment.