Skip to content
GitLab
Commit 99ac4a22 authored by xgibert's avatar xgibert
Browse files

SATCOR DEPRECATED MESSAGE

parent a109ee1d
Expand all Hide whitespace changes
Inline Side-by-side
AndroidManifest.xml
View file @ 99ac4a22
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="cs.si.satcor"
android:versionCode="1260"
android:versionName="1.2.6"
package="cs.si.satcor"
android:versionCode="2000"
android:versionName="2.0.0"
android:installLocation="auto" >
<!-- VersionCode: [3]version+[1]architecture e.g 1.0.2arm is 1020, 1.1.3x86 is 1131 -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="19" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="21" />
<application
android:name="cs.si.satcor.StavorApplication"
android:hardwareAccelerated="true"
android:hardwareAccelerated="true"
android:allowBackup="true"
android:largeHeap="true"
android:icon="@drawable/ic_launcher"
android:largeHeap="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/splashScreenTheme" >
<activity
android:name="cs.si.satcor.MainActivity"
android:theme="@style/splashScreenTheme" >
<activity
android:name="cs.si.satcor.MainActivity"
android:label="@string/app_name"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="cs.si.satcor.AboutActivity"
......@@ -51,6 +51,6 @@
android:theme="@style/nonSplashScreenTheme"
android:windowSoftInputMode="adjustPan"
>
</activity>
</application>
</manifest>
</activity>
</application>
</manifest>
ic_launcher-web.png
View replaced file @ a109ee1d View file @ 99ac4a22
ic_launcher-web.png

32.6 KB | W: | H:

ic_launcher-web.png

36.6 KB | W: | H:

ic_launcher-web.png
ic_launcher-web.png
ic_launcher-web.png
ic_launcher-web.png
  • 2-up
  • Swipe
  • Onion skin
project.properties
View file @ 99ac4a22
......@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-19
target=android-21
android.library.reference.1=../android-support-v7-appcompat
res/drawable-hdpi/ic_launcher.png
View replaced file @ a109ee1d View file @ 99ac4a22
res/drawable-hdpi/ic_launcher.png

2.46 KB | W: | H:

res/drawable-hdpi/ic_launcher.png

3.75 KB | W: | H:

res/drawable-hdpi/ic_launcher.png
res/drawable-hdpi/ic_launcher.png
res/drawable-hdpi/ic_launcher.png
res/drawable-hdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
res/drawable-mdpi/ic_launcher.png
View replaced file @ a109ee1d View file @ 99ac4a22
res/drawable-mdpi/ic_launcher.png

1.52 KB | W: | H:

res/drawable-mdpi/ic_launcher.png

2.28 KB | W: | H:

res/drawable-mdpi/ic_launcher.png
res/drawable-mdpi/ic_launcher.png
res/drawable-mdpi/ic_launcher.png
res/drawable-mdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
res/drawable-xhdpi/ic_launcher.png
View replaced file @ a109ee1d View file @ 99ac4a22
res/drawable-xhdpi/ic_launcher.png

3.51 KB | W: | H:

res/drawable-xhdpi/ic_launcher.png

5.16 KB | W: | H:

res/drawable-xhdpi/ic_launcher.png
res/drawable-xhdpi/ic_launcher.png
res/drawable-xhdpi/ic_launcher.png
res/drawable-xhdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
res/layout-sw600dp/sim.xml
View file @ 99ac4a22
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/RelativeLayout1"
android:id="@+id/globalSimLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:background="@color/black"
android:contentDescription="@string/powered_by" >
android:layout_gravity="center_horizontal" >
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="false"
android:layout_alignParentTop="true"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_toLeftOf="@+id/nav_item_icon"
android:paddingBottom="32dp"
android:text="@string/powered_by"
android:textColor="@color/white"
android:textSize="20sp" />
<ImageView
android:id="@+id/nav_item_icon"
android:layout_width="90dp"
android:layout_height="60dp"
android:layout_alignParentRight="true"
android:layout_alignTop="@+id/textView1"
android:layout_margin="10dp"
android:contentDescription="@string/powered_by"
android:scaleType="fitCenter"
android:src="@drawable/orekit" />
<Switch
android:id="@+id/switch1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/nav_item_icon"
android:layout_alignParentLeft="true"
android:layout_marginLeft="10dp"
android:textOff="@string/title_sim_local"
android:textOn="@string/title_sim_remote" />
<ViewSwitcher
android:id="@+id/sim_content"
<RelativeLayout
android:id="@+id/RelativeLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/buttonConnect"
android:layout_alignParentLeft="true"
android:layout_below="@+id/nav_item_icon"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/grey5"
android:inAnimation="@android:anim/fade_in"
android:outAnimation="@android:anim/fade_out" >
android:layout_height="match_parent"
android:background="@color/black"
android:contentDescription="@string/powered_by" >
<include
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
layout="@layout/sim_local" />
android:layout_alignParentLeft="false"
android:layout_alignParentTop="true"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_toLeftOf="@+id/nav_item_icon"
android:paddingBottom="32dp"
android:text="@string/powered_by"
android:textColor="@color/white"
android:textSize="20sp" />
<ImageView
android:id="@+id/nav_item_icon"
android:layout_width="90dp"
android:layout_height="60dp"
android:layout_alignParentRight="true"
android:layout_alignTop="@+id/textView1"
android:layout_margin="10dp"
android:contentDescription="@string/powered_by"
android:scaleType="fitCenter"
android:src="@drawable/orekit" />
<include
<Switch
android:id="@+id/switch1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal"
layout="@layout/sim_remote" />
android:layout_alignBottom="@+id/nav_item_icon"
android:layout_alignParentLeft="true"
android:layout_marginLeft="10dp"
android:textOff="@string/title_sim_local"
android:textOn="@string/title_sim_remote" />
<ViewSwitcher
android:id="@+id/sim_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/buttonConnect"
android:layout_alignParentLeft="true"
android:layout_below="@+id/nav_item_icon"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/grey5"
android:inAnimation="@android:anim/fade_in"
android:outAnimation="@android:anim/fade_out" >
</ViewSwitcher>
<include
android:layout_width="wrap_content"
android:layout_height="wrap_content"
layout="@layout/sim_local" />
<Button
android:id="@+id/buttonConnect"
<include
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal"
layout="@layout/sim_remote" />
</ViewSwitcher>
<Button
android:id="@+id/buttonConnect"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="5dp"
android:minHeight="60dp"
android:text="@string/sim_connect"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/white" />
</RelativeLayout>
<FrameLayout
android:id="@+id/deprecatedLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="5dp"
android:minHeight="60dp"
android:text="@string/sim_connect"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/white" />
android:layout_alignParentTop="true" >
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black" >
<ImageView
android:id="@+id/imageView1"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_alignParentTop="true"
android:layout_centerInParent="true"
android:layout_marginTop="50dp"
android:scaleType="fitCenter"
android:src="@drawable/alert" />
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/imageView1"
android:layout_centerHorizontal="true"
android:layout_margin="20dp"
android:linksClickable="true"
android:text="@string/app_deprecated_message"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:id="@+id/textViewLink"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/textView2"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:linksClickable="true"
android:text="@string/stavor_link"
android:textAppearance="?android:attr/textAppearanceLarge" />
</RelativeLayout>
</FrameLayout>
</RelativeLayout>
res/layout/sim.xml
View file @ 99ac4a22
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/RelativeLayout1"
android:id="@+id/globalSimLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:background="@color/black"
android:contentDescription="@string/powered_by" >
android:layout_gravity="center_horizontal" >
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="false"
android:layout_alignParentTop="true"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_toLeftOf="@+id/nav_item_icon"
android:paddingBottom="32dp"
android:text="@string/powered_by"
android:textColor="@color/white"
android:textSize="20sp" />
<ImageView
android:id="@+id/nav_item_icon"
android:layout_width="90dp"
android:layout_height="60dp"
android:layout_alignParentRight="true"
android:layout_alignTop="@+id/textView1"
android:layout_margin="10dp"
android:contentDescription="@string/powered_by"
android:scaleType="fitCenter"
android:src="@drawable/orekit" />
<Switch
android:id="@+id/switch1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/nav_item_icon"
android:layout_alignParentLeft="true"
android:layout_marginLeft="10dp"
android:textOff="@string/title_sim_local"
android:textOn="@string/title_sim_remote" />
<ViewSwitcher
android:id="@+id/sim_content"
<RelativeLayout
android:id="@+id/RelativeLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/buttonConnect"
android:layout_alignParentLeft="true"
android:layout_below="@+id/nav_item_icon"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/grey5"
android:inAnimation="@android:anim/fade_in"
android:outAnimation="@android:anim/fade_out" >
android:layout_height="match_parent"
android:background="@color/black"
android:contentDescription="@string/powered_by" >
<include
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
layout="@layout/sim_local" />
android:layout_alignParentLeft="false"
android:layout_alignParentTop="true"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
android:layout_toLeftOf="@+id/nav_item_icon"
android:paddingBottom="32dp"
android:text="@string/powered_by"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/white"
android:textSize="20sp" />
<ImageView
android:id="@+id/nav_item_icon"
android:layout_width="90dp"
android:layout_height="60dp"
android:layout_alignParentRight="true"
android:layout_alignTop="@+id/textView1"
android:layout_margin="10dp"
android:contentDescription="@string/powered_by"
android:scaleType="fitCenter"
android:src="@drawable/orekit" />
<include
<Switch
android:id="@+id/switch1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal"
layout="@layout/sim_remote" />
android:layout_alignBottom="@+id/nav_item_icon"
android:layout_alignParentLeft="true"
android:layout_marginLeft="10dp"
android:textOff="@string/title_sim_local"
android:textOn="@string/title_sim_remote" />
<ViewSwitcher
android:id="@+id/sim_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/buttonConnect"
android:layout_alignParentLeft="true"
android:layout_below="@+id/nav_item_icon"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/grey5"
android:inAnimation="@android:anim/fade_in"
android:outAnimation="@android:anim/fade_out" >
<include
android:layout_width="wrap_content"
android:layout_height="wrap_content"
layout="@layout/sim_local" />
</ViewSwitcher>
<include
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|center_horizontal"
layout="@layout/sim_remote" />
</ViewSwitcher>
<Button
android:id="@+id/buttonConnect"
<Button
android:id="@+id/buttonConnect"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="5dp"
android:text="@string/sim_connect"
android:textColor="@color/white" />
</RelativeLayout>
<FrameLayout
android:id="@+id/deprecatedLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="5dp"
android:text="@string/sim_connect"
android:textColor="@color/white" />
android:layout_height="match_parent" >
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black" >
<ImageView
android:id="@+id/imageView1"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_alignParentTop="true"
android:layout_centerInParent="true"
android:layout_marginTop="30dp"
android:scaleType="fitCenter"
android:src="@drawable/alert" />
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/imageView1"
android:layout_centerHorizontal="true"
android:layout_margin="20dp"
android:linksClickable="true"
android:text="@string/app_deprecated_message"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/textViewLink"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/textView2"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:linksClickable="true"
android:text="@string/stavor_link"
android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
</FrameLayout>
</RelativeLayout>
res/values-es/strings.xml
View file @ 99ac4a22
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<string name="app_deprecated_message">Esta aplicación es obsoleta! Las funcionalidades de SATCOR han sido combinadas con la aplicación STAVOR. Por favor, remplace esta aplicación por STAVOR</string>
<string name="app_exit_prevent_message">Presione atrás otra vez para cerrar la aplicación</string>
<string name="title_section1">Simulador</string>
<string name="title_section2">Mapa</string>
......@@ -448,7 +449,7 @@
<string name="color3_title">Color 3</string>
<string name="color3_summary">picker con alpha slider</string>
<string name="color4_title">Color 4</string>
<string name="color4_summary">color establecido con HEX code en xml</string>
<string name="color4_summary">color establecido con HEX code en xml</string>
</resources>
</resources>
res/values-fr/strings.xml
View file @ 99ac4a22
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<string name="app_deprecated_message">Cette application est obsolète! Les fonctionnalités de SATCOR ont été combinées avec l\'application STAVOR. Merci de remplacer cette application par STAVOR</string>
<string name="app_exit_prevent_message">Appuyez de nouveau pour fermer l\'application</string>
<string name="title_section1">Simulateur</string>
<string name="title_section2">Carte</string>
......
res/values-v14/styles.xml
View file @ 99ac4a22
<resources>
<!--
<resources>
<!--
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.
-->
<style name="AppBaseTheme" parent="Theme.AppCompat">
<!-- API 14 theme customizations can go here. -->
<item name="android:actionBarStyle">@style/MyActionBar</item>
</style>
<style name="MyActionBar" parent="Widget.AppCompat.Base.ActionBar">
<item name="android:background">@color/grey5</item>
</style>
<style name="HDivider">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1dp</item>
<item name="android:background">@color/grey3</item>
</style>
<style name="VDivider">
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">1dp</item>
<item name="android:layout_marginRight">2dp</item>
<item name="android:background">@color/grey3</item>
</style>
<style name="VDividerAbout">
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">1sp</item>
<item name="android:background">@color/grey5</item>
<item name="android:layout_marginRight">1dp</item>
</style>
</resources>
res/values-v11/styles.xml on API 14+ devices.
-->
<!-- <style name="AppBaseTheme" parent="Theme.AppCompat">
<item name="android:actionBarStyle">@style/MyActionBar</item>
</style>
<style name="MyActionBar" parent="Widget.AppCompat.Base.ActionBar">
<item name="android:background">@color/grey5</item>
</style> -->
<style name="HDivider">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1dp</item>
<item name="android:background">@color/grey3</item>
</style>
<style name="VDivider">
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">1dp</item>
<item name="android:layout_marginRight">2dp</item>
<item name="android:background">@color/grey3</item>
</style>
<style name="VDividerAbout">
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">1sp</item>
<item name="android:background">@color/grey5</item>
<item name="android:layout_marginRight">1dp</item>
</style>
</resources>
res/values/strings.xml
View file @ 99ac4a22
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<string name="stavor_link"><a href="https://play.google.com/store/apps/details?id=cs.si.stavor">DOWNLOAD</a></string>
<string name="app_deprecated_message">This application is deprecated! The functionalities of SATCOR have been merged into the application STAVOR. Please replace this application by STAVOR</string>
<string name="app_exit_prevent_message">Press back again to close this app</string>
<string name="title_section1">Simulator</string>
<string name="title_section2">Map</string>
......@@ -448,7 +451,7 @@
<string name="color3_title">Color 3</string>
<string name="color3_summary">picker with alpha slider</string>
<string name="color4_title">Color 4</string>
<string name="color4_summary">color set with HEX code in xml</string>
<string name="color4_summary">color set with HEX code in xml</string>