-
Notifications
You must be signed in to change notification settings - Fork 0
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
#11 [ui] 스토리텔링 뷰 작업 #14
Merged
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
fdf72c4
#11 [chore] 스토리텔링 아이콘 파일 추가
stellar-halo 555e465
#11 [ui] radius 12인 하얀색 사각형 파일 추가
stellar-halo bd21191
#11 [setting] bubble20 폰트 추가
stellar-halo bef8e69
#11 [ui] story telling string 추가
stellar-halo 8b8a656
#11 [ui] fragment story telling intro 추가
stellar-halo 536a814
#11 [ui] merge with #6
stellar-halo 303e4d9
#11 [chore] story telling icon 파일 추가
stellar-halo 1cc2f39
#11 [chore] story telling string 추가
stellar-halo b44c4b0
#11 [ui] story telling conclusion xml
stellar-halo 80fb4de
Merge remote-tracking branch 'origin/develop' into feature/#11-ui-sto…
stellar-halo 230d16b
#11 [chore] svg 파일 삭제
stellar-halo b08db81
#11 [chore] color 값 추가
stellar-halo 1f263ad
#11 [chore] activity 추가 및 portrait 속성 추가
stellar-halo 02f63c7
#11 [chore] png 파일 추가
stellar-halo 7ce2b0b
#11 [chore] status 글자 어둡게
stellar-halo e01272c
#11 [ui] png 변경에 따른 background 변경 및 ImageView로 바꾸기 / layout으로 변경
stellar-halo b3ac175
#11 [ui] activity story telling 추가
stellar-halo 01de73f
#11 [ui] fragment 파일 추가
stellar-halo f59e948
#11 [ui] activity 파일 추가
stellar-halo 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
38 changes: 38 additions & 0 deletions
38
app/src/main/java/com/sopetit/softie/ui/storytelling/StoryTellingActivity.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,38 @@ | ||
package com.sopetit.softie.ui.storytelling | ||
|
||
import android.os.Bundle | ||
import androidx.core.content.ContextCompat | ||
import androidx.fragment.app.Fragment | ||
import com.sopetit.softie.R | ||
import com.sopetit.softie.databinding.ActivityStoryTellingBinding | ||
import com.sopetit.softie.util.binding.BindingActivity | ||
|
||
class StoryTellingActivity : | ||
BindingActivity<ActivityStoryTellingBinding>(R.layout.activity_story_telling) { | ||
override fun onCreate(savedInstanceState: Bundle?) { | ||
super.onCreate(savedInstanceState) | ||
|
||
initFragment() | ||
initStatusBarColor() | ||
} | ||
|
||
private fun initFragment() { | ||
val currentFragment = | ||
supportFragmentManager.findFragmentById(R.id.fcv_story_telling_fragment) | ||
if (currentFragment == null) { | ||
supportFragmentManager.beginTransaction() | ||
.add(R.id.fcv_story_telling_fragment, StoryTellingIntroFragment()) | ||
.commit() | ||
} | ||
} | ||
|
||
private fun initStatusBarColor() { | ||
window.statusBarColor = ContextCompat.getColor(this, R.color.story_telling_background) | ||
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. 굿구웃 |
||
} | ||
|
||
fun replaceFragment(fragment: Fragment) { | ||
val fragmentManager = supportFragmentManager | ||
val fragmentTransaction = fragmentManager.beginTransaction() | ||
fragmentTransaction.replace(R.id.fcv_story_telling_fragment, fragment).commit() | ||
} | ||
} |
14 changes: 14 additions & 0 deletions
14
app/src/main/java/com/sopetit/softie/ui/storytelling/StoryTellingConclusionFragment.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,14 @@ | ||
package com.sopetit.softie.ui.storytelling | ||
|
||
import android.os.Bundle | ||
import android.view.View | ||
import com.sopetit.softie.R | ||
import com.sopetit.softie.databinding.FragmentStoryTellingConclusionBinding | ||
import com.sopetit.softie.util.binding.BindingFragment | ||
|
||
class StoryTellingConclusionFragment : | ||
BindingFragment<FragmentStoryTellingConclusionBinding>(R.layout.fragment_story_telling_conclusion) { | ||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
super.onViewCreated(view, savedInstanceState) | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
app/src/main/java/com/sopetit/softie/ui/storytelling/StoryTellingIntroFragment.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,24 @@ | ||
package com.sopetit.softie.ui.storytelling | ||
|
||
import android.os.Bundle | ||
import android.view.View | ||
import com.sopetit.softie.R | ||
import com.sopetit.softie.databinding.FragmentStoryTellingIntroBinding | ||
import com.sopetit.softie.util.binding.BindingFragment | ||
|
||
class StoryTellingIntroFragment : | ||
BindingFragment<FragmentStoryTellingIntroBinding>(R.layout.fragment_story_telling_intro) { | ||
|
||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
super.onViewCreated(view, savedInstanceState) | ||
|
||
initClickListener() | ||
} | ||
|
||
private fun initClickListener() { | ||
binding.tvStoryTellingIntro.setOnClickListener { | ||
val storyTellingMainFragment = StoryTellingMainFragment() | ||
(activity as StoryTellingActivity).replaceFragment(storyTellingMainFragment) | ||
} | ||
} | ||
} |
23 changes: 23 additions & 0 deletions
23
app/src/main/java/com/sopetit/softie/ui/storytelling/StoryTellingMainFragment.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,23 @@ | ||
package com.sopetit.softie.ui.storytelling | ||
|
||
import android.os.Bundle | ||
import android.view.View | ||
import com.sopetit.softie.R | ||
import com.sopetit.softie.databinding.FragmentStoryTellingMainBinding | ||
import com.sopetit.softie.util.binding.BindingFragment | ||
|
||
class StoryTellingMainFragment : | ||
BindingFragment<FragmentStoryTellingMainBinding>(R.layout.fragment_story_telling_main) { | ||
|
||
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
super.onViewCreated(view, savedInstanceState) | ||
initClickListener() | ||
} | ||
|
||
private fun initClickListener() { | ||
binding.tvStoryTellingMain.setOnClickListener { | ||
val storyTellingConclusionFragment = StoryTellingConclusionFragment() | ||
(activity as StoryTellingActivity).replaceFragment(storyTellingConclusionFragment) | ||
} | ||
} | ||
} |
Large diffs are not rendered by default.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,9 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="14dp" | ||
android:height="14dp" | ||
android:viewportWidth="14" | ||
android:viewportHeight="14"> | ||
<path | ||
android:pathData="M12.356,5.619C13.059,5.996 13.059,7.004 12.356,7.381L4.972,11.34C4.306,11.697 3.5,11.214 3.5,10.458L3.5,2.542C3.5,1.786 4.306,1.303 4.972,1.66L12.356,5.619Z" | ||
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. 고생하셨습니당 ㅎ |
||
android:fillColor="#26282B"/> | ||
</vector> |
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,23 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:aapt="http://schemas.android.com/aapt" | ||
android:width="360dp" | ||
android:height="780dp" | ||
android:viewportWidth="360" | ||
android:viewportHeight="780"> | ||
<path | ||
android:pathData="M0,0h360v780h-360z" | ||
android:strokeAlpha="0.5" | ||
android:fillAlpha="0.5"> | ||
<aapt:attr name="android:fillColor"> | ||
<gradient | ||
android:centerX="363.84" | ||
android:centerY="530.73" | ||
android:gradientRadius="595.78" | ||
android:type="radial"> | ||
<item android:offset="0" android:color="#33FFCC00"/> | ||
<item android:offset="0.55" android:color="#00FFCC00"/> | ||
<item android:offset="1" android:color="#00FFCC00"/> | ||
</gradient> | ||
</aapt:attr> | ||
</path> | ||
</vector> |
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,23 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:aapt="http://schemas.android.com/aapt" | ||
android:width="360dp" | ||
android:height="780dp" | ||
android:viewportWidth="360" | ||
android:viewportHeight="780"> | ||
<path | ||
android:pathData="M0,0h360v780h-360z" | ||
android:strokeAlpha="0.5" | ||
android:fillAlpha="0.5"> | ||
<aapt:attr name="android:fillColor"> | ||
<gradient | ||
android:centerX="172.32" | ||
android:centerY="533.13" | ||
android:gradientRadius="528.33" | ||
android:type="radial"> | ||
<item android:offset="0" android:color="#33FFCC00"/> | ||
<item android:offset="0.49" android:color="#00FFCC00"/> | ||
<item android:offset="1" android:color="#00FFCC00"/> | ||
</gradient> | ||
</aapt:attr> | ||
</path> | ||
</vector> |
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,7 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:shape="rectangle"> | ||
|
||
<solid android:color="@color/white" /> | ||
<corners android:radius="12dp" /> | ||
</shape> |
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,23 @@ | ||
<?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"> | ||
|
||
<data> | ||
|
||
</data> | ||
|
||
<androidx.constraintlayout.widget.ConstraintLayout | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent"> | ||
|
||
<androidx.fragment.app.FragmentContainerView | ||
android:id="@+id/fcv_story_telling_fragment" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
app:layout_constraintBottom_toBottomOf="parent" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintStart_toStartOf="parent" | ||
app:layout_constraintTop_toTopOf="parent" /> | ||
|
||
</androidx.constraintlayout.widget.ConstraintLayout> | ||
</layout> |
67 changes: 67 additions & 0 deletions
67
app/src/main/res/layout/fragment_story_telling_conclusion.xml
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,67 @@ | ||
<?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"> | ||
|
||
<data> | ||
|
||
</data> | ||
|
||
<androidx.constraintlayout.widget.ConstraintLayout | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:background="@color/story_telling_background"> | ||
|
||
<ImageView | ||
android:id="@+id/iv_story_telling_main_spotlight" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:src="@drawable/ic_spotlight3" /> | ||
|
||
<ImageView | ||
android:id="@+id/iv_story_telling_conclusion_door" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_marginBottom="242dp" | ||
android:src="@drawable/ic_door" | ||
app:layout_constraintBottom_toBottomOf="parent" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintStart_toStartOf="parent" /> | ||
|
||
<ImageView | ||
android:id="@+id/iv_story_telling_conclusion_box" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_marginBottom="210dp" | ||
android:src="@drawable/ic_box_closed" | ||
app:layout_constraintBottom_toBottomOf="parent" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintStart_toStartOf="parent" /> | ||
|
||
<TextView | ||
android:id="@+id/tv_story_telling_conclusion" | ||
style="@style/bubble20" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:layout_marginHorizontal="20dp" | ||
android:layout_marginBottom="74dp" | ||
android:background="@drawable/shape_white_fill_12_rect" | ||
android:gravity="center" | ||
android:paddingTop="23dp" | ||
android:paddingBottom="22dp" | ||
android:text="@string/story_telling_conclusion" | ||
app:layout_constraintBottom_toBottomOf="parent" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintStart_toStartOf="parent" /> | ||
|
||
<ImageView | ||
android:id="@+id/btn_story_telling_conclusion_next" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_marginEnd="16dp" | ||
android:src="@drawable/ic_onboard_next" | ||
app:layout_constraintBottom_toBottomOf="@id/tv_story_telling_conclusion" | ||
app:layout_constraintEnd_toEndOf="@id/tv_story_telling_conclusion" | ||
app:layout_constraintTop_toTopOf="@id/tv_story_telling_conclusion" /> | ||
|
||
</androidx.constraintlayout.widget.ConstraintLayout> | ||
</layout> |
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,51 @@ | ||
<?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"> | ||
|
||
<data> | ||
|
||
</data> | ||
|
||
<androidx.constraintlayout.widget.ConstraintLayout | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:background="@color/story_telling_background"> | ||
|
||
<ImageView | ||
android:id="@+id/iv_story_telling_intro_girl" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_marginStart="20dp" | ||
android:layout_marginTop="194dp" | ||
android:src="@drawable/ic_girl1" | ||
app:layout_constraintStart_toStartOf="parent" | ||
app:layout_constraintTop_toTopOf="parent" /> | ||
|
||
<TextView | ||
android:id="@+id/tv_story_telling_intro" | ||
style="@style/bubble20" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:layout_marginHorizontal="20dp" | ||
android:layout_marginBottom="74dp" | ||
android:background="@drawable/shape_white_fill_12_rect" | ||
android:gravity="center" | ||
android:paddingTop="23dp" | ||
android:paddingBottom="22dp" | ||
android:text="@string/story_telling_intro" | ||
app:layout_constraintBottom_toBottomOf="parent" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintStart_toStartOf="parent" /> | ||
|
||
<ImageView | ||
android:id="@+id/btn_story_telling_intro_next" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_marginEnd="16dp" | ||
android:src="@drawable/ic_onboard_next" | ||
app:layout_constraintBottom_toBottomOf="@id/tv_story_telling_intro" | ||
app:layout_constraintEnd_toEndOf="@id/tv_story_telling_intro" | ||
app:layout_constraintTop_toTopOf="@id/tv_story_telling_intro" /> | ||
|
||
</androidx.constraintlayout.widget.ConstraintLayout> | ||
</layout> |
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.
다들 true 놔두길래 협업할때 원칙인줄 알았는데..
근본은 false가 맞네요