Skip to content
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

dashboard: better strings (fixes #3683) #3684

Merged
merged 18 commits into from
Jul 2, 2024
Merged

dashboard: better strings (fixes #3683) #3684

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f302d3b
chat: share with community, teams and enterprises (fixes #3679) (#3680)
Okuro3499 Jun 24, 2024
535f300
fix warnings and unused imports (fixes #3683)
rlam20 Jun 24, 2024
838411b
update lite
rlam20 Jun 24, 2024
93084d7
Merge branch 'master' into 3683-deprecations-in-dashboardactivitykt
rlam20 Jun 25, 2024
8966d67
Merge branch 'master' into 3683-deprecations-in-dashboardactivitykt
rlam20 Jun 25, 2024
ddbc860
translations
rlam20 Jun 28, 2024
7ab1d65
resolve warning
rlam20 Jul 1, 2024
fbcaf35
update lite
rlam20 Jul 1, 2024
3fb32c0
Merge branch 'master' into 3683-deprecations-in-dashboardactivitykt
rlam20 Jul 1, 2024
39d4f1a
update string files and match lite with default
Okuro3499 Jul 2, 2024
79bcb33
Update strings.xml
dogi Jul 2, 2024
e114e50
Update strings.xml
dogi Jul 2, 2024
3cbd5d8
Update strings.xml
dogi Jul 2, 2024
fbc59a2
Update strings.xml
dogi Jul 2, 2024
244daf0
Update strings.xml
dogi Jul 2, 2024
7c4a996
Update strings.xml
dogi Jul 2, 2024
6d6d041
Update DashboardActivity.kt.lite
dogi Jul 2, 2024
fba1d63
Update build.gradle
dogi Jul 2, 2024
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
4 changes: 3 additions & 1 deletion app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.ole.planet.myplanet.ui.dashboard

import android.annotation.SuppressLint
import android.app.AlertDialog
import android.content.Context
import android.content.Intent
Expand Down Expand Up @@ -80,6 +81,7 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
super.attachBaseContext(LocaleHelper.onAttach(base))
}

@SuppressLint("SetTextI18n")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

android studio give a suggestion on a better way to handle this instead of suppressing String literal in setText can not be translated. Use Android resources instead

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
checkUser()
Expand Down Expand Up @@ -440,4 +442,4 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
companion object {
const val MESSAGE_PROGRESS = "message_progress"
}
}
}
4 changes: 3 additions & 1 deletion app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.ole.planet.myplanet.ui.dashboard

import android.annotation.SuppressLint
import android.app.AlertDialog
import android.content.Context
import android.content.Intent
Expand Down Expand Up @@ -80,6 +81,7 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
super.attachBaseContext(LocaleHelper.onAttach(base))
}

@SuppressLint("SetTextI18n")
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
checkUser()
Expand Down Expand Up @@ -440,4 +442,4 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
companion object {
const val MESSAGE_PROGRESS = "message_progress"
}
}
}