Skip to content
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

[feature/#841] 마이페이지 compose 리팩토링 #854

Merged
merged 42 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
b03d14f
feat #841: compose 추가
leeeyubin Sep 12, 2024
07713a9
feat #841: mypage UI 구현
leeeyubin Sep 16, 2024
cdf75aa
[feature/#841] mypage UI 구현
leeeyubin Sep 16, 2024
ee2778b
[feature/#841] mypage LaunchedEffect 구현
leeeyubin Sep 16, 2024
fac5ee1
[feature/#841] SignOut UI
leeeyubin Sep 17, 2024
bf9998e
[feature/#841] make MyPageButton
leeeyubin Sep 17, 2024
7d98a63
[feature/#841] make AdjustSentence UI
leeeyubin Sep 17, 2024
8edbe5a
[feature/#841] make AdjustSentence UI
leeeyubin Sep 17, 2024
4c4f66f
[feature/#841] fix fontStyle
leeeyubin Sep 17, 2024
3e8ba39
[feature/#841] make MyPage Dialog
leeeyubin Sep 17, 2024
e21ca0f
[feature/#841] make Soptamp Dialog
leeeyubin Sep 17, 2024
f008af8
[feature/#841] make MyPageTopBar Component
leeeyubin Sep 17, 2024
b019008
[feature/#841] make logout Dialog
leeeyubin Sep 17, 2024
56e8f78
[feature/#841] delete AlertDialogPositiveNegative.kt
leeeyubin Sep 17, 2024
8133da3
[feature/#841] delete color
leeeyubin Sep 17, 2024
9119127
[feature/#841] make MyPageSection
leeeyubin Sep 17, 2024
afb7488
[feature/#841] make MyPageSection
leeeyubin Sep 17, 2024
e71fcf6
[feature/#841] change Dialog logic
leeeyubin Sep 17, 2024
19794cd
[chore/#841] fix code
leeeyubin Sep 17, 2024
12a0d50
[feature/#841] MIT License
leeeyubin Sep 18, 2024
f13250f
[feature/#841] resolving conflict
leeeyubin Sep 18, 2024
1e3b4b4
[fix/#841] Fix build issues (due to conflicts)
l2hyunwoo Sep 18, 2024
ab0d1d0
[fix/#841] kspplugin 2.0.20-1.0.25 -> 2.0.20-1.0.24
leeeyubin Sep 18, 2024
f20195e
[fix/#841] kspplugin 2.0.20-1.0.24 -> 2.0.20-1.0.25
leeeyubin Sep 18, 2024
ca3b1e9
[fix/#841] resolving conflict
leeeyubin Sep 24, 2024
2b96203
[fix/#841] onButtonClick -> onClick
leeeyubin Sep 24, 2024
c6239ad
[fix/#841] onButtonClick -> onClick
leeeyubin Sep 24, 2024
9834a95
[fix/#841] paddingShape -> shape
leeeyubin Sep 24, 2024
96eba0f
[fix/#841] add vertical
leeeyubin Sep 24, 2024
eddf9a3
[fix/#841] slot API 적용
leeeyubin Sep 24, 2024
52dbd50
[fix/#841] remove MyPageButton fillMaxWidth()
leeeyubin Sep 25, 2024
a247848
[fix/#841] onIconClick -> onNavigationIconClick
leeeyubin Sep 25, 2024
bdb041a
[fix/#841] delete activity layout
leeeyubin Sep 25, 2024
524029c
[fix/#841] delete get()
leeeyubin Sep 25, 2024
1443f05
[fix/#841] resolving conflict
leeeyubin Sep 25, 2024
614f92a
[fix/#841] change List to ImmutableList
leeeyubin Sep 25, 2024
38dbedb
[fix/#841] delete StringResources
leeeyubin Sep 25, 2024
ec770b6
[fix/#841] fix dialog padding
leeeyubin Sep 25, 2024
c41961b
[fix/#841] fix section padding
leeeyubin Sep 25, 2024
8d76b7b
[fix/#841] delete dialog StringResources
leeeyubin Sep 25, 2024
e5e7f87
[fix/#841] delete ResultCode
leeeyubin Sep 25, 2024
b40e17b
[feature/#841] MIT License
leeeyubin Sep 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ class HomeActivity : AppCompatActivity() {
tracker.track(type = EventType.CLICK, name = "mypage", properties = mapOf("view_type" to args?.userStatus?.value))
lifecycleScope.launch {
startActivity(
MyPageActivity.getIntent(this@HomeActivity, MyPageActivity.Argument(viewModel.userActiveState.value))
MyPageActivity.getIntent(this@HomeActivity, MyPageActivity.StartArgs(viewModel.userActiveState.value))
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class NavigatorProviderIntent @Inject constructor(

override fun getMyPageActivityIntent(name: String) = MyPageActivity.getIntent(
context,
MyPageActivity.Argument(UserActiveState.valueOf(name))
MyPageActivity.StartArgs(UserActiveState.valueOf(name))
)

override fun getAttendanceActivityIntent() = AttendanceActivity.newInstance(context)
Expand Down
982 changes: 23 additions & 959 deletions app/src/release/generated/baselineProfiles/baseline-prof.txt

Large diffs are not rendered by default.

982 changes: 23 additions & 959 deletions app/src/release/generated/baselineProfiles/startup-prof.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* MIT License
* Copyright 2023-2024 SOPT - Shout Our Passion Together
* Copyright 2024 SOPT - Shout Our Passion Together
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* MIT License
* Copyright 2024 SOPT - Shout Our Passion Together
* Copyright 2023-2024 SOPT - Shout Our Passion Together
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* MIT License
* Copyright 2024 SOPT - Shout Our Passion Together
* Copyright 2023-2024 SOPT - Shout Our Passion Together
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* MIT License
* Copyright 2024 SOPT - Shout Our Passion Together
* Copyright 2023-2024 SOPT - Shout Our Passion Together
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion domain/notification/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* MIT License
* Copyright 2024 SOPT - Shout Our Passion Together
* Copyright 2023-2024 SOPT - Shout Our Passion Together
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* MIT License
* Copyright 2024 SOPT - Shout Our Passion Together
* Copyright 2023-2024 SOPT - Shout Our Passion Together
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* MIT License
* Copyright 2024 SOPT - Shout Our Passion Together
* Copyright 2023-2024 SOPT - Shout Our Passion Together
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* MIT License
* Copyright 2024 SOPT - Shout Our Passion Together
* Copyright 2023-2024 SOPT - Shout Our Passion Together
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* MIT License
* Copyright 2024 SOPT - Shout Our Passion Together
* Copyright 2023-2024 SOPT - Shout Our Passion Together
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* MIT License
* Copyright 2024 SOPT - Shout Our Passion Together
* Copyright 2023-2024 SOPT - Shout Our Passion Together
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion feature/fortune/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* MIT License
* Copyright 2024 SOPT - Shout Our Passion Together
* Copyright 2023-2024 SOPT - Shout Our Passion Together
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* MIT License
* Copyright 2024 SOPT - Shout Our Passion Together
* Copyright 2023-2024 SOPT - Shout Our Passion Together
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* MIT License
* Copyright 2024 SOPT - Shout Our Passion Together
* Copyright 2023-2024 SOPT - Shout Our Passion Together
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* MIT License
* Copyright 2024 SOPT - Shout Our Passion Together
* Copyright 2023-2024 SOPT - Shout Our Passion Together
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 2 additions & 0 deletions feature/mypage/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

plugins {
sopt("feature")
sopt("compose")
}

android {
Expand All @@ -41,4 +42,5 @@ dependencies {
implementation(platform(libs.firebase))
implementation(libs.bundles.firebase)
implementation(libs.process.phoenix)
implementation(libs.kotlin.collections.immutable)
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/*
* MIT License
* Copyright 2024 SOPT - Shout Our Passion Together
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package org.sopt.official.feature.mypage.component

import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import org.sopt.official.designsystem.Black
import org.sopt.official.designsystem.Gray300
import org.sopt.official.designsystem.Gray600
import org.sopt.official.designsystem.White

@Composable
fun MyPageButton(
paddingVertical: Dp,
leeeyubin marked this conversation as resolved.
Show resolved Hide resolved
onClick: () -> Unit,
modifier: Modifier = Modifier.fillMaxWidth(),
shape: Shape = RoundedCornerShape(10.dp),
isEnabled: Boolean = true,
containerColor: Color = White,
contentColor: Color = Black,
content: @Composable () -> Unit,
) {
Button(
contentPadding = PaddingValues(vertical = paddingVertical),
modifier = modifier,
enabled = isEnabled,
colors = ButtonDefaults.buttonColors(
containerColor = containerColor,
contentColor = contentColor,
disabledContainerColor = Gray600,
disabledContentColor = Gray300
),
shape = shape,
onClick = onClick
) {
content()
}
}
Loading