Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
031dc9c42a
|
@ -15,18 +15,5 @@ public class UserAreaActivity extends AppCompatActivity {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_user_area);
|
setContentView(R.layout.activity_user_area);
|
||||||
|
|
||||||
Intent intent = getIntent();
|
|
||||||
String username = intent.getStringExtra("username");
|
|
||||||
|
|
||||||
|
|
||||||
TextView tvWelcomeMsg = (TextView) findViewById(R.id.tvWelcomeMsg);
|
|
||||||
EditText etUsername = (EditText) findViewById(R.id.etUsername);
|
|
||||||
|
|
||||||
|
|
||||||
// Display user details
|
|
||||||
String message = username + " welcome to your user area";
|
|
||||||
tvWelcomeMsg.setText(message);
|
|
||||||
etUsername.setText(username);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,42 +1,16 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:padding="@dimen/activity_horizontal_margin">
|
android:background="@drawable/bg_gradient2">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tvWelcomeMsg"
|
android:id="@+id/textView4"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentLeft="true"
|
android:text="USER INFO"
|
||||||
android:layout_alignParentStart="true"
|
android:layout_marginTop="40dp"
|
||||||
android:layout_alignParentTop="true"
|
android:layout_marginRight="100dp"
|
||||||
android:text="hello world"
|
android:layout_marginLeft="161dp"/>
|
||||||
android:textAppearance="?android:attr/textAppearanceLarge" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/textView"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:layout_below="@+id/tvWelcomeMsg"
|
|
||||||
android:text="Username"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/etUsername"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_alignParentEnd="true"
|
|
||||||
android:layout_alignParentLeft="true"
|
|
||||||
android:layout_alignParentRight="true"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:layout_below="@+id/textView"
|
|
||||||
android:editable="false" />
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
Loading…
Reference in New Issue