Skip to content

Commit 3f558c2

Browse files
committed
[DELETE] 알람 항목 삭제
1 parent 67c2e74 commit 3f558c2

File tree

4 files changed

+7
-37
lines changed

4 files changed

+7
-37
lines changed

.idea/misc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/com/PastPest/competition1/ReportHistory/ReportHistoryAdapter.java

-2
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,9 @@ public View getView(int position, View convertView, ViewGroup parent) {
4646

4747
TextView title = (TextView) convertView.findViewById(R.id.title); //피해신고 제목
4848
TextView date = (TextView) convertView.findViewById(R.id.date); //신고 날짜
49-
TextView status = (TextView) convertView.findViewById(R.id.status); //답변 상태
5049

5150
title.setText(reportHistoryList.get(position).getTitle()); //화면에 데이터 표시
5251
date.setText(reportHistoryList.get(position).getDate());
53-
status.setText("답변 대기중");
5452

5553
return convertView;
5654
}

app/src/main/res/layout/fragment_mypage.xml

-10
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,6 @@
5252
android:text="병해충 피해 신고 내역"
5353
android:textAlignment="viewStart" />
5454

55-
<androidx.appcompat.widget.AppCompatButton
56-
android:id="@+id/alarm"
57-
android:layout_width="match_parent"
58-
android:layout_height="wrap_content"
59-
android:paddingHorizontal="10dp"
60-
android:text="알림 설정"
61-
android:textAlignment="viewStart"
62-
android:stateListAnimator="@null"
63-
android:backgroundTint="@color/white"/>
64-
6555
<androidx.appcompat.widget.AppCompatButton
6656
android:id="@+id/password"
6757
android:layout_width="match_parent"

app/src/main/res/layout/item_report_history.xml

+6-24
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,12 @@
1616
android:textStyle="bold"
1717
android:padding="10dp"/>
1818

19-
<LinearLayout
20-
android:layout_width="match_parent"
21-
android:layout_height="match_parent"
22-
android:orientation="horizontal">
23-
24-
<TextView
25-
android:id="@+id/date"
26-
android:layout_width="wrap_content"
27-
android:layout_height="wrap_content"
28-
android:padding="10dp"
29-
android:text="date" />
30-
31-
<View
32-
android:layout_width="0dp"
33-
android:layout_height="0dp"
34-
android:layout_weight="1"/>
35-
36-
<TextView
37-
android:id="@+id/status"
38-
android:layout_width="wrap_content"
39-
android:layout_height="wrap_content"
40-
android:padding="10dp"
41-
android:text="status"/>
42-
</LinearLayout>
19+
<TextView
20+
android:id="@+id/date"
21+
android:layout_width="wrap_content"
22+
android:layout_height="wrap_content"
23+
android:padding="10dp"
24+
android:text="date" />
4325

4426
</LinearLayout>
4527
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)