2013-05-30 Miguel de Dios <miguel.dedios@artica.es>

* AndroidManifest.xml: added icon for application.
	
	* src/pandorafms/pandorafmsandroidconsole/Help.java,
	src/pandorafms/pandorafmsandroidconsole/Options.java,
	src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java: fixed
	java warnings.
	
	* res/values-ja/strings.xml, res/values/strings.xml,
	res/values-es/strings.xml: translate strings to english and
	spanish.
	
	* res/drawable-ldpi/icon_logo_pandorafms.png: added icon.
	
	* res/layout/help.xml, res/layout/options.xml: change layout.
	
	* bin/*, gen/*: erased the binary temp files from eclipse.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8231 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-05-30 10:43:18 +00:00
parent 9a3c839528
commit 221038a759
32 changed files with 42 additions and 200 deletions

View File

@ -4,5 +4,6 @@
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

View File

@ -10,7 +10,7 @@
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:icon="@drawable/icon_logo_pandorafms"
android:label="@string/app_name"
android:theme="@style/AppTheme" >

View File

@ -0,0 +1,24 @@
2013-05-30 Miguel de Dios <miguel.dedios@artica.es>
* AndroidManifest.xml: added icon for application.
* src/pandorafms/pandorafmsandroidconsole/Help.java,
src/pandorafms/pandorafmsandroidconsole/Options.java,
src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java: fixed
java warnings.
* res/values-ja/strings.xml, res/values/strings.xml,
res/values-es/strings.xml: translate strings to english and
spanish.
* res/drawable-ldpi/icon_logo_pandorafms.png: added icon.
* res/layout/help.xml, res/layout/options.xml: change layout.
* bin/*, gen/*: erased the binary temp files from eclipse.
2013-02-22 Miguel de Dios <miguel.dedios@artica.es>
* PandoraFMS_android_console/*: added first version of PandoraFMS
android console (it is a custom browser standaralone for the
Pandora Web Console Mobile).

View File

@ -1,51 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="pandorafms.pandorafmsandroidconsole"
android:versionCode="1"
android:versionName="1.0" >
<uses-sdk
android:minSdkVersion="8"
android:targetSdkVersion="17" />
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
<activity
android:name="pandorafms.pandorafmsandroidconsole.PandoraWebView"
android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".Help"
android:configChanges="orientation|keyboardHidden"
android:label="@string/app_name"
android:theme="@android:style/Theme.Dialog" >
</activity>
<activity
android:name=".Options"
android:configChanges="orientation|keyboardHidden"
android:label="@string/app_name"
android:theme="@android:style/Theme.Dialog" >
</activity>
<activity
android:name=".ConnectionCustomToast"
android:configChanges="orientation|keyboardHidden"
android:label="@string/connection_str"
android:theme="@android:style/Theme.Dialog" >
</activity>
</application>
<uses-permission android:name="android.permission.INTERNET" />
</manifest>

View File

@ -1,6 +0,0 @@
/** Automatically generated file. DO NOT MODIFY */
package pandorafms.pandorafmsandroidconsole;
public final class BuildConfig {
public final static boolean DEBUG = true;
}

View File

@ -1,118 +0,0 @@
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* aapt tool from the resource data it found. It
* should not be modified by hand.
*/
package pandorafms.pandorafmsandroidconsole;
public final class R {
public static final class attr {
}
public static final class dimen {
/** Default screen margins, per the Android Design guidelines.
Customize dimensions originally defined in res/values/dimens.xml (such as
screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
*/
public static final int activity_horizontal_margin=0x7f040000;
public static final int activity_vertical_margin=0x7f040001;
}
public static final class drawable {
public static final int config=0x7f020000;
public static final int exit=0x7f020001;
public static final int help=0x7f020002;
public static final int ic_launcher=0x7f020003;
public static final int loading=0x7f020004;
public static final int loading_1=0x7f020005;
public static final int loading_10=0x7f020006;
public static final int loading_11=0x7f020007;
public static final int loading_12=0x7f020008;
public static final int loading_2=0x7f020009;
public static final int loading_3=0x7f02000a;
public static final int loading_4=0x7f02000b;
public static final int loading_5=0x7f02000c;
public static final int loading_6=0x7f02000d;
public static final int loading_7=0x7f02000e;
public static final int loading_8=0x7f02000f;
public static final int loading_9=0x7f020010;
public static final int pandorafms_logo=0x7f020011;
public static final int refresh=0x7f020012;
}
public static final class id {
public static final int cancel_options=0x7f080008;
public static final int exit_button_menu_options=0x7f08000d;
public static final int help_button_menu_options=0x7f08000c;
public static final int img_logo_about=0x7f080002;
public static final int loading_anim=0x7f080001;
public static final int options_button_menu_options=0x7f08000a;
public static final int password_option=0x7f080007;
public static final int refresh_button_menu_options=0x7f08000b;
public static final int save_options=0x7f080009;
public static final int tableRow1=0x7f080004;
public static final int url_option=0x7f080005;
public static final int url_pandora=0x7f080003;
public static final int user_option=0x7f080006;
public static final int webview=0x7f080000;
}
public static final class layout {
public static final int activity_web_view=0x7f030000;
public static final int connection_custom_toast=0x7f030001;
public static final int help=0x7f030002;
public static final int options=0x7f030003;
}
public static final class menu {
public static final int web_view=0x7f070000;
}
public static final class string {
public static final int app_name=0x7f050001;
public static final int cancel_button_str=0x7f050010;
public static final int connection_str=0x7f050011;
public static final int const_string_preferences=0x7f050000;
public static final int dont_show_again=0x7f050007;
public static final int exit_label_str=0x7f050005;
public static final int help_label_str=0x7f050003;
public static final int loading_desc=0x7f050012;
public static final int options_label_str=0x7f050002;
public static final int pandorafms_logo_description=0x7f050006;
public static final int pandroid_info_long_txt=0x7f050009;
public static final int pandroid_info_txt=0x7f050008;
public static final int pandroid_options_txt=0x7f05000a;
public static final int password_option=0x7f05000d;
public static final int refresh_label_str=0x7f050004;
public static final int save_button_str=0x7f05000e;
public static final int update_button_str=0x7f05000f;
public static final int url_option=0x7f05000b;
public static final int user_option=0x7f05000c;
}
public static final class style {
/**
Base application theme, dependent on API level. This theme is replaced
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
Theme customizations available in newer API levels can go in
res/values-vXX/styles.xml, while customizations related to
backward-compatibility can go here.
Base application theme for API 11+. This theme completely replaces
AppBaseTheme from res/values/styles.xml on API 11+ devices.
API 11 theme customizations can go here.
Base application theme for API 14+. This theme completely replaces
AppBaseTheme from BOTH res/values/styles.xml and
res/values-v11/styles.xml on API 14+ devices.
API 14 theme customizations can go here.
*/
public static final int AppBaseTheme=0x7f060000;
/** Application theme.
All customizations that are NOT specific to a particular API-level can go here.
*/
public static final int AppTheme=0x7f060001;
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@ -16,11 +16,6 @@
android:padding="5dp"
android:src="@drawable/pandorafms_logo" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pandroid_info_txt" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"

View File

@ -12,7 +12,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/pandroid_options_txt"
android:text="@string/pandroid_info_txt"
/>
<TableLayout

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="const_string_preferences">PANDROID_CONSOLE_PREFERENCES</string>
<string name="app_name">Pandora FMS Android Console</string>
<string name="options_label_str">Opciones</string>
<string name="help_label_str">Ayuda</string>
@ -8,14 +9,15 @@
<string name="exit_label_str">Salir</string>
<string name="pandorafms_logo_description">Logo PandoraFMS</string>
<string name="dont_show_again">No mostrar más</string>
<string name="pandroid_info_txt">Need a large string for to fill this space with pretty things and rainbows.</string>
<string name="pandroid_info_long_txt">Need a large string for to fill this space with pretty things and rainbows.</string>
<string name="pandroid_options_txt">Need a large string for to fill this space with pretty things and rainbows.</string>
<string name="pandroid_info_txt">Configura estos parametros para acceder a tu instalación de PandoraFMS.</string>
<string name="pandroid_info_long_txt">Esta aplicación permite que tu veas toda la información de PandoraFMS en tu móvil.</string>
<string name="url_option">URL:</string>
<string name="user_option">Usuario:</string>
<string name="password_option">Contraseña:</string>
<string name="save_button_str">Guardar</string>
<string name="update_button_str">Actualizar</string>
<string name="cancel_button_str">Cancelar</string>
<string name="connection_str">Conectando&#8230;</string>
<string name="loading_desc">Conectando&#8230;</string>
</resources>

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="const_string_preferences">PANDROID_CONSOLE_PREFERENCES</string>
<string name="app_name">Pandora FMS Android Console</string>
<string name="options_label_str">オプション</string>
<string name="help_label_str">Help</string>
@ -8,14 +9,15 @@
<string name="exit_label_str">Exit</string>
<string name="pandorafms_logo_description">PandoraFMS\'s logo</string>
<string name="dont_show_again">Don\'t show again</string>
<string name="pandroid_info_txt">Need a large string for to fill this space with pretty things and rainbows.</string>
<string name="pandroid_info_long_txt">Need a large string for to fill this space with pretty things and rainbows.</string>
<string name="pandroid_options_txt">Need a large string for to fill this space with pretty things and rainbows.</string>
<string name="pandroid_info_txt">Configure these parameters to access your Pandora FMS installation.</string>
<string name="pandroid_info_long_txt">This application allows you to see all the information from PandoraFMS in your mobile phone.</string>
<string name="url_option">URL:</string>
<string name="user_option">User:</string>
<string name="password_option">Password:</string>
<string name="save_button_str">Save</string>
<string name="update_button_str">Update</string>
<string name="cancel_button_str">Cancel</string>
<string name="connection_str">Connecting&#8230;</string>
<string name="loading_desc">Connecting&#8230;</string>
</resources>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="const_string_preferences">PANDROID_EVENT_VIEWER_PREFERENCES</string>
<string name="const_string_preferences">PANDROID_CONSOLE_PREFERENCES</string>
<string name="app_name">Pandora FMS Android Console</string>
<string name="options_label_str">Options</string>
@ -10,9 +10,8 @@
<string name="exit_label_str">Exit</string>
<string name="pandorafms_logo_description">PandoraFMS\'s logo</string>
<string name="dont_show_again">Don\'t show again</string>
<string name="pandroid_info_txt">Need a large string for to fill this space with pretty things and rainbows.</string>
<string name="pandroid_info_long_txt">Need a large string for to fill this space with pretty things and rainbows.</string>
<string name="pandroid_options_txt">Need a large string for to fill this space with pretty things and rainbows.</string>
<string name="pandroid_info_txt">Configure these parameters to access your Pandora FMS installation.</string>
<string name="pandroid_info_long_txt">This application allows you to see all the information from PandoraFMS in your mobile phone.</string>
<string name="url_option">URL:</string>
<string name="user_option">User:</string>
<string name="password_option">Password:</string>

View File

@ -25,12 +25,9 @@ GNU General Public License for more details.
package pandorafms.pandorafmsandroidconsole;
import android.app.Activity;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.text.Html;
import android.text.method.LinkMovementMethod;
import android.view.View;
import android.widget.CheckBox;
import android.widget.TextView;
public class Help extends Activity {
@ -41,7 +38,7 @@ public class Help extends Activity {
TextView text = (TextView) findViewById(R.id.url_pandora);
text.setText(Html
.fromHtml("<a href='http://pandorafms.org/'>PandoraFMS.org</a>"));
.fromHtml("<a href='http://pandorafms.com/'>pandorafms.com</a>"));
text.setMovementMethod(LinkMovementMethod.getInstance());
}
}

View File

@ -25,7 +25,6 @@ GNU General Public License for more details.
package pandorafms.pandorafmsandroidconsole;
import android.app.Activity;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.view.View;

View File

@ -34,12 +34,10 @@ import android.content.SharedPreferences;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.webkit.SslErrorHandler;
import android.widget.Toast;
import android.net.http.SslError;
public class PandoraWebView extends Activity {