diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aa724b7 --- /dev/null +++ b/.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/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b86273d --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7b3006b --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 0000000..f8051a6 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..74dd639 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..16660f1 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..ea0c222 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,43 @@ +plugins { + alias(libs.plugins.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_11 + targetCompatibility = JavaVersion.VERSION_11 + } +} + +dependencies { + + implementation(libs.appcompat) + implementation(libs.material) + implementation(libs.activity) + implementation(libs.constraintlayout) + testImplementation(libs.junit) + androidTestImplementation(libs.ext.junit) + androidTestImplementation(libs.espresso.core) +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/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/app/src/androidTest/java/fr/univpau/convertisseur/ExampleInstrumentedTest.java b/app/src/androidTest/java/fr/univpau/convertisseur/ExampleInstrumentedTest.java new file mode 100644 index 0000000..ad61a2c --- /dev/null +++ b/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/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..1fb6941 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/univpau/convertisseur/ConvertisseurMainActivity.java b/app/src/main/java/fr/univpau/convertisseur/ConvertisseurMainActivity.java new file mode 100644 index 0000000..35077a5 --- /dev/null +++ b/app/src/main/java/fr/univpau/convertisseur/ConvertisseurMainActivity.java @@ -0,0 +1,33 @@ +package fr.univpau.convertisseur; + +import android.os.Bundle; +import android.widget.Button; + +import androidx.activity.EdgeToEdge; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; + +public class ConvertisseurMainActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.convertisseur_main); + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> { + Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); + return insets; + }); + + final Button convertButton = findViewById(R.id.btn_convert); + convertButton.setOnClickListener(new OnConvertListener( + findViewById(R.id.spinner_from), + findViewById(R.id.spinner_to), + findViewById(R.id.input_from), + findViewById(R.id.input_to) + )); + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/univpau/convertisseur/OnConvertListener.java b/app/src/main/java/fr/univpau/convertisseur/OnConvertListener.java new file mode 100644 index 0000000..7605440 --- /dev/null +++ b/app/src/main/java/fr/univpau/convertisseur/OnConvertListener.java @@ -0,0 +1,48 @@ +package fr.univpau.convertisseur; + +import android.util.Log; +import android.view.View; +import android.widget.EditText; +import android.widget.Spinner; + +public class OnConvertListener implements View.OnClickListener { + + private final Spinner spinnerFrom; + private final Spinner spinnerTo; + private final EditText inputFrom; + private final EditText inputTo; + + public OnConvertListener(Spinner spinnerFrom, Spinner spinnerTo, EditText inputFrom, EditText inputTo) { + this.spinnerFrom = spinnerFrom; + this.spinnerTo = spinnerTo; + this.inputFrom = inputFrom; + this.inputTo = inputTo; + } + + @Override + public void onClick(View view) { + final double inputValue = getInputValue(this.inputFrom); + final Temperature.Units fromUnit = getUnit(this.spinnerFrom); + final Temperature.Units toUnit = getUnit(this.spinnerTo); + + Temperature temperature = new Temperature(inputValue, fromUnit); + + try { + double result = temperature.convert(toUnit); + this.inputTo.setText(String.format("%.2f", result)); + } catch (IllegalArgumentException e) { + Log.e("OnConvertListener", "Invalid conversion", e); + } + } + + private double getInputValue(EditText input) { + String inputFromText = input.getText().toString(); + if (inputFromText.isEmpty()) return 0; + return Double.parseDouble(inputFromText); + } + + private Temperature.Units getUnit(Spinner spinner) { + int unitIndex = spinner.getSelectedItemPosition(); + return Temperature.Units.values()[unitIndex]; + } +} diff --git a/app/src/main/java/fr/univpau/convertisseur/Temperature.java b/app/src/main/java/fr/univpau/convertisseur/Temperature.java new file mode 100644 index 0000000..0dd80a0 --- /dev/null +++ b/app/src/main/java/fr/univpau/convertisseur/Temperature.java @@ -0,0 +1,22 @@ +package fr.univpau.convertisseur; + +public class Temperature { + + public enum Units { + CELSIUS, FAHRENHEIT, KELVIN + } + + double valueInKelvin; + + public Temperature(double value, Temperature.Units from) { + if (from == Units.CELSIUS) this.valueInKelvin = value + 273.15; + if (from == Units.FAHRENHEIT) this.valueInKelvin = (value - 32) * 5 / 9 + 273.15; + if (from == Units.KELVIN) this.valueInKelvin = value; + } + + public double convert(Units to) { + if (to == Units.CELSIUS) return this.valueInKelvin - 273.15; + if (to == Units.FAHRENHEIT) return (this.valueInKelvin - 273.15) * 9 / 5 + 32; + return this.valueInKelvin; + } +} diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/convertisseur_main.xml b/app/src/main/res/layout-land/convertisseur_main.xml new file mode 100644 index 0000000..b46ce76 --- /dev/null +++ b/app/src/main/res/layout-land/convertisseur_main.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +