From 69961b74e727604fa7eb5a6ffe3ad09e7f9acb9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Fern=C3=A1ndez=20Garc=C3=ADa?= <43956318+Luisofo@users.noreply.github.com> Date: Tue, 2 Nov 2021 17:59:46 +0100 Subject: [PATCH 1/4] ARREGLO idx 0 --- .../tlaabs/timetableview/TimetableView.java | 55 ++++++++++--------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java b/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java index 8f1644f..ac2f85b 100644 --- a/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java +++ b/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java @@ -149,35 +149,38 @@ public void add(ArrayList schedules) { add(schedules, -1); } - private void add(final ArrayList schedules, int specIdx) { - final int count = specIdx < 0 ? ++stickerCount : specIdx; + private void add(final ArrayList schedules, int specIdx) { + int count = specIdx < 0 ? ++stickerCount : specIdx; Sticker sticker = new Sticker(); for (Schedule schedule : schedules) { - TextView tv = new TextView(context); - - RelativeLayout.LayoutParams param = createStickerParam(schedule); - tv.setLayoutParams(param); - tv.setPadding(10, 0, 10, 0); - tv.setText(schedule.getClassTitle() + "\n" + schedule.getClassPlace()); - tv.setTextColor(Color.parseColor("#FFFFFF")); - tv.setTextSize(TypedValue.COMPLEX_UNIT_DIP, DEFAULT_STICKER_FONT_SIZE_DP); - tv.setTypeface(null, Typeface.BOLD); - - tv.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - if(stickerSelectedListener != null) - stickerSelectedListener.OnStickerSelected(count, schedules); - } - }); - - sticker.addTextView(tv); - sticker.addSchedule(schedule); - stickers.put(count, sticker); - stickerBox.addView(tv); + TextView tv = new TextView(context); + + RelativeLayout.LayoutParams param = createStickerParam(schedule); + tv.setLayoutParams(param); + tv.setPadding(10, 0, 10, 0); + tv.setText(schedule.getClassTitle() + "\n" + schedule.getClassPlace()); + tv.setTextColor(Color.parseColor("#FFFFFF")); + tv.setTextSize(TypedValue.COMPLEX_UNIT_DIP, DEFAULT_STICKER_FONT_SIZE_DP); + tv.setTypeface(null, Typeface.BOLD); + + int finalCount = count; + tv.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + if(stickerSelectedListener != null){ + stickerSelectedListener.OnStickerSelected(finalCount, schedules); + } + } + }); + + sticker.addTextView(tv); + sticker.addSchedule(schedule); + stickers.put(count, sticker); + stickerBox.addView(tv); + count = count + 1; + } + setStickerColor(); } - setStickerColor(); - } public String createSaveData() { return SaveManager.saveSticker(stickers); From 81a75c9d82b49bc6babdbf53669bf63066017daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Fern=C3=A1ndez=20Garc=C3=ADa?= <43956318+Luisofo@users.noreply.github.com> Date: Tue, 2 Nov 2021 18:36:04 +0100 Subject: [PATCH 2/4] Update TimetableView.java --- .../java/com/github/tlaabs/timetableview/TimetableView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java b/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java index ac2f85b..14cc382 100644 --- a/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java +++ b/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java @@ -149,7 +149,7 @@ public void add(ArrayList schedules) { add(schedules, -1); } - private void add(final ArrayList schedules, int specIdx) { + private void add(final ArrayList schedules, int specIdx) { int count = specIdx < 0 ? ++stickerCount : specIdx; Sticker sticker = new Sticker(); for (Schedule schedule : schedules) { From f9a9889315b13ab0f57f3abaaef5185594901061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Fern=C3=A1ndez=20Garc=C3=ADa?= <43956318+Luisofo@users.noreply.github.com> Date: Tue, 2 Nov 2021 18:45:05 +0100 Subject: [PATCH 3/4] Update TimetableView.java --- .../java/com/github/tlaabs/timetableview/TimetableView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java b/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java index 14cc382..cc1345f 100644 --- a/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java +++ b/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java @@ -150,7 +150,7 @@ public void add(ArrayList schedules) { } private void add(final ArrayList schedules, int specIdx) { - int count = specIdx < 0 ? ++stickerCount : specIdx; + final int count = specIdx < 0 ? ++stickerCount : specIdx; Sticker sticker = new Sticker(); for (Schedule schedule : schedules) { TextView tv = new TextView(context); @@ -163,7 +163,7 @@ private void add(final ArrayList schedules, int specIdx) { tv.setTextSize(TypedValue.COMPLEX_UNIT_DIP, DEFAULT_STICKER_FONT_SIZE_DP); tv.setTypeface(null, Typeface.BOLD); - int finalCount = count; + final int finalCount = count; tv.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { From 841dd513eb62d0fd3e61e783ed19512bbb5c02a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Fern=C3=A1ndez=20Garc=C3=ADa?= <43956318+Luisofo@users.noreply.github.com> Date: Tue, 2 Nov 2021 18:46:55 +0100 Subject: [PATCH 4/4] Update TimetableView.java --- .../java/com/github/tlaabs/timetableview/TimetableView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java b/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java index cc1345f..b636657 100644 --- a/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java +++ b/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java @@ -150,7 +150,7 @@ public void add(ArrayList schedules) { } private void add(final ArrayList schedules, int specIdx) { - final int count = specIdx < 0 ? ++stickerCount : specIdx; + int count = specIdx < 0 ? ++stickerCount : specIdx; Sticker sticker = new Sticker(); for (Schedule schedule : schedules) { TextView tv = new TextView(context);