Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package net.ardevd.tagius.core.data

data class TimeTaggerVersionResponse(
val version: String
)
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ interface TimeTaggerApiService {
@GET("settings")
suspend fun getSettings(): Any

@GET("version")
suspend fun getVersion(): net.ardevd.tagius.core.data.TimeTaggerVersionResponse

@GET("records")
suspend fun getRecords(
@Query("timerange") timerange: String,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.launch
import net.ardevd.tagius.core.data.TokenManager
import net.ardevd.tagius.core.network.RetrofitClient
import net.ardevd.tagius.databinding.FragmentSettingsBinding

class SettingsBottomSheet : BottomSheetDialogFragment() {
Expand All @@ -35,6 +36,15 @@ class SettingsBottomSheet : BottomSheetDialogFragment() {
viewLifecycleOwner.lifecycleScope.launch {
val url = TokenManager(requireContext()).serverUrlFlow.first()
binding.serverUrlText.text = url

try {
val apiService = RetrofitClient.getInstance(requireContext())
val versionResponse = apiService.getVersion()
binding.serverVersionText.text = getString(net.ardevd.tagius.R.string.settings_server_version, versionResponse.version)
binding.serverVersionText.visibility = View.VISIBLE
} catch (e: Exception) {
binding.serverVersionText.visibility = View.GONE
}
Comment thread
ardevd marked this conversation as resolved.
}

// Handle Logout
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/res/layout/fragment_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@
android:text="@string/login_server_url_default"
android:textAppearance="?attr/textAppearanceBodyLarge"
android:textStyle="bold" />

<TextView
android:id="@+id/serverVersionText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textAppearance="?attr/textAppearanceBodySmall"
android:textColor="?attr/colorOnSurfaceVariant"
android:visibility="gone"
tools:text="Server Version: 1.0.0" />
Comment thread
ardevd marked this conversation as resolved.
</LinearLayout>
</com.google.android.material.card.MaterialCardView>

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-no/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<string name="stats_duration_per_day">Varighet per dag</string>
<string name="settings_account_settings">Kontoinnstillinger</string>
<string name="settings_connected_to">Tilkoblet</string>
<string name="settings_server_version">Serverversjon: %1$s</string>
<string name="settings_dynamic_colors">Dynamisk Tema</string>
<string name="settings_log_out">Logg Ut</string>
<string name="settings_settings">Innstillinger</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@

<string name="settings_account_settings">Account Settings</string>
<string name="settings_connected_to">Connected to</string>
<string name="settings_server_version">Server Version: %1$s</string>
<string name="settings_dynamic_colors">Dynamic Theme</string>
<string name="settings_log_out">Log Out</string>
<string name="settings_settings">Settings</string>
Expand Down
Loading