From 07302d22e400b2848f43e89bbd7c712d7f643f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kevin=20Mitress=C3=A9?= <96947354+kmitresse@users.noreply.github.com> Date: Thu, 24 Oct 2024 16:02:49 +0200 Subject: [PATCH] [feat] - Prog Android - TP2 : Convertisseur --- prog_android/Convertisseur/.gitignore | 15 ++ prog_android/Convertisseur/.idea/.gitignore | 3 + prog_android/Convertisseur/.idea/compiler.xml | 6 + .../.idea/deploymentTargetDropDown.xml | 10 + prog_android/Convertisseur/.idea/gradle.xml | 19 ++ .../Convertisseur/.idea/migrations.xml | 10 + prog_android/Convertisseur/.idea/misc.xml | 9 + prog_android/Convertisseur/.idea/vcs.xml | 6 + prog_android/Convertisseur/app/.gitignore | 1 + .../Convertisseur/app/build.gradle.kts | 39 ++++ .../Convertisseur/app/proguard-rules.pro | 21 ++ .../ExampleInstrumentedTest.java | 26 +++ .../app/src/main/AndroidManifest.xml | 26 +++ .../univpau/convertisseur/ButtonListener.java | 32 +++ .../univpau/convertisseur/Convertisseur.java | 19 ++ .../fr/univpau/convertisseur/Temperature.java | 40 ++++ .../convertisseur/TemperatureUnits.java | 7 + .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++ .../res/drawable/ic_launcher_foreground.xml | 30 +++ .../layout-land/activity_convertisseur.xml | 93 +++++++++ .../res/layout/activity_convertisseur.xml | 92 +++++++++ .../main/res/mipmap-anydpi/ic_launcher.xml | 6 + .../res/mipmap-anydpi/ic_launcher_round.xml | 6 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../app/src/main/res/values-night/themes.xml | 16 ++ .../app/src/main/res/values/colors.xml | 10 + .../app/src/main/res/values/strings.xml | 12 ++ .../app/src/main/res/values/themes.xml | 16 ++ .../app/src/main/res/xml/backup_rules.xml | 13 ++ .../main/res/xml/data_extraction_rules.xml | 19 ++ .../convertisseur/ExampleUnitTest.java | 17 ++ prog_android/Convertisseur/build.gradle.kts | 4 + prog_android/Convertisseur/gradle.properties | 21 ++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + prog_android/Convertisseur/gradlew | 185 ++++++++++++++++++ prog_android/Convertisseur/gradlew.bat | 89 +++++++++ .../Convertisseur/settings.gradle.kts | 18 ++ 47 files changed, 1112 insertions(+) create mode 100644 prog_android/Convertisseur/.gitignore create mode 100644 prog_android/Convertisseur/.idea/.gitignore create mode 100644 prog_android/Convertisseur/.idea/compiler.xml create mode 100644 prog_android/Convertisseur/.idea/deploymentTargetDropDown.xml create mode 100644 prog_android/Convertisseur/.idea/gradle.xml create mode 100644 prog_android/Convertisseur/.idea/migrations.xml create mode 100644 prog_android/Convertisseur/.idea/misc.xml create mode 100644 prog_android/Convertisseur/.idea/vcs.xml create mode 100644 prog_android/Convertisseur/app/.gitignore create mode 100644 prog_android/Convertisseur/app/build.gradle.kts create mode 100644 prog_android/Convertisseur/app/proguard-rules.pro create mode 100644 prog_android/Convertisseur/app/src/androidTest/java/fr/univpau/convertisseur/ExampleInstrumentedTest.java create mode 100644 prog_android/Convertisseur/app/src/main/AndroidManifest.xml create mode 100644 prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/ButtonListener.java create mode 100644 prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/Convertisseur.java create mode 100644 prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/Temperature.java create mode 100644 prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/TemperatureUnits.java create mode 100644 prog_android/Convertisseur/app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 prog_android/Convertisseur/app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 prog_android/Convertisseur/app/src/main/res/layout-land/activity_convertisseur.xml create mode 100644 prog_android/Convertisseur/app/src/main/res/layout/activity_convertisseur.xml create mode 100644 prog_android/Convertisseur/app/src/main/res/mipmap-anydpi/ic_launcher.xml create mode 100644 prog_android/Convertisseur/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml create mode 100644 prog_android/Convertisseur/app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 prog_android/Convertisseur/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 prog_android/Convertisseur/app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 prog_android/Convertisseur/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 prog_android/Convertisseur/app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 prog_android/Convertisseur/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 prog_android/Convertisseur/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 prog_android/Convertisseur/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 prog_android/Convertisseur/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 prog_android/Convertisseur/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 prog_android/Convertisseur/app/src/main/res/values-night/themes.xml create mode 100644 prog_android/Convertisseur/app/src/main/res/values/colors.xml create mode 100644 prog_android/Convertisseur/app/src/main/res/values/strings.xml create mode 100644 prog_android/Convertisseur/app/src/main/res/values/themes.xml create mode 100644 prog_android/Convertisseur/app/src/main/res/xml/backup_rules.xml create mode 100644 prog_android/Convertisseur/app/src/main/res/xml/data_extraction_rules.xml create mode 100644 prog_android/Convertisseur/app/src/test/java/fr/univpau/convertisseur/ExampleUnitTest.java create mode 100644 prog_android/Convertisseur/build.gradle.kts create mode 100644 prog_android/Convertisseur/gradle.properties create mode 100644 prog_android/Convertisseur/gradle/wrapper/gradle-wrapper.jar create mode 100644 prog_android/Convertisseur/gradle/wrapper/gradle-wrapper.properties create mode 100644 prog_android/Convertisseur/gradlew create mode 100644 prog_android/Convertisseur/gradlew.bat create mode 100644 prog_android/Convertisseur/settings.gradle.kts diff --git a/prog_android/Convertisseur/.gitignore b/prog_android/Convertisseur/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/prog_android/Convertisseur/.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/prog_android/Convertisseur/.idea/.gitignore b/prog_android/Convertisseur/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/prog_android/Convertisseur/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/prog_android/Convertisseur/.idea/compiler.xml b/prog_android/Convertisseur/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/prog_android/Convertisseur/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/prog_android/Convertisseur/.idea/deploymentTargetDropDown.xml b/prog_android/Convertisseur/.idea/deploymentTargetDropDown.xml new file mode 100644 index 0000000..0c0c338 --- /dev/null +++ b/prog_android/Convertisseur/.idea/deploymentTargetDropDown.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/prog_android/Convertisseur/.idea/gradle.xml b/prog_android/Convertisseur/.idea/gradle.xml new file mode 100644 index 0000000..0897082 --- /dev/null +++ b/prog_android/Convertisseur/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/prog_android/Convertisseur/.idea/migrations.xml b/prog_android/Convertisseur/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/prog_android/Convertisseur/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/prog_android/Convertisseur/.idea/misc.xml b/prog_android/Convertisseur/.idea/misc.xml new file mode 100644 index 0000000..8978d23 --- /dev/null +++ b/prog_android/Convertisseur/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/prog_android/Convertisseur/.idea/vcs.xml b/prog_android/Convertisseur/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/prog_android/Convertisseur/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/prog_android/Convertisseur/app/.gitignore b/prog_android/Convertisseur/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/prog_android/Convertisseur/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/prog_android/Convertisseur/app/build.gradle.kts b/prog_android/Convertisseur/app/build.gradle.kts new file mode 100644 index 0000000..2e3f643 --- /dev/null +++ b/prog_android/Convertisseur/app/build.gradle.kts @@ -0,0 +1,39 @@ +plugins { + id("com.android.application") +} + +android { + namespace = "fr.univpau.convertisseur" + compileSdk = 34 + + defaultConfig { + applicationId = "fr.univpau.convertisseur" + minSdk = 29 + targetSdk = 34 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } +} + +dependencies { + + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("com.google.android.material:material:1.12.0") + implementation("androidx.constraintlayout:constraintlayout:2.1.4") + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.2.1") + androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") +} \ No newline at end of file diff --git a/prog_android/Convertisseur/app/proguard-rules.pro b/prog_android/Convertisseur/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/prog_android/Convertisseur/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/prog_android/Convertisseur/app/src/androidTest/java/fr/univpau/convertisseur/ExampleInstrumentedTest.java b/prog_android/Convertisseur/app/src/androidTest/java/fr/univpau/convertisseur/ExampleInstrumentedTest.java new file mode 100644 index 0000000..ad61a2c --- /dev/null +++ b/prog_android/Convertisseur/app/src/androidTest/java/fr/univpau/convertisseur/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package fr.univpau.convertisseur; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("fr.univpau.convertisseur", appContext.getPackageName()); + } +} \ 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 new file mode 100644 index 0000000..23d3bc8 --- /dev/null +++ b/prog_android/Convertisseur/app/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/ButtonListener.java b/prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/ButtonListener.java new file mode 100644 index 0000000..15d7c55 --- /dev/null +++ b/prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/ButtonListener.java @@ -0,0 +1,32 @@ +package fr.univpau.convertisseur; + +//La classe ButtonListener est une classe qui écoute les événements sur un bouton + +import android.util.Log; +import android.view.View; +import android.widget.EditText; +import android.widget.Spinner; + +public class ButtonListener implements View.OnClickListener { + + Spinner srcUnit; + Spinner destUnit; + EditText srcValue; + EditText destValue; + + public ButtonListener(Spinner srcUnit, Spinner destUnit, EditText srcValue, EditText destValue) { + this.srcUnit = srcUnit; + this.destUnit = destUnit; + this.srcValue = srcValue; + this.destValue = destValue; + } + + @Override + public void onClick(View v) { + Temperature temperature = new Temperature(srcUnit.getSelectedItemPosition(), destUnit.getSelectedItemPosition(), Double.parseDouble(srcValue.getText().toString())); + destValue.setText(String.valueOf(temperature.convert())); + } + + + +} 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 new file mode 100644 index 0000000..1f58a84 --- /dev/null +++ b/prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/Convertisseur.java @@ -0,0 +1,19 @@ +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 new file mode 100644 index 0000000..c72329e --- /dev/null +++ b/prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/Temperature.java @@ -0,0 +1,40 @@ +package fr.univpau.convertisseur; + +public class Temperature { + + TemperatureUnits srcUnit; + TemperatureUnits destUnit; + double srcValue; + + public Temperature(int srcUnit, int destUnit, double srcValue) { + this.srcUnit = getUnit(srcUnit); + this.destUnit = getUnit(destUnit); + this.srcValue = srcValue; + } + + public double convert() { + if (srcUnit == destUnit) + return srcValue; + else { + if (srcUnit == TemperatureUnits.CELSIUS) { + return destUnit == TemperatureUnits.FAHRENHEIT ? + srcValue * 9 / 5 + 32 : + srcValue + 273.15; + } + if (srcUnit == TemperatureUnits.FAHRENHEIT) { + return destUnit == TemperatureUnits.CELSIUS ? + (srcValue - 32) * 5 / 9 : + (srcValue - 32) * 5 / 9 + 273.15; + } + if (srcUnit == TemperatureUnits.KELVIN) { + return destUnit == TemperatureUnits.CELSIUS ? + srcValue - 273.15 : + (srcValue - 273.15) * 9 / 5 + 32; + } + } + return 0; + } + public TemperatureUnits getUnit(int unitPosition) { + return TemperatureUnits.values()[unitPosition]; + } +} diff --git a/prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/TemperatureUnits.java b/prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/TemperatureUnits.java new file mode 100644 index 0000000..16af150 --- /dev/null +++ b/prog_android/Convertisseur/app/src/main/java/fr/univpau/convertisseur/TemperatureUnits.java @@ -0,0 +1,7 @@ +package fr.univpau.convertisseur; + +public enum TemperatureUnits { + CELSIUS, + FAHRENHEIT, + KELVIN +} diff --git a/prog_android/Convertisseur/app/src/main/res/drawable/ic_launcher_background.xml b/prog_android/Convertisseur/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/prog_android/Convertisseur/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/prog_android/Convertisseur/app/src/main/res/drawable/ic_launcher_foreground.xml b/prog_android/Convertisseur/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/prog_android/Convertisseur/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000..a6ea039 --- /dev/null +++ b/prog_android/Convertisseur/app/src/main/res/layout-land/activity_convertisseur.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +