From 62f86341cbcd7c0cf73fcd3d0d63e3c76b114b13 Mon Sep 17 00:00:00 2001 From: Shinokuni Date: Sat, 26 Jan 2019 22:24:19 +0000 Subject: [PATCH] Adding some items to the navigation drawer as well as a floating button in the main activity --- .idea/assetWizardSettings.xml | 5 +- .idea/caches/build_file_checksums.ser | Bin 592 -> 592 bytes .../com/readrops/app/LocalFeedRepository.java | 6 ++- app/src/main/res/drawable/ic_about.xml | 9 ++++ app/src/main/res/drawable/ic_add.xml | 9 ++++ app/src/main/res/drawable/ic_add_white.xml | 5 ++ app/src/main/res/drawable/ic_folder.xml | 9 ++++ app/src/main/res/drawable/ic_settings.xml | 9 ++++ app/src/main/res/layout/activity_main.xml | 15 +++++- app/src/main/res/menu/drawer_view.xml | 50 ++++++++++++++---- app/src/main/res/values-fr-rFR/strings.xml | 5 +- app/src/main/res/values/strings.xml | 4 ++ .../readropslibrary/localfeed/RSSNetwork.java | 3 +- 13 files changed, 111 insertions(+), 18 deletions(-) create mode 100644 app/src/main/res/drawable/ic_about.xml create mode 100644 app/src/main/res/drawable/ic_add.xml create mode 100644 app/src/main/res/drawable/ic_add_white.xml create mode 100644 app/src/main/res/drawable/ic_folder.xml create mode 100644 app/src/main/res/drawable/ic_settings.xml diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml index 71af66db..8fb845ce 100644 --- a/.idea/assetWizardSettings.xml +++ b/.idea/assetWizardSettings.xml @@ -18,7 +18,7 @@ @@ -28,7 +28,8 @@ diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 2ecf6db849470b8c37e538fcf433b1090500f947..eeefb48c056fb4a839553d08f0e43573365648d4 100644 GIT binary patch delta 36 ucmV+<0Nel21kePKm;{VFH0!aP1pyHAy0Nqz>C|2c=uf=CLJu>qeeOb}cE delta 36 ucmV+<0Nel21kePKm;{RdecrL01pyG6XGNIXh&cyDV)ejc?PoNTu>qeocM!$^ diff --git a/app/src/main/java/com/readrops/app/LocalFeedRepository.java b/app/src/main/java/com/readrops/app/LocalFeedRepository.java index b731b392..41512a7a 100644 --- a/app/src/main/java/com/readrops/app/LocalFeedRepository.java +++ b/app/src/main/java/com/readrops/app/LocalFeedRepository.java @@ -45,12 +45,12 @@ public class LocalFeedRepository extends ARepository implements QueryCallback { @Override public void sync() { executor.execute(() -> { - RSSNetwork request = new RSSNetwork(); + RSSNetwork rssNet = new RSSNetwork(); List feedList = database.feedDao().getAllFeeds(); for (Feed feed : feedList) { try { - request.request(feed.getUrl(), this); + rssNet.request(feed.getUrl(), this); } catch (Exception e) { failureCallBackInMainThread(e); } @@ -71,7 +71,9 @@ public class LocalFeedRepository extends ARepository implements QueryCallback { @Override public void deleteFeed(Item item) { + executor.execute(() -> { + }); } @Override diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml new file mode 100644 index 00000000..cf53e145 --- /dev/null +++ b/app/src/main/res/drawable/ic_about.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml new file mode 100644 index 00000000..0258249c --- /dev/null +++ b/app/src/main/res/drawable/ic_add.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_add_white.xml b/app/src/main/res/drawable/ic_add_white.xml new file mode 100644 index 00000000..e3979cd7 --- /dev/null +++ b/app/src/main/res/drawable/ic_add_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_folder.xml b/app/src/main/res/drawable/ic_folder.xml new file mode 100644 index 00000000..d7c6145c --- /dev/null +++ b/app/src/main/res/drawable/ic_folder.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml new file mode 100644 index 00000000..ace746c4 --- /dev/null +++ b/app/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 8a88a49f..4d8b9b6c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -34,9 +34,22 @@ - + + + + + + - + + + + + + + + + + + + + + + + + + - - \ No newline at end of file diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 145e76ec..77756941 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -1,9 +1,12 @@ - Readrops A lire Articles non lus Ouvrir le menu Fermer le menu + Ajouter un flux + Ajouter un dossier + Paramètres + A propos \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cd532e1d..693e5cec 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,4 +5,8 @@ Non read articles Open menu Close menu + Add feed + Add folder + Settings + About diff --git a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSNetwork.java b/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSNetwork.java index ca986f89..76308d47 100644 --- a/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSNetwork.java +++ b/readropslibrary/src/main/java/com/readrops/readropslibrary/localfeed/RSSNetwork.java @@ -21,7 +21,7 @@ import okhttp3.Response; public class RSSNetwork { - public static final String TAG = RSSNetwork.class.getName(); + public static final String TAG = RSSNetwork.class.getSimpleName(); /** * Request the url given in parameter. @@ -33,7 +33,6 @@ public class RSSNetwork { public void request(String url, final QueryCallback callback) throws Exception { OkHttpClient okHttpClient = new OkHttpClient(); - Log.d(TAG, "starting request"); Request request = new Request.Builder().url(url).build(); Response response = okHttpClient.newCall(request).execute();