Skip to content

Commit

Permalink
Bugs fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@ArjunLuam
ArjunLuam committed Jun 21, 2020
1 parent 82752af commit 7955c77
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 37 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/com/example/mask_detector/About_us.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class About_us extends AppCompatActivity {

private String[] names = new String[]{"Shivam Kumar", "Arjun Anand", "Reetvik Chatterjee", "Harit Yadav"};
private String[] descriptions = new String[]{"", "", "", "", "", "", ""};
private int[] images = new int[]{R.drawable.ic_avatar, R.drawable.arjun, R.drawable.ic_avatar, R.drawable.ic_avatar};
private int[] images = new int[]{R.drawable.shivam, R.drawable.arjun, R.drawable.reetvik, R.drawable.eveator};

private ListView listView;

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/example/mask_detector/fragments/HomeFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
}
});
v.findViewById(R.id.helpCard5).setOnClickListener(help -> {
Intent intent = new Intent(Intent.ACTION_CALL, Uri.parse("tel:" + "1075"));
Intent intent = new Intent(Intent.ACTION_DIAL);
intent.setData(Uri.parse("tel:" + "1075"));
startActivity(intent);
});
welcome = v.findViewById(R.id.welcome);
Expand Down
Binary file added app/src/main/res/drawable-v24/eveator.jpg
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 added app/src/main/res/drawable-v24/reetvik.jpg
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 added app/src/main/res/drawable-v24/shivam.jpg
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 added app/src/main/res/drawable/heart.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 36 additions & 32 deletions app/src/main/res/layout/fragment_home.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,36 +13,37 @@

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


<androidx.cardview.widget.CardView
android:id="@+id/cardView2"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_height="180dp"
android:layout_marginStart="20dp"
android:layout_marginTop="140dp"
android:layout_marginTop="40dp"
android:layout_marginEnd="20dp"
app:cardBackgroundColor="#66b3e5fc"
app:cardCornerRadius="5dp"
app:cardCornerRadius="24dp"
app:cardElevation="3dp"
app:cardPreventCornerOverlap="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toBottomOf="@+id/welcome">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="#66b3e5fc">

<TextView
android:id="@+id/tvAppointment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_width="356dp"
android:layout_height="51dp"
android:layout_marginStart="16dp"
android:layout_marginTop="48dp"
android:drawableStart="@drawable/cam"
android:drawablePadding="15dp"
android:paddingLeft="19dp"
android:text="Monitor Surveillance Cameras (Admin)"
android:textSize="18sp"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -54,29 +55,29 @@
<androidx.cardview.widget.CardView
android:id="@+id/cardView3"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_height="180dp"
android:layout_marginStart="20dp"
android:layout_marginTop="25dp"
android:layout_marginEnd="20dp"
app:cardBackgroundColor="#66b39ddb"
app:cardCornerRadius="5dp"
app:cardElevation="3dp"
app:cardCornerRadius="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cardView2">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="#66b39ddb">

<TextView
android:id="@+id/tvReadArticle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_height="64dp"
android:layout_marginTop="48dp"
android:drawableStart="@drawable/document"
android:drawablePadding="15dp"
android:paddingLeft="19dp"
android:paddingRight="12dp"
android:text="Share Medical Documents (Long Press on Documents)"
android:textSize="18sp"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -87,28 +88,29 @@
<androidx.cardview.widget.CardView
android:id="@+id/helpCard4"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_height="180dp"
android:layout_marginStart="20dp"
android:layout_marginTop="25dp"
android:layout_marginEnd="20dp"
app:cardBackgroundColor="#6680cbc4"
app:cardCornerRadius="5dp"
app:cardElevation="3dp"

app:cardCornerRadius="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cardView3">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="#6680cbc4"
>

<TextView
android:id="@+id/paytm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginStart="64dp"
android:layout_marginTop="56dp"
android:drawableStart="@drawable/ic_tick"
android:drawablePadding="15sp"
android:text="Pay Your Medical Bills"
Expand All @@ -121,27 +123,29 @@
<androidx.cardview.widget.CardView
android:id="@+id/helpCard5"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_height="180dp"
android:layout_marginStart="20dp"
android:layout_marginTop="25dp"
android:layout_marginEnd="20dp"
android:layout_marginBottom="20dp"
app:cardBackgroundColor="#6680cbc4"
app:cardCornerRadius="5dp"
app:cardElevation="3dp"
app:cardCornerRadius="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/helpCard4">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="#66b3e5fc">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginStart="60dp"
android:layout_marginTop="56dp"
android:drawableStart="@drawable/ic_warning"
android:drawablePadding="15dp"
android:text="Contact / Call Helpline"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/fragment_login_option.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<!--<ImageView
<ImageView
android:id="@+id/iv_space"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:src=
android:src="@drawable/heart"
app:layout_constraintBottom_toBottomOf="@id/iv_dots"
app:layout_constraintDimensionRatio="16:9"
app:layout_constraintEnd_toEndOf="@id/iv_dots"
Expand All @@ -43,7 +43,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:alpha="0.9"
android:text="Welcome to "
android:text="Welcome to Sehatmand"
app:layout_constraintBottom_toTopOf="@+id/tvBody"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down

0 comments on commit 7955c77

Please sign in to comment.