Skip to content

Commit

Permalink
UI improved, images postioned, profile button's java code commented i…
Browse files Browse the repository at this point in the history 
…n category

Signed-off-by: Prathamesh Bhagat <prathameshbhagat0608@gmail.com>
  • Loading branch information
@PrathameshBhagat
PrathameshBhagat committed Mar 11, 2024
1 parent d18b5f5 commit 0d8eb9e
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 40 deletions.
3 changes: 2 additions & 1 deletion app/src/main/java/com/example/ofywellness/Category.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public class Category extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_category);
/* his code was used to add profile log out button on click of image button which is removed
profile= findViewById(R.id.profile);
gso= new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN).requestEmail().build();
gsc= GoogleSignIn.getClient(this,gso);
Expand All @@ -32,7 +33,7 @@ protected void onCreate(Bundle savedInstanceState) {
Toast.makeText(getApplicationContext(),"Logged Out !, Signin Again ",Toast.LENGTH_SHORT).show();
});
});
});*/
}

public void returnhome(View view) {
Expand Down
Binary file added app/src/main/res/drawable/scarremoval.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable/skintreatment.png
View file
Binary file not shown.
55 changes: 30 additions & 25 deletions app/src/main/res/layout/activity_category.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@
android:id="@+id/profile_container"
android:orientation="horizontal">

<ImageView
android:id="@+id/profile"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentEnd="true"
android:background="@drawable/profile1" />

<ImageButton
android:id="@+id/heading_im6age"
android:layout_width="40dp"
Expand Down Expand Up @@ -60,14 +53,7 @@
android:textStyle="bold"
android:text="@string/home_cleaning"
android:textColor="#006666"
android:textSize="50sp"
/>
<ImageButton
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="10dp"
android:background="@drawable/skintreatment" />
android:textSize="50sp"/>
</TableRow>
</TableLayout>
</LinearLayout>
Expand Down Expand Up @@ -114,14 +100,15 @@
<ImageButton
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_margin="10dp"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:background="@drawable/haircare" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="Hair Treatment"
android:text="Transplant"
android:textAlignment="center"
android:textColor="#1E295C"
android:textStyle="bold" />
Expand All @@ -146,7 +133,8 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Floor Cleaning"
android:layout_marginBottom="10dp"
android:text="Skin Care"
android:textAlignment="center"
android:textColor="#1E295C"
android:textStyle="bold" />
Expand All @@ -171,7 +159,8 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Home Cleaning"
android:layout_marginBottom="10dp"
android:text="Shampoo"
android:textAlignment="center"
android:textColor="#1E295C"
android:textStyle="bold" />
Expand Down Expand Up @@ -206,7 +195,8 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Glass Cleaning"
android:layout_marginBottom="10dp"
android:text="Whitening"
android:textAlignment="center"
android:textColor="#1E295C"
android:textStyle="bold" />
Expand All @@ -231,7 +221,8 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Sanitation"
android:layout_marginBottom="10dp"
android:text="Mole removal"
android:textAlignment="center"
android:textColor="#1E295C"
android:textStyle="bold" />
Expand All @@ -255,16 +246,30 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Toilet Cleaning"
android:layout_marginBottom="10dp"
android:text="Hair Removal"
android:textAlignment="center"
android:textColor="#1E295C"
android:textStyle="bold" />
</LinearLayout>
</TableRow>
</HorizontalScrollView>
</TableLayout>-->

<Button
</TableLayout>
<!-- Image Of Fitness Trainer -->
<ImageButton
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_gravity="center"
android:layout_marginTop="30dp"
android:layout_marginEnd="-10dp"
android:background="@drawable/bodyshapingfullbody"
android:scaleX="0.8"
android:scaleY="1.35"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Next"
Expand Down
26 changes: 13 additions & 13 deletions app/src/main/res/layout/activity_home.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="30dp"
android:paddingBottom="10dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/profile_container"
android:orientation="horizontal">
Expand Down Expand Up @@ -143,8 +143,8 @@
<ImageView
android:id="@+id/heading_image"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="10dp"
android:layout_height="160dp"
android:layout_marginEnd="5dp"
android:layout_weight="2"
android:background="@drawable/headimage"
android:onClick="categorystart" />
Expand Down Expand Up @@ -188,7 +188,7 @@

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="136dp"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:background="#F0F0F0"
android:gravity="center"
Expand Down Expand Up @@ -490,7 +490,7 @@
android:layout_width="125dp"
android:layout_height="125dp"
android:layout_margin="10dp"
android:background="@drawable/hairremoval" />
android:background="@drawable/mole" />

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -506,7 +506,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="4.1"
android:text="4.6"
android:textStyle="bold"
android:textColor="@color/black"
android:textSize="15sp" />
Expand All @@ -524,15 +524,15 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Cloth Cleaning"
android:text="Mole Removal"
android:textStyle="bold"
android:textColor="#006666"
android:textSize="20sp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="By Om Bhatt "
android:text="By Riya Memon "
android:textColor="#49569E"
android:textStyle="bold"
android:textSize="15sp" />
Expand All @@ -557,7 +557,7 @@
android:layout_width="125dp"
android:layout_height="125dp"
android:layout_margin="10dp"
android:background="@drawable/mole" />
android:background="@drawable/yoga" />

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -573,7 +573,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="4.6"
android:text="4.1"
android:textStyle="bold"
android:textColor="@color/black"
android:textSize="15sp" />
Expand All @@ -591,15 +591,15 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Mole Removal"
android:text="Yoga"
android:textStyle="bold"
android:textColor="#006666"
android:textSize="20sp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="By Riya Memon "
android:text="By Om Bhatt "
android:textColor="#49569E"
android:textStyle="bold"
android:textSize="15sp" />
Expand All @@ -623,7 +623,7 @@
android:layout_width="125dp"
android:layout_height="125dp"
android:layout_margin="10dp"
android:background="@drawable/skintreatment"
android:background="@drawable/scarremoval"
android:onClick="categorystart" />

<LinearLayout
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
<string name="hello_first_fragment">Hello first fragment</string>
<string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
<string name="_250">₹<b><big><big>100</big></big></b>/hr</string>
<string name="home_cleaning">Home\nCleaning</string>
<string name="home_cleaning">Body\nToning </string>

</resources>

0 comments on commit 0d8eb9e

Please sign in to comment.