diff --git a/.idea/.name b/.idea/.name old mode 100644 new mode 100755 diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml old mode 100644 new mode 100755 diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml old mode 100644 new mode 100755 diff --git a/.idea/vcs.xml b/.idea/vcs.xml old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4fed2d4dc51985df53f0e44fd681b0888d57dc84..bc7ed884499219e0e090fc84c57b4d024585c837 100755 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,7 +4,7 @@ plugins { android { namespace = "fr.iutlille.ctp2024" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "fr.iutlille.ctp2024" @@ -36,6 +36,7 @@ dependencies { implementation("androidx.appcompat:appcompat:1.6.1") implementation("com.google.android.material:material:1.11.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") + implementation("androidx.activity:activity:1.10.0") testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1a3e29746252708c0c14cdb22f1d59a7c630706c..89fada752607d7a527c41c8cf20c61e461845691 100755 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools"> <application + android:name=".TacheApplication" android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" @@ -11,13 +12,16 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.CTP2024" - tools:targetApi="31" - android:name=".TacheApplication"> + tools:targetApi="31"> + <activity + android:name=".SuperTache" + android:exported="false" /> <activity android:name=".MainActivity" android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> diff --git a/app/src/main/java/fr/iutlille/ctp2024/MainActivity.java b/app/src/main/java/fr/iutlille/ctp2024/MainActivity.java index 3189b9f5f1e7477e475cf9b8195db7fd29a65af5..05a6e78c036a7684ea95359947c96683f1c1d5d4 100755 --- a/app/src/main/java/fr/iutlille/ctp2024/MainActivity.java +++ b/app/src/main/java/fr/iutlille/ctp2024/MainActivity.java @@ -9,6 +9,6 @@ public class MainActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); + setContentView(R.layout.activity_super_tache); } } \ No newline at end of file diff --git a/app/src/main/java/fr/iutlille/ctp2024/SuperTache.java b/app/src/main/java/fr/iutlille/ctp2024/SuperTache.java new file mode 100755 index 0000000000000000000000000000000000000000..c0df3bfd75fbe7bf8e2c886b5e470d203d5befe9 --- /dev/null +++ b/app/src/main/java/fr/iutlille/ctp2024/SuperTache.java @@ -0,0 +1,24 @@ +package fr.iutlille.ctp2024; + +import android.os.Bundle; + +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 SuperTache extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_super_tache); + 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; + }); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_super_tache.xml b/app/src/main/res/layout/activity_super_tache.xml new file mode 100755 index 0000000000000000000000000000000000000000..e29990cfc78d396129d8fb5a9ea66b1ac3cb6a27 --- /dev/null +++ b/app/src/main/res/layout/activity_super_tache.xml @@ -0,0 +1,34 @@ +<?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:id="@+id/main" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".SuperTache"> + + + <TextView + android:id="@+id/title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAlignment="center" + android:textSize="50dp" + android:text="Super Tâches"/> + + <Button + android:id="@+id/myTasks" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="MES TÂCHES" + app:layout_constraintTop_toBottomOf="@+id/title" /> + + <Button + android:id="@+id/quitButton" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="QUITTER" + app:layout_constraintTop_toBottomOf="@+id/myTasks" /> + + +</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 196e64702324ed3572daa032c6dfe2049fb28eab..234e93835aeb1bddf7ee323f35c4128de55de81f 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +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 + id("com.android.application") version "8.8.0" apply false } \ No newline at end of file diff --git a/demo.apk b/demo.apk old mode 100644 new mode 100755 diff --git a/figs/Q2.png b/figs/Q2.png old mode 100644 new mode 100755 diff --git a/figs/Q2_small.png b/figs/Q2_small.png old mode 100644 new mode 100755 diff --git a/figs/activite1.png b/figs/activite1.png old mode 100644 new mode 100755 diff --git a/figs/activite1_small.png b/figs/activite1_small.png old mode 100644 new mode 100755 diff --git a/figs/activite2.png b/figs/activite2.png old mode 100644 new mode 100755 diff --git a/figs/activite2_small.png b/figs/activite2_small.png old mode 100644 new mode 100755 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 386fe19883608234a30e0e58f54f1d7d8e0fb94d..a005a5dec9fadcf40e83dc653181381d42627424 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Apr 10 15:38:59 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists