From e6e8786787fbe0a3120d72724698c481ceb8814f Mon Sep 17 00:00:00 2001 From: Yusuf Eka Sayogana Date: Sat, 6 Oct 2018 21:11:49 +0700 Subject: [PATCH 1/2] update gradle --- app/build.gradle | 2 ++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c38e153..6094f30 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,6 +28,8 @@ dependencies { implementation 'com.android.support.constraint:constraint-layout:1.1.2' implementation 'com.android.support:cardview-v7:27.1.1' testImplementation 'junit:junit:4.12' + implementation 'com.jakewharton:butterknife:8.8.1' + annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' implementation 'com.android.support:cardview-v7:27.1.1' diff --git a/build.gradle b/build.gradle index 1a3d812..4e8009d 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.2.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9c12821..8a9a101 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Sep 25 16:05:04 ICT 2018 +#Sat Oct 06 17:52:49 WIB 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip From 26e26c7a266c16a90f0eda8042b704e65b4cebe0 Mon Sep 17 00:00:00 2001 From: Yusuf Eka Sayogana Date: Sat, 6 Oct 2018 21:20:31 +0700 Subject: [PATCH 2/2] implementasi butter knife --- .../main/java/onestep/id/sinergiin/login.java | 80 ++++++------------- 1 file changed, 26 insertions(+), 54 deletions(-) diff --git a/app/src/main/java/onestep/id/sinergiin/login.java b/app/src/main/java/onestep/id/sinergiin/login.java index 1f8ab51..73e4f8c 100644 --- a/app/src/main/java/onestep/id/sinergiin/login.java +++ b/app/src/main/java/onestep/id/sinergiin/login.java @@ -22,66 +22,45 @@ import java.util.HashMap; import java.util.Map; +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.OnClick; import onestep.id.sinergiin.Admin.admin; import onestep.id.sinergiin.Model.BaseApi; import onestep.id.sinergiin.Pembeli.pembeli; import onestep.id.sinergiin.Pengrajin.Pengrajin; public class login extends AppCompatActivity { - private Button login,regis; - private EditText txtUsername, txtPassword; - private String username, password,id_user,token,email,role; + + @BindView(R.id.txt_username) + EditText txtUsername; + + @BindView(R.id.txt_password) + EditText txtPassword; + + private String username, password, id_user, token, email, role; private ProgressDialog pDialog; TinyDB tinyDB; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_login); - txtUsername = (EditText) findViewById(R.id.txt_username); - txtPassword = (EditText) findViewById(R.id.txt_password); + ButterKnife.bind(this); tinyDB = new TinyDB(getApplicationContext()); - - login = (Button) findViewById(R.id.btn_login); - login.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { -// setLogin(); - userLogin(); - } - }); - regis = (Button) findViewById(R.id.btn_register); - regis.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent i = new Intent(login.this,register.class); - startActivity(i); - } - }); } - /* private void setLogin() { - email = txtEmail.getText().toString().trim(); - pass = txtPassword.getText().toString().trim(); - tinyDB.putString("id_user","14"); - tinyDB.putString("token","2b6898a282eece7bae4cdb706d4dcb1203433eee69d7ab317eaa081737ee5632"); - - if (email.equalsIgnoreCase("admin") && pass.equalsIgnoreCase("admin")) { - Intent i = new Intent(login.this, admin.class); - startActivity(i); - finish(); - } else if (email.equalsIgnoreCase("pengrajin") && pass.equalsIgnoreCase("pengrajin")) { - Intent i = new Intent(login.this, Pengrajin.class); - startActivity(i); - finish(); - } else if (email.equalsIgnoreCase("pembeli") && pass.equalsIgnoreCase("pembeli")) { - Intent i = new Intent(login.this, pembeli.class); - startActivity(i); - finish(); - } + @OnClick(R.id.btn_register) + void register() + { + Intent i = new Intent(login.this, register.class); + startActivity(i); } -*/ - private void userLogin() { + + + @OnClick(R.id.btn_login) + void userLogin() { username = txtUsername.getText().toString().trim(); password = txtPassword.getText().toString().trim(); if (username.equalsIgnoreCase("") || password.equalsIgnoreCase("")) { @@ -113,30 +92,23 @@ public void onResponse(String response) { tinyDB.putString("email", email); tinyDB.putString("token", token); - if (role.equalsIgnoreCase("pembeli")){ + if (role.equalsIgnoreCase("pembeli")) { Intent intent = new Intent(login.this, pembeli.class); startActivity(intent); finish(); - } - else if(role.equalsIgnoreCase("pengrajin")){ + } else if (role.equalsIgnoreCase("pengrajin")) { Intent intent = new Intent(login.this, Pengrajin.class); startActivity(intent); finish(); - } - else if(role.equalsIgnoreCase("admin")){ + } else if (role.equalsIgnoreCase("admin")) { Intent intent = new Intent(login.this, admin.class); startActivity(intent); finish(); - } - else { + } else { } - - - - } else { // Error in login. Get the error message String errorMsg = jObj.getString("error_msg");