diff --git a/Intention/.gitignore b/Intention/.gitignore
new file mode 100644
index 0000000..aa724b7
--- /dev/null
+++ b/Intention/.gitignore
@@ -0,0 +1,15 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
diff --git a/Intention/app/src/main/java/fr/univpau/intention/A1.java b/Intention/app/src/main/java/fr/univpau/intention/A1.java
new file mode 100644
index 0000000..533d43e
--- /dev/null
+++ b/Intention/app/src/main/java/fr/univpau/intention/A1.java
@@ -0,0 +1,22 @@
+package fr.univpau.intention;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Button;
+import android.widget.TextView;
+
+public class A1 extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_all);
+        Button button = findViewById(R.id.button);
+        button.setOnClickListener(v -> {
+            // Start the activity A2
+            startActivity(new Intent(this, A2.class));
+        });
+    }
+}
\ No newline at end of file
diff --git a/Intention/app/src/main/java/fr/univpau/intention/A2.java b/Intention/app/src/main/java/fr/univpau/intention/A2.java
new file mode 100644
index 0000000..532cd9c
--- /dev/null
+++ b/Intention/app/src/main/java/fr/univpau/intention/A2.java
@@ -0,0 +1,22 @@
+package fr.univpau.intention;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Button;
+import android.widget.TextView;
+
+public class A2 extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_all);
+        Button button = findViewById(R.id.button);
+        button.setOnClickListener(v -> {
+            // Start the activity A2
+            startActivity(new Intent(this, A3.class));
+        });
+    }
+}
\ No newline at end of file
diff --git a/Intention/app/src/main/java/fr/univpau/intention/A3.java b/Intention/app/src/main/java/fr/univpau/intention/A3.java
new file mode 100644
index 0000000..861cc54
--- /dev/null
+++ b/Intention/app/src/main/java/fr/univpau/intention/A3.java
@@ -0,0 +1,22 @@
+package fr.univpau.intention;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class A3 extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_all);
+        Button button = findViewById(R.id.button);
+        button.setOnClickListener(v -> {
+            // Start the activity A2
+            startActivity(new Intent(this, A4.class));
+        });
+    }
+}
\ No newline at end of file
diff --git a/Intention/app/src/main/java/fr/univpau/intention/A4.java b/Intention/app/src/main/java/fr/univpau/intention/A4.java
new file mode 100644
index 0000000..9091690
--- /dev/null
+++ b/Intention/app/src/main/java/fr/univpau/intention/A4.java
@@ -0,0 +1,22 @@
+package fr.univpau.intention;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class A4 extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_all);
+        Button button = findViewById(R.id.button);
+        button.setOnClickListener(v -> {
+            // Start the activity A2
+            startActivity(new Intent(this, A5.class));
+        });
+    }
+}
\ No newline at end of file
diff --git a/Intention/app/src/main/java/fr/univpau/intention/A5.java b/Intention/app/src/main/java/fr/univpau/intention/A5.java
new file mode 100644
index 0000000..052c8e5
--- /dev/null
+++ b/Intention/app/src/main/java/fr/univpau/intention/A5.java
@@ -0,0 +1,16 @@
+package fr.univpau.intention;
+
+import android.os.Bundle;
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class A5 extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_a5);
+    }
+}
\ No newline at end of file
diff --git a/Intention/app/src/main/res/layout/activity_a5.xml b/Intention/app/src/main/res/layout/activity_a5.xml
new file mode 100644
index 0000000..c60a0f1
--- /dev/null
+++ b/Intention/app/src/main/res/layout/activity_a5.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".A5">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/activityLabel"/>
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Intention/app/src/main/res/layout/activity_all.xml b/Intention/app/src/main/res/layout/activity_all.xml
new file mode 100644
index 0000000..4867266
--- /dev/null
+++ b/Intention/app/src/main/res/layout/activity_all.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".A1">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/activityLabel"/>
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/button"
+            android:text="@string/next"/>
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Intention/build.gradle.kts b/Intention/build.gradle.kts
new file mode 100644
index 0000000..196e647
--- /dev/null
+++ b/Intention/build.gradle.kts
@@ -0,0 +1,4 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    id("com.android.application") version "8.2.2" apply false
+}
\ No newline at end of file
diff --git a/Intention/gradle.properties b/Intention/gradle.properties
new file mode 100644
index 0000000..3e927b1
--- /dev/null
+++ b/Intention/gradle.properties
@@ -0,0 +1,21 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
\ No newline at end of file
diff --git a/Intention/gradle/wrapper/gradle-wrapper.jar b/Intention/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..e708b1c
Binary files /dev/null and b/Intention/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/Intention/gradle/wrapper/gradle-wrapper.properties b/Intention/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..ca1bbd7
--- /dev/null
+++ b/Intention/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Nov 13 11:21:41 CET 2024
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/Intention/gradlew b/Intention/gradlew
new file mode 100644
index 0000000..4f906e0
--- /dev/null
+++ b/Intention/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/Intention/gradlew.bat b/Intention/gradlew.bat
new file mode 100644
index 0000000..107acd3
--- /dev/null
+++ b/Intention/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/Intention/settings.gradle.kts b/Intention/settings.gradle.kts
new file mode 100644
index 0000000..6e24a63
--- /dev/null
+++ b/Intention/settings.gradle.kts
@@ -0,0 +1,17 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "Intention"
+include(":app")
diff --git a/prog_android/Convertisseur/.idea/vcs.xml b/prog_android/Convertisseur/.idea/vcs.xml
index 6c0b863..64713b8 100644
--- a/prog_android/Convertisseur/.idea/vcs.xml
+++ b/prog_android/Convertisseur/.idea/vcs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/prog_android/Convertisseur/app/src/main/AndroidManifest.xml b/prog_android/Convertisseur/app/src/main/AndroidManifest.xml
index 23d3bc8..f5be128 100644
--- a/prog_android/Convertisseur/app/src/main/AndroidManifest.xml
+++ b/prog_android/Convertisseur/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:theme="@style/Theme.Convertisseur"
         tools:targetApi="31">
         <activity
-            android:name=".Convertisseur"
+            android:name=".TemperatureConverter"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/Convertisseur.java b/prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/Convertisseur.java
deleted file mode 100644
index 1f58a84..0000000
--- a/prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/Convertisseur.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package fr.univpau.convertisseur;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.util.Log;
-import android.widget.Button;
-import android.os.Bundle;
-
-public class Convertisseur extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_convertisseur);
-        Button convertButton = findViewById(R.id.convertButton);
-        Log.i("TP2-Info", "Button '"+convertButton.getText().toString()+"' found");
-        convertButton.setOnClickListener(new ButtonListener(findViewById(R.id.srcUnit), findViewById(R.id.destUnit), findViewById(R.id.srcValue), findViewById(R.id.destValue)));
-    }
-}
\ No newline at end of file
diff --git a/prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/Temperature.java b/prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/Temperature.java
index c72329e..901828f 100644
--- a/prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/Temperature.java
+++ b/prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/Temperature.java
@@ -17,19 +17,22 @@ public class Temperature {
             return srcValue;
         else {
             if (srcUnit == TemperatureUnits.CELSIUS) {
-                return destUnit == TemperatureUnits.FAHRENHEIT ?
-                        srcValue * 9 / 5 + 32 :
-                        srcValue + 273.15;
+                if (destUnit == TemperatureUnits.FAHRENHEIT)
+                    return srcValue * 9 / 5 + 32;
+                if (destUnit == TemperatureUnits.KELVIN)
+                    return srcValue + 273.15;
             }
             if (srcUnit == TemperatureUnits.FAHRENHEIT) {
-                return destUnit == TemperatureUnits.CELSIUS ?
-                        (srcValue - 32) * 5 / 9 :
-                        (srcValue - 32) * 5 / 9 + 273.15;
+                if (destUnit == TemperatureUnits.CELSIUS)
+                    return (srcValue - 32) * 5 / 9;
+                if (destUnit == TemperatureUnits.KELVIN)
+                    return (srcValue - 32) * 5 / 9 + 273.15;
             }
             if (srcUnit == TemperatureUnits.KELVIN) {
-                return destUnit == TemperatureUnits.CELSIUS ?
-                        srcValue - 273.15 :
-                        (srcValue - 273.15) * 9 / 5 + 32;
+                if (destUnit == TemperatureUnits.CELSIUS)
+                    return srcValue - 273.15;
+                if (destUnit == TemperatureUnits.FAHRENHEIT)
+                    return (srcValue - 273.15) * 9 / 5 + 32;
             }
         }
         return 0;
diff --git a/prog_android/Convertisseur/app/src/main/res/layout-land/activity_convertisseur.xml b/prog_android/Convertisseur/app/src/main/res/layout-land/activity_convertisseur.xml
deleted file mode 100644
index a6ea039..0000000
--- a/prog_android/Convertisseur/app/src/main/res/layout-land/activity_convertisseur.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".Convertisseur">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_margin="40dp">
-
-        <LinearLayout
-            android:id="@+id/linearLayout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:showDividers="middle"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/select_scr_unite" />
-
-                <Spinner
-                    android:id="@+id/srcUnit"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:entries="@array/units"
-                    android:minHeight="48dp" />
-
-                <EditText
-                    android:id="@+id/srcValue"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:inputType="numberDecimal"
-                    android:minHeight="48dp"
-                    android:hint="@string/enter_value" />
-            </LinearLayout>
-            <Space
-                android:layout_width="40dp"
-                android:layout_height="wrap_content"
-                 />
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/select_dest_unite" />
-
-                <Spinner
-                    android:id="@+id/destUnit"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:entries="@array/units"
-                    android:minHeight="48dp" />
-
-                <EditText
-                    android:id="@+id/destValue"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:enabled="false"
-                    android:inputType="numberDecimal"
-                    android:minHeight="48dp"
-                    android:hint="@string/enter_value" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/convertButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/convert"
-            android:gravity="center"/>
-
-    </LinearLayout>
-
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/prog_android/Convertisseur/app/src/main/res/layout/activity_convertisseur.xml b/prog_android/Convertisseur/app/src/main/res/layout/activity_convertisseur.xml
deleted file mode 100644
index 457cc0a..0000000
--- a/prog_android/Convertisseur/app/src/main/res/layout/activity_convertisseur.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".Convertisseur">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_margin="40dp">
-
-        <LinearLayout
-            android:id="@+id/linearLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:showDividers="middle"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/select_scr_unite" />
-
-                <Spinner
-                    android:id="@+id/srcUnit"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:entries="@array/units"
-                    android:minHeight="48dp" />
-
-                <EditText
-                    android:id="@+id/srcValue"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:inputType="numberDecimal"
-                    android:minHeight="48dp"
-                    android:hint="@string/enter_value" />
-            </LinearLayout>
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="40dp" />
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/select_dest_unite" />
-
-                <Spinner
-                    android:id="@+id/destUnit"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:entries="@array/units"
-                    android:minHeight="48dp" />
-
-                <EditText
-                    android:id="@+id/destValue"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:enabled="false"
-                    android:inputType="numberDecimal"
-                    android:minHeight="48dp"
-                    android:hint="@string/enter_value" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/convertButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/convert"
-            />
-
-    </LinearLayout>
-
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file