diff options
| -rwxr-xr-x | org.fox.ttrss/build.gradle | 1 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/AndroidManifest.xml | 4 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java | 26 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java | 13 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml | 62 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/layout/article_pager.xml | 24 | ||||
| -rwxr-xr-x | org.fox.ttrss/src/main/res/layout/fragment_article.xml | 1 | ||||
| -rwxr-xr-x | tt-rss-android.iml | 2 |
8 files changed, 84 insertions, 49 deletions
diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index 5eda4c64..4a23cd3e 100755 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -66,7 +66,6 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar' implementation 'me.relex:circleindicator:1.2.2@aar' - implementation 'com.viewpagerindicator:library:2.4.1' implementation 'com.nineoldandroids:library:2.4.0' implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' implementation 'frankiesardo:icepick:3.2.0' diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 2ffa2458..e30eeafa 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="522" - android:versionName="1.288"> + android:versionCode="526" + android:versionName="1.292"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java index e08934bd..e32d5ad1 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java @@ -20,7 +20,6 @@ import androidx.viewpager.widget.ViewPager; import com.google.android.material.snackbar.Snackbar; import com.google.gson.JsonElement; -import com.viewpagerindicator.UnderlinePageIndicator; import org.fox.ttrss.types.Article; import org.fox.ttrss.types.ArticleList; @@ -139,27 +138,19 @@ public class ArticlePager extends StateSavedFragment { pager.setAdapter(m_adapter); - UnderlinePageIndicator indicator = view.findViewById(R.id.article_pager_indicator); - indicator.setViewPager(pager); - pager.setCurrentItem(position); - - indicator.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { - + pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override - public void onPageScrollStateChanged(int arg0) { - } + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - @Override - public void onPageScrolled(int arg0, float arg1, int arg2) { } @Override public void onPageSelected(int position) { - Log.d(TAG, "onPageSelected: " + position); + Log.d(TAG, "onPageSelected: " + position); final Article article = m_articles.get(position); - + if (article != null) { m_article = article; @@ -171,7 +162,7 @@ public class ArticlePager extends StateSavedFragment { }, 250); //Log.d(TAG, "Page #" + position + "/" + m_adapter.getCount()); - + if (!m_refreshInProgress && !m_lazyLoadDisabled && (m_activity.isSmallScreen() || m_activity.isPortrait()) && position >= m_adapter.getCount() - 5) { Log.d(TAG, "loading more articles..."); @@ -184,8 +175,13 @@ public class ArticlePager extends StateSavedFragment { } } } + + @Override + public void onPageScrollStateChanged(int state) { + + } }); - + return view; } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java index 4957b0b7..20c2fd0c 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java @@ -12,15 +12,13 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.viewpagerindicator.UnderlinePageIndicator; - -import org.fox.ttrss.R; - import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentStatePagerAdapter; import androidx.viewpager.widget.ViewPager; +import org.fox.ttrss.R; + public class OfflineArticlePager extends Fragment { private final String TAG = this.getClass().getSimpleName(); @@ -184,13 +182,8 @@ public class OfflineArticlePager extends Fragment { pager.setAdapter(m_adapter); - UnderlinePageIndicator indicator = view.findViewById(R.id.article_pager_indicator); - indicator.setViewPager(pager); - pager.setCurrentItem(position); - - indicator.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { - + pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() { @Override public void onPageScrollStateChanged(int arg0) { } diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml new file mode 100644 index 00000000..95cb35e0 --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml @@ -0,0 +1,62 @@ +<!-- we don't hide actionbar on tablets even in portrait so this is a bit different from activity_master_phone.xml --> + +<androidx.drawerlayout.widget.DrawerLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:fitsSystemWindows="true" + android:id="@+id/headlines_drawer" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> + + <androidx.coordinatorlayout.widget.CoordinatorLayout + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_below="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/master_fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end|bottom" + android:visibility="gone" + android:src="@drawable/ic_refresh" + android:layout_margin="16dp" /> + + <FrameLayout + android:id="@+id/headlines_fragment" + app:layout_behavior=".util.FabAwareScrollingViewBehavior" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?headlinesBackground" /> + + </androidx.coordinatorlayout.widget.CoordinatorLayout> + + </RelativeLayout> + + <org.fox.ttrss.util.ScrimInsetsFrameLayout + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/scrimInsetsFrameLayout" + android:layout_width="300dp" + android:layout_height="match_parent" + android:layout_gravity="start" + android:background="@android:color/white" + android:elevation="10dp" + android:fitsSystemWindows="true" + app:insetForeground="#4000"> + + <FrameLayout + android:id="@+id/feeds_fragment" + android:layout_width="match_parent" + android:background="?feedlistBackground" + android:layout_height="match_parent" > + </FrameLayout> + + </org.fox.ttrss.util.ScrimInsetsFrameLayout> + +</androidx.drawerlayout.widget.DrawerLayout> diff --git a/org.fox.ttrss/src/main/res/layout/article_pager.xml b/org.fox.ttrss/src/main/res/layout/article_pager.xml index 5144f823..62b3fea4 100755 --- a/org.fox.ttrss/src/main/res/layout/article_pager.xml +++ b/org.fox.ttrss/src/main/res/layout/article_pager.xml @@ -1,23 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/article_pager_container" +<androidx.viewpager.widget.ViewPager + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/article_pager" android:background="?android:colorBackground" android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <androidx.viewpager.widget.ViewPager - android:id="@+id/article_pager" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_above="@+id/article_pager_indicator" - android:layout_alignParentTop="true"/> - - <com.viewpagerindicator.UnderlinePageIndicator - android:id="@+id/article_pager_indicator" - android:layout_width="fill_parent" - android:layout_height="2dp" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" /> - - -</RelativeLayout>
\ No newline at end of file + android:layout_height="fill_parent"/> diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml index 2226cffe..0dd14149 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml @@ -130,6 +130,7 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" + android:descendantFocusability="blocksDescendants" android:orientation="vertical" > <TextView diff --git a/tt-rss-android.iml b/tt-rss-android.iml index 0e954cf4..21249593 100755 --- a/tt-rss-android.iml +++ b/tt-rss-android.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="tt-rss-android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="tt-rss-android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
|