From 7684a15e9492ba1fd928c9707783570504d6864f Mon Sep 17 00:00:00 2001 From: Sadwhy <99601717+Sadwhy@users.noreply.github.com> Date: Thu, 28 Dec 2023 16:13:42 +0600 Subject: [PATCH 1/2] Changed a few strings (#101) * :) Changed some strings * More strings * New string --- .github/workflows/beta.yml | 2 +- app/src/main/res/values-en-rDW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index a9145485..1f24338c 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -50,7 +50,7 @@ jobs: shell: bash run: | contentbody=$( jq -Rsa . <<< "${{ github.event.head_commit.message }}" ) - curl -F "payload_json={\"content\":\" everyone **${{ env.VERSION }}**\n\n${contentbody:1:-1}\"}" -F "dantotsu_debug=@app/build/outputs/apk/debug/app-debug.apk" ${{ secrets.DISCORD_WEBHOOK }} + curl -F "payload_json={\"content\":\" Debug-Build **${{ env.VERSION }}**\n\n${contentbody:1:-1}\"}" -F "dantotsu_debug=@app/build/outputs/apk/debug/app-debug.apk" ${{ secrets.DISCORD_WEBHOOK }} - name: Delete Old Pre-Releases id: delete-pre-releases diff --git a/app/src/main/res/values-en-rDW/strings.xml b/app/src/main/res/values-en-rDW/strings.xml index e50ccd3a..293ce3fc 100644 --- a/app/src/main/res/values-en-rDW/strings.xml +++ b/app/src/main/res/values-en-rDW/strings.xml @@ -228,7 +228,7 @@ Subtitle Background Color Subtitle Window Color "The subtitle window is the part left and right from them. (where the background isn\'t)" - Note: Changing Subtitle formatting only works with Soft-Subbed Sources such as Zoro! + Note: Changing above settings only affects Soft-Subtitles! Subtitle Font Subtitle Size diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6a8da5ba..23e646c5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -227,7 +227,7 @@ Subtitle Background Color Subtitle Window Color "The subtitle window is the part left and right from them. (where the background isn\'t)" - Note: Changing Subtitle formatting only works with Soft-Subbed Sources such as Zoro! + Note: Changing above settings only affects Soft-Subtitles! Subtitle Font Subtitle Size From bbc986784b69540e85bc99908988443487b3ca60 Mon Sep 17 00:00:00 2001 From: aayush262 <99584765+aayush2622@users.noreply.github.com> Date: Thu, 28 Dec 2023 15:45:10 +0530 Subject: [PATCH 2/2] small changes (#102) --- .../download/manga/OfflineMangaFragment.kt | 10 +++++++++ .../ani/dantotsu/home/AnimePageAdapter.kt | 6 ----- .../java/ani/dantotsu/home/HomeFragment.kt | 8 ------- .../ani/dantotsu/home/MangaPageAdapter.kt | 6 ----- .../ani/dantotsu/media/user/ListActivity.kt | 5 ++--- .../settings/UserInterfaceSettings.kt | 1 - .../settings/UserInterfaceSettingsActivity.kt | 7 ------ .../main/res/layout/activity_extensions.xml | 17 -------------- .../activity_user_interface_settings.xml | 22 ------------------- 9 files changed, 12 insertions(+), 70 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt index 85a06bed..d405583c 100644 --- a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt +++ b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt @@ -14,6 +14,8 @@ import android.util.TypedValue import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.view.animation.AlphaAnimation +import android.view.animation.LayoutAnimationController import android.view.animation.OvershootInterpolator import android.widget.AbsListView import android.widget.AutoCompleteTextView @@ -145,6 +147,7 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener { gridView.visibility = View.GONE gridView = view.findViewById(R.id.gridView1) gridView.adapter = adapter + gridView.scheduleLayoutAnimation() gridView.visibility = View.VISIBLE adapter.notifyNewGrid() } @@ -152,8 +155,15 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener { gridView = if(style == 0) view.findViewById(R.id.gridView) else view.findViewById(R.id.gridView1) gridView.visibility = View.VISIBLE getDownloads() + + val fadeIn = AlphaAnimation(0f, 1f) + fadeIn.duration = 200 // animations pog + val animation = LayoutAnimationController(fadeIn) + + gridView.layoutAnimation = animation adapter = OfflineMangaAdapter(requireContext(), downloads, this) gridView.adapter = adapter + gridView.scheduleLayoutAnimation() gridView.setOnItemClickListener { parent, view, position, id -> // Get the OfflineMangaModel that was clicked val item = adapter.getItem(position) as OfflineMangaModel diff --git a/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt b/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt index 43c1bc3e..732ac43f 100644 --- a/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt +++ b/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt @@ -77,12 +77,6 @@ class AnimePageAdapter : RecyclerView.Adapter("ui_settings") ?: UserInterfaceSettings() - if (!uiSettings.immersiveModeList) { + if (!uiSettings.immersiveMode) { this.window.statusBarColor = ContextCompat.getColor(this, R.color.nav_bg_inv) binding.root.fitsSystemWindows = true @@ -78,8 +78,7 @@ class ListActivity : AppCompatActivity() { setContentView(binding.root) val anime = intent.getBooleanExtra("anime", true) - binding.listTitle.text = - intent.getStringExtra("username") + "'s " + (if (anime) "Anime" else "Manga") + " List" + binding.listTitle.text = (if (anime) "Anime" else "Manga") + " List" binding.listTabLayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener { override fun onTabSelected(tab: TabLayout.Tab?) { diff --git a/app/src/main/java/ani/dantotsu/settings/UserInterfaceSettings.kt b/app/src/main/java/ani/dantotsu/settings/UserInterfaceSettings.kt index 15fd20a8..39dd18b1 100644 --- a/app/src/main/java/ani/dantotsu/settings/UserInterfaceSettings.kt +++ b/app/src/main/java/ani/dantotsu/settings/UserInterfaceSettings.kt @@ -10,7 +10,6 @@ data class UserInterfaceSettings( //App var immersiveMode: Boolean = false, - var immersiveModeList: Boolean = false, var smallView: Boolean = true, var defaultStartUpTab: Int = 1, var homeLayoutShow: MutableList = mutableListOf( diff --git a/app/src/main/java/ani/dantotsu/settings/UserInterfaceSettingsActivity.kt b/app/src/main/java/ani/dantotsu/settings/UserInterfaceSettingsActivity.kt index 189d691f..fb49c496 100644 --- a/app/src/main/java/ani/dantotsu/settings/UserInterfaceSettingsActivity.kt +++ b/app/src/main/java/ani/dantotsu/settings/UserInterfaceSettingsActivity.kt @@ -68,13 +68,6 @@ class UserInterfaceSettingsActivity : AppCompatActivity() { saveData(ui, settings) restartApp() } - binding.uiSettingsImmersiveList.isChecked = settings.immersiveModeList - binding.uiSettingsImmersiveList.setOnCheckedChangeListener { _, isChecked -> - settings.immersiveModeList = isChecked - saveData(ui, settings) - restartApp() - } - binding.uiSettingsBannerAnimation.isChecked = settings.bannerAnimations binding.uiSettingsBannerAnimation.setOnCheckedChangeListener { _, isChecked -> settings.bannerAnimations = isChecked diff --git a/app/src/main/res/layout/activity_extensions.xml b/app/src/main/res/layout/activity_extensions.xml index 85a8db87..728236ba 100644 --- a/app/src/main/res/layout/activity_extensions.xml +++ b/app/src/main/res/layout/activity_extensions.xml @@ -81,23 +81,6 @@ app:tabPaddingStart="16dp" app:tabTextAppearance="@style/NavBarText" app:tabGravity="fill"> - - - - - - -