Skip to content

I
intern-amin-qms
Commit b4ee0f71 authored by Amin's avatar Amin
Browse files
Options

add history activity and ui

parent 39d90132
Show whitespace changes
Inline Side-by-side
Showing with 466 additions and 23 deletions
app/src/main/AndroidManifest.xml
View file @ b4ee0f71
...@@ -12,6 +12,12 @@ ...@@ -12,6 +12,12 @@
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.Qms"> android:theme="@style/Theme.Qms">
<activity <activity
android:name=".AddInfo"
android:exported="false" />
<activity
android:name=".History"
android:exported="false" />
<activity
android:name=".IssueDetails" android:name=".IssueDetails"
android:exported="false" /> android:exported="false" />
<activity <activity
......
app/src/main/java/com/example/qms/AddInfo.java 0 → 100644
View file @ b4ee0f71
package com.example.qms;
import android.os.Bundle;
import androidx.activity.EdgeToEdge;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
public class AddInfo extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
EdgeToEdge.enable(this);
setContentView(R.layout.activity_add_info);
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
return insets;
});
}
}
\ No newline at end of file
app/src/main/java/com/example/qms/History.java 0 → 100644
View file @ b4ee0f71
package com.example.qms;
import android.content.Intent;
import android.os.Bundle;
import android.widget.ImageButton;
import androidx.activity.EdgeToEdge;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
public class History extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
EdgeToEdge.enable(this);
setContentView(R.layout.activity_history);
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
return insets;
});
ImageButton addInfo = findViewById(R.id.add_info_icon);
addInfo.setOnClickListener(v -> {
Intent intent = new Intent(History.this, AddInfo.class);
startActivity(intent);
});
}
}
\ No newline at end of file
app/src/main/java/com/example/qms/IssueDetails.java
View file @ b4ee0f71
package com.example.qms; package com.example.qms;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.widget.ImageButton; import android.widget.ImageButton;
...@@ -23,6 +24,12 @@ public class IssueDetails extends AppCompatActivity { ...@@ -23,6 +24,12 @@ public class IssueDetails extends AppCompatActivity {
}); });
ImageButton backButton = findViewById(R.id.backButton); ImageButton backButton = findViewById(R.id.backButton);
ImageButton historyButton = findViewById(R.id.history_button);
historyButton.setOnClickListener(v -> {
Intent intent = new Intent(IssueDetails.this, History.class);
startActivity(intent);
});
backButton.setOnClickListener(v -> { backButton.setOnClickListener(v -> {
onBackPressed(); onBackPressed();
......
app/src/main/res/drawable/history_badge.xml 0 → 100644
View file @ b4ee0f71
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/black" />
<stroke android:width="1dp" android:color="@color/black" />
<corners android:radius="40dp" />
</shape>
app/src/main/res/layout/activity_add_info.xml 0 → 100644
View file @ b4ee0f71
<?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:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".AddInfo">
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_history.xml 0 → 100644
View file @ b4ee0f71
<?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:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/light_grey"
tools:context=".History">
<LinearLayout
android:id="@+id/top_nav"
android:layout_width="match_parent"
android:layout_height="117dp"
android:background="@color/primary"
android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<View
android:layout_width="match_parent"
android:layout_height="59dp" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="59dp">
<ImageButton
android:id="@+id/backButton"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="16dp"
android:background="@null"
android:src="@drawable/arrow_left"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/titleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="History"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/add_info_icon"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginEnd="16dp"
android:background="@null"
android:src="@drawable/add_info_icon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
<ScrollView
android:layout_width="0dp"
android:layout_height="0dp"
android:fillViewport="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/top_nav">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="21dp"
android:paddingBottom="32dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="20dp"
android:textSize="19sp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:text="04 Jan 2025"
android:textSize="19sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/history_badge"
android:paddingHorizontal="10dp"
android:paddingVertical="10dp"
android:text="12:24 PM"
android:textColor="@color/white"
android:textSize="17sp"
android:textStyle="bold" />
<View
android:layout_width="3dp"
android:layout_height="match_parent"
android:background="@color/timeline_grey" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginBottom="15dp"
android:background="@drawable/card_border_issue"
android:orientation="vertical"
android:padding="15dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="15dp"
android:src="@drawable/round_grey" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:text="Project Supervisor"
android:textSize="19sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="@color/light_grey" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10dp"
android:text="Work will need to be done by 05 Jan 2024"
android:textSize="19sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/history_badge"
android:paddingHorizontal="10dp"
android:paddingVertical="10dp"
android:text="12:24 PM"
android:textColor="@color/white"
android:textSize="17sp"
android:textStyle="bold" />
<View
android:layout_width="3dp"
android:layout_height="match_parent"
android:background="@color/timeline_grey" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginBottom="15dp"
android:background="@drawable/card_border_issue"
android:orientation="vertical"
android:padding="15dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="15dp"
android:src="@drawable/round_grey" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:text="Project Supervisor"
android:textSize="19sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="@color/light_grey" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10dp"
android:text="Work will need to be done by 05 Jan 2024"
android:textSize="19sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/history_badge"
android:paddingHorizontal="10dp"
android:paddingVertical="10dp"
android:text="12:24 PM"
android:textColor="@color/white"
android:textSize="17sp"
android:textStyle="bold" />
<View
android:layout_width="3dp"
android:layout_height="match_parent"
android:background="@color/timeline_grey" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginBottom="15dp"
android:background="@drawable/card_border_issue"
android:orientation="vertical"
android:padding="15dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="15dp"
android:src="@drawable/round_grey" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:text="Project Supervisor"
android:textSize="19sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="@color/light_grey" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10dp"
android:text="Work will need to be done by 05 Jan 2024"
android:textSize="19sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_issue_details.xml
View file @ b4ee0f71
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".IssueDetails"> tools:context=".IssueDetails">
<!-- Top Navigation -->
<LinearLayout <LinearLayout
android:id="@+id/top_nav" android:id="@+id/top_nav"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -59,26 +60,35 @@ ...@@ -59,26 +60,35 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>
<!-- Image -->
<ImageView <ImageView
android:id="@+id/image" android:id="@+id/image"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="220dp" android:layout_height="220dp"
android:src="@drawable/home_details" android:src="@drawable/home_details"
app:layout_constraintStart_toStartOf="parent" android:scaleType="centerCrop"
app:layout_constraintTop_toBottomOf="@+id/top_nav" app:layout_constraintTop_toBottomOf="@+id/top_nav"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<!-- Scrollable Content -->
<ScrollView
android:layout_width="0dp"
android:layout_height="0dp"
android:fillViewport="true"
app:layout_constraintTop_toBottomOf="@id/image"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:scaleType="centerCrop"/> app:layout_constraintBottom_toBottomOf="parent">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent" android:paddingHorizontal="21dp"
app:layout_constraintTop_toBottomOf="@+id/image" android:paddingBottom="32dp">
android:paddingHorizontal="21dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -96,36 +106,29 @@ ...@@ -96,36 +106,29 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="ASH1-L011-N826" android:text="ASH1-L011-N826"
android:textStyle="bold" android:textStyle="bold"
android:textSize="24dp" android:textSize="24sp"
android:layout_marginBottom="5dp"/> android:layout_marginBottom="5dp"/>
<Button <Button
android:layout_width="139dp" android:layout_width="139dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:backgroundTint="@color/yellow" android:backgroundTint="@color/yellow"
android:clickable="true"
android:elevation="20dp"
android:focusable="true"
android:text="WIP" android:text="WIP"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="17sp" android:textSize="17sp"
android:elevation="20dp"
app:cornerRadius="40dp" /> app:cornerRadius="40dp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!-- DETAILS SECTION -->
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginTop="15dp"> android:layout_marginTop="15dp">
<!-- Created Date -->
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -146,7 +149,6 @@ ...@@ -146,7 +149,6 @@
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="20sp" android:textSize="20sp"
android:layout_marginStart="15dp"/> android:layout_marginStart="15dp"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -287,10 +289,7 @@ ...@@ -287,10 +289,7 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/values/colors.xml
View file @ b4ee0f71
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
<resources> <resources>
<color name="black">#FF000000</color> <color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color> <color name="white">#FFFFFFFF</color>
<color name="timeline_grey">#999999</color>
//qms //qms
<color name="primary">#0E7392</color> <color name="primary">#0E7392</color>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment