diff options
47 files changed, 577 insertions, 149 deletions
diff --git a/build.gradle b/build.gradle index 3bc02651..cccba8b8 100755 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0' + classpath 'com.android.tools.build:gradle:3.2.1' } } diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index 70cf8072..3bbf843c 100755 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -64,7 +64,6 @@ dependencies { implementation 'com.android.support:design:27.1.1' implementation 'com.google.code.gson:gson:2.8.2' implementation 'com.shamanland:fab:0.0.8' - implementation 'ch.acra:acra:4.9.1' 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' 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 diff --git a/org.fox.ttrss/src_drawable/s_drawer_header_amber.svg b/org.fox.ttrss/src_drawable/s_drawer_header_amber.svg new file mode 100644 index 00000000..9c83cf7f --- /dev/null +++ b/org.fox.ttrss/src_drawable/s_drawer_header_amber.svg @@ -0,0 +1,257 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="300" + height="120" + viewBox="0 0 300.00001 120.00001" + id="svg2" + version="1.1" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="s_drawer_header_dark.svg" + inkscape:export-filename="C:\Users\andrew\Projects\tt-rss-android\org.fox.ttrss\src\main\res\drawable-xxhdpi\drawer_header_dark.png" + inkscape:export-xdpi="307.20001" + inkscape:export-ydpi="307.20001"> + <defs + id="defs4"> + <filter + style="color-interpolation-filters:sRGB" + inkscape:label="Drop Shadow" + id="filter4210"> + <feFlood + flood-opacity="0.321569" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4212" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite4214" /> + <feGaussianBlur + in="composite1" + stdDeviation="2" + result="blur" + id="feGaussianBlur4216" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4218" /> + <feComposite + in="SourceGraphic" + in2="offset" + operator="over" + result="composite2" + id="feComposite4220" /> + </filter> + <filter + style="color-interpolation-filters:sRGB" + inkscape:label="Drop Shadow" + id="filter4222"> + <feFlood + flood-opacity="0.321569" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4224" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite4226" /> + <feGaussianBlur + in="composite1" + stdDeviation="2" + result="blur" + id="feGaussianBlur4228" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4230" /> + <feComposite + in="SourceGraphic" + in2="offset" + operator="over" + result="composite2" + id="feComposite4232" /> + </filter> + <filter + style="color-interpolation-filters:sRGB" + inkscape:label="Drop Shadow" + id="filter4234"> + <feFlood + flood-opacity="0.321569" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4236" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite4238" /> + <feGaussianBlur + in="composite1" + stdDeviation="2" + result="blur" + id="feGaussianBlur4240" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4242" /> + <feComposite + in="SourceGraphic" + in2="offset" + operator="over" + result="composite2" + id="feComposite4244" /> + </filter> + <filter + style="color-interpolation-filters:sRGB" + inkscape:label="Drop Shadow" + id="filter4306"> + <feFlood + flood-opacity="0.611765" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood4308" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite4310" /> + <feGaussianBlur + in="composite1" + stdDeviation="6" + result="blur" + id="feGaussianBlur4312" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset4314" /> + <feComposite + in="SourceGraphic" + in2="offset" + operator="over" + result="composite2" + id="feComposite4316" /> + </filter> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#000000" + borderopacity="1" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="2.8" + inkscape:cx="95.509823" + inkscape:cy="76.447795" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + units="px" + borderlayer="true" + inkscape:window-width="1920" + inkscape:window-height="1170" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-932.36214)"> + <path + style="fill:#eed5b2;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 96.7857,905.93357 63.21428,60.35714 -55.35714,95.71429 -32.857141,-1.0714 z" + id="path4208" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:#624318;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 198.57141,994.505 64.64286,68.9286 -126.78572,-2.5 z" + id="path4162" + inkscape:connector-curvature="0" /> + <path + style="fill:#a0712c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4234)" + d="M 219.2857,1007.3621 71.071414,1113.0764 161.78572,948.79071 Z" + id="path4154" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccc" /> + <path + style="fill:#ab2f08;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 58.214271,1057.3621 -62.1428577,0.3572 -0.7142858,-157.14287 24.6428575,-0.71429 z" + id="path4160" + inkscape:connector-curvature="0" /> + <path + style="fill:#f4511e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4222)" + d="M 100.71427,895.93357 71.071414,1111.6478 3.2142708,895.93357 Z" + id="path4156" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> + <path + style="fill:#b87d2c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4306)" + d="m 83.571414,898.07643 163.214276,159.99997 63.21429,-0.7143 -3.57143,-161.42853 z" + id="path4142" + inkscape:connector-curvature="0" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m -1.4285867,895.93357 -1.0714286,-5" + id="path4158" + inkscape:connector-curvature="0" /> + <rect + style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4164" + width="65.35714" + height="202.85715" + x="-66.428589" + y="888.43359" /> + <rect + style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4164-4" + width="65.357147" + height="202.85718" + x="300.89288" + y="875.93353" /> + <rect + style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4164-41" + width="364.28574" + height="81.428589" + x="-36.250019" + y="1053.7908" /> + <rect + style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect4164-41-3" + width="364.28577" + height="81.428596" + x="-23.571449" + y="820.2193" /> + </g> +</svg> diff --git a/org.fox.ttrss/src_drawable/s_drawer_header_dark.svg b/org.fox.ttrss/src_drawable/s_drawer_header_dark.svg index c1c94ae2..45c92e72 100644 --- a/org.fox.ttrss/src_drawable/s_drawer_header_dark.svg +++ b/org.fox.ttrss/src_drawable/s_drawer_header_dark.svg @@ -14,11 +14,11 @@ viewBox="0 0 300.00001 120.00001" id="svg2" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="s_drawer_header_dark.svg" - inkscape:export-filename="C:\Users\andrew\Projects\tt-rss-android\org.fox.ttrss\src\main\res\drawable-xxhdpi\drawer_header_dark.png" - inkscape:export-xdpi="307.20001" - inkscape:export-ydpi="307.20001"> + inkscape:export-filename="/home/fox/Projects/tt-rss-android/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_amber.png" + inkscape:export-xdpi="192" + inkscape:export-ydpi="192"> <defs id="defs4"> <filter @@ -158,17 +158,17 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="2.8" - inkscape:cx="52.474109" - inkscape:cy="70.376366" + inkscape:cx="95.15268" + inkscape:cy="76.447795" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" units="px" borderlayer="true" inkscape:window-width="1920" - inkscape:window-height="1137" - inkscape:window-x="-8" - inkscape:window-y="-8" + inkscape:window-height="1170" + inkscape:window-x="0" + inkscape:window-y="0" inkscape:window-maximized="1" /> <metadata id="metadata7"> @@ -178,7 +178,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -188,18 +188,18 @@ id="layer1" transform="translate(0,-932.36214)"> <path - style="fill:#b2d9ee;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:#eed5b2;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 96.7857,905.93357 63.21428,60.35714 -55.35714,95.71429 -32.857141,-1.0714 z" id="path4208" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" /> <path - style="fill:#164964;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:#624318;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 198.57141,994.505 64.64286,68.9286 -126.78572,-2.5 z" id="path4162" inkscape:connector-curvature="0" /> <path - style="fill:#2579a6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4234)" + style="fill:#a0712c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4234)" d="M 219.2857,1007.3621 71.071414,1113.0764 161.78572,948.79071 Z" id="path4154" inkscape:connector-curvature="0" @@ -216,7 +216,7 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" /> <path - style="fill:#1e6286;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4306)" + style="fill:#b87d2c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4306)" d="m 83.571414,898.07643 163.214276,159.99997 63.21429,-0.7143 -3.57143,-161.42853 z" id="path4142" inkscape:connector-curvature="0" /> diff --git a/org.fox.ttrss/src_drawable/s_launcher.svg b/org.fox.ttrss/src_drawable/s_launcher.svg index ad3ea829..12e1988e 100644 --- a/org.fox.ttrss/src_drawable/s_launcher.svg +++ b/org.fox.ttrss/src_drawable/s_launcher.svg @@ -13,7 +13,7 @@ height="72" id="svg2985" version="1.1" - inkscape:version="0.91 r13725" + inkscape:version="0.92.3 (2405546, 2018-03-11)" inkscape:export-filename="C:\Users\Andrew\Documents\Projects\Tiny-Tiny-RSS-for-Honeycomb\org.fox.ttrss\src\main\res\drawable-hdpi\ic_launcher.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" @@ -84,19 +84,6 @@ result="composite2" id="feComposite5291" /> </filter> - <filter - inkscape:collect="always" - style="color-interpolation-filters:sRGB" - id="filter5363" - x="-0.048000477" - width="1.096001" - y="-0.047999523" - height="1.095999"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.2132931" - id="feGaussianBlur5365" /> - </filter> </defs> <sodipodi:namedview id="base" @@ -114,10 +101,11 @@ inkscape:grid-bbox="true" inkscape:snap-page="false" inkscape:window-width="1920" - inkscape:window-height="1137" - inkscape:window-x="1912" - inkscape:window-y="-8" - inkscape:window-maximized="1" /> + inkscape:window-height="1170" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:object-nodes="false" /> <metadata id="metadata2990"> <rdf:RDF> @@ -126,7 +114,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -135,100 +123,16 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" transform="translate(0,8)"> - <g - id="g4827" - style="opacity:0.5;fill:#000000;fill-opacity:1;filter:url(#filter5363)" - transform="translate(44.345363,-23.201201)"> - <ellipse - ry="8.3198061" - rx="8.3196411" - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69765961;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="circle26" - cy="73.467369" - cx="-30.012384" /> - <path - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.69765961;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - inkscape:connector-curvature="0" - id="path28" - d="m 1.879574,81.787172 -11.786158,0 A 28.425441,28.426004 0 0 0 -38.332025,53.361167 l 0,-11.786392 A 40.2116,40.212396 0 0 1 1.879574,81.787172 Z" /> - <g - id="g4792" - style="fill:#000000;fill-opacity:1"> - <g - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.01254654;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="g3773" - transform="matrix(0.34665172,0,0,0.34665859,-53.584701,7.948892)"> - <g - id="g3793" - style="fill:#000000;fill-opacity:1"> - <path - d="M 184,213 A 140,140 0 0 0 44,73 l 0,-35 a 175,175 0 0 1 175,175 z" - id="path30" - inkscape:connector-curvature="0" - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.01254654;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - <g - id="g3796" - style="fill:#000000;fill-opacity:1"> - <path - style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.01254654;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - inkscape:connector-curvature="0" - id="path3798" - d="M 184,213 A 140,140 0 0 0 44,73 l 0,-35 a 175,175 0 0 1 175,175 z" /> - </g> - </g> - </g> - </g> - <g - id="g3814"> - <ellipse - cx="13.987616" - cy="50.012821" - id="ellipse3800" - style="fill:#ffa000;fill-opacity:1;stroke:none;stroke-width:0.69765961;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;" - rx="8.3196411" - ry="8.3198061" /> - <path - d="m 45.879574,58.332627 -11.786158,0 A 28.425441,28.426004 0 0 0 5.6679745,29.906622 l 0,-11.786392 A 40.2116,40.212396 0 0 1 45.879574,58.332627 Z" - id="path3802" - inkscape:connector-curvature="0" - style="fill:#ff8f00;fill-opacity:1;stroke:none;stroke-width:0.69765961;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;" /> - <g - style="fill:#ff6f00;fill-opacity:1;stroke:none;stroke-width:2.01254654;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;" - id="g3804" - transform="matrix(0.34665172,0,0,0.34665859,-9.5847012,-15.505653)"> - <g - id="g3806"> - <path - d="M 184,213 A 140,140 0 0 0 44,73 l 0,-35 a 175,175 0 0 1 175,175 z" - id="path3808" - inkscape:connector-curvature="0" - style="fill:#ff6f00;fill-opacity:1;stroke:none;stroke-width:2.01254654;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;" /> - </g> - <g - id="g3810"> - <path - style="fill:#ff6f00;fill-opacity:1;stroke:none;stroke-width:2.01254654;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;" - inkscape:connector-curvature="0" - id="path3812" - d="M 184,213 A 140,140 0 0 0 44,73 l 0,-35 a 175,175 0 0 1 175,175 z" /> - </g> - </g> - </g> - <g - id="g5414"> - <path - inkscape:connector-curvature="0" - d="m 51.33532,22.906446 -11.140249,0 -3.822177,15.064333 Q 36.279672,38.4821 36.139836,39.072087 36,39.662073 35.860165,40.25206 q -0.09323,0.589988 -0.186449,1.140642 -0.09322,0.511323 -0.09322,0.865315 0,1.573298 0.932239,2.320614 0.932237,0.747318 3.076385,0.747318 0.559343,0 1.398357,-0.117999 0.885628,-0.117997 1.771253,-0.314658 0.932239,-0.196663 1.771253,-0.393326 0.839014,-0.235995 1.351746,-0.393324 l -2.283985,9.203795 q -0.839014,0.275328 -2.050924,0.550655 -1.211908,0.275327 -2.656878,0.511322 -1.44497,0.235994 -3.029774,0.393324 -1.538195,0.15733 -3.029774,0.15733 -3.542506,0 -5.919715,-0.786649 -2.377207,-0.747317 -3.822177,-2.08462 -1.398357,-1.376636 -2.004311,-3.18593 -0.559344,-1.809293 -0.559344,-3.933246 0,-0.629318 0.09322,-1.455301 0.09322,-0.825982 0.23306,-1.691295 0.186447,-0.865315 0.372896,-1.730628 0.233058,-0.904647 0.419507,-1.651964 l 3.822177,-15.496989 -7.364683,0 2.610267,-9.164463 7.038398,0 2.42382,-9.4397891 15.521769,-3.2252617 -3.122999,12.6650508 11.326696,0 -2.563656,9.164463 z" - style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Segoe UI';-inkscape-font-specification:'Segoe UI Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#2b4265;stroke-width:3;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="path5090" /> - <rect - y="-11.724709" - x="-3.5998158" - height="79.195961" - width="79.067383" - id="rect5412" - style="opacity:0.5;fill:none;fill-opacity:1;stroke:none;stroke-width:3.5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> + <path + style="fill:#000000;fill-opacity:0.27450982;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 24.55589,54.743329 42.426407,71.713893 73.41054,75.570838 83.567165,54.871894 81.124432,34.815775 47.440437,-0.9252589 33.298301,21.959288 Z" + id="path3352" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccc" /> + <path + id="path5090" + style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Segoe UI';-inkscape-font-specification:'Segoe UI Bold Italic';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#2b4265;stroke-width:3;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 51.33532,22.906446 H 40.195071 L 36.372894,37.970779 Q 36.279672,38.4821 36.139836,39.072087 36,39.662073 35.860165,40.25206 q -0.09323,0.589988 -0.186449,1.140642 -0.09322,0.511323 -0.09322,0.865315 0,1.573298 0.932239,2.320614 0.932237,0.747318 3.076385,0.747318 0.559343,0 1.398357,-0.117999 0.885628,-0.117997 1.771253,-0.314658 0.932239,-0.196663 1.771253,-0.393326 0.839014,-0.235995 1.351746,-0.393324 l -2.283985,9.203795 q -0.839014,0.275328 -2.050924,0.550655 -1.211908,0.275327 -2.656878,0.511322 -1.44497,0.235994 -3.029774,0.393324 -1.538195,0.15733 -3.029774,0.15733 -3.542506,0 -5.919715,-0.786649 -2.377207,-0.747317 -3.822177,-2.08462 -1.398357,-1.376636 -2.004311,-3.18593 -0.559344,-1.809293 -0.559344,-3.933246 0,-0.629318 0.09322,-1.455301 0.09322,-0.825982 0.23306,-1.691295 0.186447,-0.865315 0.372896,-1.730628 0.233058,-0.904647 0.419507,-1.651964 l 3.822177,-15.496989 h -7.364683 l 2.610267,-9.164463 h 7.038398 L 30.173509,4.3021939 45.695278,1.0769322 42.572279,13.741983 h 11.326696 l -2.563656,9.164463 z" + inkscape:connector-curvature="0" /> </g> </svg> diff --git a/org.fox.ttrss/src_drawable/s_launcher_bg.svg b/org.fox.ttrss/src_drawable/s_launcher_bg.svg new file mode 100644 index 00000000..98b348ec --- /dev/null +++ b/org.fox.ttrss/src_drawable/s_launcher_bg.svg @@ -0,0 +1,107 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="72" + height="72" + id="svg2985" + version="1.1" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + inkscape:export-filename="C:\Users\Andrew\Documents\Projects\Tiny-Tiny-RSS-for-Honeycomb\org.fox.ttrss\src\main\res\drawable-hdpi\ic_launcher.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + sodipodi:docname="s_launcher_bg.svg"> + <defs + id="defs2987" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:zoom="8.1677726" + inkscape:cx="36" + inkscape:cy="36" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:document-units="px" + inkscape:grid-bbox="true" + inkscape:snap-page="false" + inkscape:window-width="1920" + inkscape:window-height="1170" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="0" /> + <metadata + id="metadata2990"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer" + transform="translate(0,8)"> + <rect + style="fill:#216d96;fill-opacity:1;stroke:none" + id="rect3348" + width="94.366615" + height="92.438141" + x="-9.8994951" + y="-15.710218" /> + <g + id="g3814" + style=""> + <ellipse + cx="13.987616" + cy="50.012821" + id="ellipse3800" + style="fill:#ffa000;fill-opacity:1;stroke:none;stroke-width:0.69765961;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;" + rx="8.3196411" + ry="8.3198061" /> + <path + d="m 45.879574,58.332627 -11.786158,0 A 28.425441,28.426004 0 0 0 5.6679745,29.906622 l 0,-11.786392 A 40.2116,40.212396 0 0 1 45.879574,58.332627 Z" + id="path3802" + inkscape:connector-curvature="0" + style="fill:#ff8f00;fill-opacity:1;stroke:none;stroke-width:0.69765961;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;" /> + <g + style="fill:#ff6f00;fill-opacity:1;stroke:none;stroke-width:2.01254654;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;" + id="g3804" + transform="matrix(0.34665172,0,0,0.34665859,-9.5847012,-15.505653)"> + <g + id="g3806" + style=""> + <path + d="M 184,213 A 140,140 0 0 0 44,73 l 0,-35 a 175,175 0 0 1 175,175 z" + id="path3808" + inkscape:connector-curvature="0" + style="fill:#ff6f00;fill-opacity:1;stroke:none;stroke-width:2.01254654;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;" /> + </g> + <g + id="g3810" + style=""> + <path + style="fill:#ff6f00;fill-opacity:1;stroke:none;stroke-width:2.01254654;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;" + inkscape:connector-curvature="0" + id="path3812" + d="M 184,213 A 140,140 0 0 0 44,73 l 0,-35 a 175,175 0 0 1 175,175 z" /> + </g> + </g> + </g> + </g> +</svg> |
