diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 57e6b8c2..183645ee 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -108,6 +108,8 @@ + diff --git a/app/src/main/java/ani/dantotsu/media/CommentsFragment.kt b/app/src/main/java/ani/dantotsu/media/CommentsFragment.kt new file mode 100644 index 00000000..8a28795c --- /dev/null +++ b/app/src/main/java/ani/dantotsu/media/CommentsFragment.kt @@ -0,0 +1,34 @@ +package ani.dantotsu.media + +import android.os.Bundle +import android.view.ViewGroup +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.updateLayoutParams +import ani.dantotsu.connections.anilist.Anilist +import ani.dantotsu.databinding.FragmentCommentsBinding +import ani.dantotsu.loadImage +import ani.dantotsu.navBarHeight +import ani.dantotsu.snackString +import ani.dantotsu.statusBarHeight +import ani.dantotsu.themes.ThemeManager + +class CommentsFragment : AppCompatActivity(){ + lateinit var binding: FragmentCommentsBinding + //Comments + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + ThemeManager(this).applyTheme() + binding = FragmentCommentsBinding.inflate(layoutInflater) + setContentView(binding.root) + + binding.CommentsLayout.updateLayoutParams { + topMargin = statusBarHeight + bottomMargin = navBarHeight + } + binding.commentUserAvatar.loadImage(Anilist.avatar) + binding.commentTitle.text = "Work in progress" + binding.commentSend.setOnClickListener { + //TODO + } + } +} \ No newline at end of file diff --git a/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt b/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt index 5c81a2c3..69740c23 100644 --- a/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt +++ b/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt @@ -2,10 +2,8 @@ package ani.dantotsu.media.anime import android.annotation.SuppressLint import android.content.Intent -import android.net.Uri import android.view.LayoutInflater import android.view.View -import android.os.Bundle import ani.dantotsu.settings.FAQActivity import android.view.ViewGroup import android.widget.ArrayAdapter @@ -20,6 +18,7 @@ import ani.dantotsu.* import ani.dantotsu.databinding.DialogLayoutBinding import ani.dantotsu.databinding.ItemAnimeWatchBinding import ani.dantotsu.databinding.ItemChipBinding +import ani.dantotsu.media.CommentsFragment import ani.dantotsu.media.Media import ani.dantotsu.media.MediaDetailsActivity import ani.dantotsu.media.SourceSearchDialogFragment @@ -60,20 +59,22 @@ class AnimeWatchAdapter( override fun onBindViewHolder(holder: ViewHolder, position: Int) { val binding = holder.binding _binding = binding - - //Youtube - if (media.anime!!.youtube != null && PrefManager.getVal(PrefName.ShowYtButton)) { - binding.animeSourceYT.visibility = View.VISIBLE - binding.animeSourceYT.setOnClickListener { - val intent = Intent(Intent.ACTION_VIEW, Uri.parse(media.anime.youtube)) - fragment.requireContext().startActivity(intent) - } + //Comments + binding.animeComments.visibility = View.GONE + binding.animeComments.setOnClickListener { + startActivity( + fragment.requireContext(), + Intent(fragment.requireContext(), CommentsFragment::class.java), + null + ) } - //Fuck u launch binding.faqbutton.setOnClickListener { - val intent = Intent(fragment.requireContext(), FAQActivity::class.java) - startActivity(fragment.requireContext(), intent, null) + startActivity( + fragment.requireContext(), + Intent(fragment.requireContext(), FAQActivity::class.java), + null + ) } binding.animeSourceDubbed.isChecked = media.selected!!.preferDub diff --git a/app/src/main/res/drawable/ic_round_comment_24.xml b/app/src/main/res/drawable/ic_round_comment_24.xml new file mode 100644 index 00000000..da93094d --- /dev/null +++ b/app/src/main/res/drawable/ic_round_comment_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_round_send_24.xml b/app/src/main/res/drawable/ic_round_send_24.xml new file mode 100644 index 00000000..320ac7a3 --- /dev/null +++ b/app/src/main/res/drawable/ic_round_send_24.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/layout/fragment_comments.xml b/app/src/main/res/layout/fragment_comments.xml index fda80065..512ec1da 100644 --- a/app/src/main/res/layout/fragment_comments.xml +++ b/app/src/main/res/layout/fragment_comments.xml @@ -1,28 +1,95 @@ - + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/commentsLayout"> - + android:orientation="vertical"> - + + + + + + + + + + + + - + android:orientation="horizontal" + android:paddingBottom="8dp" + android:layout_gravity="bottom|end" + android:background="@color/nav_bg"> + + + + + + + + + diff --git a/app/src/main/res/layout/item_anime_watch.xml b/app/src/main/res/layout/item_anime_watch.xml index a401e363..0d928a32 100644 --- a/app/src/main/res/layout/item_anime_watch.xml +++ b/app/src/main/res/layout/item_anime_watch.xml @@ -20,21 +20,22 @@ android:padding="32dp">