Skip to content

login: smoother create splitting (fixes #13083) #13017

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
dogi merged 3 commits into from
Apr 22, 2026
Merged

login: smoother create splitting (fixes #13083) #13017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a59096e
🧹 Refactor overly long onCreate in LoginActivity into smaller methods
dogi Apr 16, 2026
111ec97
Update versionCode and versionName in build.gradle
dogi Apr 22, 2026
6f0a26f
Merge branch 'master' into code-health-loginactivity-oncreate-2880981…
dogi Apr 22, 2026
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: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ android {
applicationId "org.ole.planet.myplanet"
minSdk = 26
targetSdk = 36
versionCode = 5359
versionName = "0.53.59"
versionCode = 5360
versionName = "0.53.60"
ndkVersion = '26.3.11579264'
vectorDrawables.useSupportLibrary = true
}
Expand Down
52 changes: 40 additions & 12 deletions app/src/main/java/org/ole/planet/myplanet/ui/sync/LoginActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,29 @@ class LoginActivity : SyncActivity(), OnUserProfileClickListener {
binding = ActivityLoginBinding.inflate(layoutInflater)
setContentView(binding.root)
EdgeToEdgeUtils.setupEdgeToEdge(this, binding.root)

bindViews()
setupAvailableSpace()

changeLogoColor()
declareElements()
declareMoreElements()
showWifiDialog()
registerReceiver()

handleSyncAndUpdates()
checkUsagesPermission()

setupAdditionalListeners()
handleAutoLogin()

getTeamMembers()

setupOnBackPressed()
setupTeamAdapter()
}

private fun bindViews() {
lblLastSyncDate = binding.lblLastSyncDate
btnSignIn = binding.btnSignin
syncIcon = binding.syncIcon
Expand All @@ -96,7 +119,9 @@ class LoginActivity : SyncActivity(), OnUserProfileClickListener {
btnLang = binding.btnLang
inputName = binding.inputName
inputPassword = binding.inputPassword
}

private fun setupAvailableSpace() {
lifecycleScope.launch {
val storageText = withContext(Dispatchers.IO) {
FileUtils.availableOverTotalMemoryFormattedString(this@LoginActivity)
Expand All @@ -107,11 +132,9 @@ class LoginActivity : SyncActivity(), OnUserProfileClickListener {
append(storageText)
}
}
changeLogoColor()
declareElements()
declareMoreElements()
showWifiDialog()
registerReceiver()
}

private fun handleSyncAndUpdates() {
forceSync = intent.getBooleanExtra("forceSync", false)
processedUrl = getUrl()
if (forceSync) {
Expand All @@ -129,9 +152,10 @@ class LoginActivity : SyncActivity(), OnUserProfileClickListener {
} else {
configurationsRepository.checkVersion(this, prefData)
}
checkUsagesPermission()
forceSyncTrigger()
}

private fun setupAdditionalListeners() {
val url = getUrl()
if (url.isNotEmpty() && url != "/db") {
binding.openCommunity.visibility = View.VISIBLE
Expand All @@ -149,7 +173,13 @@ class LoginActivity : SyncActivity(), OnUserProfileClickListener {
settingDialog()
}
}
val selectDarkModeButton = binding.themeToggleButton
selectDarkModeButton.setOnClickListener {
ThemeManager.showThemeDialog(this)
}
}

private fun handleAutoLogin() {
guest = intent.getBooleanExtra("guest", false)

val encryptedUsername = sharedPrefManager.getNewLoginUsername()
Expand All @@ -169,9 +199,9 @@ class LoginActivity : SyncActivity(), OnUserProfileClickListener {
submitForm(username, password)
}
}
}

getTeamMembers()

private fun setupOnBackPressed() {
onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() {
if (System.currentTimeMillis() - backPressedTime < backPressedInterval) {
Expand All @@ -182,11 +212,9 @@ class LoginActivity : SyncActivity(), OnUserProfileClickListener {
}
}
})
val selectDarkModeButton = binding.themeToggleButton
selectDarkModeButton.setOnClickListener {
ThemeManager.showThemeDialog(this)
}
}

private fun setupTeamAdapter() {
teamList.add(getString(R.string.loading))
teamAdapter = ArrayAdapter(this, R.layout.spinner_item_white, teamList)
teamAdapter?.setDropDownViewResource(R.layout.custom_simple_list_item_1)
Expand Down
Loading