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.

Sign up for GitHub

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

Jump to bottom

[feat] 상세 피드 / 피드와 댓글 같이 스크롤 되도록 구현 #138

Merged
merged 23 commits into from
Aug 21, 2023
Merged

[feat] 상세 피드 / 피드와 댓글 같이 스크롤 되도록 구현 #138

merged 23 commits into from
Aug 21, 2023

Commits on Aug 19, 2023

  1. Merge branch 'feature/feat-detail-getFeedDetail' of https://github.co… 

    …m/team-winey/Winey-AOS into feature/feat-create-feed-comment

� Conflicts:
�	app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt
�	app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt
�	app/src/main/res/values/strings.xml
    @leeeha
    leeeha committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    1d7829f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/team-winey/Winey-AOS int… 

    …o feature/feat-create-feed-comment
    @leeeha
    leeeha committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    8e03113 View commit details
    Browse the repository at this point in the history

  3. [mod] 레벨업 설명 텍스트 수정

    @leeeha
    leeeha committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    b15f251 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of https://github.com/team-winey/Winey-AOS int… 

    …o feature/feat-create-feed-comment

� Conflicts:
�	app/src/main/java/com/android/go/sopt/winey/util/binding/BindingAdapter.kt
    @leeeha
    leeeha committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    d06a3f6 View commit details
    Browse the repository at this point in the history

  5. [fix] 바인딩 어댑터에서 loadImager 함수 널처리 코드 추가

    @leeeha
    leeeha committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    80c7c49 View commit details
    Browse the repository at this point in the history

  6. [add] #132 댓글 생성을 위한 서버통신 코드 추가

    @leeeha
    leeeha committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    4f94319 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2023

  1. Merge branch 'develop' of https://github.com/team-winey/Winey-AOS int… 

    …o feature/feat-create-feed-comment
    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    ae17fa1 View commit details
    Browse the repository at this point in the history

  2. [feat] 절약 내용 작성 텍스트 필드 높이 고정, 스크롤바 추가

    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    993af3b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/feat-detail-getFeedDetail' of https://github.co… 

    …m/team-winey/Winey-AOS into feature/feat-create-feed-comment

� Conflicts:
�	app/src/main/java/com/android/go/sopt/winey/util/binding/BindingAdapter.kt
    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    993e52f View commit details
    Browse the repository at this point in the history

  4. [fix] 상세 피드에서 뒤로가기 버튼 누르면 액티비티가 종료되도록 변경 (스크롤 위치 유지)

    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    5ff5d7e View commit details
    Browse the repository at this point in the history

  5. [ui] #132 댓글 생성을 위한 에디트텍스트 뷰 구현

    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    348a002 View commit details
    Browse the repository at this point in the history

  6. [mod] #132 디테일 프래그먼트에 부가 데이터를 전달하는 코드 수정

    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    4dd7824 View commit details
    Browse the repository at this point in the history

  7. [del] #132 불필요한 코드 삭제

    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    a73286e View commit details
    Browse the repository at this point in the history

  8. [ui] #132 댓글이 아직 없어요 배경 색상 변경

    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    8a4be2c View commit details
    Browse the repository at this point in the history

  9. [feat] #132 유효한 댓글일 때만 등록 버튼 활성화

    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    ec89226 View commit details
    Browse the repository at this point in the history

  10. [mod] #132 에디트텍스트 너비가 버튼과 겹치지 않도록 조정하기

    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    31d5fa6 View commit details
    Browse the repository at this point in the history

  11. [ui] #132 댓글 글자수 표시

    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    5d2ae1c View commit details
    Browse the repository at this point in the history

  12. [feat] #132 450자 넘으면 댓글 글자수 표시하도록

    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    d9baae1 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'develop' of https://github.com/team-winey/Winey-AOS int… 

    …o feature/feat-create-feed-comment
    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    453f432 View commit details
    Browse the repository at this point in the history

  14. [feat] 상세피드와 댓글 같이 스크롤 가능하도록 (concat 어댑터)

    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    48a0a2e View commit details
    Browse the repository at this point in the history

  15. [fix] 댓글이 없는 경우 스크롤 불가능 하도록 높이, 배경색 조정하기

    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    fd21860 View commit details
    Browse the repository at this point in the history

  16. [feat] 작성자 레벨에 따라 이미지 변경 (바인딩 어댑터 이용)

    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    a4539bb View commit details
    Browse the repository at this point in the history

  17. [fix] 닉네임 최대 길이 1줄로 지정, 더 길면 말줄임표 사용하도록

    @leeeha
    leeeha committed Aug 20, 2023
    Configuration menu
    Copy the full SHA
    a1ad73d View commit details
    Browse the repository at this point in the history