diff --git a/app/src/main/java/ani/dantotsu/MainActivity.kt b/app/src/main/java/ani/dantotsu/MainActivity.kt index eadae423..73ac4a2d 100644 --- a/app/src/main/java/ani/dantotsu/MainActivity.kt +++ b/app/src/main/java/ani/dantotsu/MainActivity.kt @@ -104,9 +104,9 @@ class MainActivity : AppCompatActivity() { } catch (e: Exception) { statusBarHeight } - val layoutParams = binding.incognitoTextView.layoutParams as ViewGroup.MarginLayoutParams + val layoutParams = binding.incognito.layoutParams as ViewGroup.MarginLayoutParams layoutParams.topMargin = 11 * offset / 12 - binding.incognitoTextView.layoutParams = layoutParams + binding.incognito.layoutParams = layoutParams incognitoLiveData = SharedPreferenceBooleanLiveData( sharedPreferences, "incognito", @@ -115,26 +115,26 @@ class MainActivity : AppCompatActivity() { incognitoLiveData.observe(this) { if (it) { val slideDownAnim = ObjectAnimator.ofFloat( - binding.incognitoTextView, + binding.incognito, View.TRANSLATION_Y, - -(binding.incognitoTextView.height.toFloat() + statusBarHeight), + -(binding.incognito.height.toFloat() + statusBarHeight), 0f ) slideDownAnim.duration = 200 slideDownAnim.start() - binding.incognitoTextView.visibility = View.VISIBLE + binding.incognito.visibility = View.VISIBLE } else { val slideUpAnim = ObjectAnimator.ofFloat( - binding.incognitoTextView, + binding.incognito, View.TRANSLATION_Y, 0f, - -(binding.incognitoTextView.height.toFloat() + statusBarHeight) + -(binding.incognito.height.toFloat() + statusBarHeight) ) slideUpAnim.duration = 200 slideUpAnim.start() //wait for animation to finish Handler(Looper.getMainLooper()).postDelayed( - { binding.incognitoTextView.visibility = View.GONE }, + { binding.incognito.visibility = View.GONE }, 200 ) } diff --git a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt index 4ef01b8a..66c25029 100644 --- a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt +++ b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt @@ -17,7 +17,6 @@ import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.content.res.AppCompatResources import androidx.core.content.ContextCompat -import androidx.core.graphics.drawable.DrawableCompat import androidx.core.text.bold import androidx.core.text.color import androidx.core.view.updateLayoutParams @@ -44,7 +43,6 @@ import ani.dantotsu.media.novel.NovelReadFragment import ani.dantotsu.navBarHeight import ani.dantotsu.openLinkInBrowser import ani.dantotsu.others.ImageViewDialog -import ani.dantotsu.others.LangSet import ani.dantotsu.others.getSerialized import ani.dantotsu.saveData import ani.dantotsu.settings.UserInterfaceSettings @@ -97,6 +95,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi binding.mediaBanner.updateLayoutParams { height += statusBarHeight } binding.mediaBannerNoKen.updateLayoutParams { height += statusBarHeight } binding.mediaClose.updateLayoutParams { topMargin += statusBarHeight } + binding.incognito.updateLayoutParams { topMargin += statusBarHeight } binding.mediaCollapsing.minimumHeight = statusBarHeight if (binding.mediaTab is CustomBottomNavBar) binding.mediaTab.updateLayoutParams { @@ -162,21 +161,16 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi banner.setOnTouchListener { _, motionEvent -> gestureDetector.onTouchEvent(motionEvent);true } if (this.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE) .getBoolean("incognito", false)) { - binding.mediaTitle.text = " ${media.userPreferredName}" - binding.mediaTitleCollapse.text = " ${media.userPreferredName}" - val drawable = ContextCompat.getDrawable(this, R.drawable.ic_incognito_24) - val color = ContextCompat.getColor(this, R.color.incognito) - DrawableCompat.setTint(drawable!!, color) - binding.mediaTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(drawable, null, null, null) - binding.mediaTitleCollapse.setCompoundDrawablesRelativeWithIntrinsicBounds(drawable, null, null, null) + binding.mediaTitle.text = " ${media.userPreferredName}" + binding.incognito.visibility = View.VISIBLE }else { binding.mediaTitle.text = media.userPreferredName - binding.mediaTitleCollapse.text = media.userPreferredName } binding.mediaTitle.setOnLongClickListener { copyToClipboard(media.userPreferredName) true } + binding.mediaTitleCollapse.text = media.userPreferredName binding.mediaTitleCollapse.setOnLongClickListener { copyToClipboard(media.userPreferredName) true diff --git a/app/src/main/java/ani/dantotsu/media/SearchAdapter.kt b/app/src/main/java/ani/dantotsu/media/SearchAdapter.kt index 67c523e6..18fe0a4c 100644 --- a/app/src/main/java/ani/dantotsu/media/SearchAdapter.kt +++ b/app/src/main/java/ani/dantotsu/media/SearchAdapter.kt @@ -1,6 +1,8 @@ package ani.dantotsu.media import android.annotation.SuppressLint +import android.content.Context +import android.graphics.drawable.Drawable import android.text.Editable import android.text.TextWatcher import android.view.LayoutInflater @@ -10,10 +12,14 @@ import android.view.ViewGroup import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputMethodManager import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.content.res.AppCompatResources import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.HORIZONTAL +import ani.dantotsu.App.Companion.context +import ani.dantotsu.R import ani.dantotsu.connections.anilist.Anilist +import ani.dantotsu.currContext import ani.dantotsu.databinding.ItemChipBinding import ani.dantotsu.databinding.ItemSearchHeaderBinding import ani.dantotsu.saveData @@ -54,6 +60,14 @@ class SearchAdapter(private val activity: SearchActivity) : } binding.searchBar.hint = activity.result.type + if (currContext()?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE) + ?.getBoolean("incognito", false ) == true){ + val startIconDrawableRes = R.drawable.ic_incognito_24 + val startIconDrawable: Drawable? = + context?.let { AppCompatResources.getDrawable(it, startIconDrawableRes) } + binding.searchBar.startIconDrawable = startIconDrawable + } + var adult = activity.result.isAdult var listOnly = activity.result.onList diff --git a/app/src/main/res/layout-land/activity_media.xml b/app/src/main/res/layout-land/activity_media.xml index 52b8cd61..bc77af2a 100644 --- a/app/src/main/res/layout-land/activity_media.xml +++ b/app/src/main/res/layout-land/activity_media.xml @@ -276,6 +276,26 @@ tools:srcCompat="@tools:sample/backgrounds/scenic[2]" /> + + + + + - + + + + + + + + +