Skip to content

Commit

Permalink
problem list coloured
Browse files Browse the repository at this point in the history
  • Loading branch information
@matveevk
matveevk committed Apr 19, 2017
1 parent 2ce15b4 commit 80d98fe
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 12 deletions.
20 changes: 13 additions & 7 deletions app/src/main/java/com/example/root/prepolymp/Problem.java
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
package com.example.root.prepolymp;

import java.util.ArrayList;

public class Problem {
public int id = 0;
public String text = "Текст недоступен";
String ans = "";
String topic = "Не указано";
int form = 9;
int diff = 3;
String origins = "Неизвестно";
public String ans = "";
public String topic = "Не указано";
public int form = 9;
public int diff = 3;
public String origins = "Неизвестно";

Problem() {
}
Expand All @@ -33,6 +31,14 @@ public class Problem {
this.diff = diff;
}

Problem(int id, String text, String ans, String topic, int form) {
this.id = id;
this.text = text;
this.ans = ans;
this.topic = topic;
this.form = form;
}

Problem(int id, String text, String ans, String topic) {
this.id = id;
this.text = text;
Expand Down
59 changes: 57 additions & 2 deletions app/src/main/java/com/example/root/prepolymp/Start.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,67 @@ protected void onCreate(Bundle savedInstanceState) {
isLater.add(false);
isSolved.add(false);

problems.add(new Problem(2, "Посчитайте 2 + 3", "5", "алгебра"));
problems.add(new Problem(2, "Посчитайте 25 + 3", "28", "алгебра", 10));
isFavourite.add(false);
isLater.add(false);
isSolved.add(false);

problems.add(new Problem(3, "Посчитайте 25 + 3", "28", "алгебра"));
problems.add(new Problem(3, "Посчитайте 25 + 3", "28", "геометрия", 11));
isFavourite.add(false);
isLater.add(false);
isSolved.add(false);

problems.add(new Problem(4, "Посчитайте 25 + 3", "28", "алгебра", 9));
isFavourite.add(false);
isLater.add(false);
isSolved.add(false);

problems.add(new Problem(5, "Посчитайте 25 + 3", "28", "комбинаторика", 8));
isFavourite.add(false);
isLater.add(false);
isSolved.add(false);

problems.add(new Problem(6, "Посчитайте 25 + 3", "28", "геометрия", 10));
isFavourite.add(false);
isLater.add(false);
isSolved.add(false);

problems.add(new Problem(7, "Посчитайте 25 + 3", "28", "алгебра", 10));
isFavourite.add(false);
isLater.add(false);
isSolved.add(false);

problems.add(new Problem(8, "Посчитайте 25 + 3", "28", "комбинаторика", 11));
isFavourite.add(false);
isLater.add(false);
isSolved.add(false);

problems.add(new Problem(9, "Посчитайте 25 + 3", "28", "комбинаторика", 10));
isFavourite.add(false);
isLater.add(false);
isSolved.add(false);

problems.add(new Problem(10, "Посчитайте 25 + 3", "28", "геометрия", 10));
isFavourite.add(false);
isLater.add(false);
isSolved.add(false);

problems.add(new Problem(11, "Посчитайте 25 + 3", "28", "алгебра", 8));
isFavourite.add(false);
isLater.add(false);
isSolved.add(false);

problems.add(new Problem(12, "Посчитайте 25 + 3", "28", "геометрия", 10));
isFavourite.add(false);
isLater.add(false);
isSolved.add(false);

problems.add(new Problem(13, "Посчитайте 25 + 3", "28", "геометрия", 9));
isFavourite.add(false);
isLater.add(false);
isSolved.add(false);

problems.add(new Problem(14, "Посчитайте 25 + 3", "28", "алгебра", 8));
isFavourite.add(false);
isLater.add(false);
isSolved.add(false);
Expand Down
33 changes: 30 additions & 3 deletions app/src/main/java/com/example/root/prepolymp/fragments/ProblemList.java
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,27 @@
package com.example.root.prepolymp.fragments;

import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.TextView;

import com.example.root.prepolymp.Problem;
import com.example.root.prepolymp.ProblemActivity;
import com.example.root.prepolymp.R;

import java.util.ArrayList;

import static com.example.root.prepolymp.Start.isSolved;
import static com.example.root.prepolymp.Start.problems;

public class ProblemList extends Fragment {
Expand All @@ -34,14 +39,36 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
getActivity().setTitle("Задачи");

ArrayList<String> probText = new ArrayList<>();
final ArrayList<String> probText = new ArrayList<>();
for (Problem s : problems) {
probText.add("Задача № " + s.id);
String ss = "№ " + s.id + " - ";
if (s.topic == "алгебра") {
ss += ("<font size=3 color=#C162EA>алг</font>");
} else if (s.topic == "геометрия") {
ss += ("<font size=3 color=#2675BF>геом</font>");
} else {
ss += ("<font size=3 color=#499351>комб</font>");
}
ss += " " + s.form + " класс";
probText.add(ss);
}

ListView listView = (ListView)view.findViewById(R.id.list_problems);
ArrayAdapter<String> arrayAdapter = new ArrayAdapter<String>(getActivity().getApplicationContext(),
R.layout.custom_textview, probText);
R.layout.custom_textview, probText) {
@NonNull
@Override
public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
TextView tv = (TextView)super.getView(position, convertView, parent);
if (isSolved.get(position)) {
tv.setText(Html.fromHtml(probText.get(position)) + " (решено)");
tv.setTextColor(Color.GRAY);
} else {
tv.setText(Html.fromHtml(probText.get(position)));
}
return tv;
}
};
listView.setAdapter(arrayAdapter);
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
Expand Down

0 comments on commit 80d98fe

Please sign in to comment.