prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix reader activity ui

Browse Source
This commit is contained in:
Koitharu
2025-04-30 16:14:32 +03:00
parent c871255eb7
commit d45bab3879
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/kotlin/org/koitharu/kotatsu/core/network/proxy/ProxyProvider.kt
View File

@@ -11,6 +11,7 @@ import okhttp3.Credentials
import okhttp3.Request import okhttp3.Request
import okhttp3.Response import okhttp3.Response
import okhttp3.Route import okhttp3.Route
import okio.IOException
import org.koitharu.kotatsu.core.exceptions.ProxyConfigException import org.koitharu.kotatsu.core.exceptions.ProxyConfigException
import org.koitharu.kotatsu.core.network.CommonHeaders import org.koitharu.kotatsu.core.network.CommonHeaders
import org.koitharu.kotatsu.core.prefs.AppSettings import org.koitharu.kotatsu.core.prefs.AppSettings
@@ -39,7 +40,7 @@ class ProxyProvider @Inject constructor(
return listOf(getProxy()) return listOf(getProxy())
} }
override fun connectFailed(uri: URI?, sa: SocketAddress?, ioe: okio.IOException?) { override fun connectFailed(uri: URI?, sa: SocketAddress?, ioe: IOException?) {
ioe?.printStackTraceDebug() ioe?.printStackTraceDebug()
} }
} }
@@ -80,8 +81,8 @@ class ProxyProvider @Inject constructor(
append(settings.proxyPort) append(settings.proxyPort)
} }
if (settings.proxyType == Proxy.Type.SOCKS) { if (settings.proxyType == Proxy.Type.SOCKS) {
System.setProperty("java.net.socks.username", settings.proxyLogin); System.setProperty("java.net.socks.username", settings.proxyLogin)
System.setProperty("java.net.socks.password", settings.proxyPassword); System.setProperty("java.net.socks.password", settings.proxyPassword)
} }
val proxyConfig = ProxyConfig.Builder() val proxyConfig = ProxyConfig.Builder()
.addProxyRule(url) .addProxyRule(url)

8
app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
View File

@@ -9,6 +9,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.view.WindowManager import android.view.WindowManager
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.graphics.Insets import androidx.core.graphics.Insets
import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat
import androidx.core.view.isGone import androidx.core.view.isGone
@@ -37,6 +38,7 @@ import org.koitharu.kotatsu.core.ui.BaseFullscreenActivity
import org.koitharu.kotatsu.core.ui.util.MenuInvalidator import org.koitharu.kotatsu.core.ui.util.MenuInvalidator
import org.koitharu.kotatsu.core.ui.widgets.ZoomControl import org.koitharu.kotatsu.core.ui.widgets.ZoomControl
import org.koitharu.kotatsu.core.util.IdlingDetector import org.koitharu.kotatsu.core.util.IdlingDetector
import org.koitharu.kotatsu.core.util.ext.getThemeDimensionPixelOffset
import org.koitharu.kotatsu.core.util.ext.hasGlobalPoint import org.koitharu.kotatsu.core.util.ext.hasGlobalPoint
import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled import org.koitharu.kotatsu.core.util.ext.isAnimationsEnabled
import org.koitharu.kotatsu.core.util.ext.observe import org.koitharu.kotatsu.core.util.ext.observe
@@ -54,6 +56,7 @@ import org.koitharu.kotatsu.reader.ui.pager.ReaderUiState
import org.koitharu.kotatsu.reader.ui.tapgrid.TapGridDispatcher import org.koitharu.kotatsu.reader.ui.tapgrid.TapGridDispatcher
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import javax.inject.Inject import javax.inject.Inject
import androidx.appcompat.R as appcompatR
@AndroidEntryPoint @AndroidEntryPoint
class ReaderActivity : class ReaderActivity :
@@ -110,6 +113,11 @@ class ReaderActivity :
screenOrientationHelper.applySettings() screenOrientationHelper.applySettings()
scrollTimer.isActive.observe(this) { viewBinding.actionsView.setTimerActive(it) } scrollTimer.isActive.observe(this) { viewBinding.actionsView.setTimerActive(it) }
viewBinding.timerControl.attach(scrollTimer, this) viewBinding.timerControl.attach(scrollTimer, this)
if (resources.getBoolean(R.bool.is_tablet)) {
viewBinding.timerControl.updateLayoutParams<CoordinatorLayout.LayoutParams> {
topMargin = marginEnd + getThemeDimensionPixelOffset(appcompatR.attr.actionBarSize)
}
}
viewModel.onError.observeEvent( viewModel.onError.observeEvent(
this, this,

7
app/src/main/res/layout-w600dp-land/activity_reader.xml
View File

@@ -38,12 +38,13 @@
android:id="@+id/timerControl" android:id="@+id/timerControl"
android:layout_width="320dp" android:layout_width="320dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top|end"
android:layout_margin="@dimen/screen_padding" android:layout_margin="@dimen/screen_padding"
android:background="@drawable/bg_card" android:background="@drawable/bg_card"
android:elevation="@dimen/m3_card_elevated_elevation" android:elevation="4dp"
android:visibility="gone" android:visibility="gone"
app:layout_dodgeInsetEdges="top" /> app:layout_anchor="@id/appbar_top"
app:layout_anchorGravity="bottom|end"
tools:visibility="visible" />
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar_top" android:id="@+id/appbar_top"