Skip to content
This repository
Browse code

Text & settings changes

  • Loading branch information...
commit 4d595af8f8c905626392b5326cde20b699f01f20 1 parent d214c36
Hermes Pique hpique authored
6 res/values-de/strings.xml
@@ -88,10 +88,10 @@
88 88 <string name="category_memory_title">Speicher</string>
89 89 <string name="preference_load_last_title">Laden des letzten Comic</string>
90 90 <string name="preference_load_last_summary">Laden des zuletzt gesehenen Comics beim Start</string>
91   - <string name="preference_acv_listing_summary">Öffnen der Droid Comic Viewer Liste auf dem Android Market</string>
  91 + <string name="preference_acv_listing_summary">Öffnen der ACV Liste auf dem Google Play</string>
92 92 <string name="category_about_title">Über</string>
93 93 <string name="preference_version_title">Version</string>
94   - <string name="preference_version_summary">Droid Comic Viewer v</string>
  94 + <string name="preference_version_summary">ACV v</string>
95 95 <string name="preference_site_title">Internetseite</string>
96   - <string name="preference_site_summary">Öffnen der Robot Comics Internetseite im Browser</string>
  96 + <string name="preference_site_summary">Öffnen der Robot Media Internetseite im Browser</string>
97 97 </resources>
14 res/values-es/strings.xml
@@ -124,15 +124,15 @@
124 124 <string name="preference_low_memory_summary">Deshabilitar precarga y transiciones</string>
125 125 <string name="preference_manual_title">Manual de usuario</string>
126 126 <string name="preference_manual_summary">Abrir el manual de usuario en el navegador</string>
127   - <string name="preference_acv_listing_title">Ficha en Android Market</string>
128   - <string name="preference_acv_listing_summary">Abrir la ficha de Droid Comic Viewer en el Android Market</string>
  127 + <string name="preference_acv_listing_title">Ficha en Google Play</string>
  128 + <string name="preference_acv_listing_summary">Abrir la ficha de ACV en Google Play</string>
129 129 <string name="category_about_title">Acerca de</string>
130 130 <string name="preference_version_title">Versión</string>
131   - <string name="preference_version_summary">Droid Comic Viewer v</string>
  131 + <string name="preference_version_summary">ACV v</string>
132 132 <string name="preference_contact_title">Contacto</string>
133   - <string name="preference_contact_summary">Enviar un email a Robot Comics</string>
  133 + <string name="preference_contact_summary">Enviar un email a Robot Media</string>
134 134 <string name="preference_site_title">Sitio web</string>
135   - <string name="preference_site_summary">Abrir el sitio web de Robot Comics en el navegador</string>
  135 + <string name="preference_site_summary">Abrir el sitio web de Robot Media en el navegador</string>
136 136 <string name="preference_subscribe_summary">Recibe noticias sobre ACV y futuros lanzamientos</string>
137 137 <string name="category_acv_format_title">Ficheros ACV</string>
138 138 <string name="preference_acv_frames_title">Cuadros</string>
@@ -154,7 +154,7 @@
154 154
155 155 <!-- Share -->
156 156 <string name="share_app_title">Lee cómics en tu Android!</string>
157   - <string name="share_app_message">Prueba Droid Comic Viewer, el mejor visor de comics y manga para Android http://bit.ly/3dlKI5</string>
  157 + <string name="share_app_message">Prueba ACV, el mejor visor de comics y manga para Android http://goo.gl/FfAWL5</string>
158 158 <string name="share_screen_title">Pantalla de @comic</string>
159   - <string name="share_screen_message">Mira esta pantalla de @comic enviada desde Droid Comic Viewer http://bit.ly/3dlKI5</string>
  159 + <string name="share_screen_message">Mira esta pantalla de @comic enviada desde ACV http://goo.gl/FfAWL5</string>
160 160 </resources>
8 res/values-fr/strings.xml
@@ -117,11 +117,11 @@
117 117 <string name='preference_acv_listing_title'>Fiche sur le market Android</string>
118 118 <string name='preference_acv_listing_summary'>Ouvrir la fiche d\'ACV sur le market</string>
119 119 <string name='preference_version_title'>Version</string>
120   -<string name='preference_version_summary'>Droid Comic Viewer v</string>
  120 +<string name='preference_version_summary'>ACV v</string>
121 121 <string name='preference_contact_title'>Contacter</string>
122   -<string name='preference_contact_summary'>Envoyer un message à Robot Comics</string>
  122 +<string name='preference_contact_summary'>Envoyer un message à Robot Media</string>
123 123 <string name='preference_site_title'>Site web</string>
124   -<string name='preference_site_summary'>Ouvrir le site de Robot Comics dans le navigateur par défaut</string>
  124 +<string name='preference_site_summary'>Ouvrir le site de Robot Media dans le navigateur par défaut</string>
125 125 <string name='preference_subscribe_summary'>Recevoir les nouveautés sur ACV et les sorties de BD mobiles.</string>
126 126 <string name='category_acv_format_title'>Format ACV</string>
127 127 <string name='preference_acv_frames_title'>Cases</string>
@@ -139,7 +139,7 @@
139 139 <string name='dialog_email_error_title'>Adresse mail invalide</string>
140 140 <string name='dialog_email_error_text'>Veuillez entrer une adresse valide.</string>
141 141 <string name='share_app_title'>Lisez des BD sur votre système Android!</string>
142   -<string name='share_app_message'>Découvrez Droid Comic Viewer, le lecteur #1 de bandes-dessinées et de manga sur Android http://bit.ly/3dlKI5</string>
  142 +<string name='share_app_message'>Découvrez ACV, le lecteur #1 de bandes-dessinées et de manga sur Android http://goo.gl/FfAWL5</string>
143 143 <string name='share_screen_title'>Page tirée de @comic</string>
144 144 <string name='share_screen_message'>Lis cette page grâce à @comic</string>
145 145 </resources>
14 res/values-it/strings.xml
@@ -114,14 +114,14 @@
114 114 <string name='preference_manual_title'>Manuale utente</string>
115 115 <string name='preference_manual_summary'>Apre il manuale utente nel browser</string>
116 116 <string name='category_about_title'>Informazioni</string>
117   -<string name='preference_acv_listing_title'>Pagina Android Market</string>
118   -<string name='preference_acv_listing_summary'>Apri la pagina di Droid Comic Viewer su Android Market</string>
  117 +<string name='preference_acv_listing_title'>Pagina Google Play</string>
  118 +<string name='preference_acv_listing_summary'>Apri la pagina di ACV su Google Play</string>
119 119 <string name='preference_version_title'>Versione</string>
120   -<string name='preference_version_summary'>Droid Comic Viewer v</string>
  120 +<string name='preference_version_summary'>ACV v</string>
121 121 <string name='preference_contact_title'>Contatti</string>
122   -<string name='preference_contact_summary'>Invia una email a Robot Comics</string>
  122 +<string name='preference_contact_summary'>Invia una email a Robot Media</string>
123 123 <string name='preference_site_title'>Sito web</string>
124   -<string name='preference_site_summary'>Apre il sito di Robot Comics nel browser</string>
  124 +<string name='preference_site_summary'>Apre il sito di Robot Media nel browser</string>
125 125 <string name='preference_subscribe_summary'>Ricevi notizie riguardo ACV e future pubblicazioni</string>
126 126 <string name='category_acv_format_title'>Formato ACV</string>
127 127 <string name='preference_acv_frames_title'>Fotogrammi</string>
@@ -139,7 +139,7 @@
139 139 <string name='dialog_email_error_title'>Email non valida</string>
140 140 <string name='dialog_email_error_text'>Per favore inserisci un indirizzo email valido.</string>
141 141 <string name='share_app_title'>Leggi i fumetti sul tuo Android!</string>
142   -<string name='share_app_message'>Prova Droid Comic Viewer, il lettore di fumetti e manga #1 per Android http://bit.ly/3dlKI5</string>
  142 +<string name='share_app_message'>Prova ACV, il lettore di fumetti e manga #1 per Android http://goo.gl/FfAWL5</string>
143 143 <string name='share_screen_title'>Schermata da @comic</string>
144   -<string name='share_screen_message'>Guarda questa schermata di @comic, inviata da Droid Comic Viewer http://bit.ly/3dlKI5</string>
  144 +<string name='share_screen_message'>Guarda questa schermata di @comic, inviata da ACV http://goo.gl/FfAWL5</string>
145 145 </resources>
14 res/values-pl/strings.xml
@@ -133,14 +133,14 @@
133 133 <string name='preference_manual_title'>Podręcznik użytkownika</string>
134 134 <string name='preference_manual_summary'>Otwórz podręcznik użytkownika w domyślnej przeglądarce</string>
135 135 <string name='category_about_title'>O programie</string>
136   -<string name='preference_acv_listing_title'>Opis w Android Market</string>
137   -<string name='preference_acv_listing_summary'>Otwórz opis Droid Comic Viewer w witrynie Android Market</string>
  136 +<string name='preference_acv_listing_title'>Opis w Google Play</string>
  137 +<string name='preference_acv_listing_summary'>Otwórz opis ACV w witrynie Google Play</string>
138 138 <string name='preference_version_title'>Wersja</string>
139   -<string name='preference_version_summary'>Droid Comic Viewer wersja</string>
  139 +<string name='preference_version_summary'>ACV wersja</string>
140 140 <string name='preference_contact_title'>Kontakt</string>
141   -<string name='preference_contact_summary'>Wyślij e-maila do Robot Comics</string>
  141 +<string name='preference_contact_summary'>Wyślij e-maila do Robot Media</string>
142 142 <string name='preference_site_title'>Strona domowa</string>
143   -<string name='preference_site_summary'>Otwórz stronę domową Robot Comics w domyślnej przeglądarce</string>
  143 +<string name='preference_site_summary'>Otwórz stronę domową Robot Media w domyślnej przeglądarce</string>
144 144 <string name='preference_subscribe_summary'>Otrzymuj wiadomości o ACV i nowych komiksach na telefon</string>
145 145 <string name='category_acv_format_title'>Format ACV</string>
146 146 <string name='preference_acv_frames_title'>Klatki</string>
@@ -158,7 +158,7 @@
158 158 <string name='dialog_email_error_title'>Niepoprawny adres e-mail.</string>
159 159 <string name='dialog_email_error_text'>Wpisz poprawny adres e-mail.</string>
160 160 <string name='share_app_title'>Czytaj komiksy w systemie Android!</string>
161   -<string name='share_app_message'>Wypróbuj Droid Comic Viewer, najpopularniejszą aplikację komiksową dla Androida http://bit.ly/3dlKI5</string>
  161 +<string name='share_app_message'>Wypróbuj ACV, najpopularniejszą aplikację komiksową dla Androida http://goo.gl/FfAWL5</string>
162 162 <string name='share_screen_title'>Ekran z @comic</string>
163   -<string name='share_screen_message'>Obejrzyj ten ekran z @comic wysłany za pośrednictwem Droid Comic Viewer http://bit.ly/3dlKI5</string>
  163 +<string name='share_screen_message'>Obejrzyj ten ekran z @comic wysłany za pośrednictwem ACV http://goo.gl/FfAWL5</string>
164 164 </resources>
14 res/values-pt/strings.xml
@@ -116,14 +116,14 @@
116 116 <string name='preference_manual_title'>Manual do usuário</string>
117 117 <string name='preference_manual_summary'>Abre o manual do usuário no navegador</string>
118 118 <string name='category_about_title'>Sobre</string>
119   -<string name='preference_acv_listing_title'>Detalhes no Android Market</string>
120   -<string name='preference_acv_listing_summary'>Abre os detalhes do Droid Comic Viewer no Android Market</string>
  119 +<string name='preference_acv_listing_title'>Detalhes no Google Play</string>
  120 +<string name='preference_acv_listing_summary'>Abre os detalhes do ACV no Google Play</string>
121 121 <string name='preference_version_title'>Versão</string>
122   -<string name='preference_version_summary'>Droid Comic Viewer v</string>
  122 +<string name='preference_version_summary'>ACV v</string>
123 123 <string name='preference_contact_title'>Contato</string>
124   -<string name='preference_contact_summary'>Enviar email para Robot Comics</string>
  124 +<string name='preference_contact_summary'>Enviar email para Robot Media</string>
125 125 <string name='preference_site_title'>Site da web</string>
126   -<string name='preference_site_summary'>Abre o site do Robot Comics no navegador</string>
  126 +<string name='preference_site_summary'>Abre o site do Robot Media no navegador</string>
127 127 <string name='preference_subscribe_summary'>Receber notícias sobre o ACV e lançamentos de comics</string>
128 128 <string name='category_acv_format_title'>Formato ACV</string>
129 129 <string name='preference_acv_frames_title'>Quadros</string>
@@ -141,7 +141,7 @@
141 141 <string name='dialog_email_error_title'>Email inválido</string>
142 142 <string name='dialog_email_error_text'>Por favor digite um endereço de email válido.</string>
143 143 <string name='share_app_title'>Leia comics no seu Android!</string>
144   -<string name='share_app_message'>Dê uma olhada no Droid Comic Viewer, o #1 leitor de comics e mangá para Android http://bit.ly/3dlKI</string>
  144 +<string name='share_app_message'>Dê uma olhada no ACV, o #1 leitor de comics e mangá para Android http://goo.gl/FfAWL</string>
145 145 <string name='share_screen_title'>Tela do @comic</string>
146   -<string name='share_screen_message'>Dê uma olhada nesta tela do @comic enviada através do Droid Comic Viewer http://bit.ly/3dlKI5</string>
  146 +<string name='share_screen_message'>Dê uma olhada nesta tela do @comic enviada através do ACV http://goo.gl/FfAWL5</string>
147 147 </resources>
5 res/values/config.xml
@@ -18,7 +18,6 @@
18 18 <string name="app_name">ACV</string>
19 19 <string name="credits"><b>Lead developer</b>\nHermes Pique\n\n<b>Additional development</b>\nGuillermo Lechuga\n\n<b>High-res launcher icon</b>\nblunden\n\n<b>SD browser icons</b>\nMark James (famfamfam)\n\n<b>Beta testing</b>\nTorX (2)\nTran Lan (2)\nThomas Nixon (2)\nMichael Charlton (1)\n\n<b>Translation</b>\nDavide Borin (Italian)\nClimbatize (French)\nMichał \'Vesper\' Dziewoński (Polish)\nFelippe Montez (Portuguese)</string>
20 20 <string name="acv_uri">market://search?q=pname:net.androidcomics.acv</string>
21   - <string name="site_url">http://www.robotcomics.net/?utm_source=android&amp;utm_medium=site_link&amp;utm_campaign=acv</string>
22   - <string name="contact_uri">mailto:contact@robotcomics.net</string>
23   - <string name="manual_uri">http://www.robotcomics.net/android-comic-viewer/user-manual/?utm_source=android&amp;utm_medium=user_manual_link&amp;utm_campaign=acv</string>
  21 + <string name="site_url">http://www.robotmedia.net/?utm_source=android&amp;utm_medium=site_link&amp;utm_campaign=acv</string>
  22 + <string name="contact_uri">mailto:acv@robotmedia.net</string>
24 23 </resources>
41 res/values/strings.xml
@@ -51,9 +51,9 @@
51 51
52 52 <string name="dialog_no_sd_title">Warning</string>
53 53 <string name="dialog_no_sd_text">No SD card was found.\n\nPlease insert or mount your SD card to open comics.</string>
54   - <string name="dialog_page_progress_title">Loading...</string>
55   - <string name="dialog_page_progress_text">Loading screen @number. Please wait...</string>
56   - <string name="dialog_loading_progress_title">Loading...</string>
  54 + <string name="dialog_page_progress_title">Loading&#8230;</string>
  55 + <string name="dialog_page_progress_text">Loading screen @number. Please wait&#8230;</string>
  56 + <string name="dialog_loading_progress_title">Loading&#8230;</string>
57 57 <string name="dialog_loading_progress_text">Loading comic archive from SD card.</string>
58 58 <string name="dialog_load_error_title">Oops!</string>
59 59 <string name="dialog_load_error_text">An error has occurred while loading. If you need help, please contact support@androidcomics.net.</string>
@@ -113,39 +113,20 @@
113 113 <string name="preference_default_brightness">Default brightness</string>
114 114
115 115 <string name="category_memory_title">History</string>
116   - <string name="preference_load_last_title">Load last comic</string>
117   - <string name="preference_load_last_summary">Load last viewed comic on startup</string>
118 116 <string name="preference_clear_history_title">Clear history</string>
119 117 <string name="preference_clear_history_summary">Clear all viewing history</string>
120 118
121   - <string name="category_support_title">Support</string>
122 119 <string name="preference_low_memory_title">Low memory mode</string>
123 120 <string name="preference_low_memory_summary">Disable preloading and transitions</string>
124   - <string name="preference_manual_title">User manual</string>
125   - <string name="preference_manual_summary">Open the user manual in the Browser</string>
126   - <string name="preference_report_problem_title">Report problem</string>
127   - <string name="preference_report_problem_summary">Report a problem through Bug Reporter</string>
128   -
129   - <string name="dialog_bug_reporter_title"><b>Bug Reporter</b> required</string>
130   - <string name="dialog_bug_reporter_text">This feature requires the <b>Bug Reporter</b> app.\n\nOpen the Market to install it?</string>
131   -
  121 +
132 122 <string name="category_about_title">About</string>
133   - <string name="preference_acv_listing_title">Android Market listing</string>
134   - <string name="preference_acv_listing_summary">Open Droid Comic Viewer listing on the Android Market</string>
  123 + <string name="preference_acv_listing_title">Google Play listing</string>
  124 + <string name="preference_acv_listing_summary">Open ACV listing on Google Play</string>
135 125 <string name="preference_version_title">Version</string>
136   - <string name="preference_version_summary">Droid Comic Viewer v</string>
  126 + <string name="preference_version_summary">ACV v</string>
137 127 <string name="preference_contact_title">Contact</string>
138   - <string name="preference_contact_summary">Email Robot Comics</string>
139   - <string name="preference_site_title">Website</string>
140   - <string name="preference_site_summary">Open Robot Comics\' website in the Browser</string>
141   - <string name="preference_subscribe_summary">Receive news about ACV and mobile comics releases</string>
142   - <string name="category_acv_format_title">ACV format</string>
143   - <string name="preference_acv_frames_title">Frames</string>
144   - <string name="preference_acv_frames_summary">Frame by frame navigation</string>
145   - <string name="preference_acv_vibration_title">Vibration</string>
146   - <string name="preference_acv_vibration_summary">Vibration and screen tilt effects</string>
147   - <string name="preference_acv_autoplay_title">Autoplay</string>
148   - <string name="preference_acv_autoplay_summary">Enable autoplay sequences</string>
  128 + <string name="preference_contact_summary">Email Robot Media</string>
  129 + <string name="preference_subscribe_summary">Receive news about ACV</string>
149 130
150 131 <!-- Advanced preferences -->
151 132 <string name="category_advanced_title">Advanced</string>
@@ -168,9 +149,9 @@
168 149
169 150 <!-- Share -->
170 151 <string name="share_app_title">Read comics in your Android!</string>
171   - <string name="share_app_message">Check out Droid Comic Viewer, the #1 comics and manga reader for Android http://bit.ly/3dlKI5</string>
  152 + <string name="share_app_message">Check out ACV, the #1 comics and manga reader for Android http://goo.gl/FfAWL</string>
172 153 <string name="share_screen_title">Screen from @comic</string>
173   - <string name="share_screen_message">Check out this screen from @comic sent from Droid Comic Viewer http://bit.ly/3dlKI5</string>
  154 + <string name="share_screen_message">Check out this screen from @comic sent from ACV http://goo.gl/FfAWL</string>
174 155
175 156 <!-- Changelog -->
176 157 <string name="dialog_changelog_title">Changelog</string>
18 res/xml/about_settings.xml
@@ -16,22 +16,20 @@
16 16 -->
17 17 <PreferenceScreen
18 18 xmlns:android="http://schemas.android.com/apk/res/android">
19   - <PreferenceScreen android:title="@string/preference_acv_listing_title"
  19 + <Preference android:key="subscribe" android:title="@string/activity_subscribe_label"
  20 + android:summary="@string/preference_subscribe_summary">
  21 + </Preference>
  22 + <PreferenceScreen android:title="@string/preference_acv_listing_title"
20 23 android:summary="@string/preference_acv_listing_summary">
21 24 <intent android:action="android.intent.action.VIEW"
22 25 android:data="@string/acv_uri" />
23 26 </PreferenceScreen>
24   - <PreferenceScreen android:title="@string/preference_site_title"
25   - android:summary="@string/preference_site_summary">
  27 + <PreferenceScreen android:title="@string/preference_contact_title"
  28 + android:summary="@string/preference_contact_summary">
26 29 <intent android:action="android.intent.action.VIEW"
27   - android:data="@string/site_url" />
  30 + android:data="@string/contact_uri" />
28 31 </PreferenceScreen>
29   - <Preference android:key="version" android:title="@string/preference_version_title"
  32 + <Preference android:key="version" android:title="@string/preference_version_title"
30 33 android:summary="@string/preference_version_summary">
31 34 </Preference>
32   - <Preference android:key="credits" android:title="@string/activity_credits_label">
33   - <intent android:action="android.intent.action.MAIN"
34   - android:targetPackage="net.androidcomics.acv"
35   - android:targetClass="net.robotmedia.acv.ui.CreditsActivity" />
36   - </Preference>
37 35 </PreferenceScreen>
5 res/xml/preferences.xml
@@ -38,11 +38,6 @@
38 38 android:targetClass="net.robotmedia.acv.ui.settings.AdvancedSettingsActivity" />
39 39 </net.robotmedia.acv.ui.settings.IconPreferenceScreen>
40 40 <net.robotmedia.acv.ui.settings.IconPreferenceScreen
41   - android:title="@string/category_support_title" settings:icon="@android:drawable/ic_menu_help">
42   - <intent android:action="android.intent.action.MAIN"
43   - android:targetPackage="net.androidcomics.acv" android:targetClass="net.robotmedia.acv.ui.settings.SupportSettingsActivity" />
44   - </net.robotmedia.acv.ui.settings.IconPreferenceScreen>
45   - <net.robotmedia.acv.ui.settings.IconPreferenceScreen
46 41 android:title="@string/category_about_title" settings:icon="@android:drawable/ic_menu_info_details">
47 42 <intent android:action="android.intent.action.MAIN"
48 43 android:targetPackage="net.androidcomics.acv" android:targetClass="net.robotmedia.acv.ui.settings.AboutSettingsActivity" />
35 res/xml/support_settings.xml
... ... @@ -1,35 +0,0 @@
1   -<?xml version="1.0" encoding="utf-8"?>
2   -<!--
3   - Copyright 2009 Robot Media SL
4   -
5   - Licensed under the Apache License, Version 2.0 (the "License");
6   - you may not use this file except in compliance with the License.
7   - You may obtain a copy of the License at
8   -
9   - http://www.apache.org/licenses/LICENSE-2.0
10   -
11   - Unless required by applicable law or agreed to in writing, software
12   - distributed under the License is distributed on an "AS IS" BASIS,
13   - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14   - See the License for the specific language governing permissions and
15   - limitations under the License.
16   --->
17   -<PreferenceScreen
18   - xmlns:android="http://schemas.android.com/apk/res/android">
19   - <Preference android:key="subscribe" android:title="@string/activity_subscribe_label"
20   - android:summary="@string/preference_subscribe_summary">
21   - </Preference>
22   - <PreferenceScreen android:title="@string/preference_manual_title"
23   - android:summary="@string/preference_manual_summary">
24   - <intent android:action="android.intent.action.VIEW"
25   - android:data="@string/manual_uri" />
26   - </PreferenceScreen>
27   - <PreferenceScreen android:title="@string/preference_contact_title"
28   - android:summary="@string/preference_contact_summary">
29   - <intent android:action="android.intent.action.VIEW"
30   - android:data="@string/contact_uri" />
31   - </PreferenceScreen>
32   - <Preference android:key="report_problem" android:title="@string/preference_report_problem_title"
33   - android:summary="@string/preference_report_problem_summary">
34   - </Preference>
35   -</PreferenceScreen>
35 src/net/robotmedia/acv/ui/settings/AboutSettingsActivity.java
@@ -17,13 +17,20 @@
17 17
18 18 import net.androidcomics.acv.R;
19 19 import net.robotmedia.acv.Constants;
  20 +import net.robotmedia.acv.ui.SubscribeActivity;
  21 +import net.robotmedia.acv.ui.widget.DialogFactory;
  22 +import android.content.Intent;
20 23 import android.content.pm.PackageInfo;
21 24 import android.content.pm.PackageManager.NameNotFoundException;
22 25 import android.os.Bundle;
23 26 import android.preference.Preference;
  27 +import android.preference.Preference.OnPreferenceClickListener;
24 28
25 29 public class AboutSettingsActivity extends ExtendedPreferenceActivity {
26 30
  31 + private static final String KEY_SUBSCRIBE = "subscribe";
  32 + private static final String SOURCE_VALUE = "DroidComicViewer";
  33 +
27 34 @Override
28 35 protected void onCreate(Bundle savedInstanceState) {
29 36 super.onCreate(savedInstanceState);
@@ -39,6 +46,34 @@ protected void onCreate(Bundle savedInstanceState) {
39 46 versionName = "1";
40 47 }
41 48 version.setSummary(version.getSummary() + versionName);
  49 +
  50 +
  51 + final Preference subscribe = findPreference(KEY_SUBSCRIBE);
  52 + subscribe.setOnPreferenceClickListener(new OnPreferenceClickListener() {
  53 +
  54 + public boolean onPreferenceClick(Preference preference) {
  55 + Intent myIntent = new Intent(AboutSettingsActivity.this, SubscribeActivity.class);
  56 + myIntent.putExtra(SubscribeActivity.SOURCE_EXTRA, SOURCE_VALUE);
  57 + startActivityForResult(myIntent, Constants.SUBSCRIBE_CODE);
  58 + return true;
  59 + }
  60 + });
  61 +
  62 + }
  63 +
  64 + @Override
  65 + public void onActivityResult(int requestCode, int resultCode, Intent data) {
  66 + super.onActivityResult(requestCode, resultCode, data);
  67 + if (requestCode == Constants.SUBSCRIBE_CODE) {
  68 + switch (resultCode) {
  69 + case RESULT_OK:
  70 + DialogFactory.showSimpleAlert(this, true, R.string.dialog_subscribe_success_title, R.string.dialog_subscribe_success_text);
  71 + break;
  72 + case SubscribeActivity.RESULT_ERROR:
  73 + DialogFactory.showSimpleAlert(this, false, R.string.dialog_subscribe_error_title, R.string.dialog_subscribe_error_text);
  74 + break;
  75 + }
  76 + }
42 77 }
43 78
44 79 }
32 src/net/robotmedia/acv/ui/settings/AboutSettingsFragment.java
@@ -17,13 +17,20 @@
17 17
18 18 import net.androidcomics.acv.R;
19 19 import net.robotmedia.acv.Constants;
  20 +import net.robotmedia.acv.ui.SubscribeActivity;
  21 +import net.robotmedia.acv.ui.widget.DialogFactory;
  22 +import android.content.Intent;
20 23 import android.content.pm.PackageInfo;
21 24 import android.content.pm.PackageManager.NameNotFoundException;
22 25 import android.os.Bundle;
23 26 import android.preference.Preference;
  27 +import android.preference.Preference.OnPreferenceClickListener;
24 28
25 29 public class AboutSettingsFragment extends ExtendedPreferenceFragment {
26 30
  31 + private static final String KEY_SUBSCRIBE = "subscribe";
  32 + private static final String SOURCE_VALUE = "DroidComicViewer";
  33 +
27 34 @Override
28 35 public void onCreate(Bundle savedInstanceState) {
29 36 super.onCreate(savedInstanceState);
@@ -39,6 +46,31 @@ public void onCreate(Bundle savedInstanceState) {
39 46 versionName = "1";
40 47 }
41 48 version.setSummary(version.getSummary() + versionName);
  49 +
  50 + final Preference subscribe = findPreference(KEY_SUBSCRIBE);
  51 + subscribe.setOnPreferenceClickListener(new OnPreferenceClickListener() {
  52 +
  53 + public boolean onPreferenceClick(Preference preference) {
  54 + Intent myIntent = new Intent(AboutSettingsFragment.this.getActivity(), SubscribeActivity.class);
  55 + myIntent.putExtra(SubscribeActivity.SOURCE_EXTRA, SOURCE_VALUE);
  56 + startActivityForResult(myIntent, Constants.SUBSCRIBE_CODE);
  57 + return true;
  58 + }
  59 + });
42 60 }
43 61
  62 + @Override
  63 + public void onActivityResult(int requestCode, int resultCode, Intent data) {
  64 + super.onActivityResult(requestCode, resultCode, data);
  65 + if (requestCode == Constants.SUBSCRIBE_CODE) {
  66 + switch (resultCode) {
  67 + case -1:
  68 + DialogFactory.showSimpleAlert(this.getActivity(), true, R.string.dialog_subscribe_success_title, R.string.dialog_subscribe_success_text);
  69 + break;
  70 + case SubscribeActivity.RESULT_ERROR:
  71 + DialogFactory.showSimpleAlert(this.getActivity(), false, R.string.dialog_subscribe_error_title, R.string.dialog_subscribe_error_text);
  72 + break;
  73 + }
  74 + }
  75 + }
44 76 }
109 src/net/robotmedia/acv/ui/settings/SupportSettingsActivity.java
... ... @@ -1,109 +0,0 @@
1   -/*******************************************************************************
2   - * Copyright 2009 Robot Media SL
3   - *
4   - * Licensed under the Apache License, Version 2.0 (the "License");
5   - * you may not use this file except in compliance with the License.
6   - * You may obtain a copy of the License at
7   - *
8   - * http://www.apache.org/licenses/LICENSE-2.0
9   - *
10   - * Unless required by applicable law or agreed to in writing, software
11   - * distributed under the License is distributed on an "AS IS" BASIS,
12   - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13   - * See the License for the specific language governing permissions and
14   - * limitations under the License.
15   - ******************************************************************************/
16   -package net.robotmedia.acv.ui.settings;
17   -
18   -import net.androidcomics.acv.R;
19   -
20   -import net.robotmedia.acv.Constants;
21   -import net.robotmedia.acv.ui.SubscribeActivity;
22   -import net.robotmedia.acv.ui.widget.DialogFactory;
23   -import net.robotmedia.acv.utils.AlertUtils;
24   -import net.robotmedia.acv.utils.IntentUtils;
25   -import android.content.Context;
26   -import android.content.DialogInterface;
27   -import android.content.Intent;
28   -import android.content.pm.PackageManager.NameNotFoundException;
29   -import android.os.Bundle;
30   -import android.preference.Preference;
31   -import android.preference.Preference.OnPreferenceClickListener;
32   -
33   -public class SupportSettingsActivity extends ExtendedPreferenceActivity {
34   -
35   - private static final String KEY_REPORT_PROBLEM = "report_problem";
36   - private static final String KEY_SUBSCRIBE = "subscribe";
37   - private static final String SOURCE_VALUE = "DroidComicViewer";
38   -
39   - @Override
40   - public void onActivityResult(int requestCode, int resultCode, Intent data) {
41   - super.onActivityResult(requestCode, resultCode, data);
42   - if (requestCode == Constants.SUBSCRIBE_CODE) {
43   - switch (resultCode) {
44   - case RESULT_OK:
45   - DialogFactory.showSimpleAlert(this, true, R.string.dialog_subscribe_success_title, R.string.dialog_subscribe_success_text);
46   - break;
47   - case SubscribeActivity.RESULT_ERROR:
48   - DialogFactory.showSimpleAlert(this, false, R.string.dialog_subscribe_error_title, R.string.dialog_subscribe_error_text);
49   - break;
50   - }
51   - }
52   - }
53   -
54   - @Override
55   - protected void onCreate(Bundle savedInstanceState) {
56   - super.onCreate(savedInstanceState);
57   - addPreferencesFromResource(R.xml.support_settings);
58   -
59   - final Preference subscribe = findPreference(KEY_SUBSCRIBE);
60   - subscribe.setOnPreferenceClickListener(new OnPreferenceClickListener() {
61   -
62   - public boolean onPreferenceClick(Preference preference) {
63   - Intent myIntent = new Intent(SupportSettingsActivity.this, SubscribeActivity.class);
64   - myIntent.putExtra(SubscribeActivity.SOURCE_EXTRA, SOURCE_VALUE);
65   - startActivityForResult(myIntent, Constants.SUBSCRIBE_CODE);
66   - return true;
67   - }
68   - });
69   -
70   - final Preference pReportProblem = findPreference(KEY_REPORT_PROBLEM);
71   - pReportProblem.setOnPreferenceClickListener(new OnPreferenceClickListener() {
72   -
73   - public boolean onPreferenceClick(Preference preference) {
74   - reportProblem();
75   - return true;
76   - }
77   - });
78   -
79   - }
80   -
81   - private static final String ACTION_REPORT_BUG = "net.robotmedia.bugreporter.intent.action.REPORT_BUG";
82   - private static final String EXTRA_PACKAGE = "net.robotmedia.supportrequest.intent.extra.package";
83   - private static final String EXTRA_EMAIL = "net.robotmedia.supportrequest.intent.extra.email";
84   - private static final String EMAIL = "acv@robotcomics.net";
85   - private static final String PACKAGE_BUG_REPORTER = "net.robotmedia.bugreporter";
86   -
87   - private void reportProblem() {
88   - final Context context = this;
89   - try {
90   - getPackageManager().getPackageInfo(PACKAGE_BUG_REPORTER, 0);
91   - final Intent intent = new Intent(ACTION_REPORT_BUG);
92   - intent.putExtra(EXTRA_PACKAGE, context.getPackageName());
93   - intent.putExtra(EXTRA_EMAIL, EMAIL);
94   - startActivity(intent);
95   - } catch (NameNotFoundException e) {
96   - AlertUtils.showYesNoAlert(this, false,
97   - R.string.dialog_bug_reporter_title,
98   - R.string.dialog_bug_reporter_text,
99   - new DialogInterface.OnClickListener() {
100   -
101   - @Override
102   - public void onClick(DialogInterface dialog, int which) {
103   - IntentUtils.openMarket(context, PACKAGE_BUG_REPORTER);
104   - }
105   - }, null);
106   - }
107   - }
108   -
109   -}
108 src/net/robotmedia/acv/ui/settings/SupportSettingsFragment.java
... ... @@ -1,108 +0,0 @@
1   -/*******************************************************************************
2   - * Copyright 2009 Robot Media SL
3   - *
4   - * Licensed under the Apache License, Version 2.0 (the "License");
5   - * you may not use this file except in compliance with the License.
6   - * You may obtain a copy of the License at
7   - *
8   - * http://www.apache.org/licenses/LICENSE-2.0
9   - *
10   - * Unless required by applicable law or agreed to in writing, software
11   - * distributed under the License is distributed on an "AS IS" BASIS,
12   - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13   - * See the License for the specific language governing permissions and
14   - * limitations under the License.
15   - ******************************************************************************/
16   -package net.robotmedia.acv.ui.settings;
17   -
18   -import net.androidcomics.acv.R;
19   -import net.robotmedia.acv.Constants;
20   -import net.robotmedia.acv.ui.SubscribeActivity;
21   -import net.robotmedia.acv.ui.widget.DialogFactory;
22   -import net.robotmedia.acv.utils.AlertUtils;
23   -import net.robotmedia.acv.utils.IntentUtils;
24   -import android.content.Context;
25   -import android.content.DialogInterface;
26   -import android.content.Intent;
27   -import android.content.pm.PackageManager.NameNotFoundException;
28   -import android.os.Bundle;
29   -import android.preference.Preference;
30   -import android.preference.Preference.OnPreferenceClickListener;
31   -
32   -public class SupportSettingsFragment extends ExtendedPreferenceFragment {
33   -
34   - private static final String KEY_REPORT_PROBLEM = "report_problem";
35   - private static final String KEY_SUBSCRIBE = "subscribe";
36   - private static final String SOURCE_VALUE = "DroidComicViewer";
37   -
38   - @Override
39   - public void onActivityResult(int requestCode, int resultCode, Intent data) {
40   - super.onActivityResult(requestCode, resultCode, data);
41   - if (requestCode == Constants.SUBSCRIBE_CODE) {
42   - switch (resultCode) {
43   - case -1:
44   - DialogFactory.showSimpleAlert(this.getActivity(), true, R.string.dialog_subscribe_success_title, R.string.dialog_subscribe_success_text);
45   - break;
46   - case SubscribeActivity.RESULT_ERROR:
47   - DialogFactory.showSimpleAlert(this.getActivity(), false, R.string.dialog_subscribe_error_title, R.string.dialog_subscribe_error_text);
48   - break;
49   - }
50   - }
51   - }
52   -
53   - @Override
54   - public void onCreate(Bundle savedInstanceState) {
55   - super.onCreate(savedInstanceState);
56   - addPreferencesFromResource(R.xml.support_settings);
57   -
58   - final Preference subscribe = findPreference(KEY_SUBSCRIBE);
59   - subscribe.setOnPreferenceClickListener(new OnPreferenceClickListener() {
60   -
61   - public boolean onPreferenceClick(Preference preference) {
62   - Intent myIntent = new Intent(SupportSettingsFragment.this.getActivity(), SubscribeActivity.class);
63   - myIntent.putExtra(SubscribeActivity.SOURCE_EXTRA, SOURCE_VALUE);
64   - startActivityForResult(myIntent, Constants.SUBSCRIBE_CODE);
65   - return true;
66   - }
67   - });
68   -
69   - final Preference pReportProblem = findPreference(KEY_REPORT_PROBLEM);
70   - pReportProblem.setOnPreferenceClickListener(new OnPreferenceClickListener() {
71   -
72   - public boolean onPreferenceClick(Preference preference) {
73   - reportProblem();
74   - return true;
75   - }
76   - });
77   -
78   - }
79   -
80   - private static final String ACTION_REPORT_BUG = "net.robotmedia.bugreporter.intent.action.REPORT_BUG";
81   - private static final String EXTRA_PACKAGE = "net.robotmedia.supportrequest.intent.extra.package";
82   - private static final String EXTRA_EMAIL = "net.robotmedia.supportrequest.intent.extra.email";
83   - private static final String EMAIL = "acv@robotcomics.net";
84   - private static final String PACKAGE_BUG_REPORTER = "net.robotmedia.bugreporter";
85   -
86   - private void reportProblem() {
87   - final Context context = this.getActivity();
88   - try {
89   - this.getActivity().getPackageManager().getPackageInfo(PACKAGE_BUG_REPORTER, 0);
90   - final Intent intent = new Intent(ACTION_REPORT_BUG);
91   - intent.putExtra(EXTRA_PACKAGE, context.getPackageName());
92   - intent.putExtra(EXTRA_EMAIL, EMAIL);
93   - startActivity(intent);
94   - } catch (NameNotFoundException e) {
95   - AlertUtils.showYesNoAlert(this.getActivity(), false,
96   - R.string.dialog_bug_reporter_title,
97   - R.string.dialog_bug_reporter_text,
98   - new DialogInterface.OnClickListener() {
99   -
100   - @Override
101   - public void onClick(DialogInterface dialog, int which) {
102   - IntentUtils.openMarket(context, PACKAGE_BUG_REPORTER);
103   - }
104   - }, null);
105   - }
106   - }
107   -
108   -}

0 comments on commit 4d595af

Please sign in to comment.
Something went wrong with that request. Please try again.