diff options
| -rw-r--r-- | AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | assets/fonts/Storopia.ttf | bin | 89888 -> 0 bytes | |||
| -rw-r--r-- | assets/html/en/index.html | 98 | ||||
| -rw-r--r-- | assets/html/fr/index.html | 100 | ||||
| -rw-r--r-- | assets/html/img/paypal.gif | bin | 2127 -> 0 bytes | |||
| -rw-r--r-- | assets/html/img/subsonic.png | bin | 2084 -> 0 bytes | |||
| -rw-r--r-- | assets/html/ru/index.html | 98 | ||||
| -rw-r--r-- | assets/html/style.css | 11 | ||||
| -rw-r--r-- | res/layout/help.xml | 42 | ||||
| -rw-r--r-- | res/menu/main.xml | 5 | ||||
| -rw-r--r-- | src/github/daneren2005/dsub/activity/HelpActivity.java | 117 | ||||
| -rw-r--r-- | src/github/daneren2005/dsub/fragments/SubsonicFragment.java | 4 |
12 files changed, 1 insertions, 480 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d6b13e09..613c8e6d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -50,11 +50,7 @@ android:configChanges="orientation|keyboardHidden"
android:launchMode="singleTask"/>
- <activity android:name="github.daneren2005.dsub.activity.HelpActivity"
- android:label="@string/help.label"
- android:launchMode="singleTask"/>
-
- <activity android:name="github.daneren2005.dsub.activity.EqualizerActivity"
+ <activity android:name="github.daneren2005.dsub.activity.EqualizerActivity"
android:label="@string/equalizer.label"
android:configChanges="orientation|keyboardHidden"
android:launchMode="singleTask"/>
diff --git a/assets/fonts/Storopia.ttf b/assets/fonts/Storopia.ttf Binary files differdeleted file mode 100644 index cbdc4c1f..00000000 --- a/assets/fonts/Storopia.ttf +++ /dev/null diff --git a/assets/html/en/index.html b/assets/html/en/index.html deleted file mode 100644 index 9ad7542c..00000000 --- a/assets/html/en/index.html +++ /dev/null @@ -1,98 +0,0 @@ -<html> -<head> - <title>DSub Help</title> - <link rel="stylesheet" href="../style.css" type="text/css"> - -</head> - -<body> - -<h3><img src="../img/subsonic.png" alt=""> Welcome to DSub!</h3> - -<p> - With <b>DSub</b> you can easily stream or download music from your home computer to your Android phone - (and do lots of other cool stuff too). -</p> - -<p> - To install the Subsonic server software on your computer, please visit <a href="http://subsonic.org">subsonic.org</a>. - It's available for Windows, Mac, Linux and Unix. -</p> - -<p> - By default, this program is configured to use the <b>Subsonic demo server</b>. Once you've set up your own - server, please go to <b>Settings</b> and change the configuration so that it connects to your own computer. -</p> - -<p> - You can use this program freely for 30 days. After that you will have to make a donation to the Subsonic project. - As a donor you get the following benefits: -</p> -<ul> - <li>Unlimited streaming and download to any number of iPhone and Android phones.</li> - <li>Video streaming.</li> - <li>A personal web address for your Subsonic server (<em>yourname</em>.subsonic.org).</li> - <li>No ads in the Subsonic web interface.</li> - <li>Free access to new premium features.</li> -</ul> - -<p> - The suggested donation amount is <b>€20</b>, but you can give any amount you like. -</p> - -<p> - Click one of the buttons to go to PayPal where you can pay by credit card or by using your PayPal account. - Once the donation is processed, you will receive a license key by email. -</p> - -<table> - <tr> - <td style="border:none;"> - <table> - <tr> - <td style="border:none;padding:0;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3RTGWJRNAW2PU"><img src="../img/paypal.gif" alt=""/></a> </td> - </tr> - <tr> - <td style="text-align:center;border:none;padding:0">€10</td> - </tr> - </table> - </td> - <td style="border:none;"> - <table> - <tr> - <td style="border:none;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=UCUUB2TYE4PGN"><img src="../img/paypal.gif" alt=""/></a> </td> - </tr> - <tr> - <td style="text-align:center;border:none;padding:0">€20</td> - </tr> - </table> - </td> - <td style="border:none;"> - <table> - <tr> - <td style="border:none;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3M6TFHWEPSU44"><img src="../img/paypal.gif" alt=""/></a> </td> - </tr> - <tr> - <td style="text-align:center;border:none;padding:0">€25</td> - </tr> - </table> - </td> - <td style="border:none;"> - <table> - <tr> - <td style="border:none;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5KP7LPQU77UAS"><img src="../img/paypal.gif" alt=""/></a> </td> - </tr> - <tr> - <td style="text-align:center;border:none;padding:0">€30</td> - </tr> - </table> - </td> - </tr> -</table> - -<p> - For more information, please visit <a href="http://subsonic.org/">subsonic.org</a> -</p> - -</body> -</html> diff --git a/assets/html/fr/index.html b/assets/html/fr/index.html deleted file mode 100644 index 4ac8c9c3..00000000 --- a/assets/html/fr/index.html +++ /dev/null @@ -1,100 +0,0 @@ -<html> -<head> - <title>Aide de Subsonic</title> - <link rel="stylesheet" href="../style.css" type="text/css"> - -</head> - -<body> - -<h3><img src="../img/subsonic.png" alt=""> Bienvenue dans Subsonic</h3> - -<p> - Avec <b>Subsonic</b>, vous pouvez facilement écouter ou télécharger de la musique à partir de votre ordinateur personnel sur votre appareil Android - (et faire plein d'autres trucs cools aussi). -</p> - -<p> - Pour installer le serveur Subsonic sur votre ordinateur, veuillez visiter <a href="http://subsonic.org">subsonic.org</a>. - Celui-ci est disponible pour Windows, Mac, Linux et Unix. -</p> - -<p> - Par défaut, cette application est configuré pour utiliser le <b>serveur démo Subsonic</b>. - Après avoir configuré votre serveur personnel, veuillez accéder aux <b>Paramètres</b> et modifier la configuration - afin de vous connecter à votre propre ordinateur. -</p> - -<p> - Vous pouvez utiliser cette application gratuitement pendant 30 jours. - Ensuite, vous devrez effectuer un don au projet Subsonic. - En tant que donateur, vous obtiendrez les bénéfices suivants: -</p> -<ul> - <li>Écoute et téléchargement illimités vers autant de iPhones et d'appareils Android que désiré.</li> - <li>Écoute de vidéos.</li> - <li>Une adresse web personnalisée pour votre serveur Subsonic (<em>votrenom</em>.subsonic.org).</li> - <li>Aucune publicité dans l'interface web de Subsonic.</li> - <li>Accès gratuit aux nouvelles fonctionnalités avancées.</li> -</ul> - -<p> - Le montant suggéré pour le don est de <b>20€</b>, mais n'importe quel montant fera l'affaire. -</p> - -<p> - Cliquez l'un des boutons suivants pour accéder à PayPal, d'où vous pourrez payer soit par carte de crédit ou en utilisant votre compte PayPal. - Une fois le don reçu et traité, vous recevrez votre clé d'activation par courriel. -</p> - -<table> - <tr> - <td style="border:none;"> - <table> - <tr> - <td style="border:none;padding:0;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3RTGWJRNAW2PU"><img src="../img/paypal.gif" alt=""/></a> </td> - </tr> - <tr> - <td style="text-align:center;border:none;padding:0">10€</td> - </tr> - </table> - </td> - <td style="border:none;"> - <table> - <tr> - <td style="border:none;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=UCUUB2TYE4PGN"><img src="../img/paypal.gif" alt=""/></a> </td> - </tr> - <tr> - <td style="text-align:center;border:none;padding:0">20€</td> - </tr> - </table> - </td> - <td style="border:none;"> - <table> - <tr> - <td style="border:none;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3M6TFHWEPSU44"><img src="../img/paypal.gif" alt=""/></a> </td> - </tr> - <tr> - <td style="text-align:center;border:none;padding:0">25€</td> - </tr> - </table> - </td> - <td style="border:none;"> - <table> - <tr> - <td style="border:none;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5KP7LPQU77UAS"><img src="../img/paypal.gif" alt=""/></a> </td> - </tr> - <tr> - <td style="text-align:center;border:none;padding:0">30€</td> - </tr> - </table> - </td> - </tr> -</table> - -<p> - Pour plus d'information, veuillez visiter <a href="http://subsonic.org/">subsonic.org</a> -</p> - -</body> -</html> diff --git a/assets/html/img/paypal.gif b/assets/html/img/paypal.gif Binary files differdeleted file mode 100644 index d017250a..00000000 --- a/assets/html/img/paypal.gif +++ /dev/null diff --git a/assets/html/img/subsonic.png b/assets/html/img/subsonic.png Binary files differdeleted file mode 100644 index 38c521c5..00000000 --- a/assets/html/img/subsonic.png +++ /dev/null diff --git a/assets/html/ru/index.html b/assets/html/ru/index.html deleted file mode 100644 index 57979152..00000000 --- a/assets/html/ru/index.html +++ /dev/null @@ -1,98 +0,0 @@ -<html>
-<head>
- <title>Помощь DSub</title>
- <link rel="stylesheet" href="../style.css" type="text/css">
-
-</head>
-
-<body>
-
-<h3><img src="../img/subsonic.png" alt=""> Добро пожаловать в DSub!</h3>
-
-<p>
- С программой <b>DSub</b> Вы можете легко включить поточное воспроизведение или скачивать музыку с Вашего домашнего компьютера на Android устройство
- (и использовать множество других полезных функции).
-</p>
-
-<p>
- Для установки серверного приложения Subsonic на Ваш компьютер, пожалуйста, посетите <a href="http://subsonic.org">subsonic.org</a>.
- Приложение доступно для Windows, Mac, а также Linux и Unix.
-</p>
-
-<p>
- По умолчанию данная программа настроена на работу с <b>демо сервером Subsonic</b>. После установки серверного
- приложения, пожалуйста, перейдите в раздел <b>Настройки</b> и измените параметры для подключения.
-</p>
-
-<p>
- Вы можете бесплатно использовать программу до 30 дней. После этого Вам необходимо сделать пожертвование проекту Subsonic.
- После этого Вы получите следующие возможности:
-</p>
-<ul>
- <li>Неограниченное поточное воспроизведение или скачивание с любого количества iPhone и Android устройств.</li>
- <li>Потоковое воспроизведение видео.</li>
- <li>Персональный адрес страницы на сервере Subsonic (<em>вашеимя</em>.subsonic.org).</li>
- <li>Отсутствие рекламы в веб-интерфейсе Subsonic.</li>
- <li>Бесплатный доступ к новым премиум-функциям.</li>
-</ul>
-
-<p>
- Рекомендуемая сумма пожертвования - <b>€20</b>, но Вы можете пожертвовать любую сумму.
-</p>
-
-<p>
- Нажмите одну из кнопок для перехода на страницу PayPal, откуда Вы сможете сделать перевод с Вашей кредитной карты или используя аккаунт PayPal.
- После отправки пожертвования Вы получите лицензионный ключ на Ваш email.
-</p>
-
-<table>
- <tr>
- <td style="border:none;">
- <table>
- <tr>
- <td style="border:none;padding:0;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3RTGWJRNAW2PU"><img src="../img/paypal.gif" alt=""/></a> </td>
- </tr>
- <tr>
- <td style="text-align:center;border:none;padding:0">€10</td>
- </tr>
- </table>
- </td>
- <td style="border:none;">
- <table>
- <tr>
- <td style="border:none;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=UCUUB2TYE4PGN"><img src="../img/paypal.gif" alt=""/></a> </td>
- </tr>
- <tr>
- <td style="text-align:center;border:none;padding:0">€20</td>
- </tr>
- </table>
- </td>
- <td style="border:none;">
- <table>
- <tr>
- <td style="border:none;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3M6TFHWEPSU44"><img src="../img/paypal.gif" alt=""/></a> </td>
- </tr>
- <tr>
- <td style="text-align:center;border:none;padding:0">€25</td>
- </tr>
- </table>
- </td>
- <td style="border:none;">
- <table>
- <tr>
- <td style="border:none;padding:0"><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5KP7LPQU77UAS"><img src="../img/paypal.gif" alt=""/></a> </td>
- </tr>
- <tr>
- <td style="text-align:center;border:none;padding:0">€30</td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
-
-<p>
- За дополнительной информацией посетите <a href="http://subsonic.org/">subsonic.org</a>
-</p>
-
-</body>
-</html>
\ No newline at end of file diff --git a/assets/html/style.css b/assets/html/style.css deleted file mode 100644 index 9c1d55f2..00000000 --- a/assets/html/style.css +++ /dev/null @@ -1,11 +0,0 @@ -/* -* Taken from http://yui.yahooapis.com/2.8.0r4/build/fonts/fonts.css -*/ -body { - font: 13px / 1.231 arial, helvetica, clean, sans-serif; -} - -table { - font-size:inherit; - font:100%; -}
\ No newline at end of file diff --git a/res/layout/help.xml b/res/layout/help.xml deleted file mode 100644 index f22dee37..00000000 --- a/res/layout/help.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <LinearLayout android:id="@+id/help_buttons" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:layout_alignParentBottom="true" - android:padding="4dip" - android:gravity="center_horizontal" - android:background="#ffcccccc"> - - <Button android:id="@+id/help_back" - android:text="@string/help.back" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_marginRight="5dip" - android:paddingLeft="25dip" - android:paddingRight="25dip"/> - - <Button android:id="@+id/help_close" - android:text="@string/help.close" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_marginLeft="5dip" - android:paddingLeft="25dip" - android:paddingRight="25dip"/> - </LinearLayout> - - - <WebView - android:id="@+id/help_contents" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_above="@id/help_buttons" - android:layout_weight="1" - android:fadingEdge="vertical" - android:fadingEdgeLength="12dip"/> - - </RelativeLayout> diff --git a/res/menu/main.xml b/res/menu/main.xml index 213dbf1c..b0385836 100644 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -12,11 +12,6 @@ android:icon="@drawable/action_shuffle" android:title="@string/menu.shuffle" compat:showAsAction="always|withText"/> - - <item - android:id="@+id/menu_help" - android:icon="@drawable/action_help" - android:title="@string/menu.help"/> <item android:id="@+id/menu_about" diff --git a/src/github/daneren2005/dsub/activity/HelpActivity.java b/src/github/daneren2005/dsub/activity/HelpActivity.java deleted file mode 100644 index 6dc516bf..00000000 --- a/src/github/daneren2005/dsub/activity/HelpActivity.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - This file is part of Subsonic. - - Subsonic is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Subsonic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Subsonic. If not, see <http://www.gnu.org/licenses/>. - - Copyright 2009 (C) Sindre Mehus - */ - -package github.daneren2005.dsub.activity; - -import android.app.Activity; -import android.os.Bundle; -import android.view.KeyEvent; -import android.view.View; -import android.view.Window; -import android.webkit.WebView; -import android.webkit.WebViewClient; -import android.widget.Button; -import github.daneren2005.dsub.R; -import github.daneren2005.dsub.util.Util; - -/** - * An HTML-based help screen with Back and Done buttons at the bottom. - * - * @author Sindre Mehus - */ -public final class HelpActivity extends Activity { - - private WebView webView; - private Button backButton; - - @Override - protected void onCreate(Bundle bundle) { - super.onCreate(bundle); - getWindow().requestFeature(Window.FEATURE_INDETERMINATE_PROGRESS); - - setContentView(R.layout.help); - - webView = (WebView) findViewById(R.id.help_contents); - webView.getSettings().setJavaScriptEnabled(true); - webView.setWebViewClient(new HelpClient()); - if (bundle != null) { - webView.restoreState(bundle); - } else { - webView.loadUrl(getResources().getString(R.string.help_url)); - } - - backButton = (Button) findViewById(R.id.help_back); - backButton.setOnClickListener(new Button.OnClickListener() { - @Override - public void onClick(View view) { - webView.goBack(); - } - }); - - Button doneButton = (Button) findViewById(R.id.help_close); - doneButton.setOnClickListener(new Button.OnClickListener() { - @Override - public void onClick(View view) { - finish(); - } - }); - } - - @Override - public void onResume() { - super.onResume(); - } - - @Override - protected void onSaveInstanceState(Bundle state) { - webView.saveState(state); - } - - @Override - public boolean onKeyDown(int keyCode, KeyEvent event) { - if (keyCode == KeyEvent.KEYCODE_BACK) { - if (webView.canGoBack()) { - webView.goBack(); - return true; - } - } - return super.onKeyDown(keyCode, event); - } - - private final class HelpClient extends WebViewClient { - @Override - public void onLoadResource(WebView webView, String url) { - setProgressBarIndeterminateVisibility(true); - setTitle(getResources().getString(R.string.help_loading)); - super.onLoadResource(webView, url); - } - - @Override - public void onPageFinished(WebView view, String url) { - setProgressBarIndeterminateVisibility(false); - setTitle(view.getTitle()); - backButton.setEnabled(view.canGoBack()); - } - - @Override - public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) { - Util.toast(HelpActivity.this, description); - } - } -} diff --git a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java index 048d75e8..1a55d1d0 100644 --- a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java +++ b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java @@ -41,7 +41,6 @@ import android.widget.EditText; import android.widget.TextView;
import github.daneren2005.dsub.R;
import github.daneren2005.dsub.activity.DownloadActivity;
-import github.daneren2005.dsub.activity.HelpActivity;
import github.daneren2005.dsub.activity.SearchActivity;
import github.daneren2005.dsub.activity.SettingsActivity;
import github.daneren2005.dsub.activity.SubsonicActivity;
@@ -132,9 +131,6 @@ public class SubsonicFragment extends Fragment { case R.id.menu_settings:
startActivity(new Intent(context, SettingsActivity.class));
return true;
- case R.id.menu_help:
- startActivity(new Intent(context, HelpActivity.class));
- return true;
}
return false;
|
