diff --git a/app/src/main/java/net/ardevd/tagius/features/auth/ui/LoginFragment.kt b/app/src/main/java/net/ardevd/tagius/features/auth/ui/LoginFragment.kt index cf4613a..caeadce 100644 --- a/app/src/main/java/net/ardevd/tagius/features/auth/ui/LoginFragment.kt +++ b/app/src/main/java/net/ardevd/tagius/features/auth/ui/LoginFragment.kt @@ -11,6 +11,7 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import com.google.android.material.floatingactionbutton.FloatingActionButton +import com.google.android.material.transition.MaterialFadeThrough import kotlinx.coroutines.launch import net.ardevd.tagius.R import net.ardevd.tagius.core.data.TokenManager @@ -28,6 +29,14 @@ class LoginFragment : Fragment(R.layout.fragment_login) { private val viewModel: LoginViewModel by viewModels() + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enterTransition = MaterialFadeThrough() + exitTransition = MaterialFadeThrough() + reenterTransition = MaterialFadeThrough() + returnTransition = MaterialFadeThrough() + } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) _binding = FragmentLoginBinding.bind(view) diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index b6970ed..08595c1 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -10,8 +10,7 @@ android:id="@+id/logo" android:layout_width="72dp" android:layout_height="72dp" - android:src="@drawable/ic_timer" - app:tint="?attr/colorPrimary" + android:src="@mipmap/ic_launcher" app:layout_constraintBottom_toTopOf="@+id/title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -67,7 +66,7 @@ android:hint="@string/login_api_token" app:endIconMode="password_toggle" android:layout_marginBottom="32dp" - app:helperText="Found in Web App > Settings > API" + app:helperText="@string/login_token_helper" app:layout_constraintBottom_toTopOf="@+id/connectButton" app:layout_constraintTop_toBottomOf="@id/urlInputLayout"> diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index bab4428..5cbf3b4 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -14,6 +14,7 @@ Koble til din Timetagger-instans Server URL API Token + Web App > Account > API Token Koble Til I Dag Siste 7 Dager diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f480599..d2d53b5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,6 +17,7 @@ Server URL https://timetagger.app API Token + Found in Web App > Account > API Connect Today