priyatham
/
alzapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Priyatham 2020-03-16 20:57:33 +05:30
parent 6e2a769e29 5d77010c4b
commit 031dc9c42a
3 changed files with 8 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/example/alzapp/TileMatchingActivity.java
View File

@ -34,7 +34,7 @@ public class TileMatchingActivity extends AppCompatActivity {
Integer[] cardsArray={101,102,103,104,105,106,107,108,201,202,203,204,205,206,207,208};
int img101,img102,img103,img104,img105,img106,img107,img108,
int img101,img102,img103,img104,img105,img106,img107,img108,
img201,img202,img203,img204,img205,img206,img207,img208,
firstCard,secondCard,clickedFirst,clickedSecond,cardNumber=1,playerMoves=0;

13
app/src/main/java/com/example/alzapp/UserAreaActivity.java
View File

@ -15,18 +15,5 @@ public class UserAreaActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
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);
}
}

40
app/src/main/res/layout/activity_user_area.xml
View File

@ -1,42 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/activity_horizontal_margin">
android:background="@drawable/bg_gradient2">
<TextView
android:id="@+id/tvWelcomeMsg"
android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:text="hello world"
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" />
android:text="USER INFO"
android:layout_marginTop="40dp"
android:layout_marginRight="100dp"
android:layout_marginLeft="161dp"/>
</RelativeLayout>