diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 60fe24b1134e0dc5746714d091a7931744a43e20..08b1c9d9acf067d6c6ea261191a208cb01d5d0ae 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="cs.si.satatt" - android:versionCode="006" + android:versionCode="060" android:versionName="0.6" > <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> diff --git a/res/layout/about.xml b/res/layout/about.xml index 47002cf1f058ae4c7324a81a600018af0e93ad00..1a7c32f8004367003fcb34552ebe024edb9f16b8 100644 --- a/res/layout/about.xml +++ b/res/layout/about.xml @@ -11,7 +11,7 @@ android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_marginLeft="26dp" - android:layout_marginTop="18dp" + android:layout_marginTop="15dp" android:text="@string/about" android:textAppearance="?android:attr/textAppearanceLarge" android:textColor="@color/white" /> @@ -58,6 +58,27 @@ android:textColor="@color/white" /> </LinearLayout> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" > + + <TextView + android:id="@+id/TextView02" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/about_platform" + android:textColor="@color/white" /> + + <TextView + android:id="@+id/TextViewAboutPlatform" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:gravity="right" + android:text="@string/dummy" + android:textColor="@color/white" /> + </LinearLayout> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" > @@ -236,8 +257,8 @@ android:layout_alignParentBottom="true" android:layout_alignRight="@+id/linearLayout1" android:layout_below="@+id/textView6" - android:layout_marginBottom="25dp" - android:layout_marginTop="20dp" > + android:layout_marginBottom="10dp" + android:layout_marginTop="5dp" > <ScrollView android:id="@+id/scrollprojectsAbout" diff --git a/res/layout/mission.xml b/res/layout/mission.xml index 7054cac424b3c4bb7ed55488480424df4667253b..77e5582a9287ef729f5f5bc43dd9ca576c8dc297 100644 --- a/res/layout/mission.xml +++ b/res/layout/mission.xml @@ -222,7 +222,7 @@ android:layout_height="wrap_content" > <TextView - android:id="@+id/TextView04" + android:id="@+id/TextViewAboutPlatform" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="10dp" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 29d26f9a4eafe5b6eaaa185b4bce18ef65fe80a6..b8bb62961727ae228c8bd2409aeda335778b405f 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -89,6 +89,7 @@ <string name="about2">Con la integración de los siguientes proyectos:</string> <string name="about_lang">Idiomas:</string> <string name="about_langs">EN FR -ES-</string> + <string name="about_platform">Arquitectura:</string> <string name="dialog_welcome">Bienvenido</string> <string name="dialog_error">Error</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 85ac2f4fe8991d3491d9970a483ba18566ef6567..c04a3e3320888fd7899e840bc4f627dcbeaa0b37 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -89,6 +89,7 @@ <string name="about2">Avec l\'intégration des projets suivants:</string> <string name="about_lang">Langues:</string> <string name="about_langs">EN -FR- ES</string> + <string name="about_platform">Architecture:</string> <string name="dialog_welcome">Bienvenue</string> <string name="dialog_error">Erreur</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index c8ed600d5aa2f24117ddf18949bcf67e6b49b2a3..fa026374e72bd1d23dd9b263732f4ff966575fe0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -89,6 +89,7 @@ <string name="about2">With the integration of the following projects:</string> <string name="about_lang">Languages:</string> <string name="about_langs">-EN- FR ES</string> + <string name="about_platform">Architecture:</string> <string name="dialog_welcome">Welcome</string> <string name="dialog_error">Error</string> diff --git a/src/cs/si/satatt/AboutActivity.java b/src/cs/si/satatt/AboutActivity.java index e9360ba53f54245627dcee40c480fada33443416..e20e617b8dfc179fdbff182fa68dfbd3ee7976c6 100644 --- a/src/cs/si/satatt/AboutActivity.java +++ b/src/cs/si/satatt/AboutActivity.java @@ -24,6 +24,7 @@ public class AboutActivity extends Activity { //Load Views TextView tx_package = (TextView) findViewById(R.id.TextViewVersionPackage); + TextView tx_platform = (TextView) findViewById(R.id.TextViewAboutPlatform); TextView tx_license = (TextView) findViewById(R.id.TextViewProjectLicense); TextView tx_start_date = (TextView) findViewById(R.id.TextViewProjectStart); TextView tx_install_date = (TextView) findViewById(R.id.TextViewVersionInstallDate); @@ -40,6 +41,13 @@ public class AboutActivity extends Activity { try { tx_package.setText(getPackageManager().getPackageInfo(getPackageName(), 0).packageName); tx_version_num.setText(getPackageManager().getPackageInfo(getPackageName(), 0).versionName); + int versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode; + String code = Integer.toString(versionCode); + if(code.substring(code.length()-1).equals("0")){ + tx_platform.setText("ARM"); + }else{ + tx_platform.setText("x86"); + } tx_start_date.setText(Parameters.About.project_start_date); tx_license.setText(Parameters.About.project_license);