Skip to content
Snippets Groups Projects
Commit db2dca4f authored by Xavier Gibert's avatar Xavier Gibert
Browse files

versioning and about screen

parent 3d81dd46
No related branches found
No related tags found
No related merge requests found
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="cs.si.satatt" package="cs.si.satatt"
android:versionCode="006" android:versionCode="060"
android:versionName="0.6" > android:versionName="0.6" >
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginLeft="26dp" android:layout_marginLeft="26dp"
android:layout_marginTop="18dp" android:layout_marginTop="15dp"
android:text="@string/about" android:text="@string/about"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/white" /> android:textColor="@color/white" />
...@@ -58,6 +58,27 @@ ...@@ -58,6 +58,27 @@
android:textColor="@color/white" /> android:textColor="@color/white" />
</LinearLayout> </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 <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" > android:layout_height="wrap_content" >
...@@ -236,8 +257,8 @@ ...@@ -236,8 +257,8 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignRight="@+id/linearLayout1" android:layout_alignRight="@+id/linearLayout1"
android:layout_below="@+id/textView6" android:layout_below="@+id/textView6"
android:layout_marginBottom="25dp" android:layout_marginBottom="10dp"
android:layout_marginTop="20dp" > android:layout_marginTop="5dp" >
<ScrollView <ScrollView
android:id="@+id/scrollprojectsAbout" android:id="@+id/scrollprojectsAbout"
......
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
android:layout_height="wrap_content" > android:layout_height="wrap_content" >
<TextView <TextView
android:id="@+id/TextView04" android:id="@+id/TextViewAboutPlatform"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
......
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
<string name="about2">Con la integración de los siguientes proyectos:</string> <string name="about2">Con la integración de los siguientes proyectos:</string>
<string name="about_lang">Idiomas:</string> <string name="about_lang">Idiomas:</string>
<string name="about_langs">EN FR -ES-</string> <string name="about_langs">EN FR -ES-</string>
<string name="about_platform">Arquitectura:</string>
<string name="dialog_welcome">Bienvenido</string> <string name="dialog_welcome">Bienvenido</string>
<string name="dialog_error">Error</string> <string name="dialog_error">Error</string>
......
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
<string name="about2">Avec l\'intégration des projets suivants:</string> <string name="about2">Avec l\'intégration des projets suivants:</string>
<string name="about_lang">Langues:</string> <string name="about_lang">Langues:</string>
<string name="about_langs">EN -FR- ES</string> <string name="about_langs">EN -FR- ES</string>
<string name="about_platform">Architecture:</string>
<string name="dialog_welcome">Bienvenue</string> <string name="dialog_welcome">Bienvenue</string>
<string name="dialog_error">Erreur</string> <string name="dialog_error">Erreur</string>
......
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
<string name="about2">With the integration of the following projects:</string> <string name="about2">With the integration of the following projects:</string>
<string name="about_lang">Languages:</string> <string name="about_lang">Languages:</string>
<string name="about_langs">-EN- FR ES</string> <string name="about_langs">-EN- FR ES</string>
<string name="about_platform">Architecture:</string>
<string name="dialog_welcome">Welcome</string> <string name="dialog_welcome">Welcome</string>
<string name="dialog_error">Error</string> <string name="dialog_error">Error</string>
......
...@@ -24,6 +24,7 @@ public class AboutActivity extends Activity { ...@@ -24,6 +24,7 @@ public class AboutActivity extends Activity {
//Load Views //Load Views
TextView tx_package = (TextView) findViewById(R.id.TextViewVersionPackage); 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_license = (TextView) findViewById(R.id.TextViewProjectLicense);
TextView tx_start_date = (TextView) findViewById(R.id.TextViewProjectStart); TextView tx_start_date = (TextView) findViewById(R.id.TextViewProjectStart);
TextView tx_install_date = (TextView) findViewById(R.id.TextViewVersionInstallDate); TextView tx_install_date = (TextView) findViewById(R.id.TextViewVersionInstallDate);
...@@ -40,6 +41,13 @@ public class AboutActivity extends Activity { ...@@ -40,6 +41,13 @@ public class AboutActivity extends Activity {
try { try {
tx_package.setText(getPackageManager().getPackageInfo(getPackageName(), 0).packageName); tx_package.setText(getPackageManager().getPackageInfo(getPackageName(), 0).packageName);
tx_version_num.setText(getPackageManager().getPackageInfo(getPackageName(), 0).versionName); 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_start_date.setText(Parameters.About.project_start_date);
tx_license.setText(Parameters.About.project_license); tx_license.setText(Parameters.About.project_license);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment