Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Pedro Branco
TravelBuddy
Commits
fb7df8ac
Commit
fb7df8ac
authored
Mar 20, 2017
by
Tanmim Hanifa
Browse files
Added terms and condition checkbox with a hyperlink to the terms and conditions
parent
fd2102cf
Changes
3
Hide whitespace changes
Inline
Side-by-side
TravelPals/TravelPals/app/src/main/java/travelpals/travelpals/RegisterActivity.java
View file @
fb7df8ac
...
...
@@ -4,10 +4,15 @@ import android.content.Intent;
import
android.support.v7.app.AlertDialog
;
import
android.support.v7.app.AppCompatActivity
;
import
android.os.Bundle
;
import
android.text.Html
;
import
android.text.Spanned
;
import
android.text.method.LinkMovementMethod
;
import
android.view.View
;
import
android.widget.Button
;
import
android.widget.CheckBox
;
import
android.widget.EditText
;
import
android.widget.Spinner
;
import
android.widget.TextView
;
import
com.android.volley.RequestQueue
;
import
com.android.volley.Response
;
...
...
@@ -18,6 +23,8 @@ import org.json.JSONObject;
public
class
RegisterActivity
extends
AppCompatActivity
{
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
...
...
@@ -33,8 +40,20 @@ public class RegisterActivity extends AppCompatActivity {
final
EditText
etPasswordAgain
=
(
EditText
)
findViewById
(
R
.
id
.
etPasswordAgain
);
final
CheckBox
cbTerms
=
(
CheckBox
)
findViewById
(
R
.
id
.
cbTerms
);
final
Button
btnRegister
=
(
Button
)
findViewById
(
R
.
id
.
btnRegister
);
TextView
tvTerms
=(
TextView
)
findViewById
(
R
.
id
.
tvTerms
);
tvTerms
.
setClickable
(
true
);
tvTerms
.
setMovementMethod
(
LinkMovementMethod
.
getInstance
());
String
text
=
"<a href='http://doc.gold.ac.uk/~thani001/travelpals/termsandcondition.html'> I agree to the terms and conditions </a>"
;
tvTerms
.
setText
(
Html
.
fromHtml
(
text
));
btnRegister
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
...
...
@@ -50,36 +69,44 @@ public class RegisterActivity extends AppCompatActivity {
final
String
passwordAgain
=
etPasswordAgain
.
getText
().
toString
();
if
((
password
).
equals
(
passwordAgain
))
{
if
((
password
).
equals
(
passwordAgain
))
{
if
(
cbTerms
.
isChecked
())
{
Response
.
Listener
<
String
>
responseListener
=
new
Response
.
Listener
<
String
>()
{
Response
.
Listener
<
String
>
responseListener
=
new
Response
.
Listener
<
String
>()
{
@Override
public
void
onResponse
(
String
response
)
{
try
{
JSONObject
jsonResponse
=
new
JSONObject
(
response
);
boolean
success
=
jsonResponse
.
getBoolean
(
"success"
);
@Override
public
void
onResponse
(
String
response
)
{
try
{
JSONObject
jsonResponse
=
new
JSONObject
(
response
);
boolean
success
=
jsonResponse
.
getBoolean
(
"success"
);
if
(
success
)
{
Intent
intent
=
new
Intent
(
RegisterActivity
.
this
,
loginActivity
.
class
);
RegisterActivity
.
this
.
startActivity
(
intent
);
}
else
{
AlertDialog
.
Builder
builder
=
new
AlertDialog
.
Builder
(
RegisterActivity
.
this
);
builder
.
setMessage
(
"Username or email may already be in use."
)
.
setNegativeButton
(
"Try again"
,
null
)
.
create
()
.
show
();
}
if
(
success
)
{
Intent
intent
=
new
Intent
(
RegisterActivity
.
this
,
loginActivity
.
class
);
RegisterActivity
.
this
.
startActivity
(
intent
);
}
else
{
AlertDialog
.
Builder
builder
=
new
AlertDialog
.
Builder
(
RegisterActivity
.
this
);
builder
.
setMessage
(
"Username or email may already be in use."
)
.
setNegativeButton
(
"Try again"
,
null
)
.
create
()
.
show
();
}
}
catch
(
JSONException
e
)
{
e
.
printStackTrace
();
}
catch
(
JSONException
e
)
{
e
.
printStackTrace
();
}
}
}
};
RegisterRequest
registerRequest
=
new
RegisterRequest
(
name
,
gender
,
username
,
dob
,
email
,
password
,
responseListener
);
RequestQueue
queue
=
Volley
.
newRequestQueue
(
RegisterActivity
.
this
);
queue
.
add
(
registerRequest
);
};
RegisterRequest
registerRequest
=
new
RegisterRequest
(
name
,
gender
,
username
,
dob
,
email
,
password
,
responseListener
);
RequestQueue
queue
=
Volley
.
newRequestQueue
(
RegisterActivity
.
this
);
queue
.
add
(
registerRequest
);
}
else
{
AlertDialog
.
Builder
builder2
=
new
AlertDialog
.
Builder
(
RegisterActivity
.
this
);
builder2
.
setMessage
(
"You have not agreed to the terms and conditions"
)
.
setNegativeButton
(
"OK"
,
null
)
.
create
()
.
show
();
}
}
else
{
AlertDialog
.
Builder
builder2
=
new
AlertDialog
.
Builder
(
RegisterActivity
.
this
);
builder2
.
setMessage
(
"Passwords are not the same"
)
...
...
TravelPals/TravelPals/app/src/main/res/layout/activity_register.xml
View file @
fb7df8ac
...
...
@@ -7,7 +7,7 @@
android:paddingBottom=
"@dimen/activity_vertical_margin"
android:paddingLeft=
"@dimen/activity_horizontal_margin"
android:paddingRight=
"@dimen/activity_horizontal_margin"
android:paddingTop=
"
@dimen/activity_vertical_margin
"
android:paddingTop=
"
5dp
"
tools:context=
"travelpals.travelpals.RegisterActivity"
>
<EditText
...
...
@@ -87,13 +87,38 @@
android:layout_below=
"@id/etPassword"
android:layout_alignStart=
"@+id/etPassword"
/>
<CheckBox
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:id=
"@+id/cbTerms"
android:layout_below=
"@+id/etPasswordAgain"
android:gravity=
"center"
android:layout_marginBottom=
"20dp"
android:layout_alignStart=
"@+id/etPasswordAgain"
/>
<TextView
android:id=
"@+id/tvTerms"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:gravity=
"center"
android:padding=
"20px"
android:textStyle=
"bold"
android:textAppearance=
"?android:attr/textAppearanceSmall"
android:layout_below=
"@+id/etPasswordAgain"
android:layout_alignStart=
"@+id/btnRegister"
android:layout_alignEnd=
"@+id/etPasswordAgain"
/>
<Button
android:text=
"REGISTER"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:id=
"@+id/btnRegister"
android:layout_marginBottom=
"7dp"
android:layout_below=
"@id/etPasswordAgain"
android:layout_alignParentBottom=
"true"
android:layout_centerHorizontal=
"true"
/>
...
...
TravelPals/TravelPals/app/src/main/res/values/strings.xml
View file @
fb7df8ac
...
...
@@ -11,4 +11,7 @@
<item>
Male
</item>
<item>
Female
</item>
</string-array>
</resources>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment