diff --git a/app/src/main/java/com/example/alzapp/TileMatchingActivity.java b/app/src/main/java/com/example/alzapp/TileMatchingActivity.java index f03d3bd..7175ae2 100644 --- a/app/src/main/java/com/example/alzapp/TileMatchingActivity.java +++ b/app/src/main/java/com/example/alzapp/TileMatchingActivity.java @@ -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; diff --git a/app/src/main/java/com/example/alzapp/UserAreaActivity.java b/app/src/main/java/com/example/alzapp/UserAreaActivity.java index 02eda22..d90e989 100644 --- a/app/src/main/java/com/example/alzapp/UserAreaActivity.java +++ b/app/src/main/java/com/example/alzapp/UserAreaActivity.java @@ -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); - } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_user_area.xml b/app/src/main/res/layout/activity_user_area.xml index 784fb02..b92ce35 100644 --- a/app/src/main/res/layout/activity_user_area.xml +++ b/app/src/main/res/layout/activity_user_area.xml @@ -1,42 +1,16 @@ + android:background="@drawable/bg_gradient2"> - - - - - - - - - + android:text="USER INFO" + android:layout_marginTop="40dp" + android:layout_marginRight="100dp" + android:layout_marginLeft="161dp"/> \ No newline at end of file