Loading app/src/main/java/at/bitfire/davdroid/log/Logger.kt +1 −1 Original line number Diff line number Diff line Loading @@ -102,7 +102,7 @@ object Logger : SharedPreferences.OnSharedPreferenceChangeListener { shareIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) val pendingShare = PendingIntent.getActivity(context, 0, shareIntent, PendingIntent.FLAG_UPDATE_CURRENT) builder.addAction(NotificationCompat.Action.Builder( R.drawable.ic_share_action, R.drawable.ic_share, context.getString(R.string.logging_notification_view_share), pendingShare ).build()) Loading app/src/main/java/at/bitfire/davdroid/ui/intro/WelcomeFragment.kt +22 −19 Original line number Diff line number Diff line Loading @@ -6,16 +6,18 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import at.bitfire.davdroid.App import at.bitfire.davdroid.BuildConfig import at.bitfire.davdroid.R import at.bitfire.davdroid.settings.SettingsManager import kotlinx.android.synthetic.main.intro_welcome.view.* class WelcomeFragment: Fragment() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { val v = inflater.inflate(R.layout.intro_welcome, container, false) if (true /* relevant for non-ose builds */) { v.logo.apply { alpha = 0f animate() Loading @@ -34,6 +36,7 @@ class WelcomeFragment: Fragment() { .translationX(0f) .setDuration(300) } } return v } Loading app/src/main/res/drawable/ic_share_action.xml→app/src/main/res/drawable/ic_share.xml +0 −0 File moved. View file app/src/main/res/layout/activity_debug_info.xml +3 −3 Original line number Diff line number Diff line Loading @@ -47,8 +47,8 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" style="@style/TextAppearance.MaterialComponents.Body1" app:drawableStartCompat="@drawable/ic_share_action" app:drawableLeftCompat="@drawable/ic_share_action" app:drawableStartCompat="@drawable/ic_share" app:drawableLeftCompat="@drawable/ic_share" android:drawablePadding="8dp" android:layout_marginBottom="8dp" app:drawableTint="@color/primaryTextColor" Loading Loading @@ -407,7 +407,7 @@ android:layout_margin="@dimen/fab_margin" android:contentDescription="@string/share" android:enabled="false" android:src="@drawable/ic_share_action"/> android:src="@drawable/ic_share"/> </androidx.coordinatorlayout.widget.CoordinatorLayout> Loading Loading
app/src/main/java/at/bitfire/davdroid/log/Logger.kt +1 −1 Original line number Diff line number Diff line Loading @@ -102,7 +102,7 @@ object Logger : SharedPreferences.OnSharedPreferenceChangeListener { shareIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) val pendingShare = PendingIntent.getActivity(context, 0, shareIntent, PendingIntent.FLAG_UPDATE_CURRENT) builder.addAction(NotificationCompat.Action.Builder( R.drawable.ic_share_action, R.drawable.ic_share, context.getString(R.string.logging_notification_view_share), pendingShare ).build()) Loading
app/src/main/java/at/bitfire/davdroid/ui/intro/WelcomeFragment.kt +22 −19 Original line number Diff line number Diff line Loading @@ -6,16 +6,18 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import at.bitfire.davdroid.App import at.bitfire.davdroid.BuildConfig import at.bitfire.davdroid.R import at.bitfire.davdroid.settings.SettingsManager import kotlinx.android.synthetic.main.intro_welcome.view.* class WelcomeFragment: Fragment() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { val v = inflater.inflate(R.layout.intro_welcome, container, false) if (true /* relevant for non-ose builds */) { v.logo.apply { alpha = 0f animate() Loading @@ -34,6 +36,7 @@ class WelcomeFragment: Fragment() { .translationX(0f) .setDuration(300) } } return v } Loading
app/src/main/res/drawable/ic_share_action.xml→app/src/main/res/drawable/ic_share.xml +0 −0 File moved. View file
app/src/main/res/layout/activity_debug_info.xml +3 −3 Original line number Diff line number Diff line Loading @@ -47,8 +47,8 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" style="@style/TextAppearance.MaterialComponents.Body1" app:drawableStartCompat="@drawable/ic_share_action" app:drawableLeftCompat="@drawable/ic_share_action" app:drawableStartCompat="@drawable/ic_share" app:drawableLeftCompat="@drawable/ic_share" android:drawablePadding="8dp" android:layout_marginBottom="8dp" app:drawableTint="@color/primaryTextColor" Loading Loading @@ -407,7 +407,7 @@ android:layout_margin="@dimen/fab_margin" android:contentDescription="@string/share" android:enabled="false" android:src="@drawable/ic_share_action"/> android:src="@drawable/ic_share"/> </androidx.coordinatorlayout.widget.CoordinatorLayout> Loading