diff options
Diffstat (limited to 'org.fox.ttrss/src/main')
41 files changed, 180 insertions, 19 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 61a2a626..4350fd0c 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="488" - android:versionName="1.254"> + android:versionCode="490" + android:versionName="1.256"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> @@ -17,7 +17,7 @@ android:backupAgent=".util.PrefsBackupAgent" android:fullBackupOnly="true" android:hardwareAccelerated="true" - android:icon="@drawable/ic_launcher" + android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:networkSecurityConfig="@xml/network_security_config" > @@ -37,6 +37,9 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> + + <meta-data android:name="android.app.shortcuts" + android:resource="@xml/shortcuts" /> </activity> <activity android:name=".OnlineActivity" @@ -48,6 +51,7 @@ </activity> <activity android:name=".MasterActivity" + android:exported="true" android:label="@string/app_name" > <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/org.fox.ttrss/src/main/ic_launcher-web.png b/org.fox.ttrss/src/main/ic_launcher-web.png Binary files differnew file mode 100644 index 00000000..567b75e4 --- /dev/null +++ b/org.fox.ttrss/src/main/ic_launcher-web.png diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java index 11930716..499cd511 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java @@ -7,18 +7,11 @@ import android.support.annotation.Nullable; import com.livefront.bridge.Bridge; import com.livefront.bridge.SavedStateHandler; -import org.acra.ACRA; -import org.acra.ReportingInteractionMode; -import org.acra.annotation.ReportsCrashes; import org.fox.ttrss.types.Article; import org.fox.ttrss.types.ArticleList; import icepick.Icepick; -@ReportsCrashes(mode = ReportingInteractionMode.SILENT, - excludeMatchingSharedPreferencesKeys = {"password"}, - resDialogText = R.string.crash_dialog_text, - formUri = "https://tt-rss.org/acra/submit/") public class Application extends android.app.Application { private static Application m_singleton; @@ -36,10 +29,6 @@ public class Application extends android.app.Application { public final void onCreate() { super.onCreate(); - if (!BuildConfig.DEBUG) { - ACRA.init(this); - } - Bridge.initialize(getApplicationContext(), new SavedStateHandler() { @Override public void saveInstanceState(@NonNull Object target, @NonNull Bundle state) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java index d3f1f4db..7dcdc44e 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java @@ -117,7 +117,7 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt sortCats(); if (!specialCatFound) { - m_cats.add(0, new FeedCategory(-1, "Special", 0)); + m_cats.add(0, new FeedCategory(-1, getString(R.string.cat_special), 0)); } m_adapter.notifyDataSetChanged(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index f14978c5..0660d339 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -115,6 +115,31 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi m_feeds.add(f); catUnread += f.unread; } + + // localize special feed names + // TODO: join with shortcut title lookup by id? + if (m_activeCategory != null && m_activeCategory.id == -1) { + switch (f.id) { + case -1: + f.title = getString(R.string.feed_starred_articles); + break; + case -2: + f.title = getString(R.string.feed_published_articles); + break; + case -3: + f.title = getString(R.string.fresh_articles); + break; + case -4: + f.title = getString(R.string.feed_all_articles); + break; + case -6: + f.title = getString(R.string.feed_recently_read); + break; + case 0: + f.title = getString(R.string.feed_archived_articles); + break; + } + } } sortFeeds(); @@ -206,8 +231,8 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi @Override public int compare(Feed a, Feed b) { - Log.d(TAG, "A:" + a.title + " " + a.is_cat + " " + a.order_id); - Log.d(TAG, "B:" + b.title + " " + b.is_cat + " " + b.order_id); + //Log.d(TAG, "A:" + a.title + " " + a.is_cat + " " + a.order_id); + //Log.d(TAG, "B:" + b.title + " " + b.is_cat + " " + b.order_id); if (a.id >= 0 && b.id >= 0) if (a.is_cat && b.is_cat) diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java index 4c4b544c..010949d3 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java @@ -126,6 +126,21 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList int feedId = i.getIntExtra("feed_id", 0); boolean isCat = i.getBooleanExtra("feed_is_cat", false); String feedTitle = i.getStringExtra("feed_title"); + + // app shortcuts are not allowed to pass string extras + if (feedTitle == null) { + switch (feedId) { + case -1: + feedTitle = getString(R.string.feed_starred_articles); + break; + case -3: + feedTitle = getString(R.string.fresh_articles); + break; + case -4: + feedTitle = getString(R.string.feed_all_articles); + break; + } + } Feed tmpFeed = new Feed(feedId, feedTitle, isCat); @@ -159,7 +174,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList ft.replace(R.id.feeds_fragment, new FeedsFragment(), FRAG_FEEDS); } - if (m_prefs.getBoolean("open_fresh_on_startup", true)) { + if (!shortcutMode && m_prefs.getBoolean("open_fresh_on_startup", true)) { HeadlinesFragment hf = new HeadlinesFragment(); if (BuildConfig.DEBUG) { diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_amber.png b/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_amber.png Binary files differnew file mode 100644 index 00000000..e41c647d --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_amber.png diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_coffee.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_coffee.png Binary files differnew file mode 100644 index 00000000..ec0bf525 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_coffee.png diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_folder_open.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_folder_open.png Binary files differnew file mode 100644 index 00000000..8887429a --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_folder_open.png diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_star.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_star.png Binary files differnew file mode 100644 index 00000000..0df481c4 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_shortcut_star.png diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_coffee.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_coffee.png Binary files differnew file mode 100644 index 00000000..04e6677f --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_coffee.png diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_folder_open.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_folder_open.png Binary files differnew file mode 100644 index 00000000..7430222a --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_folder_open.png diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_star.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_star.png Binary files differnew file mode 100644 index 00000000..6e36f8a6 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_shortcut_star.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_coffee.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_coffee.png Binary files differnew file mode 100644 index 00000000..35254abf --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_coffee.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_folder_open.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_folder_open.png Binary files differnew file mode 100644 index 00000000..14c40b66 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_folder_open.png diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_star.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_star.png Binary files differnew file mode 100644 index 00000000..345b0e22 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_shortcut_star.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_amber.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_amber.png Binary files differnew file mode 100644 index 00000000..463fba18 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_amber.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_coffee.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_coffee.png Binary files differnew file mode 100644 index 00000000..49be2fd1 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_coffee.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_folder_open.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_folder_open.png Binary files differnew file mode 100644 index 00000000..246a8e6d --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_folder_open.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_star.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_star.png Binary files differnew file mode 100644 index 00000000..78044bb0 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_shortcut_star.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_coffee.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_coffee.png Binary files differnew file mode 100644 index 00000000..78aac1a8 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_coffee.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_folder_open.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_folder_open.png Binary files differnew file mode 100644 index 00000000..df88943d --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_folder_open.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_star.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_star.png Binary files differnew file mode 100644 index 00000000..1f4cbd03 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_shortcut_star.png diff --git a/org.fox.ttrss/src/main/res/drawable/ic_launcher_background.xml b/org.fox.ttrss/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..764d14c2 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,42 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportWidth="51.06383" + android:viewportHeight="51.06383"> + <group android:translateX="-10.468085" + android:translateY="-10.468085"> + <path + android:pathData="M-9.8995,-7.7102h94.3666v92.4381h-94.3666z" + android:fillColor="#216d96" + android:strokeColor="#00000000" + android:fillAlpha="1"/> + <path + android:pathData="M5.668,58.0128a8.3196,8.3198 0,1 0,16.6393 0a8.3196,8.3198 0,1 0,-16.6393 0z" + android:strokeAlpha="1" + android:strokeWidth="0.69765961" + android:fillColor="#ffa000" + android:strokeColor="#00000000" + android:fillAlpha="1"/> + <path + android:pathData="m45.8796,66.3326 l-11.7862,0A28.4254,28.426 0,0 0,5.668 37.9066l0,-11.7864A40.2116,40.2124 0,0 1,45.8796 66.3326Z" + android:strokeAlpha="1" + android:strokeWidth="0.69765961" + android:fillColor="#ff8f00" + android:strokeColor="#00000000" + android:fillAlpha="1"/> + <path + android:pathData="M54.1992,66.3326A48.5312,48.5322 0,0 0,5.668 17.8004l0,-12.1331a60.6653,60.6641 90,0 1,60.6641 60.6653z" + android:strokeAlpha="1" + android:strokeWidth="2.01254654" + android:fillColor="#ff6f00" + android:strokeColor="#00000000" + android:fillAlpha="1"/> + <path + android:pathData="M54.1992,66.3326A48.5312,48.5322 0,0 0,5.668 17.8004l0,-12.1331a60.6653,60.6641 90,0 1,60.6641 60.6653z" + android:strokeAlpha="1" + android:strokeWidth="2.01254654" + android:fillColor="#ff6f00" + android:strokeColor="#00000000" + android:fillAlpha="1"/> + </group> +</vector> diff --git a/org.fox.ttrss/src/main/res/drawable/ic_launcher_foreground.xml b/org.fox.ttrss/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..05afdf5b --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,26 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:viewportWidth="116.129036" + android:viewportHeight="116.129036"> + <group android:translateX="22.064516" + android:translateY="22.064516"> + <path + android:pathData="M24.5559,62.7433 L42.4264,79.7139 73.4105,83.5708 83.5672,62.8719 81.1244,42.8158 47.4404,7.0747 33.2983,29.9593Z" + android:strokeAlpha="1" + android:strokeLineJoin="miter" + android:strokeWidth="1" + android:fillColor="#000000" + android:strokeColor="#00000000" + android:fillAlpha="0.27450982" + android:strokeLineCap="butt"/> + <path + android:pathData="M51.3353,30.9064L40.1951,30.9064L36.3729,45.9708Q36.2797,46.4821 36.1398,47.0721 36,47.6621 35.8602,48.2521q-0.0932,0.59 -0.1864,1.1406 -0.0932,0.5113 -0.0932,0.8653 0,1.5733 0.9322,2.3206 0.9322,0.7473 3.0764,0.7473 0.5593,0 1.3984,-0.118 0.8856,-0.118 1.7713,-0.3147 0.9322,-0.1967 1.7713,-0.3933 0.839,-0.236 1.3517,-0.3933l-2.284,9.2038q-0.839,0.2753 -2.0509,0.5507 -1.2119,0.2753 -2.6569,0.5113 -1.445,0.236 -3.0298,0.3933 -1.5382,0.1573 -3.0298,0.1573 -3.5425,0 -5.9197,-0.7866 -2.3772,-0.7473 -3.8222,-2.0846 -1.3984,-1.3766 -2.0043,-3.1859 -0.5593,-1.8093 -0.5593,-3.9332 0,-0.6293 0.0932,-1.4553 0.0932,-0.826 0.2331,-1.6913 0.1864,-0.8653 0.3729,-1.7306 0.2331,-0.9046 0.4195,-1.652l3.8222,-15.497h-7.3647l2.6103,-9.1645h7.0384L30.1735,12.3022 45.6953,9.0769 42.5723,21.742h11.3267l-2.5637,9.1645z" + android:strokeAlpha="1" + android:strokeLineJoin="miter" + android:strokeWidth="3" + android:fillColor="#ffffff" + android:strokeColor="#2b4265" + android:fillAlpha="1"/> + </group> +</vector> diff --git a/org.fox.ttrss/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/org.fox.ttrss/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..bbd3e021 --- /dev/null +++ b/org.fox.ttrss/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@drawable/ic_launcher_background"/> + <foreground android:drawable="@drawable/ic_launcher_foreground"/> +</adaptive-icon>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/org.fox.ttrss/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..bbd3e021 --- /dev/null +++ b/org.fox.ttrss/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@drawable/ic_launcher_background"/> + <foreground android:drawable="@drawable/ic_launcher_foreground"/> +</adaptive-icon>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/mipmap-hdpi/ic_launcher.png b/org.fox.ttrss/src/main/res/mipmap-hdpi/ic_launcher.png Binary files differnew file mode 100644 index 00000000..8e1e97b4 --- /dev/null +++ b/org.fox.ttrss/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/org.fox.ttrss/src/main/res/mipmap-hdpi/ic_launcher_round.png b/org.fox.ttrss/src/main/res/mipmap-hdpi/ic_launcher_round.png Binary files differnew file mode 100644 index 00000000..a9e18bd0 --- /dev/null +++ b/org.fox.ttrss/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/org.fox.ttrss/src/main/res/mipmap-mdpi/ic_launcher.png b/org.fox.ttrss/src/main/res/mipmap-mdpi/ic_launcher.png Binary files differnew file mode 100644 index 00000000..366bbf6b --- /dev/null +++ b/org.fox.ttrss/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/org.fox.ttrss/src/main/res/mipmap-mdpi/ic_launcher_round.png b/org.fox.ttrss/src/main/res/mipmap-mdpi/ic_launcher_round.png Binary files differnew file mode 100644 index 00000000..8bc85ee6 --- /dev/null +++ b/org.fox.ttrss/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/org.fox.ttrss/src/main/res/mipmap-xhdpi/ic_launcher.png b/org.fox.ttrss/src/main/res/mipmap-xhdpi/ic_launcher.png Binary files differnew file mode 100644 index 00000000..8c4b165a --- /dev/null +++ b/org.fox.ttrss/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/org.fox.ttrss/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/org.fox.ttrss/src/main/res/mipmap-xhdpi/ic_launcher_round.png Binary files differnew file mode 100644 index 00000000..c247a2c0 --- /dev/null +++ b/org.fox.ttrss/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/org.fox.ttrss/src/main/res/mipmap-xxhdpi/ic_launcher.png b/org.fox.ttrss/src/main/res/mipmap-xxhdpi/ic_launcher.png Binary files differnew file mode 100644 index 00000000..9834a7be --- /dev/null +++ b/org.fox.ttrss/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/org.fox.ttrss/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/org.fox.ttrss/src/main/res/mipmap-xxhdpi/ic_launcher_round.png Binary files differnew file mode 100644 index 00000000..04211591 --- /dev/null +++ b/org.fox.ttrss/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/org.fox.ttrss/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/org.fox.ttrss/src/main/res/mipmap-xxxhdpi/ic_launcher.png Binary files differnew file mode 100644 index 00000000..6a83bda5 --- /dev/null +++ b/org.fox.ttrss/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/org.fox.ttrss/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/org.fox.ttrss/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png Binary files differnew file mode 100644 index 00000000..b0b9d99a --- /dev/null +++ b/org.fox.ttrss/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/org.fox.ttrss/src/main/res/values/colors.xml b/org.fox.ttrss/src/main/res/values/colors.xml index 7ad81fac..d87ac346 100755 --- a/org.fox.ttrss/src/main/res/values/colors.xml +++ b/org.fox.ttrss/src/main/res/values/colors.xml @@ -2,5 +2,5 @@ <resources> <item name="window_background" type="color">#216d96</item> <item name="window_background_dark" type="color">#18506e</item> - + <item name="window_background_amber" type="color">#6e4b1a</item> </resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml index c7544266..e788dcc5 100755 --- a/org.fox.ttrss/src/main/res/values/strings.xml +++ b/org.fox.ttrss/src/main/res/values/strings.xml @@ -205,6 +205,11 @@ <string name="headlines_sort_title">Title</string> <string name="headlines_sort_articles_title">Sort articles</string> <string name="fresh_articles">Fresh articles</string> + <string name="cat_special">Special</string> + <string name="feed_starred_articles">Starred articles</string> + <string name="feed_published_articles">Published articles</string> + <string name="feed_archived_articles">Archived articles</string> + <string name="feed_recently_read">Recently read</string> <string name="feed_all_articles">All articles</string> <string name="prefs_enable_fab">Enable FAB</string> <string name="prefs_enable_fab_long">Show floating action button when reading</string> diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index e16ee854..5cf9b3b0 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -70,6 +70,8 @@ <style name="AmberTheme" parent="DarkTheme"> <item name="colorPrimary">#b87d2c</item> <item name="colorPrimaryDark">#6e4b1a</item> + <item name="android:windowBackground">@color/window_background_amber</item> + <item name="drawer_header">@drawable/drawer_header_amber</item> </style> <style name="DarkTheme" parent="DarkTheme.Base"> diff --git a/org.fox.ttrss/src/main/res/xml/shortcuts.xml b/org.fox.ttrss/src/main/res/xml/shortcuts.xml new file mode 100644 index 00000000..3328b165 --- /dev/null +++ b/org.fox.ttrss/src/main/res/xml/shortcuts.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<shortcuts xmlns:android="http://schemas.android.com/apk/res/android"> + <shortcut + android:shortcutId="SHORTCUT:OPEN_MARKED" + android:enabled="true" + android:icon="@drawable/ic_shortcut_star" + android:shortcutShortLabel="@string/feed_starred_articles"> + <intent + android:action="android.intent.action.VIEW" + android:targetPackage="org.fox.ttrss" + android:targetClass="org.fox.ttrss.MasterActivity"> + <extra android:name="shortcut_mode" android:value="true"/> + <extra android:name="feed_id" android:value="-1"/> + </intent> + </shortcut> + <shortcut + android:shortcutId="SHORTCUT:OPEN_FRESH" + android:enabled="true" + android:icon="@drawable/ic_shortcut_coffee" + android:shortcutShortLabel="@string/fresh_articles"> + <intent + android:action="android.intent.action.VIEW" + android:targetPackage="org.fox.ttrss" + android:targetClass="org.fox.ttrss.MasterActivity"> + <extra android:name="shortcut_mode" android:value="true"/> + <extra android:name="feed_id" android:value="-3"/> + </intent> + </shortcut> + <shortcut + android:shortcutId="SHORTCUT:OPEN_ALL_ARTICLES" + android:enabled="true" + android:icon="@drawable/ic_shortcut_folder_open" + android:shortcutShortLabel="@string/feed_all_articles"> + <intent + android:action="android.intent.action.VIEW" + android:targetPackage="org.fox.ttrss" + android:targetClass="org.fox.ttrss.MasterActivity"> + <extra android:name="shortcut_mode" android:value="true"/> + <extra android:name="feed_id" android:value="-4"/> + </intent> + </shortcut> + +</shortcuts>
\ No newline at end of file |
