Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
80 changes: 26 additions & 54 deletions app/src/main/java/onestep/id/sinergiin/login.java
Original file line number Diff line number Diff line change
Expand Up @@ -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("")) {
Expand Down Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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