diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/material_drawer_header.xml | 119 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 54 | ||||
| -rw-r--r-- | app/src/main/res/values/strings_about.xml | 23 | ||||
| -rw-r--r-- | app/src/main/res/values/strings_download.xml | 11 | ||||
| -rw-r--r-- | app/src/main/res/values/strings_play_store.xml | 25 | ||||
| -rw-r--r-- | app/src/main/res/values/strings_pref_behaviour.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/strings_pref_debug.xml | 14 | ||||
| -rw-r--r-- | app/src/main/res/values/strings_pref_experimental.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/strings_pref_networks.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/strings_pref_notifications.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/values/strings_preferences.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/values/strings_temp.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/values/strings_web_context.xml | 13 | ||||
| -rw-r--r-- | app/src/main/res/xml/frost_changelog.xml | 18 | ||||
| -rw-r--r-- | app/src/main/res/xml/frost_faq.xml | 8 |
15 files changed, 236 insertions, 72 deletions
diff --git a/app/src/main/res/layout/material_drawer_header.xml b/app/src/main/res/layout/material_drawer_header.xml new file mode 100644 index 00000000..21cd20a1 --- /dev/null +++ b/app/src/main/res/layout/material_drawer_header.xml @@ -0,0 +1,119 @@ +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="@dimen/material_drawer_account_header_height" + android:clickable="true" + tools:ignore="all"> + + <!-- + Resolves padding + Check with <a href="https://github.com/mikepenz/MaterialDrawer/issues/1907">Issue</a> + --> + + <ImageView + android:id="@+id/material_drawer_account_header_background" + android:layout_width="match_parent" + android:layout_height="@dimen/material_drawer_account_header_height" + android:scaleType="centerCrop" /> + + <RelativeLayout + android:id="@+id/material_drawer_account_header" + android:layout_width="match_parent" + android:layout_height="@dimen/material_drawer_account_header_height"> + + <com.mikepenz.materialdrawer.view.BezelImageView + android:id="@+id/material_drawer_account_header_current" + android:layout_width="@dimen/material_drawer_account_header_selected" + android:layout_height="@dimen/material_drawer_account_header_selected" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:layout_marginBottom="@dimen/material_drawer_account_header_horizontal_bottom" + android:layout_marginLeft="@dimen/material_drawer_vertical_padding" + android:layout_marginTop="@dimen/material_drawer_account_header_horizontal_top" + android:clickable="true" + android:elevation="2dp" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_alignTop="@+id/material_drawer_account_header_current" + android:gravity="right"> + + <com.mikepenz.materialdrawer.view.BezelImageView + android:id="@+id/material_drawer_account_header_small_first" + android:layout_width="@dimen/material_drawer_account_header_secondary" + android:layout_height="@dimen/material_drawer_account_header_secondary" + android:layout_marginRight="@dimen/material_drawer_vertical_padding" + android:clickable="true" + android:elevation="2dp" + android:visibility="gone" /> + + <com.mikepenz.materialdrawer.view.BezelImageView + android:id="@+id/material_drawer_account_header_small_second" + android:layout_width="@dimen/material_drawer_account_header_secondary" + android:layout_height="@dimen/material_drawer_account_header_secondary" + android:layout_marginRight="@dimen/material_drawer_vertical_padding" + android:clickable="true" + android:elevation="2dp" + android:visibility="gone" /> + + <com.mikepenz.materialdrawer.view.BezelImageView + android:id="@+id/material_drawer_account_header_small_third" + android:layout_width="@dimen/material_drawer_account_header_secondary" + android:layout_height="@dimen/material_drawer_account_header_secondary" + android:layout_marginRight="@dimen/material_drawer_vertical_padding" + android:clickable="true" + android:elevation="2dp" + android:visibility="gone" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/material_drawer_account_header_text_section" + android:layout_width="match_parent" + android:layout_height="56dp" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true" + android:layout_marginBottom="@dimen/material_drawer_account_header_dropdown_margin_bottom" + android:layout_toLeftOf="@+id/material_drawer_account_header_text_switcher" + android:gravity="center_vertical|bottom" + android:orientation="vertical" + android:paddingEnd="56dp" + android:paddingLeft="0dp" + android:paddingRight="56dp" + android:paddingStart="0dp"> + + <TextView + android:id="@+id/material_drawer_account_header_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/material_drawer_vertical_padding" + android:fontFamily="sans-serif-medium" + android:lines="1" + android:maxLines="1" + android:textSize="@dimen/material_drawer_account_header_text" /> + + <TextView + android:id="@+id/material_drawer_account_header_email" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/material_drawer_vertical_padding" + android:fontFamily="sans-serif" + android:lines="1" + android:maxLines="1" + android:textSize="@dimen/material_drawer_account_header_text" /> + + </LinearLayout> + + <ImageView + android:id="@+id/material_drawer_account_header_text_switcher" + android:layout_width="@dimen/material_drawer_account_header_dropdown" + android:layout_height="@dimen/material_drawer_account_header_dropdown" + android:layout_alignParentBottom="true" + android:layout_alignParentRight="true" + android:layout_marginBottom="@dimen/material_drawer_account_header_dropdown_margin_bottom" + android:layout_marginRight="@dimen/material_drawer_vertical_padding" /> + + </RelativeLayout> +</FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 412d5f34..85826588 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,11 @@ <resources> <string name="dev_email" translatable="false">pitchedapps@gmail.com</string> + <string name="dev_paypal" translatable="false">https://www.paypal.me/Allanw9</string> + <string name="paypal" translatable="false">PayPal</string> <string name="play_store_package_id" translatable="false">com.pitchedapps.frost</string> + <!--Tabs--> + <string name="feed">Feed</string> <string name="most_recent">Most Recent</string> <string name="top_stories">Top Stories</string> @@ -23,6 +27,8 @@ <string name="notes">Notes</string> <string name="on_this_day">On This Day</string> + <!--Login--> + <string name="loading_account">Getting everything ready…</string> <string name="welcome">Welcome %s</string> <string name="select_facebook_account">Select Facebook Account</string> @@ -38,47 +44,23 @@ <string name="feature_request">Feature Request</string> <string name="subject">Subject</string> <string name="share">Share</string> - <string name="share_link">Share Link</string> - <string name="debug_link">Debug Link</string> - <string name="debug_link_subject">Frost for Facebook: Link Debug</string> - <string name="debug_link_content">Write here. Note that your link may contain private information, but I won\'t be able to see it as the post isn\'t public. The url will still help with debugging though.</string> - <string name="debug_link_desc">If a link isn\'t loading properly, you can email me so I can help debug it. Clicking okay will open an email request</string> - <string name="open_link">Open Link</string> - <string name="copy_link">Copy Link</string> - <string name="copy_text">Copy Text</string> - <string name="debug_image_link_subject">Frost for Facebook: Image Link Debug</string> <string name="web_overlay_swipe_hint">Swipe right to go back to the previous window.</string> <string name="profile_picture">Profile Picture</string> - <string name="custom_pro">Custom [Pro]</string> - <string name="uh_oh">Uh Oh</string> - <string name="reload">Reload</string> - <string name="play_store_not_pro">It seems like you are a pro user, but we couldn\'t find your purchasing info. If this error persists, please try clearing the Play Store cache and reinstalling the app.</string> - <string name="play_store_unsupported">It seems like app version can\'t purchase pro. Please reinstall from the play store if this is a persisting issue.</string> - <string name="play_store_not_found_pro_query">This is a pro feature, but this app doesn\'t seem to be installed from the Play Store. Please reinstall if this is an issue.</string> - <string name="play_store_billing_error">Something went wrong. Please try again later.</string> - <string name="play_thank_you">Thank you!</string> - <string name="play_purchased_pro">Thank you for your support! Enjoy the pro version.</string> - <string name="play_already_purchased">Already Purchased</string> - <string name="play_already_purchased_content">Looks like you\'ve already purchased %s. Enjoy!</string> - <string name="found_pro">Found Frost Pro!</string> - <string name="found_pro_desc">Looks like you have frost pro! We\'ll reload the app so you can enjoy the awesome features!</string> - <string name="restoring_purchases">Restoring purchases…</string> - <string name="purchases_restored">Purchases Restored</string> - <string name="purchases_restored_with_pro">Frost Pro has been restored. Enjoy the features!</string> - <string name="purchases_restored_without_pro">It seems like you don\'t have pro. If this is a persistent issue, contact me and attach your purchase receipt.</string> - - <string name="login_id_failed">Login failed; id not found</string> - <string name="iab_still_in_progress">IAB query is still in progress</string> <string name="new_message">New Message</string> <string name="no_text">No text</string> - <string name="image_download_success">Image downloaded</string> - <string name="image_download_fail">Image failed to download</string> - <string name="image_share_failed">Failed to share image</string> - <string name="downloading_video">Downloading Video</string> - <string name="downloaded_video">Video Downloaded</string> - <string name="downloading_file">Downloading File</string> - <string name="downloaded_file">File Downloaded</string> + <!--About--> + + <string name="frost_description">Frost is a fully themable, + fully functional alternative to the official Facebook app, made from scratch and proudly open sourced.</string> + + <string name="faq_title">Frost FAQ</string> + + <!--HTML Extractor--> + + <string name="html_extraction_error">An error occurred in the html extraction.</string> + <string name="html_extraction_cancelled">The request has been cancelled.</string> + <string name="html_extraction_timeout">The request has timed out.</string> </resources> diff --git a/app/src/main/res/values/strings_about.xml b/app/src/main/res/values/strings_about.xml deleted file mode 100644 index 68590718..00000000 --- a/app/src/main/res/values/strings_about.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - - <string name="frost_description">Frost is a fully themable, - fully functional alternative to the official Facebook app, made from scratch and proudly open sourced.</string> - - <string name="faq_title">Frost FAQ</string> - - <string name="faq_feature">Can you add feature xxx?</string> - <string name="faq_feature_desc">I\'m always opened to suggestions, - and if a feature will enhance your experience, I\'d like to hear it. - However, please consider taking a look at my - <a href="https://github.com/AllanWang/Frost-for-Facebook/issues">issue tracker</a></string> - - <string name="faq_cannot_scroll_horizontally">I can\'t scroll horizontally in the webviews.</string> - <string name="faq_cannot_scroll_horizontally_desc">This is known since the viewpager takes priority for horizontal scrolling. - Frost has addressed this by allowing horizontal web scrolls if you tap and hold before scrolling.</string> - - <string name="faq_more_frequent_notifications">Can I get more frequent notifications?</string> - <string name="faq_more_frequent_notifications_desc">I made the decision to prioritize battery life by using a newer job scheduler for Android. - This means that your framework picks the best time to fetch the notifications, and the lowest window is 15 minutes. - This is also why I don\'t require the wakelock permission</string> -</resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings_download.xml b/app/src/main/res/values/strings_download.xml new file mode 100644 index 00000000..383daf56 --- /dev/null +++ b/app/src/main/res/values/strings_download.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="image_download_success">Image downloaded</string> + <string name="image_download_fail">Image failed to download</string> + <string name="image_share_failed">Failed to share image</string> + + <string name="downloading_video">Downloading Video</string> + <string name="downloaded_video">Video Downloaded</string> + <string name="downloading_file">Downloading File</string> + <string name="downloaded_file">File Downloaded</string> +</resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings_play_store.xml b/app/src/main/res/values/strings_play_store.xml new file mode 100644 index 00000000..8d37ee16 --- /dev/null +++ b/app/src/main/res/values/strings_play_store.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8" standalone="no"?> +<resources> + <string name="found_pro">Found Frost Pro!</string> + <string name="found_pro_desc">Looks like you have frost pro! We\'ll reload the app so you can enjoy the awesome features!</string> + + <string name="play_already_purchased">Already Purchased</string> + <string name="play_already_purchased_content">Looks like you\'ve already purchased %s. Enjoy!</string> + <string name="play_purchased_pro">Thank you for your support! Enjoy the pro version.</string> + <string name="play_store_billing_error">Something went wrong. Please try again later.</string> + <string name="play_store_not_found_pro_query">This is a pro feature, but this app doesn\'t seem to be installed from the Play Store. Please reinstall if this is an issue.</string> + <string name="play_store_not_pro">It seems like you are a pro user, but we couldn\'t find your purchasing info. If this error persists, please try clearing the Play Store cache and reinstalling the app.</string> + <string name="play_store_unsupported">It seems like this app version can\'t purchase pro. Please reinstall from the play store if this is a persistent issue. + \nIf you would like to donate without any additional features, you may do so through PayPal.</string> + <string name="play_thank_you">Thank you!</string> + + <string name="purchases_restored">Purchases Restored</string> + <string name="purchases_restored_with_pro">Frost Pro has been restored. Enjoy the features!</string> + <string name="purchases_restored_without_pro">It seems like you don\'t have pro. If this is a persistent issue, contact me and attach your purchase receipt.</string> + + <string name="restoring_purchases">Restoring purchases…</string> + + <string name="custom_pro">Custom [Pro]</string> + <string name="uh_oh">Uh Oh</string> + <string name="reload">Reload</string> +</resources> diff --git a/app/src/main/res/values/strings_pref_behaviour.xml b/app/src/main/res/values/strings_pref_behaviour.xml index 13924a2d..6563ef69 100644 --- a/app/src/main/res/values/strings_pref_behaviour.xml +++ b/app/src/main/res/values/strings_pref_behaviour.xml @@ -9,6 +9,10 @@ <string name="overlay_full_screen_swipe_desc">Swipe right from anywhere on the overlaying web to close the browser. If disabled, only swiping from the left edge will move it.</string> <string name="viewpager_swipe">Viewpager Swipe</string> <string name="viewpager_swipe_desc">Allow swiping between the pages in the main view to switch tabs. By default, the swiping automatically stops when you long press on an item, such as the like button. Disabling this will prevent page swiping altogether.</string> + <string name="search_bar">Search Bar</string> + <string name="search_bar_desc">Enable the search bar instead of a search overlay</string> + <string name="force_message_bottom">Force Message Bottom</string> + <string name="force_message_bottom_desc">When loading a message thread, trigger a scroll to the bottom of the page rather than loading the page as is.</string> <string name="exit_confirmation">Exit Confirmation</string> <string name="exit_confirmation_desc">Show confirmation dialog before exiting the app</string> <string name="analytics">Analytics</string> diff --git a/app/src/main/res/values/strings_pref_debug.xml b/app/src/main/res/values/strings_pref_debug.xml new file mode 100644 index 00000000..d65adf29 --- /dev/null +++ b/app/src/main/res/values/strings_pref_debug.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <string name="debug_toast_enabled">Debugging section is enabled! Go back to settings.</string> + + <string name="debug_disclaimer_info">Though most private content is automatically removed in the report, some sensitive info may still be visible. + \nPlease have a look at the debug report before sending it. + \n\nClicking one of the options below will prepare an email response with the web page data. + </string> + + <string name="debug_incomplete">Incomplete report</string> + + <string name="debug_report_email_title">Frost for Facebook: Debug Report</string> +</resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings_pref_experimental.xml b/app/src/main/res/values/strings_pref_experimental.xml index 0f545b3e..10c66f99 100644 --- a/app/src/main/res/values/strings_pref_experimental.xml +++ b/app/src/main/res/values/strings_pref_experimental.xml @@ -5,8 +5,7 @@ <string name="experimental_disclaimer_info">Experimental features may be unstable and may never make it to production. Use at your own risk, send feedback, and feel free to disable them if they don\'t work well.</string> <string name="experimental_by_default">Experimental by Default</string> <string name="experimental_by_default_desc">Feeling risky or just want to help with debugging? Checking this will enable future experimental functions be default.</string> - <string name="search_bar">Search Bar</string> - <string name="search_bar_desc">Enable the search bar instead of a search overlay</string> + <string name="verbose_logging">Verbose Logging</string> <string name="verbose_logging_desc">Enable verbose logging to help with crash reports. Logging will only be sent once an error is encountered, so repeat the issue to notify the dev. This will automatically be disabled if the app restarts.</string> <string name="restart_frost">Restart Frost</string> diff --git a/app/src/main/res/values/strings_pref_networks.xml b/app/src/main/res/values/strings_pref_networks.xml new file mode 100644 index 00000000..29eca24a --- /dev/null +++ b/app/src/main/res/values/strings_pref_networks.xml @@ -0,0 +1,4 @@ +<resources> + <string name="network_media_on_metered">Load images on metered network.</string> + <string name="network_media_on_metered_desc">If a metered network is detected, Frost will automatically stop all images and videos from loading.</string> +</resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings_pref_notifications.xml b/app/src/main/res/values/strings_pref_notifications.xml index 00c30b57..3cd953f6 100644 --- a/app/src/main/res/values/strings_pref_notifications.xml +++ b/app/src/main/res/values/strings_pref_notifications.xml @@ -19,5 +19,4 @@ <string name="notification_vibrate">Notification vibration</string> <string name="notification_lights">Notification lights</string> - </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings_preferences.xml b/app/src/main/res/values/strings_preferences.xml index c2ba0b36..05335345 100644 --- a/app/src/main/res/values/strings_preferences.xml +++ b/app/src/main/res/values/strings_preferences.xml @@ -10,6 +10,9 @@ <string name="behaviour">Behaviour</string> <string name="behaviour_desc">Define how the app interacts in certain settings</string> + <string name="network">Network</string> + <string name="network_desc">Define options that affect metered networks</string> + <string name="experimental">Experimental</string> <string name="experimental_desc">Enable early access to potentially unstable features</string> @@ -19,6 +22,8 @@ <string name="about_frost">About Frost for Facebook</string> <string name="about_frost_desc">Version, Credits, and FAQs</string> + <string name="debug_frost">Frost Debugger</string> + <string name="debug_frost_desc">Send html data to help with debugging.</string> <string name="replay_intro">Replay Introduction</string> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings_temp.xml b/app/src/main/res/values/strings_temp.xml deleted file mode 100644 index 526b102d..00000000 --- a/app/src/main/res/values/strings_temp.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <string name="intro_title">Frost now has an intro screen</string> - <string name="intro_desc">Would you like to see it? You can always replay it under settings</string> - -</resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings_web_context.xml b/app/src/main/res/values/strings_web_context.xml new file mode 100644 index 00000000..3b93a202 --- /dev/null +++ b/app/src/main/res/values/strings_web_context.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <string name="share_link">Share Link</string> + <string name="debug_link">Debug Link</string> + <string name="debug_link_subject">Frost for Facebook: Link Debug</string> + <string name="debug_link_content">Write here. Note that your link may contain private information, but I won\'t be able to see it as the post isn\'t public. The url will still help with debugging though.</string> + <string name="debug_link_desc">If a link isn\'t loading properly, you can email me so I can help debug it. Clicking okay will open an email request</string> + <string name="open_link">Open Link</string> + <string name="copy_link">Copy Link</string> + <string name="copy_text">Copy Text</string> + <string name="debug_image_link_subject">Frost for Facebook: Image Link Debug</string> +</resources>
\ No newline at end of file diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml index e7681107..a1fedd42 100644 --- a/app/src/main/res/xml/frost_changelog.xml +++ b/app/src/main/res/xml/frost_changelog.xml @@ -11,19 +11,29 @@ <!--<version title="Beta Updates" />--> <version title="Beta Updates"/> - <item text="Fixed notification titles" /> - <item text="Added support for downloading videos" /> - <item text="" /> + <item text="Create more robust IM notification fetcher with a timeout" /> + <item text="Add hidden debugging options for certain views" /> + <item text="Separate IM and general notification groups" /> + <item text="Add click actions to group notifications. They will launch the message page or the notification page respectively" /> + <item text="Add behaviour setting to force message threads to scroll to the bottom after loading." /> + <item text="Add faq for disabling video auto play" /> <item text="" /> <item text="" /> - <version title="v1.5.0"/> + <version title="v1.4.2"/> <item text="Experimental: Add notifications for messages; report to me if this drains your battery" /> <item text="Add FAQ in the about section" /> <item text="Add video uploading" /> <item text="Add open link option in context menu" /> <item text="Add geolocation" /> <item text="Update theme" /> + <item text="Fix notification titles" /> + <item text="ALPHA: Add support for downloading videos (hit the download button)" /> + <item text="Deny intents for login so the page loads properly (thank you @Zenexer)" /> + <item text="Reduce injection offset and move injectors to an earlier method" /> + <item text="Add option to disable media loading on metered network" /> + <item text="Fix menu section" /> + <item text="Add more background setters to help transparent themes" /> <version title="v1.4.1"/> <item text="Add intro pages" /> diff --git a/app/src/main/res/xml/frost_faq.xml b/app/src/main/res/xml/frost_faq.xml index e46d2d50..1830ed33 100644 --- a/app/src/main/res/xml/frost_faq.xml +++ b/app/src/main/res/xml/frost_faq.xml @@ -14,4 +14,12 @@ <answer><![CDATA[I made the decision to prioritize battery life by using a newer job scheduler for Android. This means that your framework picks the best time to fetch the notifications, and the lowest window is 15 minutes. This is also why I don't require the wakelock permission]]></answer> + + <question><![CDATA[Can I disable auto play for videos?]]></question> + <answer><![CDATA[Facebook already has a toggle. <br/> Go to menu → account settings → videos <br/> and change it from there.]]></answer> + + <!-- + <question><![CDATA[]]></question> + <answer><![CDATA[]]></answer> + --> </resources>
\ No newline at end of file |