From d419b2e413075fadc342934080f345fe81441d58 Mon Sep 17 00:00:00 2001
From: chan24 <aakaschan24@gmail.com>
Date: Mon, 17 Apr 2017 22:21:33 +0530
Subject: [PATCH] profile
---
.../chan24/smartplanner/MapsActivity.java | 3 +
.../chan24/smartplanner/ProfileActivity.java | 12 +++
.../example/chan24/smartplanner/UserArea.java | 10 ---
app/src/main/res/layout/activity_profile.xml | 80 ++++++++++++++++++-
4 files changed, 93 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/example/chan24/smartplanner/MapsActivity.java b/app/src/main/java/com/example/chan24/smartplanner/MapsActivity.java
index 89ca509..433b379 100644
--- a/app/src/main/java/com/example/chan24/smartplanner/MapsActivity.java
+++ b/app/src/main/java/com/example/chan24/smartplanner/MapsActivity.java
@@ -15,6 +15,7 @@ import android.widget.Toast;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.OnMapReadyCallback;
import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.model.MarkerOptions;
public class MapsActivity extends FragmentActivity implements OnMapReadyCallback {
@@ -40,6 +41,8 @@ public class MapsActivity extends FragmentActivity implements OnMapReadyCallback
LatLng sydney = new LatLng(-34, 151);
mMap.addMarker(new MarkerOptions().position(sydney).title("Marker in Sydney"));
mMap.moveCamera(CameraUpdateFactory.newLatLng(sydney));*/
+
+
if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
return;
}
diff --git a/app/src/main/java/com/example/chan24/smartplanner/ProfileActivity.java b/app/src/main/java/com/example/chan24/smartplanner/ProfileActivity.java
index a211c6e..0addd04 100644
--- a/app/src/main/java/com/example/chan24/smartplanner/ProfileActivity.java
+++ b/app/src/main/java/com/example/chan24/smartplanner/ProfileActivity.java
@@ -1,7 +1,10 @@
package com.example.chan24.smartplanner;
+import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
public class ProfileActivity extends AppCompatActivity {
@@ -9,5 +12,14 @@ public class ProfileActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_profile);
+
+ Button cancel =(Button)findViewById(R.id.cancel);
+ cancel.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent i =new Intent(getApplicationContext(),UserArea.class);
+ startActivity(i);
+ }
+ });
}
}
diff --git a/app/src/main/java/com/example/chan24/smartplanner/UserArea.java b/app/src/main/java/com/example/chan24/smartplanner/UserArea.java
index b653f14..f190380 100644
--- a/app/src/main/java/com/example/chan24/smartplanner/UserArea.java
+++ b/app/src/main/java/com/example/chan24/smartplanner/UserArea.java
@@ -65,16 +65,6 @@ public class UserArea extends AppCompatActivity {
return false;
}
});
-
-
- Button b= (Button)findViewById(R.id.button3);
- b.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Intent i =new Intent(getApplicationContext(),MapsActivity.class);
- startActivity(i);
- }
- });
}
@Override
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index f967c52..ba7ec17 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -12,11 +12,87 @@
<TextView
android:text="Profile"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:textSize="32sp"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:layout_marginStart="136dp"
android:layout_marginTop="21dp"
android:id="@+id/textView" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/textView"
+ android:layout_marginTop="48dp"
+ android:id="@+id/userName"
+ android:layout_alignParentStart="true" />
+
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="number"
+ android:ems="10"
+ android:id="@+id/age"
+ android:hint="Age"
+ android:layout_below="@+id/userName"
+ android:layout_alignParentStart="true"
+ android:layout_marginTop="24dp" />
+
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="phone"
+ android:ems="10"
+ android:layout_below="@+id/sex"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="30dp"
+ android:id="@+id/phone"
+ android:hint="Phone" />
+
+ <Button
+ android:text="Cancel"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="44dp"
+ android:id="@+id/cancel"
+ android:layout_below="@+id/phone"
+ android:layout_alignParentStart="true"
+ android:layout_marginStart="44dp" />
+
+ <RadioGroup
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/sex"
+ android:orientation="horizontal"
+ android:layout_below="@+id/age"
+ android:layout_alignParentStart="true"
+ android:layout_marginStart="10dp"
+ android:layout_marginTop="17dp">
+
+ <RadioButton
+ android:text="Male"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/male"
+ android:layout_weight="1" />
+
+ <RadioButton
+ android:text="Female"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/female"
+ android:layout_weight="1" />
+ </RadioGroup>
+
+ <Button
+ android:text="Save"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignTop="@+id/cancel"
+ android:layout_alignParentEnd="true"
+ android:layout_marginEnd="50dp"
+ android:id="@+id/save" />
+
</RelativeLayout>
--
GitLab