|
|
7f419a2ce7
|
Merge branch 'dev-5.9.0' into feature-modular
# Conflicts:
# app/src/main/java/com/gh/common/util/EntranceUtils.java
# app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt
# app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt
# app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailFragment.kt
# app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectAdapter.java
# app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectFragment.java
# app/src/main/java/com/gh/gamecenter/qa/subject/AskSubjectViewHolder.java
# app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt
|
2022-04-25 11:53:45 +08:00 |
|
|
|
33af47b01b
|
Merge branch 'dev-5.9.0' into feature-modular
# Conflicts:
# app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt
# app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityFragment.kt
# app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt
# app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt
# app/src/main/java/com/gh/gamecenter/forum/home/ForumRecordsAdapter.kt
# app/src/main/java/com/gh/gamecenter/forum/home/ForumViewModel.kt
# app/src/main/java/com/gh/gamecenter/forum/home/HorizontalForumsAdapter.kt
# app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditViewModel.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareAdapter.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt
# app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt
# app/src/main/java/com/gh/gamecenter/qa/article/MyArticleAdapter.kt
# app/src/main/res/layout/community_answer_item.xml
# app/src/main/res/layout/fragment_game_collection_square.xml
# app/src/main/res/values-night/colors.xml
# app/src/main/res/values/attrs.xml
# app/src/main/res/values/colors.xml
|
2022-04-24 15:35:57 +08:00 |
|
|
|
7a89ef3e74
|
处理一些合并后导包错误问题
|
2022-04-18 10:06:38 +08:00 |
|
|
|
10b696f78d
|
Merge branch 'dev-5.9.0' into feature-modular
# Conflicts:
# app/src/main/java/com/gh/gamecenter/forum/detail/ForumTopLinkAdapter.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt
# app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt
# app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentFragment.kt
# app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt
# app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt
# app/src/main/res/values-night/colors.xml
# app/src/main/res/values/colors.xml
|
2022-04-18 09:53:20 +08:00 |
|
|
|
e9ac9aab7f
|
模块/组件化前期改造 https://git.shanqu.cc/halo/android/assistant-android/-/issues/64
|
2022-04-09 19:48:45 +08:00 |
|
