diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8b119d4..f2c7c11 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -35,6 +35,9 @@ + diff --git a/app/src/main/java/com/haodustudio/DailyNotes/view/activities/AboutContributorsActivity.kt b/app/src/main/java/com/haodustudio/DailyNotes/view/activities/AboutContributorsActivity.kt new file mode 100644 index 0000000..4928f13 --- /dev/null +++ b/app/src/main/java/com/haodustudio/DailyNotes/view/activities/AboutContributorsActivity.kt @@ -0,0 +1,69 @@ +package com.haodustudio.DailyNotes.view.activities + +import android.os.Bundle +import android.view.LayoutInflater +import androidx.core.content.ContextCompat +import com.haodustudio.DailyNotes.R +import com.haodustudio.DailyNotes.databinding.ActivityAboutContributorsBinding +import com.haodustudio.DailyNotes.databinding.LayoutContributorCardBinding +import com.haodustudio.DailyNotes.view.activities.base.BaseActivity +import java.util.Calendar + +class AboutContributorsActivity : BaseActivity() { + + private val binding by lazy { ActivityAboutContributorsBinding.inflate(layoutInflater) } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(binding.root) + + setupCoreContributors() + setupFooter() + } + + private fun setupCoreContributors() { + val inflater = LayoutInflater.from(this) + val coreMembers = listOf( + CoreContributor( + name = "好读游独", + roleText = getString(R.string.contributors_core_role_major), + avatarRes = R.drawable.avatar_contributor_haoduyoudu + ), + CoreContributor( + name = "HikaruQwQ", + roleText = getString(R.string.contributors_core_role_ce_lead), + avatarRes = R.drawable.avatar_contributor_hikaruqwq + ), + CoreContributor( + name = "huanli233", + roleText = getString(R.string.contributors_core_role_support), + avatarRes = R.drawable.avatar_contributor_huanli233 + ) + ) + + binding.coreContributorsContainer.removeAllViews() + coreMembers.forEach { contributor -> + val cardBinding = LayoutContributorCardBinding.inflate(inflater, binding.coreContributorsContainer, false) + cardBinding.name.text = contributor.name + cardBinding.role.text = contributor.roleText + val avatar = ContextCompat.getDrawable(this, contributor.avatarRes) + if (avatar != null) { + cardBinding.avatar.setImageDrawable(avatar) + } else { + cardBinding.avatar.setImageResource(R.drawable.ic_avatar_placeholder) + } + binding.coreContributorsContainer.addView(cardBinding.root) + } + } + + private fun setupFooter() { + val currentYear = Calendar.getInstance().get(Calendar.YEAR) + binding.footerCopyright.text = getString(R.string.contributors_footer_copyright, currentYear) + } + + private data class CoreContributor( + val name: String, + val roleText: String, + val avatarRes: Int + ) +} diff --git a/app/src/main/java/com/haodustudio/DailyNotes/view/activities/AboutSoftware.kt b/app/src/main/java/com/haodustudio/DailyNotes/view/activities/AboutSoftware.kt index a761af1..02303b6 100644 --- a/app/src/main/java/com/haodustudio/DailyNotes/view/activities/AboutSoftware.kt +++ b/app/src/main/java/com/haodustudio/DailyNotes/view/activities/AboutSoftware.kt @@ -60,7 +60,7 @@ class AboutSoftware : BaseActivity() { icon.setImageResource(R.drawable.usergroup) root.contentDescription = getString(R.string.about_section_contributors_desc) root.setOnClickListener { - openRemoteAsset("/static/about_thanks_img.png", zoomEnabled = false) + openContributorsPage() } } @@ -112,6 +112,10 @@ class AboutSoftware : BaseActivity() { startActivity(viewerIntent) } + private fun openContributorsPage() { + startActivity(Intent(this, AboutContributorsActivity::class.java)) + } + private fun openExternalUrl(url: String) { val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url)) if (intent.resolveActivity(packageManager) != null) { diff --git a/app/src/main/res/drawable/avatar_contributor_haoduyoudu.png b/app/src/main/res/drawable/avatar_contributor_haoduyoudu.png new file mode 100644 index 0000000..421a4d8 Binary files /dev/null and b/app/src/main/res/drawable/avatar_contributor_haoduyoudu.png differ diff --git a/app/src/main/res/drawable/avatar_contributor_hikaruqwq.png b/app/src/main/res/drawable/avatar_contributor_hikaruqwq.png new file mode 100644 index 0000000..cd82075 Binary files /dev/null and b/app/src/main/res/drawable/avatar_contributor_hikaruqwq.png differ diff --git a/app/src/main/res/drawable/avatar_contributor_huanli233.png b/app/src/main/res/drawable/avatar_contributor_huanli233.png new file mode 100644 index 0000000..c9a5140 Binary files /dev/null and b/app/src/main/res/drawable/avatar_contributor_huanli233.png differ diff --git a/app/src/main/res/drawable/ic_avatar_placeholder.xml b/app/src/main/res/drawable/ic_avatar_placeholder.xml new file mode 100644 index 0000000..e3655eb --- /dev/null +++ b/app/src/main/res/drawable/ic_avatar_placeholder.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_haodustudio_logo.png b/app/src/main/res/drawable/ic_haodustudio_logo.png new file mode 100644 index 0000000..5422169 Binary files /dev/null and b/app/src/main/res/drawable/ic_haodustudio_logo.png differ diff --git a/app/src/main/res/drawable/ic_main_setting.png b/app/src/main/res/drawable/ic_main_setting.png deleted file mode 100644 index a144bd5..0000000 Binary files a/app/src/main/res/drawable/ic_main_setting.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_user_img_arts.webp b/app/src/main/res/drawable/ic_user_img_arts.webp deleted file mode 100644 index 7af8875..0000000 Binary files a/app/src/main/res/drawable/ic_user_img_arts.webp and /dev/null differ diff --git a/app/src/main/res/drawable/ic_user_img_haoduyoudu.webp b/app/src/main/res/drawable/ic_user_img_haoduyoudu.webp deleted file mode 100644 index c5aed76..0000000 Binary files a/app/src/main/res/drawable/ic_user_img_haoduyoudu.webp and /dev/null differ diff --git a/app/src/main/res/drawable/ic_user_img_mengxi.webp b/app/src/main/res/drawable/ic_user_img_mengxi.webp deleted file mode 100644 index 99458ae..0000000 Binary files a/app/src/main/res/drawable/ic_user_img_mengxi.webp and /dev/null differ diff --git a/app/src/main/res/layout/activity_about_contributors.xml b/app/src/main/res/layout/activity_about_contributors.xml new file mode 100644 index 0000000..82ac623 --- /dev/null +++ b/app/src/main/res/layout/activity_about_contributors.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_about_software.xml b/app/src/main/res/layout/activity_about_software.xml index dd322b4..9e82ca0 100644 --- a/app/src/main/res/layout/activity_about_software.xml +++ b/app/src/main/res/layout/activity_about_software.xml @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:text="@string/about" android:textColor="@color/white" - android:textSize="18sp" + android:textSize="16sp" android:fontFamily="sans-serif-medium" tools:text="关于软件" /> diff --git a/app/src/main/res/layout/layout_about_item.xml b/app/src/main/res/layout/layout_about_item.xml index 9ce3de9..f66be79 100644 --- a/app/src/main/res/layout/layout_about_item.xml +++ b/app/src/main/res/layout/layout_about_item.xml @@ -30,8 +30,8 @@ diff --git a/app/src/main/res/layout/layout_contributor_card.xml b/app/src/main/res/layout/layout_contributor_card.xml new file mode 100644 index 0000000..4af48a5 --- /dev/null +++ b/app/src/main/res/layout/layout_contributor_card.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values-sw360dp/dimens_contributors.xml b/app/src/main/res/values-sw360dp/dimens_contributors.xml new file mode 100644 index 0000000..b217886 --- /dev/null +++ b/app/src/main/res/values-sw360dp/dimens_contributors.xml @@ -0,0 +1,24 @@ + + + 12dp + 16dp + 16sp + 11sp + 10sp + 12dp + 12dp + 8dp + 16dp + 20dp + 8dp + 48dp + 12dp + 40dp + 8dp + 36dp + 12dp + 9sp + 12sp + 12dp + 32dp + diff --git a/app/src/main/res/values/dimens_contributors.xml b/app/src/main/res/values/dimens_contributors.xml new file mode 100644 index 0000000..326c16c --- /dev/null +++ b/app/src/main/res/values/dimens_contributors.xml @@ -0,0 +1,24 @@ + + + 8dp + 12dp + 14sp + 10sp + 9sp + 10dp + 8dp + 6dp + 12dp + 14dp + 6dp + 36dp + 10dp + 32dp + 5dp + 28dp + 8dp + 7sp + 10sp + 8dp + 24dp + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 01b6971..3bbde9b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -32,6 +32,17 @@ 无网络连接 敬请期待 + 贡献者 + 核心开发成员 + 大版本开发者 + CE主要开发者 + 超级木桶饭 + 特别感谢 Art Team 的美工们~ + 卡比、许祁颢、DonG、侍冰、Wick、婉静自然、Oroxi、老瑜、苏柒、二贰猫 + HaoduStudio 标志 + 本软件部分图标来源于 MUI / TDesign Icon + ©HaoduStudio 2021 - %1$d + 请至少写一篇手帐 更新完成