From 7168e08587d87efc7c3c55926f268fa9788f2952 Mon Sep 17 00:00:00 2001 From: aayush262 Date: Tue, 13 Feb 2024 13:35:46 +0530 Subject: [PATCH] feat: something idr --- .github/workflows/beta.yml | 4 +- .../dantotsu/media/anime/AnimeWatchAdapter.kt | 2 +- .../res/drawable/ic_round_color_picker_24.xml | 1 + .../drawable/ic_round_dots_vertical_24.xml | 1 + .../res/drawable/ic_round_edit_note_24.xml | 2 +- .../main/res/drawable/ic_round_filter_24.xml | 1 + .../drawable/ic_round_upvote_active_24.xml | 12 +++ .../drawable/ic_round_upvote_inactive_24.xml | 11 +++ app/src/main/res/layout/fragment_comments.xml | 43 +++------ app/src/main/res/layout/item_comments.xml | 95 ++++++++++++++++--- 10 files changed, 124 insertions(+), 48 deletions(-) create mode 100644 app/src/main/res/drawable/ic_round_upvote_active_24.xml create mode 100644 app/src/main/res/drawable/ic_round_upvote_inactive_24.xml diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index 21287826..1265feae 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -39,7 +39,7 @@ jobs: fi echo "Commits since $LAST_SHA:" # Accumulate commit logs in a shell variable - COMMIT_LOGS=$(git log $LAST_SHA..HEAD --pretty=format:"· %s") + COMMIT_LOGS=$(git log $LAST_SHA..HEAD --pretty=format:"● %s") # URL-encode the newline characters for GitHub Actions COMMIT_LOGS="${COMMIT_LOGS//'%'/'%25'}" COMMIT_LOGS="${COMMIT_LOGS//$'\n'/'%0A'}" @@ -104,7 +104,7 @@ jobs: #Telegram curl -F "chat_id=${{ secrets.TELEGRAM_CHANNEL_ID }}" \ -F "document=@app/build/outputs/apk/google/alpha/app-google-alpha.apk" \ - -F "caption=Alpha-Build: **${VERSION}** Change logs :${commit_messages}" \ + -F "caption=Alpha-Build: ${VERSION}: ${commit_messages}" \ https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendDocument env: 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 69740c23..ab94ab10 100644 --- a/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt +++ b/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt @@ -60,7 +60,7 @@ class AnimeWatchAdapter( val binding = holder.binding _binding = binding //Comments - binding.animeComments.visibility = View.GONE + binding.animeComments.visibility = View.VISIBLE binding.animeComments.setOnClickListener { startActivity( fragment.requireContext(), diff --git a/app/src/main/res/drawable/ic_round_color_picker_24.xml b/app/src/main/res/drawable/ic_round_color_picker_24.xml index c4e79808..72723411 100644 --- a/app/src/main/res/drawable/ic_round_color_picker_24.xml +++ b/app/src/main/res/drawable/ic_round_color_picker_24.xml @@ -2,6 +2,7 @@ + + diff --git a/app/src/main/res/drawable/ic_round_upvote_inactive_24.xml b/app/src/main/res/drawable/ic_round_upvote_inactive_24.xml new file mode 100644 index 00000000..dceee11c --- /dev/null +++ b/app/src/main/res/drawable/ic_round_upvote_inactive_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 512ec1da..fbd07574 100644 --- a/app/src/main/res/layout/fragment_comments.xml +++ b/app/src/main/res/layout/fragment_comments.xml @@ -11,42 +11,26 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - - + android:fontFamily="@font/poppins_bold" + android:gravity="center" + android:text="@string/comments" + android:textColor="?attr/colorPrimary" + android:textSize="16sp" /> + android:layout_marginBottom="58dp" + tools:listitem="@layout/item_comments" /> + @@ -55,6 +39,7 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:paddingBottom="8dp" + android:paddingTop="8dp" android:layout_gravity="bottom|end" android:background="@color/nav_bg"> @@ -63,7 +48,7 @@ android:layout_width="42dp" android:layout_height="42dp" android:scaleType="center" - android:layout_marginStart="32dp" + android:layout_marginStart="12dp" app:srcCompat="@drawable/ic_round_add_circle_24" tools:ignore="ContentDescription,ImageContrastCheck" /> @@ -87,7 +72,7 @@ android:id="@+id/commentSend" android:layout_width="42dp" android:layout_height="42dp" - android:layout_marginEnd="32dp" + android:layout_marginEnd="12dp" android:background="@drawable/ic_round_send_24" tools:ignore="ContentDescription" /> diff --git a/app/src/main/res/layout/item_comments.xml b/app/src/main/res/layout/item_comments.xml index e9f0bef3..fccadd26 100644 --- a/app/src/main/res/layout/item_comments.xml +++ b/app/src/main/res/layout/item_comments.xml @@ -5,12 +5,10 @@ android:id="@+id/commentsCardView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginStart="24dp" - android:layout_marginEnd="24dp" + android:layout_marginStart="6dp" + android:layout_marginEnd="6dp" android:layout_marginBottom="12dp" android:orientation="horizontal" - android:background="@drawable/card_outline" - android:backgroundTint="?attr/colorSurfaceVariant" android:padding="6dp" android:paddingStart="12dp" android:paddingEnd="12dp"> @@ -61,7 +59,7 @@ - + + + + + + + + + + + + + \ No newline at end of file