Skip to content

Commit a7b4b5f

Browse files
AlbatovKAlbatovK
committed
ommit
1 parent 1302a19 commit a7b4b5f

43 files changed

Lines changed: 1143 additions & 875 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.idea/compiler.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/dictionaries/User.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations.xml‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,9 @@ dependencies {
3333
implementation 'androidx.appcompat:appcompat:1.2.0'
3434
implementation 'com.google.android.material:material:1.3.0'
3535
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
36-
implementation 'org.jsoup:jsoup:1.13.1'
3736
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
38-
implementation 'androidx.navigation:navigation-fragment:2.3.5'
39-
implementation 'androidx.navigation:navigation-ui:2.3.5'
40-
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
41-
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
4237
implementation 'androidx.preference:preference:1.1.1'
38+
implementation 'org.jsoup:jsoup:1.13.1'
4339
implementation 'androidx.work:work-runtime:2.5.0'
4440
implementation 'com.squareup.picasso:picasso:2.5.2'
4541
testImplementation 'junit:junit:4.13.2'

‎app/src/main/AndroidManifest.xml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,34 @@
2222
tools:ignore="AllowBackup"
2323
tools:targetApi="m">
2424

25-
<activity android:name=".SplashActivity">
25+
<activity android:name=".activity.SplashActivity">
2626
<intent-filter>
2727
<action android:name="android.intent.action.MAIN" />
2828

2929
<category android:name="android.intent.category.LAUNCHER" />
3030
</intent-filter>
3131
</activity>
32+
3233
<activity
33-
android:name=".LikedNewsActivity"
34+
android:name=".activity.LikedNewsActivity"
3435
android:label="@string/str_liked"
35-
android:parentActivityName=".MainActivity">
36+
android:parentActivityName=".activity.MainActivity">
3637
<meta-data
3738
android:name="android.support.PARENT_ACTIVITY"
38-
android:value=".MainActivity" />
39+
android:value=".activity.MainActivity" />
3940
</activity>
41+
4042
<activity
41-
android:name=".SettingsActivity"
43+
android:name=".activity.SettingsActivity"
4244
android:label="@string/title_activity_settings" >
4345
<meta-data
4446
android:name="android.support.PARENT_ACTIVITY"
45-
android:value=".MainActivity" />
47+
android:value=".activity.MainActivity" />
4648
</activity>
49+
4750
<activity
48-
android:name=".MainActivity"
51+
android:name=".activity.MainActivity"
4952
android:label="@string/str_main_page" />
50-
</application>
5153

54+
</application>
5255
</manifest>

‎app/src/main/assets/sites_table.sql‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
insert into sites_table (name, url) values ('Habr', 'https://habr.com/ru/rss/all/all');
2-
insert into sites_table (name, url) values ('Hi-News', 'https://hi-news.ru/feed');
2+
insert into sites_table (name, url) values ('HiNews', 'https://hi-news.ru/feed');
33
insert into sites_table (name, url) values ('Ixbt News', 'https://www.ixbt.com/export/news.rss');
4-
insert into sites_table (name, url) values ('Новости Ай-Ти', 'https://novostit.com/feed');
4+
insert into sites_table (name, url) values ('Новости IT', 'https://novostit.com/feed');
55
insert into sites_table (name, url) values ('BBC Tech', 'http://feeds.bbci.co.uk/news/technology/rss.xml');
66
insert into sites_table (name, url) values ('BBC News', 'http://feeds.bbci.co.uk/news/world/rss.xml');
7-
insert into sites_table (name, url) values ('Лента.Ру', 'https://lenta.ru/rss/top7')
7+
insert into sites_table (name, url) values ('Лента.Ру', 'https://lenta.ru/rss/top7');
8+
insert into sites_table (name, url) values ('Habrahabr', 'https://habrahabr.ru/rss/hubs');

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

Lines changed: 0 additions & 153 deletions
This file was deleted.

0 commit comments

Comments
 (0)