Skip to content

5
5711403296
Commit 369e5bf3 authored by Paded's avatar Paded
Browse files
Options

add color

parent 4f25bb3b
Show whitespace changes
Inline Side-by-side
Showing with 218 additions and 54 deletions
.idea/misc.xml
View file @ 369e5bf3
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
.idea/vcs.xml 0 → 100644
View file @ 369e5bf3
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
SSHKEY 0 → 100644
View file @ 369e5bf3
-----BEGIN RSA PRIVATE KEY-----
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
-----END RSA PRIVATE KEY-----
SSHKEY.pub 0 → 100644
View file @ 369e5bf3
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD4YEvb5V1Q0FHSDKnooA4nfPyGMb44F8HY0OLhSEPv4E6syqz66OjmVNeoQ1stY6Lx2/USFzJYgn7ruHE+Armo9Y+SQbyd3AYlt7Ml3Ha/GSBi06dxTlRyLoVXUZu2OORqk2JblW5awCm99edOfqt1HGkcbXtCRmHlooCX5HtsBiN0MB/ifKeHs+0wncOUbr/sHnS+ALIqLfSY9qfwQkIApgxAagYJFOAiSc9CQzeaNVfMZmsDAgdJC0gYqB1huDVdQ1ifDmUcNbSiict+UISTK8bkv9cDd+223qwCwgL+Ci2/9l9hPPoUCPAgPJNoD/bGqKPhBN4dnniIhvP4Fqy4zsVAeS5XYnSgTtx2/wXo2yLVcoEmXhWpwhwLD4gwhV3qiU+5/ecVJIi87lRe9HU//PuULw/UVOMQrT4ZSOMF+FjUYMYc7pGhMm9m0wMxXBBN4aasprb2M8tx6ip3U3sZ2T0YfoqMQPFuB8d/SCx5uM1Fv1LdF6i49kXB/ntOOYdKNSG5eGbfeJdM5AROHBtLFAE02/RxNr+gg0jK2fj+j2+0cg50tv/wwlAWZIJ95/hNM4jqeNPgYRIs1XXvaGCUiVaRNidnjXWo+tkJxbZhDBTpHiM2dVg6uqnMT3gV2autkHaImzY9vRrVRrfSTdU4KofF9hXNgCD0CtsIQZktGw== paded.ku.57@ubu.ac.th
app/src/main/java/ubontransitdriver/paded/com/ubontransitdriver/CreateAccountActivity.java
View file @ 369e5bf3
package ubontransitdriver.paded.com.ubontransitdriver; package ubontransitdriver.paded.com.ubontransitdriver;
import android.content.Intent;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.Toast;
import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.Task;
import com.google.firebase.auth.AuthResult;
import com.google.firebase.auth.FirebaseAuth; import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.FirebaseDatabase;
import com.h6ah4i.android.materialshadowninepatch.MaterialShadowContainerView; import com.h6ah4i.android.materialshadowninepatch.MaterialShadowContainerView;
public class CreateAccountActivity extends AppCompatActivity { public class CreateAccountActivity extends AppCompatActivity {
private EditText inputEmail, inputPassword; private EditText inputEmail, inputPassword, inputName;
private Button btnSignIn, btnSignUp, btnResetPassword; private Button btnCreateAccount, btnLogin, btnResetPassword;
private ProgressBar progressBar; private ProgressBar progressBar;
private FirebaseAuth auth; private FirebaseAuth auth;
private String TAG = "TEST22";
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.create_account_layout); setContentView(R.layout.create_account_layout);
MaterialShadowContainerView shadowView = //Get Firebase auth instance
(MaterialShadowContainerView) findViewById(R.id.shadow_item_container); auth = FirebaseAuth.getInstance();
float density = getResources().getDisplayMetrics().density; inputEmail = (EditText)findViewById(R.id.input_email);
inputPassword = (EditText)findViewById(R.id.input_password);
inputName = (EditText)findViewById(R.id.input_name);
shadowView.setShadowTranslationZ(density * 2.0f); // 2.0 dp progressBar = (ProgressBar) findViewById(R.id.progressBar);
shadowView.setShadowElevation(density * 4.0f); // 4.0 dp
btnCreateAccount = (Button)findViewById(R.id.btn_create_account);
btnResetPassword = (Button)findViewById(R.id.btn_reset_password);
btnCreateAccount.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
String email = inputEmail.getText().toString().trim();
String password = inputPassword.getText().toString().trim();
final String userName = inputName.getText().toString().trim();
if (TextUtils.isEmpty(email)) {
Toast.makeText(getApplicationContext(), "Enter email address!", Toast.LENGTH_SHORT).show();
return;
}
if (TextUtils.isEmpty(password)) {
Toast.makeText(getApplicationContext(), "Enter password!", Toast.LENGTH_SHORT).show();
return;
}
//Get Firebase auth instance
// auth = FirebaseAuth.getInstance();
//
// btnSignIn = (Button) findViewById(R.id.sign_in_button);
// btnSignUp = (Button) findViewById(R.id.sign_up_button);
// inputEmail = (EditText) findViewById(R.id.email);
// inputPassword = (EditText) findViewById(R.id.password);
// progressBar = (ProgressBar) findViewById(R.id.progressBar);
// btnResetPassword = (Button) findViewById(R.id.btn_reset_password);
if (password.length() < 6) {
Toast.makeText(getApplicationContext(), "Password too short, enter minimum 6 characters!", Toast.LENGTH_SHORT).show();
return;
}
if (TextUtils.isEmpty(userName)) {
Toast.makeText(getApplicationContext(), "Enter name!", Toast.LENGTH_SHORT).show();
return;
}
progressBar.setVisibility(View.VISIBLE);
auth.createUserWithEmailAndPassword(email,password).addOnCompleteListener(CreateAccountActivity.this, new OnCompleteListener<AuthResult>() {
@Override
public void onComplete(@NonNull Task<AuthResult> task) {
Toast.makeText(CreateAccountActivity.this, "createUserWithEmail:onComplete:" + task.isSuccessful(), Toast.LENGTH_SHORT).show();
progressBar.setVisibility(View.GONE);
if (!task.isSuccessful()) {
Toast.makeText(CreateAccountActivity.this, "Authentication failed." + task.getException(),
Toast.LENGTH_SHORT).show();
} else {
FirebaseUser user = auth.getCurrentUser();
Log.d(TAG, "onComplete: "+user.getUid());
insertData(user.getUid(),userName);
startActivity(new Intent(CreateAccountActivity.this, MainActivity.class));
finish();
}
}
});
}
});
}
public void insertData(String uid, String name){
FirebaseDatabase database = FirebaseDatabase.getInstance();
DatabaseReference myRef = database.getReference("users/"+uid);
myRef.child("name").setValue(name);
myRef.child("bus_line").setValue(name);
}
@Override
protected void onResume() {
super.onResume();
progressBar.setVisibility(View.GONE);
} }
} }
app/src/main/res/drawable/bg_edittext_focused.xml
View file @ 369e5bf3
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" > <shape xmlns:android="http://schemas.android.com/apk/res/android" >
<solid android:color="#FFFFFF" /> <solid android:color="#FFFFFF" />
<stroke <corners android:radius="8dp" />
android:width="2dip"
android:color="#F6F6F6" />
<corners android:radius="2dip" />
<padding <padding
android:bottom="7dip" android:bottom="7dip"
android:left="7dip" android:left="7dip"
......
app/src/main/res/drawable/bg_edittext_normal.xml
View file @ 369e5bf3
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android" >
<item> <solid android:color="#FFFFFF" />
<shape android:shape="rectangle"> <corners android:radius="8dp" />
<solid android:color="#CABBBBBB"/> <padding
<corners android:radius="2dp" /> android:bottom="7dip"
</shape> android:left="7dip"
</item> android:right="7dip"
<item android:top="7dip" />
android:left="0dp" </shape>
android:right="0dp" \ No newline at end of file
android:top="0dp"
android:bottom="2dp">
<shape android:shape="rectangle">
<solid android:color="@android:color/white"/>
<corners android:radius="2dp" />
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/layout/create_account_layout.xml
View file @ 369e5bf3
...@@ -11,7 +11,9 @@ ...@@ -11,7 +11,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:padding="30dp"> android:padding="25dp">
<com.h6ah4i.android.materialshadowninepatch.MaterialShadowContainerView <com.h6ah4i.android.materialshadowninepatch.MaterialShadowContainerView
...@@ -19,7 +21,6 @@ ...@@ -19,7 +21,6 @@
style="@style/ms9_DefaultShadowStyle" style="@style/ms9_DefaultShadowStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:ms9_shadowElevation="4dp" app:ms9_shadowElevation="4dp"
app:ms9_shadowTranslationZ="2dp"> app:ms9_shadowTranslationZ="2dp">
...@@ -27,18 +28,12 @@ ...@@ -27,18 +28,12 @@
android:id="@+id/input_layout" android:id="@+id/input_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/off_blue"
android:paddingLeft="5dp"
android:paddingRight="12dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
> >
<EditText <EditText
android:id="@+id/input_email" android:id="@+id/input_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_edittext" android:background="@drawable/bg_edittext"
...@@ -46,21 +41,41 @@ ...@@ -46,21 +41,41 @@
android:drawablePadding="10dp" android:drawablePadding="10dp"
android:ems="10" android:ems="10"
android:hint="Your Name" android:hint="Your Name"
android:inputType="textEmailAddress"
android:padding="15dp" /> android:padding="15dp" />
<EditText
android:id="@+id/input_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/input_name"
android:drawableLeft="@drawable/ic_email"
android:drawablePadding="10dp"
android:padding="15dp"
android:layout_marginTop="10dp"
android:hint="Your Email"
android:background="@drawable/bg_edittext"
android:ems="10"
android:inputType="textEmailAddress" />
<EditText <EditText
android:id="@+id/input_password" android:id="@+id/input_password"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/input_email" android:layout_below="@+id/input_email"
android:drawableLeft="@drawable/ic_pass_key"
android:drawablePadding="10dp"
android:padding="15dp"
android:layout_marginTop="10dp"
android:hint="Your Password"
android:background="@drawable/bg_edittext"
android:ems="10" android:ems="10"
android:inputType="textPassword" /> android:inputType="textPassword" />
</RelativeLayout> </RelativeLayout>
</com.h6ah4i.android.materialshadowninepatch.MaterialShadowContainerView> </com.h6ah4i.android.materialshadowninepatch.MaterialShadowContainerView>
<Button <Button
android:id="@+id/create_account_btn" android:id="@+id/btn_create_account"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/shadow_item_container" android:layout_below="@+id/shadow_item_container"
...@@ -70,6 +85,29 @@ ...@@ -70,6 +85,29 @@
android:text="@string/create_account_btn_txt_ENG" android:text="@string/create_account_btn_txt_ENG"
android:textColor="#ffffffff" /> android:textColor="#ffffffff" />
<Button
android:id="@+id/btn_reset_password"
android:layout_width="fill_parent"
android:layout_below="@+id/btn_create_account"
android:layout_height="wrap_content"
android:layout_marginTop="20dip"
android:background="@null"
android:text="@string/btn_forgot_password"
android:textAllCaps="false"
android:textColor="@color/blue" />
<ProgressBar
android:id="@+id/progressBar"
android:layout_width="158dp"
android:layout_height="30dp"
android:layout_below="@+id/btn_reset_password"
android:layout_gravity="center|bottom"
android:layout_marginBottom="20dp"
android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
</ScrollView> </ScrollView>
\ No newline at end of file
app/src/main/res/values/colors.xml
View file @ 369e5bf3
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="blue">#007aff</color>
<color name="off_blue">#0075f5</color>
<!--<color name="colorPrimaryDark">#303F9F</color>--> <!--<color name="colorPrimaryDark">#303F9F</color>-->
<!--<color name="colorAccent">#FF4081</color>--> <!--<color name="colorAccent">#FF4081</color>-->
<color name="white">#ffffff</color> <color name="white">#ffffff</color>
<color name="off_white">#fafAFA</color> <color name="off_white">#fafAFA</color>
<color name="blue">#007aff</color>
<color name="off_blue">#0075f5</color>
<color name="green">#4cd964</color>
<color name="red">#ff2d55</color>
<color name="black">#000000</color>
<color name="gray">#ceced2</color>
</resources> </resources>
app/src/main/res/values/strings.xml
View file @ 369e5bf3
...@@ -4,4 +4,6 @@ ...@@ -4,4 +4,6 @@
<string name="create_account_btn_txt_ENG">Create Account</string> <string name="create_account_btn_txt_ENG">Create Account</string>
<string name="btn_forgot_password">Forgot Your Password?</string>
</resources> </resources>
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