-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: add toolbar & bottom navigation bar #71
Merged
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
c3909eb
feat: add toolbar & navigation bar basic setting
HeewonP825 7d19b3e
feat: change constraintLayout into LinearLayout to pix location & add…
HeewonP825 c8d0b81
feat: edit toolbar navigate icon & actions for login/join Views
HeewonP825 9b693bf
feat: setting basic things for timelineFragment
HeewonP825 d2437e1
feat: add toolbar icon in TimelineFragment
HeewonP825 d9eaf35
feat: create Fragments for add bottom navigation bar
HeewonP825 556ae48
feat: edit activity_main.xml for toolbar/navbar/fragmentContainer vie…
HeewonP825 aef77d6
feat: edit margin in loginFragment
HeewonP825 1352d64
edit bottom_nav
HeewonP825 788ff58
feat: chained fragmentContainerView in activityMain
HeewonP825 291263a
feat: edit toolbar & bottom navigationbar
HeewonP825 877d766
feat: delete sucks itemActiceIndicator
HeewonP825 d03f4a7
feat: clear doubleClicked icon focus issue
HeewonP825 50e8831
chore: add eol
HeewonP825 bcf8bc4
chore: reflect review
HeewonP825 81a4f89
chore: reflect review
HeewonP825 8a2b7c7
chore: reflect review
HeewonP825 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
86 changes: 86 additions & 0 deletions
86
...bile/app/src/main/java/com/smilegate/Easel/presentation/view/Timeline/TimelineFragment.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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
package com.smilegate.Easel.presentation.view.Timeline | ||
|
||
import android.os.Bundle | ||
import android.os.Handler | ||
import android.os.Looper | ||
import android.view.KeyEvent | ||
import androidx.fragment.app.Fragment | ||
import android.view.LayoutInflater | ||
import android.view.View | ||
import android.view.ViewGroup | ||
import android.widget.ImageView | ||
import android.widget.Toast | ||
import androidx.activity.addCallback | ||
import androidx.navigation.NavController | ||
import androidx.navigation.fragment.findNavController | ||
import com.google.android.material.bottomnavigation.BottomNavigationView | ||
import com.smilegate.Easel.R | ||
import com.smilegate.Easel.databinding.FragmentStartBinding | ||
import com.smilegate.Easel.databinding.FragmentTimelineBinding | ||
|
||
class TimelineFragment : Fragment() { | ||
private lateinit var binding: FragmentTimelineBinding | ||
|
||
private lateinit var navController: NavController | ||
|
||
private var doubleBackPressed = false | ||
|
||
override fun onCreateView( | ||
inflater: LayoutInflater, container: ViewGroup?, | ||
savedInstanceState: Bundle? | ||
): View { | ||
binding = FragmentTimelineBinding.inflate(inflater, container, false) | ||
|
||
val toolbar = requireActivity().findViewById<androidx.appcompat.widget.Toolbar>(R.id.toolbar_container) | ||
val backButton = toolbar.findViewById<ImageView>(R.id.back_btn) | ||
backButton.visibility = View.GONE | ||
|
||
val settingButton = toolbar.findViewById<ImageView>(R.id.else_btn) | ||
settingButton.setImageResource(R.drawable.ic_setting) | ||
settingButton.visibility = View.VISIBLE | ||
|
||
navController = findNavController() | ||
|
||
// 바텀 네비게이션바 보이기 | ||
val bottomNavigation = activity?.findViewById<BottomNavigationView>(R.id.nav_view) | ||
bottomNavigation?.visibility = View.VISIBLE | ||
|
||
return binding.root | ||
} | ||
|
||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
super.onViewCreated(view, savedInstanceState) | ||
|
||
// 바텀 네비게이션바 보이기 | ||
val bottomNavigation = activity?.findViewById<BottomNavigationView>(R.id.nav_view) | ||
bottomNavigation?.visibility = View.VISIBLE | ||
|
||
// 뒤로가기 버튼을 처리하는 부분 | ||
view.isFocusableInTouchMode = true | ||
view.requestFocus() | ||
view.setOnKeyListener { _, keyCode, _ -> | ||
if (keyCode == KeyEvent.KEYCODE_BACK) { | ||
if (isCurrentFragment()) { | ||
// 현재 프래그먼트에서 뒤로가기 버튼 처리 | ||
if (doubleBackPressed) { | ||
// 두 번째 눌림 | ||
requireActivity().finish() | ||
} else { | ||
// 첫 번째 눌림 | ||
doubleBackPressed = true | ||
// 2초 내에 두 번 누르지 않으면 초기화 | ||
Handler(Looper.getMainLooper()).postDelayed({ | ||
doubleBackPressed = false | ||
}, 2000) | ||
} | ||
return@setOnKeyListener true | ||
} | ||
} | ||
false | ||
} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 별건 아닌데 개행이 빠진 것 같아요! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 수정 완료했습니다~ |
||
|
||
private fun isCurrentFragment(): Boolean { | ||
return true | ||
} | ||
} |
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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
디테일 너무 좋습니다 💯 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
두 번 터치 시 종료되는 액션은 추후 반영해보겠습니다....🥹