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

PasscodeActivity changes depending on the theme of the app #1946

Merged
merged 1 commit into from
May 31, 2023
Merged

PasscodeActivity changes depending on the theme of the app #1946

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
4 changes: 2 additions & 2 deletions mifosng-android/src/main/java/com/mifos/api/model/LoginData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.mifos.api.model;

public class LoginData {
public String username ;
public String password ;
public String username;
public String password;
}
15 changes: 15 additions & 0 deletions mifosng-android/src/main/java/com/mifos/mifosxdroid/passcode/PassCodeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ package com.mifos.mifosxdroid.passcode;
import android.content.Intent
import android.os.Bundle
import android.view.View
import androidx.core.widget.NestedScrollView
import butterknife.BindView
import butterknife.ButterKnife
import com.mifos.mifosxdroid.HomeActivity
import com.mifos.mifosxdroid.R
import com.mifos.mifosxdroid.SplashScreenActivity
Expand All @@ -14,11 +17,19 @@ import com.mifos.mobile.passcode.utils.PasscodePreferencesHelper
import com.mifos.utils.Constants

class PassCodeActivity : MifosPassCodeActivity() {

@BindView(R.id.cl_rootview)
lateinit var clRootView: NestedScrollView

private var currPassCode: String? = null
private var isToUpdatePassCode: Boolean = false

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

ButterKnife.bind(this)
clRootView.setBackgroundColor(android.R.attr.colorBackground)

intent?.let {
currPassCode = it.getStringExtra(Constants.CURR_PASSWORD)
isToUpdatePassCode = it.getBooleanExtra(Constants.IS_TO_UPDATE_PASS_CODE, false)
Expand All @@ -28,16 +39,20 @@ class PassCodeActivity : MifosPassCodeActivity() {
override fun showToaster(view: View?, msg: Int) {
Toaster.show(view, msg, Toaster.SHORT)
}

override fun startLoginActivity() {
startActivity(Intent(this, SplashScreenActivity::class.java))
finish()
}

override fun getLogo(): Int {
return R.drawable.mifos_logo
}

override fun getEncryptionType(): Int {
return EncryptionUtil.FINERACT_CN
}

override fun startNextActivity() {
startActivity(Intent(this, HomeActivity::class.java))
}
Expand Down