Skip to content

Commit

Permalink
Update project
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelbel committed Oct 25, 2024
1 parent 496e9be commit 1da1d67
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 18 deletions.
27 changes: 19 additions & 8 deletions androidApp/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@
android:theme="@style/Theme.Movies.Starting"
android:icon="@mipmap/ic_launcher_red"
android:roundIcon="@mipmap/ic_launcher_red"
android:enableOnBackInvokedCallback="true">
android:enableOnBackInvokedCallback="true"
tools:ignore="UnusedAttribute">

<profileable
android:shell="true"
tools:targetApi="29" />

<activity
android:name="org.michaelbel.movies.MainActivity"
android:exported="true"
android:screenOrientation="fullUser">
android:exported="true">

<intent-filter>
<category android:name="android.intent.category.LAUNCHER" />
Expand All @@ -56,16 +56,24 @@
android:host="www.themoviedb.org"
android:path="/movie"
android:scheme="http" />
</intent-filter>

<intent-filter
android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data
android:host="www.themoviedb.org"
android:path="/movie"
android:scheme="https" />

</intent-filter>

<intent-filter
android:autoVerify="true">
android:autoVerify="true"
tools:ignore="AppLinkUrlError">

<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
Expand All @@ -77,7 +85,8 @@
</intent-filter>

<intent-filter
android:autoVerify="true">
android:autoVerify="true"
tools:ignore="AppLinkUrlError">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
Expand All @@ -89,7 +98,8 @@
</intent-filter>

<intent-filter
android:autoVerify="true">
android:autoVerify="true"
tools:ignore="AppLinkUrlError">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
Expand All @@ -101,7 +111,8 @@
</intent-filter>

<intent-filter
android:autoVerify="true">
android:autoVerify="true"
tools:ignore="AppLinkUrlError">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import androidx.core.content.ContextCompat
import androidx.fragment.app.FragmentActivity
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flowOf
import org.michaelbel.movies.common.R
import org.michaelbel.movies.common.biometric.BiometricController
import org.michaelbel.movies.common.biometric.BiometricListener
import org.michaelbel.movies.common.R

internal class BiometricControllerImpl(
private val context: Context
Expand All @@ -35,6 +35,7 @@ internal class BiometricControllerImpl(
when (errorCode) {
BiometricPrompt.ERROR_USER_CANCELED -> biometricListener.onCancel()
BiometricPrompt.ERROR_NEGATIVE_BUTTON -> biometricListener.onCancel()
else -> Unit
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ internal class MoviesMessagingService: FirebaseMessagingService() {

private val notificationClient: NotificationClient by inject()

override fun onNewToken(token: String) {
super.onNewToken(token)
}

override fun onMessageReceived(message: RemoteMessage) {
notificationClient.send(message.mapToMoviesPush)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
@file:SuppressLint("NewApi")

package org.michaelbel.movies.widget.ktx

import android.annotation.SuppressLint
import android.app.PendingIntent
import android.appwidget.AppWidgetManager
import android.appwidget.AppWidgetProviderInfo
Expand Down
13 changes: 9 additions & 4 deletions core/widget/src/androidMain/res/layout/widget_preview.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
Expand Down Expand Up @@ -29,7 +30,8 @@
android:text="Dune"
android:textColor="@color/onBackground"
android:textSize="16sp"
android:fontFamily="@font/open_sans_semibold" />
android:fontFamily="@font/open_sans_semibold"
tools:ignore="HardcodedText" />

<TextView
android:layout_width="match_parent"
Expand All @@ -41,7 +43,8 @@
android:text="Oppenheimer"
android:textColor="@color/onBackground"
android:textSize="16sp"
android:fontFamily="@font/open_sans_semibold" />
android:fontFamily="@font/open_sans_semibold"
tools:ignore="HardcodedText" />

<TextView
android:layout_width="match_parent"
Expand All @@ -53,7 +56,8 @@
android:text="Pure Things"
android:textColor="@color/onBackground"
android:textSize="16sp"
android:fontFamily="@font/open_sans_semibold" />
android:fontFamily="@font/open_sans_semibold"
tools:ignore="HardcodedText" />

<TextView
android:layout_width="match_parent"
Expand All @@ -65,6 +69,7 @@
android:text="Turning Red"
android:textColor="@color/onBackground"
android:textSize="16sp"
android:fontFamily="@font/open_sans_semibold" />
android:fontFamily="@font/open_sans_semibold"
tools:ignore="HardcodedText" />

</LinearLayout>
3 changes: 1 addition & 2 deletions feature/debug-impl/src/androidMain/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
<activity
android:name="org.michaelbel.movies.debug.DebugActivity"
android:theme="@style/Theme.Material3.DayNight.NoActionBar"
android:exported="true"
android:screenOrientation="fullUser" />
android:exported="true" />

</application>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package org.michaelbel.movies.gallery.zoomable

import android.util.Log
import androidx.annotation.FloatRange
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.AnimationSpec
Expand Down Expand Up @@ -238,7 +237,6 @@ class ZoomState(
position: Offset,
animationSpec: AnimationSpec<Float> = spring(),
) = coroutineScope {
Log.e("2", "changeScale targetScale=$targetScale, position=$position, animationSpec=$animationSpec")
val newScale = targetScale.coerceIn(1f, maxScale)
val newOffset = calculateNewOffset(newScale, position, Offset.Zero)
val newBounds = calculateNewBounds(newScale)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ internal actual val isBiometricFeatureEnabled: Boolean
get() = true

internal actual val isWidgetFeatureEnabled: Boolean
get() = true
get() = Build.VERSION.SDK_INT >= 26

internal actual val isTileFeatureEnabled: Boolean
get() = Build.VERSION.SDK_INT >= 33
Expand Down

0 comments on commit 1da1d67

Please sign in to comment.