FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Order files

This commit is contained in:
Shinokuni 2019-02-23 17:31:11 +00:00
parent 32833706b2
commit 728dd8fc17
19 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/assetWizardSettings.xml
View File

@ -18,7 +18,7 @@
<PersistentState>
<option name="values">
<map>
<entry key="url" value="jar:file:/Applications/Android%20Studio.app/Contents/plugins/android/lib/android.jar!/images/material_design_icons/action/ic_open_in_browser_black_24dp.xml" />
<entry key="url" value="jar:file:/Applications/Android%20Studio.app/Contents/plugins/android/lib/android.jar!/images/material_design_icons/image/ic_edit_black_24dp.xml" />
</map>
</option>
</PersistentState>
@ -28,7 +28,8 @@
</option>
<option name="values">
<map>
<entry key="outputName" value="ic_open_in_browser" />
<entry key="color" value="727272" />
<entry key="outputName" value="ic_edit_grey" />
<entry key="sourceFile" value="$USER_HOME$" />
</map>
</option>

8
app/src/main/AndroidManifest.xml
View File

@ -15,9 +15,9 @@
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name=".ManageFeedsActivity"></activity>
<activity android:name=".activities.ManageFeedsActivity"></activity>
<activity
android:name=".MainActivity"
android:name=".activities.MainActivity"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -26,8 +26,8 @@
</intent-filter>
</activity>
<activity
android:name=".ItemActivity"
android:parentActivityName=".MainActivity"
android:name=".activities.ItemActivity"
android:parentActivityName=".activities.MainActivity"
android:theme="@style/AppTheme.NoActionBar"></activity>
</application>

6
app/src/main/java/com/readrops/app/ItemActivity.java → app/src/main/java/com/readrops/app/activities/ItemActivity.java
View File

@ -1,4 +1,4 @@
package com.readrops.app;
package com.readrops.app.activities;
import android.arch.lifecycle.ViewModelProvider;
import android.content.Intent;
@ -18,6 +18,8 @@ import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.readrops.app.views.ItemViewModel;
import com.readrops.app.R;
import com.readrops.app.database.pojo.ItemWithFeed;
import com.readrops.app.database.entities.Item;
import com.readrops.app.utils.DateUtils;
@ -166,8 +168,6 @@ public class ItemActivity extends AppCompatActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.item_menu, menu);
return true;
}

7
app/src/main/java/com/readrops/app/MainActivity.java → app/src/main/java/com/readrops/app/activities/MainActivity.java
View File

@ -1,4 +1,4 @@
package com.readrops.app;
package com.readrops.app.activities;
import android.app.Dialog;
import android.arch.lifecycle.ViewModelProvider;
@ -26,6 +26,11 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader;
import com.bumptech.glide.util.ViewPreloadSizeProvider;
import com.github.clans.fab.FloatingActionMenu;
import com.readrops.app.views.AddFeedDialog;
import com.readrops.app.views.MainItemListAdapter;
import com.readrops.app.views.MainViewModel;
import com.readrops.app.R;
import com.readrops.app.views.SimpleCallback;
import com.readrops.app.database.pojo.ItemWithFeed;
import com.readrops.app.database.entities.Item;
import com.readrops.app.utils.GlideApp;

5
app/src/main/java/com/readrops/app/ManageFeedsActivity.java → app/src/main/java/com/readrops/app/activities/ManageFeedsActivity.java
View File

@ -1,4 +1,4 @@
package com.readrops.app;
package com.readrops.app.activities;
import android.arch.lifecycle.ViewModelProvider;
import android.os.Bundle;
@ -8,6 +8,9 @@ import android.support.v7.widget.RecyclerView;
import com.mikepenz.fastadapter.FastAdapter;
import com.mikepenz.fastadapter.adapters.ModelAdapter;
import com.readrops.app.views.FeedWithFolderItem;
import com.readrops.app.views.ManageFeedsViewModel;
import com.readrops.app.R;
import com.readrops.app.database.pojo.FeedWithFolder;
public class ManageFeedsActivity extends AppCompatActivity {

11
app/src/main/java/com/readrops/app/ARepository.java → app/src/main/java/com/readrops/app/repositories/ARepository.java
View File

@ -1,26 +1,19 @@
package com.readrops.app;
package com.readrops.app.repositories;
import android.app.Application;
import android.os.Handler;
import android.os.Looper;
import com.readrops.app.views.SimpleCallback;
import com.readrops.app.database.Database;
import com.readrops.app.database.entities.Feed;
import com.readrops.app.database.entities.Folder;
import com.readrops.app.database.entities.Item;
import com.readrops.readropslibrary.ParsingResult;
import org.reactivestreams.Subscriber;
import java.util.concurrent.Callable;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import io.reactivex.Completable;
import io.reactivex.CompletableEmitter;
import io.reactivex.CompletableObserver;
import io.reactivex.CompletableOnSubscribe;
import io.reactivex.Flowable;
public abstract class ARepository {

2
app/src/main/java/com/readrops/app/BasedRepository.java → app/src/main/java/com/readrops/app/repositories/BasedRepository.java
View File

@ -1,4 +1,4 @@
package com.readrops.app;
package com.readrops.app.repositories;
import android.app.Application;
import android.arch.lifecycle.LiveData;

2
app/src/main/java/com/readrops/app/LocalFeedRepository.java → app/src/main/java/com/readrops/app/repositories/LocalFeedRepository.java
View File

@ -1,4 +1,4 @@
package com.readrops.app;
package com.readrops.app.repositories;
import android.app.Application;
import android.arch.lifecycle.LiveData;

8
app/src/main/java/com/readrops/app/AddFeedDialog.java → app/src/main/java/com/readrops/app/views/AddFeedDialog.java
View File

@ -1,4 +1,4 @@
package com.readrops.app;
package com.readrops.app.views;
import android.app.Activity;
import android.app.Dialog;
@ -18,6 +18,8 @@ import android.widget.Button;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.readrops.app.R;
import com.readrops.app.activities.MainActivity;
import com.readrops.app.utils.Utils;
import com.readrops.app.utils.HtmlParser;
import com.readrops.readropslibrary.ParsingResult;
@ -27,10 +29,6 @@ import java.net.UnknownHostException;
import java.util.List;
import java.util.concurrent.Executors;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
public class AddFeedDialog extends Dialog implements View.OnClickListener {
private int layoutId;

5
app/src/main/java/com/readrops/app/AddFeedListAdapter.java → app/src/main/java/com/readrops/app/views/AddFeedListAdapter.java
View File

@ -1,4 +1,4 @@
package com.readrops.app;
package com.readrops.app.views;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
@ -7,10 +7,9 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.readrops.app.R;
import com.readrops.readropslibrary.ParsingResult;
import org.w3c.dom.Text;
import java.util.List;
public class AddFeedListAdapter extends RecyclerView.Adapter<AddFeedListAdapter.AddFeedViewHolder> {

5
app/src/main/java/com/readrops/app/FeedWithFolderItem.java → app/src/main/java/com/readrops/app/views/FeedWithFolderItem.java
View File

@ -1,4 +1,4 @@
package com.readrops.app;
package com.readrops.app.views;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
@ -7,9 +7,8 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.mikepenz.fastadapter.FastAdapter;
import com.mikepenz.fastadapter.items.AbstractItem;
import com.mikepenz.fastadapter.items.ModelAbstractItem;
import com.readrops.app.R;
import com.readrops.app.database.pojo.FeedWithFolder;
import com.readrops.app.utils.GlideApp;

3
app/src/main/java/com/readrops/app/ItemViewModel.java → app/src/main/java/com/readrops/app/views/ItemViewModel.java
View File

@ -1,4 +1,4 @@
package com.readrops.app;
package com.readrops.app.views;
import android.app.Application;
import android.arch.lifecycle.AndroidViewModel;
@ -6,6 +6,7 @@ import android.arch.lifecycle.LiveData;
import android.support.annotation.NonNull;
import com.readrops.app.database.pojo.ItemWithFeed;
import com.readrops.app.repositories.BasedRepository;
public class ItemViewModel extends AndroidViewModel {

5
app/src/main/java/com/readrops/app/MainItemListAdapter.java → app/src/main/java/com/readrops/app/views/MainItemListAdapter.java
View File

@ -1,4 +1,4 @@
package com.readrops.app;
package com.readrops.app.views;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
@ -22,6 +22,7 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.transition.DrawableCrossFadeFactory;
import com.bumptech.glide.util.ViewPreloadSizeProvider;
import com.readrops.app.R;
import com.readrops.app.database.pojo.ItemWithFeed;
import com.readrops.app.database.entities.Item;
import com.readrops.app.utils.DateUtils;
@ -153,7 +154,7 @@ public class MainItemListAdapter extends ListAdapter<ItemWithFeed, MainItemListA
this.listener = listener;
}
class ItemViewHolder extends RecyclerView.ViewHolder {
public class ItemViewHolder extends RecyclerView.ViewHolder {
private TextView itemTitle;
private TextView date;

3
app/src/main/java/com/readrops/app/MainViewModel.java → app/src/main/java/com/readrops/app/views/MainViewModel.java
View File

@ -1,4 +1,4 @@
package com.readrops.app;
package com.readrops.app.views;
import android.app.Application;
import android.arch.lifecycle.AndroidViewModel;
@ -6,6 +6,7 @@ import android.arch.lifecycle.LiveData;
import android.support.annotation.NonNull;
import com.readrops.app.database.pojo.ItemWithFeed;
import com.readrops.app.repositories.LocalFeedRepository;
import com.readrops.readropslibrary.ParsingResult;
import java.util.List;

2
app/src/main/java/com/readrops/app/ManageFeedsViewModel.java → app/src/main/java/com/readrops/app/views/ManageFeedsViewModel.java
View File

@ -1,4 +1,4 @@
package com.readrops.app;
package com.readrops.app.views;
import android.app.Application;
import android.app.ListActivity;

2
app/src/main/java/com/readrops/app/SimpleCallback.java → app/src/main/java/com/readrops/app/views/SimpleCallback.java
View File

@ -1,4 +1,4 @@
package com.readrops.app;
package com.readrops.app.views;
public interface SimpleCallback {

2
app/src/main/res/layout/activity_item.xml
View File

@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ItemActivity">
tools:context=".activities.ItemActivity">
<android.support.design.widget.AppBarLayout
android:id="@+id/app_bar_layout"

2
app/src/main/res/layout/activity_main.xml
View File

@ -5,7 +5,7 @@
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
tools:context=".activities.MainActivity">
<LinearLayout
android:layout_width="match_parent"

2
app/src/main/res/layout/activity_manage_feeds.xml
View File

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ManageFeedsActivity">
tools:context=".activities.ManageFeedsActivity">
<android.support.v7.widget.RecyclerView
android:id="@+id/feeds_recyclerview"