Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	app/src/main/res/values/strings.xml
  • Loading branch information
BasemKhater committed Apr 6, 2024
2 parents 4ca9278 + 2f77fbd commit 3ecfe90
Show file tree
Hide file tree
Showing 15 changed files with 161 additions and 171 deletions.
4 changes: 2 additions & 2 deletions app/src/main/java/com/modarb/android/network/ApiService.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import retrofit2.http.Body
import retrofit2.http.POST

interface ApiService {
@POST("/api/v1/users/auth/login")
@POST("/api/v1/user/auth/login")
suspend fun loginUser(@Body loginRequest: LoginRequest): Response<LoginResponse>

@POST("/api/v1/users/auth/register")
@POST("/api/v1/user/auth/register")
suspend fun registerUser(@Body registerRequest: RegisterRequest): Response<LoginResponse>
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_home.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector android:height="26.526316dp"
android:viewportHeight="21"
android:viewportWidth="19"
android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android">
<path
android:fillColor="#FCFCFF"
android:pathData="M1.75,19.203H6.125V11.929H12.542V19.203H16.917V7.856L9.333,2.182L1.75,7.856V19.203ZM0,20.948V6.983L9.333,0L18.667,6.983V20.948H10.792V13.675H7.875V20.948H0Z" />
</vector>
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/ic_more.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
<path
android:pathData="M3.3,8.8C2.717,8.8 2.157,9.032 1.744,9.444C1.332,9.857 1.1,10.416 1.1,11C1.1,11.583 1.332,12.143 1.744,12.555C2.157,12.968 2.717,13.2 3.3,13.2C3.884,13.2 4.443,12.968 4.856,12.555C5.268,12.143 5.5,11.583 5.5,11C5.5,10.416 5.268,9.857 4.856,9.444C4.443,9.032 3.884,8.8 3.3,8.8ZM8.8,11C8.8,10.416 9.032,9.857 9.444,9.444C9.857,9.032 10.417,8.8 11,8.8C11.584,8.8 12.143,9.032 12.556,9.444C12.968,9.857 13.2,10.416 13.2,11C13.2,11.583 12.968,12.143 12.556,12.555C12.143,12.968 11.584,13.2 11,13.2C10.417,13.2 9.857,12.968 9.444,12.555C9.032,12.143 8.8,11.583 8.8,11ZM16.5,11C16.5,10.416 16.732,9.857 17.145,9.444C17.557,9.032 18.117,8.8 18.7,8.8C19.284,8.8 19.843,9.032 20.256,9.444C20.668,9.857 20.9,10.416 20.9,11C20.9,11.583 20.668,12.143 20.256,12.555C19.843,12.968 19.284,13.2 18.7,13.2C18.117,13.2 17.557,12.968 17.145,12.555C16.732,12.143 16.5,11.583 16.5,11Z"
android:fillColor="#FCFCFF"
android:fillType="evenOdd" />
</vector>
69 changes: 69 additions & 0 deletions app/src/main/res/drawable/ic_my_plan.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
<path
android:pathData="M6.452,5.624C6.452,5.624 6.172,5.476 5.99,4.643C5.808,3.81 7.404,2.269 7.404,2.269C7.404,2.269 7.894,2.031 9.925,2.066C11.956,2.101 12.439,2.43 12.86,2.934C14.692,5.133 18.133,9.51 18.95,12.962C19.135,13.476 19.393,13.195 19.393,14.026C19.393,14.62 19.067,14.784 18.98,14.881C16.865,17.248 11.683,18.033 9.372,18.033C7.061,18.033 7.075,17.5 6.431,17.5C5.787,17.5 5.072,19.629 3.479,19.938C2.292,17.556 2.341,12.738 3.479,10.193C6.158,10.193 6.585,11.222 7.691,11.222C8.637,11.222 8.49,10.634 9.981,10.634C11.473,10.634 13.532,12.336 13.532,12.336C12.366,10.886 13.666,7.354 11.147,5.004C10.675,4.563 10.454,6.012 8.983,6.012C8.767,6.14 7.986,6.243 7.986,6.243"
android:strokeLineJoin="round"
android:strokeWidth="0.770833"
android:fillColor="#00000000"
android:strokeColor="#FCFCFF"
android:strokeLineCap="round" />
<path
android:pathData="M14.155,12.936C14.565,13.404 15.407,14.038 16.189,14.027"
android:strokeLineJoin="round"
android:strokeWidth="0.770833"
android:fillColor="#00000000"
android:strokeColor="#FCFCFF"
android:strokeLineCap="round" />
<path
android:pathData="M5.717,13.537C4.813,14.623 4.694,15.799 3.784,16.289"
android:strokeLineJoin="round"
android:strokeWidth="0.770833"
android:fillColor="#00000000"
android:strokeColor="#FCFCFF"
android:strokeLineCap="round" />
<path
android:pathData="M7.11,14.027C8.469,15.406 10.927,15.315 12.363,13.845"
android:strokeLineJoin="round"
android:strokeWidth="0.770833"
android:fillColor="#00000000"
android:strokeColor="#FCFCFF"
android:strokeLineCap="round" />
<path
android:pathData="M12.424,4.006C12.361,4.268 12.025,4.673 11.778,4.741"
android:strokeLineJoin="round"
android:strokeWidth="0.770833"
android:fillColor="#00000000"
android:strokeColor="#FCFCFF"
android:strokeLineCap="round" />
<path
android:pathData="M8.584,2.955C8.4,3.176 7.508,4.31 7.529,4.494C7.55,4.678 7.418,5.597 7.697,5.697C7.975,5.797 8.92,5.628 8.91,5.229C8.899,4.83 8.821,4.625 8.842,4.431C8.863,4.237 9.493,3.275 9.493,3.275"
android:strokeLineJoin="round"
android:strokeWidth="0.770833"
android:fillColor="#00000000"
android:strokeColor="#FCFCFF"
android:strokeLineCap="round" />
<path
android:pathData="M7.676,2.787C7.445,3.065 6.683,4.142 6.693,4.594C6.704,5.046 6.751,5.376 6.856,5.476C6.961,5.576 7.529,5.341 7.529,5.341"
android:strokeLineJoin="round"
android:strokeWidth="0.770833"
android:fillColor="#00000000"
android:strokeColor="#FCFCFF"
android:strokeLineCap="round" />
<path
android:pathData="M7.732,5.707C7.732,5.707 7.959,5.955 7.986,6.222C8.012,6.49 7.639,6.748 7.298,6.842C6.956,6.937 6.478,6.296 6.478,6.054C6.478,5.813 6.856,5.477 6.856,5.477"
android:strokeLineJoin="round"
android:strokeWidth="0.770833"
android:fillColor="#00000000"
android:strokeColor="#FCFCFF"
android:strokeLineCap="round" />
<path
android:pathData="M9.89,4.432C9.902,4.772 9.985,5.14 9.692,5.246C9.399,5.353 8.892,5.327 8.892,5.327"
android:strokeLineJoin="round"
android:strokeWidth="0.770833"
android:fillColor="#00000000"
android:strokeColor="#FCFCFF"
android:strokeLineCap="round" />
</vector>
18 changes: 18 additions & 0 deletions app/src/main/res/drawable/ic_nutrition.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="37dp"
android:height="32dp"
android:viewportWidth="37"
android:viewportHeight="32">
<group>
<clip-path android:pathData="M0,0h37v32h-37z" />
<path
android:pathData="M30.729,22.414C30.34,22.208 29.869,22.378 29.676,22.794C28.982,24.298 28.037,25.695 26.868,26.948C26.801,27.02 26.735,27.089 26.667,27.159L26.599,27.229C22.574,31.344 16.268,31.344 12.243,27.229L12.174,27.158C12.108,27.089 12.041,27.02 11.975,26.948C11.145,26.059 10.42,25.085 9.821,24.053C9.593,23.658 9.108,23.537 8.74,23.783C8.372,24.029 8.259,24.548 8.488,24.942C9.151,26.084 9.95,27.159 10.865,28.139C10.939,28.218 11.012,28.296 11.086,28.371L11.16,28.447C13.477,30.815 16.45,31.999 19.422,31.999C22.395,31.999 25.369,30.815 27.686,28.446L27.758,28.371C27.832,28.294 27.906,28.217 27.98,28.138C29.27,26.755 30.315,25.208 31.085,23.541C31.278,23.124 31.118,22.619 30.73,22.413L30.729,22.414Z"
android:fillColor="#FDFDFD" />
<path
android:pathData="M7.143,18.213C7.149,18.213 7.156,18.213 7.163,18.213C7.588,18.213 7.937,17.849 7.948,17.392C7.991,15.493 8.59,13.87 9.68,12.702C11.657,10.584 15.016,10.25 18.448,11.828C18.753,11.967 19.08,12.039 19.408,12.04C19.413,12.04 19.417,12.042 19.421,12.042C19.426,12.042 19.431,12.04 19.436,12.04C19.763,12.039 20.091,11.968 20.395,11.828C23.827,10.25 27.186,10.584 29.162,12.702C30.11,13.719 30.694,15.1 30.853,16.696C30.899,17.158 31.287,17.495 31.717,17.444C32.148,17.395 32.46,16.98 32.415,16.518C32.218,14.534 31.478,12.803 30.272,11.51C27.907,8.978 24.057,8.456 20.151,10.114C20.128,9.85 20.096,9.547 20.051,9.215C21.358,9.179 23.576,8.861 25.061,7.27C26.619,5.6 26.869,3.063 26.88,1.699C26.883,1.244 26.72,0.816 26.42,0.494C26.119,0.171 25.724,-0.003 25.295,0C24.022,0.011 21.655,0.28 20.097,1.95C19.384,2.714 18.948,3.658 18.68,4.589C18.05,3.371 17.158,2.257 15.898,1.537C15.515,1.319 15.04,1.474 14.836,1.884C14.632,2.295 14.776,2.804 15.159,3.023C17.679,4.464 18.372,8.175 18.563,10.061C14.7,8.469 10.909,9.005 8.57,11.51C7.189,12.991 6.431,15.01 6.377,17.35C6.367,17.814 6.709,18.201 7.143,18.213ZM21.207,3.141C22.369,1.895 24.275,1.694 25.309,1.687C25.3,2.793 25.113,4.835 23.95,6.081C22.788,7.327 20.883,7.527 19.849,7.535C19.858,6.429 20.045,4.387 21.207,3.141Z"
android:fillColor="#FDFDFD" />
<path
android:pathData="M35.397,18.552C34.785,18.552 34.253,18.92 33.984,19.463H28.443L27.01,16.755C26.869,16.49 26.605,16.32 26.32,16.314C26.033,16.306 25.765,16.462 25.613,16.719L23.988,19.463H22.391C22.083,19.463 21.796,19.64 21.641,19.927L19.928,23.1L18.073,16.069C17.982,15.724 17.724,15.453 17.401,15.362C17.077,15.273 16.728,15.373 16.492,15.627L16.437,15.685L13.885,19.763L12.895,18.827C12.592,18.541 12.146,18.534 11.835,18.811L10.292,20.188H3.029C2.765,19.628 2.226,19.244 1.601,19.244C0.717,19.244 0,20.013 0,20.96C0,21.907 0.717,22.675 1.601,22.675C2.172,22.675 2.671,22.354 2.954,21.872H10.547C10.748,21.872 10.945,21.796 11.102,21.657L12.343,20.549L13.449,21.596C13.637,21.773 13.886,21.854 14.135,21.82C14.382,21.786 14.605,21.639 14.744,21.416L16.931,17.921L18.819,25.079C18.921,25.468 19.228,25.753 19.603,25.809C19.645,25.815 19.689,25.818 19.732,25.818C20.059,25.818 20.367,25.636 20.541,25.33L22.799,21.147H24.377C24.676,21.147 24.95,20.985 25.109,20.716L26.267,18.76L27.282,20.677C27.436,20.967 27.725,21.147 28.036,21.147H34.027C34.306,21.648 34.816,21.983 35.399,21.983C36.283,21.983 37,21.215 37,20.268C37,19.321 36.283,18.552 35.399,18.552L35.397,18.552Z"
android:fillColor="#FDFDFD" />
</group>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_workouts.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="21dp"
android:height="22dp"
android:viewportWidth="21"
android:viewportHeight="22">
<path
android:pathData="M20.669,14.385L19.791,13.507L19.825,13.474C20.076,13.222 20.214,12.888 20.214,12.531C20.214,12.174 20.076,11.839 19.825,11.588L19.047,10.81C18.527,10.29 17.681,10.29 17.161,10.81L15.427,12.545L14.928,12.046C15.026,11.995 15.12,11.931 15.204,11.854L15.557,11.531C15.811,11.299 15.96,10.98 15.975,10.634C15.99,10.289 15.871,9.959 15.639,9.705C15.414,9.46 15.116,9.322 14.809,9.292C14.848,8.935 14.741,8.564 14.48,8.278C14.289,8.069 14.044,7.939 13.786,7.886C13.786,7.872 13.789,7.859 13.789,7.846C13.805,7.5 13.685,7.17 13.453,6.916C13.22,6.662 12.902,6.513 12.556,6.498C12.486,6.495 12.417,6.499 12.349,6.506C12.315,6.245 12.203,6 12.023,5.802C11.541,5.276 10.722,5.24 10.196,5.721L9.804,6.08C9.65,6.22 9.536,6.393 9.466,6.583L8.453,5.571L10.188,3.836C10.439,3.584 10.577,3.25 10.577,2.893C10.577,2.536 10.439,2.201 10.188,1.95L9.41,1.172C9.159,0.921 8.824,0.783 8.467,0.783C8.11,0.783 7.776,0.921 7.524,1.172L7.491,1.205L6.613,0.327C6.177,-0.109 5.466,-0.109 5.03,0.327L4.12,1.237L3.778,0.895C3.507,0.623 3.066,0.623 2.795,0.895L1.773,1.916C1.502,2.187 1.502,2.628 1.773,2.899L2.116,3.242L1.206,4.152C0.995,4.363 0.879,4.644 0.879,4.943C0.879,5.243 0.995,5.524 1.206,5.735L2.084,6.613L2.05,6.646C1.799,6.898 1.661,7.232 1.661,7.589C1.661,7.946 1.8,8.281 2.05,8.532L2.829,9.31C3.08,9.561 3.415,9.699 3.771,9.699C4.128,9.699 4.463,9.561 4.714,9.31L6.449,7.575L6.864,7.99C6.845,8.01 6.826,8.03 6.808,8.051L5.768,9.262C5.605,9.453 5.486,9.682 5.425,9.927L4.807,12.408C4.787,12.475 4.771,12.542 4.759,12.609L0.104,18.101C-0.052,18.284 -0.03,18.56 0.155,18.716C0.237,18.785 0.337,18.819 0.436,18.819C0.561,18.819 0.683,18.767 0.77,18.665L5.504,13.08C5.507,13.077 5.508,13.074 5.51,13.072C5.522,13.058 5.531,13.043 5.541,13.027C5.546,13.019 5.553,13.01 5.557,13.002C5.566,12.986 5.572,12.97 5.578,12.953C5.581,12.944 5.586,12.934 5.589,12.924C5.593,12.91 5.595,12.896 5.598,12.882C5.601,12.868 5.604,12.855 5.606,12.842C5.606,12.841 5.606,12.84 5.606,12.839C5.612,12.779 5.625,12.718 5.644,12.658L6.273,10.138C6.302,10.024 6.357,9.917 6.432,9.83L7.472,8.618C7.533,8.547 7.614,8.497 7.706,8.475L8.393,8.31C8.533,8.276 8.676,8.31 8.786,8.404C8.854,8.461 8.902,8.537 8.927,8.622C8.991,8.844 8.876,9.075 8.66,9.16L8.167,9.354C7.778,9.506 7.482,9.838 7.373,10.242L6.899,12.017C6.836,12.25 6.975,12.49 7.207,12.552C7.441,12.615 7.679,12.476 7.742,12.243L8.217,10.468C8.253,10.332 8.354,10.219 8.486,10.167L8.886,10.01L11.967,13.091L11.274,13.849C10.864,14.298 10.389,14.678 9.861,14.979L9.582,15.138C9.375,15.231 9.157,15.289 8.933,15.31C8.923,15.311 8.913,15.314 8.902,15.316C8.885,15.319 8.868,15.321 8.851,15.326C8.838,15.33 8.825,15.336 8.812,15.341C8.799,15.346 8.785,15.351 8.773,15.358C8.759,15.365 8.747,15.374 8.734,15.382C8.723,15.389 8.712,15.396 8.701,15.404C8.687,15.416 8.674,15.429 8.661,15.443C8.654,15.45 8.647,15.455 8.641,15.462L3.77,21.208C3.614,21.392 3.637,21.667 3.821,21.823C3.903,21.893 4.003,21.927 4.103,21.927C4.227,21.927 4.35,21.875 4.436,21.773L9.198,16.156C9.462,16.114 9.718,16.037 9.963,15.924L10.294,15.738C10.901,15.391 11.448,14.954 11.919,14.438L12.585,13.709L13.424,14.548L11.689,16.283C11.169,16.803 11.169,17.648 11.689,18.168L12.467,18.946C12.727,19.206 13.069,19.336 13.41,19.336C13.752,19.336 14.093,19.206 14.353,18.946L14.387,18.912L15.265,19.79C15.476,20.001 15.757,20.117 16.056,20.117C16.356,20.117 16.637,20.001 16.848,19.79L17.758,18.88L18.101,19.223C18.236,19.359 18.414,19.426 18.592,19.426C18.77,19.426 18.948,19.359 19.084,19.223L20.105,18.201C20.376,17.931 20.376,17.49 20.105,17.219L19.763,16.876L20.673,15.966C21.109,15.53 21.109,14.82 20.673,14.384L20.669,14.385ZM14.401,10.267C14.482,10.194 14.583,10.158 14.684,10.158C14.798,10.158 14.912,10.203 14.994,10.294C15.069,10.376 15.108,10.483 15.103,10.595C15.098,10.708 15.05,10.812 14.968,10.887L14.615,11.21C14.533,11.285 14.425,11.323 14.313,11.318C14.201,11.313 14.097,11.266 14.022,11.184C13.866,11.013 13.878,10.747 14.049,10.591L14.401,10.267ZM13.526,8.731C13.64,8.731 13.753,8.777 13.836,8.868C13.992,9.038 13.98,9.305 13.809,9.46L13.443,9.795C13.362,9.87 13.254,9.909 13.142,9.904C13.029,9.899 12.926,9.851 12.851,9.769C12.776,9.687 12.737,9.58 12.742,9.467C12.747,9.354 12.795,9.251 12.877,9.176L13.243,8.841C13.323,8.768 13.425,8.731 13.526,8.731ZM12.215,7.478C12.293,7.408 12.392,7.37 12.498,7.37C12.504,7.37 12.511,7.37 12.517,7.37C12.63,7.375 12.733,7.423 12.809,7.504C12.884,7.586 12.922,7.694 12.917,7.806C12.912,7.916 12.866,8.016 12.788,8.091C12.742,8.123 12.696,8.158 12.654,8.197L12.288,8.532C12.244,8.572 12.204,8.615 12.167,8.661L11.949,8.86C11.778,9.016 11.512,9.005 11.356,8.834C11.281,8.752 11.243,8.644 11.247,8.532C11.252,8.42 11.3,8.316 11.382,8.241L12.215,7.478ZM10.393,6.725L10.785,6.365C10.866,6.292 10.967,6.256 11.068,6.256C11.182,6.256 11.296,6.301 11.378,6.392C11.453,6.474 11.492,6.581 11.487,6.694C11.482,6.806 11.434,6.91 11.352,6.985L10.959,7.344C10.788,7.5 10.523,7.488 10.366,7.318C10.291,7.235 10.253,7.128 10.258,7.016C10.263,6.903 10.31,6.799 10.393,6.725ZM3.286,1.638L3.495,1.848L2.725,2.618L2.516,2.408L3.286,1.638ZM1.823,5.117C1.777,5.072 1.752,5.01 1.752,4.943C1.752,4.877 1.777,4.815 1.823,4.769L5.647,0.945C5.695,0.898 5.758,0.874 5.821,0.874C5.885,0.874 5.948,0.898 5.996,0.945L6.874,1.823L2.701,5.996L1.823,5.117ZM4.096,8.693C4.01,8.779 3.895,8.826 3.771,8.826C3.647,8.826 3.532,8.779 3.446,8.693L2.667,7.915C2.581,7.828 2.534,7.713 2.534,7.589C2.534,7.466 2.581,7.35 2.667,7.264L2.701,7.23L5.404,4.527L8.141,1.79C8.227,1.704 8.343,1.656 8.467,1.656C8.59,1.656 8.706,1.703 8.792,1.79L9.57,2.568C9.656,2.654 9.704,2.77 9.704,2.893C9.704,3.017 9.656,3.133 9.57,3.219L4.096,8.693ZM9.592,9.483C9.803,9.171 9.877,8.773 9.765,8.383C9.693,8.131 9.549,7.908 9.35,7.739C9.03,7.467 8.595,7.364 8.188,7.462L7.691,7.582L7.16,7.051L7.93,6.282L10.388,8.74C10.425,8.994 10.536,9.231 10.712,9.424C10.92,9.651 11.192,9.785 11.475,9.827L13.245,11.596C13.284,11.658 13.328,11.717 13.379,11.773C13.456,11.857 13.543,11.929 13.637,11.989L14.81,13.162L14.041,13.932L9.592,9.483ZM13.767,18.297L13.734,18.33C13.555,18.51 13.263,18.51 13.083,18.33L12.305,17.552C12.126,17.373 12.126,17.081 12.305,16.902L14.04,15.167L16.045,13.163L17.78,11.428C17.869,11.338 17.987,11.293 18.105,11.293C18.223,11.293 18.341,11.338 18.431,11.428L19.209,12.206C19.295,12.292 19.342,12.408 19.342,12.531C19.342,12.655 19.295,12.771 19.209,12.857L17.376,14.689L13.767,18.297ZM18.59,18.481L18.381,18.272L19.15,17.503L19.36,17.712L18.59,18.481ZM20.052,15.351L16.228,19.175C16.134,19.269 15.974,19.269 15.88,19.175L15.002,18.297L16.333,16.966L19.174,14.125L20.052,15.003C20.147,15.097 20.147,15.256 20.052,15.351Z"
android:fillColor="#ffffff" />
</vector>
Loading

0 comments on commit 3ecfe90

Please sign in to comment.