Fix moar build warnings

saket · Feb 15, 2024 · ce26acd · ce26acd
1 parent 9260b6e
commit ce26acd
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 122 deletions.
diff --git a/gradle/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/gradle/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -10,6 +10,9 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
     }
 
     extensions.configure<LibraryExtension> {
+      defaultConfig {
+        resourcePrefix = "_telephoto"
+      }
       configureAndroid(this)
     }
   }

diff --git a/gradle/build-logic/convention/src/main/kotlin/configureAndroid.kt b/gradle/build-logic/convention/src/main/kotlin/configureAndroid.kt
@@ -6,7 +6,6 @@ internal fun Project.configureAndroid(commonExtension: CommonExtension <*, *, *,
     compileSdk = libs.findVersion("compileSdk").get().toString().toInt()
     defaultConfig {
       minSdk = libs.findVersion("minSdk").get().toString().toInt()
-      resourcePrefix = "_telephoto"
     }
     lint {
       abortOnError = true

diff --git a/sample/src/main/kotlin/me/saket/telephoto/sample/gallery/GalleryScreen.kt b/sample/src/main/kotlin/me/saket/telephoto/sample/gallery/GalleryScreen.kt
@@ -50,7 +50,7 @@ import me.saket.telephoto.sample.R
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)
-fun GalleryScreen(
+internal fun GalleryScreen(
   key: GalleryScreenKey,
   navigator: Navigator,
 ) {
@@ -72,8 +72,8 @@ fun GalleryScreen(
 @Composable
 private fun AlbumGrid(
   album: MediaAlbum,
-  modifier: Modifier = Modifier,
-  navigator: Navigator
+  navigator: Navigator,
+  modifier: Modifier = Modifier
 ) {
   LazyVerticalGrid(
     modifier = modifier,

diff --git a/sample/src/main/kotlin/me/saket/telephoto/sample/navigation.kt b/sample/src/main/kotlin/me/saket/telephoto/sample/navigation.kt
@@ -16,7 +16,7 @@ import me.saket.telephoto.sample.viewer.MediaViewerScreen
 import com.slack.circuit.runtime.Screen as CircuitScreenKey
 
 @Composable
-fun Navigation(
+internal fun Navigation(
   initialScreenKey: ScreenKey,
 ) {
   val backstack = rememberSaveableBackStack { push(initialScreenKey) }

diff --git a/sample/src/main/kotlin/me/saket/telephoto/sample/viewer/MediaViewerScreen.kt b/sample/src/main/kotlin/me/saket/telephoto/sample/viewer/MediaViewerScreen.kt
@@ -42,7 +42,7 @@ import me.saket.telephoto.zoomable.rememberZoomableState
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
-fun MediaViewerScreen(key: MediaViewerScreenKey) {
+internal fun MediaViewerScreen(key: MediaViewerScreenKey) {
   Scaffold(
     contentWindowInsets = WindowInsets.none,
     contentColor = Color.White,
@@ -90,8 +90,8 @@ private fun CloseNavIconButton() {
 @Composable
 private fun MediaPage(
   model: MediaItem,
-  modifier: Modifier = Modifier,
   isActivePage: Boolean,
+  modifier: Modifier = Modifier,
 ) {
   val zoomableState = rememberZoomableState()
   val flickState = rememberFlickToDismissState(dismissThresholdRatio = 0.05f)

diff --git a/sample/src/main/res/drawable/emoji.xml b/sample/src/main/res/drawable/emoji.xml
diff --git a/zoomable/src/commonTest/kotlin/me/saket/telephoto/zoomable/internal/CoerceInsideTest.kt b/zoomable/src/commonTest/kotlin/me/saket/telephoto/zoomable/internal/CoerceInsideTest.kt
@@ -70,13 +70,6 @@ class CoerceInsideTest {
     ).isEqualTo(Offset(x = 0f, y = 0f))
   }
 
-  @Test fun `vertical movement when zoomed content is bigger than layout size in height`() {
-    val layoutSize = Rect(Offset.Zero, Size(1000f, 2000f))
-    val contentSize = Size(1000f, 3000f)
-
-    // todo.
-  }
-
   @Test fun `2d movement when zoomed content is bigger than layout size in both width and height`() {
     val layoutSize = Size(1000f, 2000f)
     val contentSize = Size(2000f, 3000f)