Commit d2a33b71 by onuma

Bizのレビューで指摘内容をCheckにも反映した

parent 77894f98
...@@ -64,7 +64,7 @@ public class ABVEnvironment { ...@@ -64,7 +64,7 @@ public class ABVEnvironment {
public boolean operationGroupMasterClearFlg; public boolean operationGroupMasterClearFlg;
// 利用規約に同意するのテキストがあるURL // 利用規約に同意するのテキストがあるURL
public String agree_to_terms_of_use_url = ""; public String agreeToTermsOfUseUrl = "";
// プライバシーポリシーURL // プライバシーポリシーURL
public String privacyPolicyUrl; public String privacyPolicyUrl;
......
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
</LinearLayout> </LinearLayout>
<Button <Button
android:id="@+id/btn_login_off" android:id="@+id/btn_login"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="46dp" android:layout_height="46dp"
android:layout_gravity="center" android:layout_gravity="center"
......
...@@ -144,7 +144,7 @@ public class Initializer { ...@@ -144,7 +144,7 @@ public class Initializer {
env.setInitialized(true); env.setInitialized(true);
// 利用規約に同意するの詳細があるURL // 利用規約に同意するの詳細があるURL
env.agree_to_terms_of_use_url = s(R.string.agree_to_terms_of_use_url); env.agreeToTermsOfUseUrl = s(R.string.agree_to_terms_of_use_url);
// Helperクラス初期化 // Helperクラス初期化
ActivityHandlingHelper.getInstance().init(context); ActivityHandlingHelper.getInstance().init(context);
......
...@@ -97,10 +97,8 @@ public class LoginActivity extends ABVLoginActivity { ...@@ -97,10 +97,8 @@ public class LoginActivity extends ABVLoginActivity {
private InputMethodManager imm; private InputMethodManager imm;
private Button btnLoginOff;
private Button btnDetail;
private CheckBox chexBoxAgree; private CheckBox chexBoxAgree;
private static String termsOfUseUrl = ABVEnvironment.getInstance().agree_to_terms_of_use_url; private static String termsOfUseUrl = ABVEnvironment.getInstance().agreeToTermsOfUseUrl;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
...@@ -158,9 +156,8 @@ public class LoginActivity extends ABVLoginActivity { ...@@ -158,9 +156,8 @@ public class LoginActivity extends ABVLoginActivity {
// ログインボタン // ログインボタン
btnLoginOff = findViewById(R.id.btn_login_off); final Button btnLogin = findViewById(R.id.btn_login);
btnLoginOff.setVisibility(View.VISIBLE); btnLogin.setOnClickListener(new View.OnClickListener() {
btnLoginOff.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
tryLogin(); tryLogin();
...@@ -171,17 +168,12 @@ public class LoginActivity extends ABVLoginActivity { ...@@ -171,17 +168,12 @@ public class LoginActivity extends ABVLoginActivity {
chexBoxAgree = findViewById(R.id.check_box_agree); chexBoxAgree = findViewById(R.id.check_box_agree);
// 初期化(状態は保存しておく。ログアウトした後に使う) // 初期化(状態は保存しておく。ログアウトした後に使う)
boolean agree = PreferenceUtil.getUserPref(LoginActivity.this, AppDefType.PrefName.AGREE_STATUS, false); boolean agree = PreferenceUtil.getUserPref(LoginActivity.this, AppDefType.PrefName.AGREE_STATUS, false);
if (agree) { chexBoxAgree.setChecked(agree);
chexBoxAgree.setChecked(true);
}
chexBoxAgree.setOnClickListener(new View.OnClickListener() { chexBoxAgree.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
if (chexBoxAgree.isChecked()) { PreferenceUtil.put(LoginActivity.this, AppDefType.PrefName.AGREE_STATUS, chexBoxAgree.isChecked());
PreferenceUtil.putUserPref(LoginActivity.this, AppDefType.PrefName.AGREE_STATUS, true);
} else {
PreferenceUtil.putUserPref(LoginActivity.this, AppDefType.PrefName.AGREE_STATUS, false);
}
} }
}); });
...@@ -232,7 +224,7 @@ public class LoginActivity extends ABVLoginActivity { ...@@ -232,7 +224,7 @@ public class LoginActivity extends ABVLoginActivity {
} }
// 詳細ボタン // 詳細ボタン
btnDetail = findViewById(R.id.detail); final Button btnDetail = findViewById(R.id.detail);
btnDetail.setOnClickListener(new View.OnClickListener() { btnDetail.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment