Skip to content

refactor(login): replaced icon, improved strings and animations #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ardevd merged 1 commit into from
May 31, 2026
+13 −3
Merged

refactor(login): replaced icon, improved strings and animations #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/src/main/java/net/ardevd/tagius/features/auth/ui/LoginFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/res/layout/fragment_login.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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">

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-no/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<string name="login_welcome_subtitle">Koble til din Timetagger-instans</string>
<string name="login_server_url_hint">Server URL</string>
<string name="login_api_token">API Token</string>
<string name="login_token_helper">Web App &gt; Account &gt; API Token</string>
<string name="login_connect">Koble Til</string>
<string name="records_today">I Dag</string>
<string name="records_last_seven_days">Siste 7 Dager</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<string name="login_server_url_hint">Server URL</string>
<string name="login_server_url_default" translatable="false">https://timetagger.app</string>
<string name="login_api_token">API Token</string>
<string name="login_token_helper">Found in Web App &gt; Account &gt; API</string>
<string name="login_connect">Connect</string>

<string name="records_today">Today</string>
Expand Down
Loading