Skip to content

Commit 1302a19

Browse files
committed
Newest updated version of application 07_05_2021 ...
1 parent 4fe1ebd commit 1302a19

13 files changed

Lines changed: 438 additions & 238 deletions

app/src/main/java/com/example/project_28_02_2021/DataBaseHelper.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
public class DataBaseHelper extends SQLiteOpenHelper {
1111

1212
protected final ArrayList<String> rows = new ArrayList<>();
13-
protected final Context context;
13+
protected final Context context;
1414

1515
public static String deleteQuery
1616
= "delete from sites_table where name = '%s';";
@@ -38,11 +38,14 @@ public void addSite(Site site) {
3838
@Override
3939
public void onCreate(SQLiteDatabase db) {
4040
db.execSQL(createQuery);
41-
for (String row : rows) { db.execSQL(row); }
41+
for (String row : rows) {
42+
db.execSQL(row);
43+
}
4244
}
4345

4446
@Override
45-
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {}
47+
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
48+
}
4649

4750
public ArrayList<Site> getSites() {
4851
Cursor cursor = getReadableDatabase().rawQuery(selectQuery, null);
@@ -54,14 +57,6 @@ public ArrayList<Site> getSites() {
5457
String url = cursor.getString(urlId);
5558
Site site = new Site(name, url, context);
5659
sites.add(site);
57-
/* boolean notAgain = true;
58-
for (Site s : Site.getSites()) {
59-
if (site.getName().equals(s.getName())) {
60-
notAgain = false;
61-
break;
62-
}
63-
}
64-
if (notAgain) { sites.add(site); } */
6560
}
6661
cursor.close();
6762
return sites;

app/src/main/java/com/example/project_28_02_2021/LikedNewsActivity.java

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
4444
deleteFile("news.xml");
4545
setDefaultSettings();
4646
return true;
47-
} else { return super.onOptionsItemSelected(item); }
47+
} else {
48+
return super.onOptionsItemSelected(item);
49+
}
4850
}
4951

5052
@Override
@@ -71,30 +73,40 @@ public boolean onContextItemSelected(MenuItem item) {
7173
(dialog, which) -> closeOptionsMenu())
7274
.setPositiveButton(R.string.str_delete_site,
7375
(dialog, which) -> {
74-
NewsRssItem removedItem = NewsRssItem.getLikedNews().get(info.position);
76+
NewsRssItem removedItem = NewsRssItem.getLikedNews().get(info.position);
7577
StringBuilder gotXml = new StringBuilder();
7678
try (InputStream inputStream = openFileInput("news.xml")) {
7779
Scanner scanner = new Scanner(inputStream);
78-
while (scanner.hasNext()) { gotXml.append(scanner.nextLine()); }
79-
} catch (IOException ignored) {}
80+
while (scanner.hasNext()) {
81+
gotXml.append(scanner.nextLine());
82+
}
83+
} catch (IOException ignored) {
84+
}
8085
deleteFile("news.xml");
8186
Document doc = Jsoup.parse(gotXml.toString(), "", Parser.xmlParser());
8287
Elements items = doc.select("item");
8388
StringBuilder resXml = new StringBuilder();
8489
String root = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
8590
String startTag = "<items>";
8691
String endTag = "</items>";
87-
try {for (Element docItem : items) {
88-
if (docItem.select("title").text().equals(removedItem.getTitle())) { continue; }
89-
resXml.append(docItem.toString()); }
90-
} catch (Exception ignored) {}
92+
try {
93+
for (Element docItem : items) {
94+
if (docItem.select("title").text().equals(removedItem.getTitle())) {
95+
continue;
96+
}
97+
resXml.append(docItem.toString());
98+
}
99+
} catch (Exception ignored) {
100+
}
91101
String res = root + startTag + resXml.toString() + endTag;
92-
try { openFileOutput("news.xml", MODE_APPEND).write(res.getBytes()); }
93-
catch (IOException ignored) {}
102+
try {
103+
openFileOutput("news.xml", MODE_APPEND).write(res.getBytes());
104+
} catch (IOException ignored) {
105+
}
94106
NewsRssItem.getLikedNews().remove(info.position);
95107
listView.setAdapter(new NewsRssItemAdapter(this,
96108
R.layout.list_item_layout, NewsRssItem.getLikedNews(), false));
97-
})
109+
})
98110
.create();
99111
alertDialog.show();
100112
}
@@ -105,16 +117,19 @@ public void setDefaultSettings() {
105117
SharedPreferences settings = getSharedPreferences(PreferenceManager.SETTINGS_NAME, MODE_MULTI_PROCESS);
106118
AdapterView.OnItemClickListener itemListener =
107119
(parent, view, position, id) -> startActivity(new Intent(Intent.ACTION_VIEW,
108-
Uri.parse(NewsRssItem.getLikedNews().get(position).getLink())));
120+
Uri.parse(NewsRssItem.getLikedNews().get(position).getLink())));
109121
listView.setOnItemClickListener(itemListener);
110122
Comparator<NewsRssItem> defaultComparator;
111123
switch (settings.getString(PreferenceManager.SORT_KEY, PreferenceManager.SORT_BY_DATE)) {
112124
case PreferenceManager.SORT_BY_DATE:
113-
defaultComparator = NewsRssItem.getComparator(NewsRssItem.ItemComparators.SORT_BY_DATE); break;
125+
defaultComparator = NewsRssItem.getComparator(NewsRssItem.ItemComparators.SORT_BY_DATE);
126+
break;
114127
case PreferenceManager.SORT_BY_SITE:
115-
defaultComparator = NewsRssItem.getComparator(NewsRssItem.ItemComparators.SORT_BY_SITE); break;
128+
defaultComparator = NewsRssItem.getComparator(NewsRssItem.ItemComparators.SORT_BY_SITE);
129+
break;
116130
case PreferenceManager.SORT_BY_SIZE:
117-
defaultComparator = NewsRssItem.getComparator(NewsRssItem.ItemComparators.SORT_BY_SIZE); break;
131+
defaultComparator = NewsRssItem.getComparator(NewsRssItem.ItemComparators.SORT_BY_SIZE);
132+
break;
118133
default:
119134
defaultComparator = (n_1, n_2) -> 0;
120135
}
@@ -128,7 +143,9 @@ protected void onCreate(Bundle savedInstanceState) {
128143
super.onCreate(savedInstanceState);
129144
setContentView(R.layout.activity_liked_news_activity);
130145
ActionBar bar = getSupportActionBar();
131-
if (bar != null) { bar.setDisplayHomeAsUpEnabled(true); }
146+
if (bar != null) {
147+
bar.setDisplayHomeAsUpEnabled(true);
148+
}
132149
listView = findViewById(R.id.liked_news_list);
133150
setDefaultSettings();
134151
registerForContextMenu(listView);

0 commit comments

Comments
 (0)