Skip to content

Commit

Permalink
Update Changed into new branch.
Browse files Browse the repository at this point in the history
  • Loading branch information
BasemKhater committed Apr 6, 2024
1 parent 3ecfe90 commit d359daf
Show file tree
Hide file tree
Showing 8 changed files with 1,598 additions and 10 deletions.
18 changes: 10 additions & 8 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,23 @@
android:theme="@style/Theme.Modarb"
tools:targetApi="31">
<activity
android:name=".ui.workout.activites.TodayWorkoutActivity"
android:name=".ui.menu.activities.EditProfileActivity"
android:exported="false" />
<activity
android:name=".ui.onboarding.activities.WelcomeScreenActivity"
android:name=".ui.menu.activities.ProfileActivity"
android:exported="false" />
<activity
android:name=".ui.home.HomeActivity"
android:exported="false" />
<activity
android:name=".ui.workout.activites.WorkoutActivity"
android:name=".ui.workout.activites.TodayWorkoutActivity"
android:exported="false" />
<activity
android:name=".ui.onboarding.activities.WelcomeScreenActivity"
android:exported="false" />
<activity
android:name=".ui.onboarding.activities.RegisterScreenActivity"
android:exported="false" />

<!-- <activity-->
<!-- android:name=".ui.home.HomeActivity"-->
<!-- android:exported="false" />-->
<activity
android:name=".ui.onboarding.activities.OnBoardingSplashActivity"
android:exported="false" />
Expand All @@ -40,7 +42,7 @@
android:name=".MainActivity"
android:exported="false" />
<activity
android:name=".ui.home.HomeActivity"
android:name=".ui.menu.activities.MenuActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package com.modarb.android.ui.menu.activities

import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.widget.ArrayAdapter
import android.widget.Button
import android.widget.ListView
import androidx.appcompat.app.AlertDialog
import com.modarb.android.R

class EditProfileActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_edit_profile)

val genderButton: Button = findViewById(R.id.genderButton)
val genders = arrayOf("Male", "Female")

genderButton.setOnClickListener {
val builder = AlertDialog.Builder(this)
builder.setTitle("Select Gender")
val listView = ListView(this)
listView.adapter = ArrayAdapter(this, android.R.layout.simple_list_item_1, genders)
builder.setView(listView)

val dialog = builder.create()
dialog.show()

listView.setOnItemClickListener { _, _, position, _ ->
val selectedGender = genders[position]
genderButton.text = selectedGender
dialog.dismiss()
}
}


val startButton: Button = findViewById(R.id.startButton)

startButton.setOnClickListener {
startActivity(Intent(this, ProfileActivity::class.java))
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.modarb.android.ui.menu.activities

import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.View
import com.modarb.android.R

class MenuActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_menu)

val cardView = findViewById<View>(R.id.cardView)
cardView.setOnClickListener {
startActivity(Intent(this, ProfileActivity::class.java))
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.modarb.android.ui.menu.activities

import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.view.View
import com.modarb.android.R

class ProfileActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_profile)

val editTextView = findViewById<View>(R.id.editTextView)
editTextView.setOnClickListener {
val intent = Intent(this, EditProfileActivity::class.java)
startActivity(intent)
}
}
}
209 changes: 209 additions & 0 deletions app/src/main/res/layout/activity_edit_profile.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"
tools:context=".ui.menu.activities.EditProfileActivity">


<ImageView
android:id="@+id/profile"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/select_profile_picture"
tools:ignore="ContentDescription"/>

<TextView
android:id="@+id/profile_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:textColor="@color/white"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/profile"
tools:text="Name" />


<FrameLayout
android:id="@+id/frameLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="32dp"
android:layout_marginEnd="8dp"
android:background="@drawable/grey700_shape"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/profile_name"
app:layout_constraintVertical_bias="0.0">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">


<TextView
android:id="@+id/genderTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="20dp"
android:fontFamily="@font/montserrat"
android:gravity="center"
android:padding="8dp"
android:text="@string/gender"
android:textColor="@color/gray_92"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<Button
android:id="@+id/genderButton"
android:layout_width="140dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="32dp"
android:backgroundTint="@color/grey_400"
android:textColor="@color/white_700"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/genderTextView"
app:layout_constraintTop_toTopOf="parent"
tools:text="Female" />

<TextView
android:id="@+id/ageTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="24dp"
android:fontFamily="@font/montserrat"
android:gravity="center"
android:padding="8dp"
android:text="@string/age"
android:textColor="@color/gray_92"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/genderTextView" />

<EditText
android:id="@+id/ageValueEditText"
android:layout_width="140dp"
android:layout_height="48dp"
android:layout_marginTop="13dp"
android:layout_marginEnd="32dp"
android:autofillHints="Age"
android:backgroundTint="@color/grey_400"
android:hint="@string/age_hint"
android:inputType="number"
android:textAlignment="center"
android:textColor="@color/white_700"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/ageTextView"
app:layout_constraintTop_toBottomOf="@+id/genderButton" />


<TextView
android:id="@+id/weightTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="24dp"
android:fontFamily="@font/montserrat"
android:gravity="center"
android:padding="8dp"
android:text="@string/weight"
android:textColor="@color/gray_92"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ageTextView" />


<EditText
android:id="@+id/weightValueEditText"
android:layout_width="140dp"
android:layout_height="48dp"
android:layout_marginTop="13dp"
android:layout_marginEnd="32dp"
android:autofillHints="Weight"
android:backgroundTint="@color/grey_400"
android:hint="@string/weight_hint"
android:inputType="number"
android:textAlignment="center"
android:textColor="@color/white_700"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/weightTextView"
app:layout_constraintTop_toBottomOf="@+id/ageValueEditText" />


<TextView
android:id="@+id/heightTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="24dp"
android:layout_marginBottom="20dp"
android:fontFamily="@font/montserrat"
android:gravity="center"
android:padding="8dp"
android:text="@string/height"
android:textColor="@color/gray_92"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/weightTextView" />

<EditText
android:id="@+id/heightValueEditText"
android:layout_width="140dp"
android:layout_height="48dp"
android:layout_marginTop="13dp"
android:layout_marginEnd="32dp"
android:layout_marginBottom="16dp"
android:autofillHints="Height"
android:backgroundTint="@color/grey_400"
android:hint="@string/height_hint"
android:inputType="number"
android:textAlignment="center"
android:textColor="@color/white_700"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/heightTextView"
app:layout_constraintTop_toBottomOf="@+id/weightValueEditText" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

<Button
android:id="@+id/startButton"
android:layout_width="240dp"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:backgroundTint="@color/button"
android:padding="12dp"
android:text="@string/save"
android:textSize="20sp"
android:textStyle="bold"
app:cornerRadius="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.496"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/frameLayout"
app:layout_constraintVertical_bias="1.0" />

</androidx.constraintlayout.widget.ConstraintLayout>
Loading

0 comments on commit d359daf

Please sign in to comment.