Skip to content
Extraits de code Groupes Projets
Valider 1969c5c2 rédigé par wu2018's avatar wu2018
Parcourir les fichiers

Merge branch 'master' of http://git.iiens.net/monnot2018/dm_td2 

# Conflicts:
#	app/build.gradle
parents 4b242e1f f7de788a
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 178 ajouts et 15 suppressions
app/build.gradle
+ 8
− 3
Voir le fichier @ 1969c5c2
......@@ -14,7 +14,7 @@ android {
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
......@@ -35,14 +35,19 @@ android {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
//implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:2.0.4'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation "androidx.recyclerview:recyclerview:1.1.0"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.google.android.material:material:1.0.0'
testImplementation 'junit:junit:4.+'
<<<<<<< HEAD
// androidTestImplementation 'com.android.support.test:runner:1.0.2'
// androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
=======
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
>>>>>>> f7de788a79d6a422d77d0cab63ac99197c44abfb
}
\ No newline at end of file
app/src/androidTest/java/com/clemhaowen/dm_td2/ExampleInstrumentedTest.kt
+ 2
− 2
Voir le fichier @ 1969c5c2
package com.clemhaowen.dm_td2
import android.support.test.InstrumentationRegistry
import android.support.test.runner.AndroidJUnit4
import androidx.test.InstrumentationRegistry
import androidx.test.runner.AndroidJUnit4
import org.junit.Test
import org.junit.runner.RunWith
......
app/src/main/java/com/clemhaowen/dm_td2/MainActivity.kt
+ 1
− 1
Voir le fichier @ 1969c5c2
package com.clemhaowen.dm_td2
import android.support.v7.app.AppCompatActivity
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
......
app/src/main/java/com/clemhaowen/dm_td2/tasklist/TaskAdapter.kt
+ 2
− 1
Voir le fichier @ 1969c5c2
package com.clemhaowen.dm_td2.tasklist
import android.os.Bundle
import android.support.v4.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
......@@ -28,4 +27,6 @@ class TaskListAdapter(private val taskList: List<String>) : RecyclerView.Adapter
}
}
}
\ No newline at end of file
app/src/main/java/com/clemhaowen/dm_td2/tasklist/TaskListFragment.kt
+ 4
− 4
Voir le fichier @ 1969c5c2
package com.clemhaowen.dm_td2.tasklist
import android.os.Bundle
import android.support.v4.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.clemhaowen.dm_td2.R
class TaskListFragment : Fragment() {
//private val taskList = listOf("Task 1", "Task 2", "Task 3")
private val taskList = listOf("Task 1", "Task 2", "Task 3")
// TODO uncomment when Task is implemented
private val taskList = listOf(
/*private val taskList = listOf(
Task(id = "id_1", title = "Task 1", description = "description 1"),
Task(id = "id_2", title = "Task 2"),
Task(id = "id_3", title = "Task 3")
)
)*/
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
......
app/src/main/res/layout/activity_main.xml
+ 4
− 3
Voir le fichier @ 1969c5c2
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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/constraintLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
<fragment
android:name="com.clemhaowen.dm_td2.tasklist.TaskListFragment"
android:id="@+id/fragment_tasklist"
android:name="com.clemhaowen.dm_td2.tasklist.TaskListFragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hello World!"
......@@ -18,4 +19,4 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/item_task.xml
+ 8
− 0
Voir le fichier @ 1969c5c2
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
......@@ -10,4 +11,11 @@
android:background="@android:color/holo_blue_bright"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<ImageButton
android:id="@+id/imageButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:contentDescription="@android:string/unknownName"
app:srcCompat="@android:drawable/ic_menu_delete" />
</LinearLayout>
\ No newline at end of file
fix.patch 0 → 100644
+ 147
− 0
Voir le fichier @ 1969c5c2
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
- <bytecodeTargetLevel target="1.8" />
+ <bytecodeTargetLevel target="11" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d5d35ec..4700283 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index c38f927..7aba2de 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,7 @@ android {
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
@@ -35,16 +35,12 @@ android {
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
- //implementation 'com.android.support:appcompat-v7:28.0.0'
- implementation 'com.android.support.constraint:constraint-layout:2.0.4'
+ implementation 'androidx.appcompat:appcompat:1.0.0'
+ implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation "androidx.recyclerview:recyclerview:1.1.0"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.google.android.material:material:1.0.0'
testImplementation 'junit:junit:4.+'
-<<<<<<< HEAD
- // androidTestImplementation 'com.android.support.test:runner:1.0.2'
-=======
- //androidTestImplementation 'com.android.support.test:runner:1.0.2'
->>>>>>> 36446a79a955a5ec115e137ca38bcb6976aede75
- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
}
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/clemhaowen/dm_td2/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/clemhaowen/dm_td2/ExampleInstrumentedTest.kt
index 4e9510b..7c19130 100644
--- a/app/src/androidTest/java/com/clemhaowen/dm_td2/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/clemhaowen/dm_td2/ExampleInstrumentedTest.kt
@@ -1,7 +1,7 @@
package com.clemhaowen.dm_td2
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/app/src/main/java/com/clemhaowen/dm_td2/MainActivity.kt b/app/src/main/java/com/clemhaowen/dm_td2/MainActivity.kt
index b08adbe..269c834 100644
--- a/app/src/main/java/com/clemhaowen/dm_td2/MainActivity.kt
+++ b/app/src/main/java/com/clemhaowen/dm_td2/MainActivity.kt
@@ -1,7 +1,7 @@
package com.clemhaowen.dm_td2
-import android.support.v7.app.AppCompatActivity
import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/clemhaowen/dm_td2/tasklist/TaskAdapter.kt b/app/src/main/java/com/clemhaowen/dm_td2/tasklist/TaskAdapter.kt
index 9299739..5878d57 100644
--- a/app/src/main/java/com/clemhaowen/dm_td2/tasklist/TaskAdapter.kt
+++ b/app/src/main/java/com/clemhaowen/dm_td2/tasklist/TaskAdapter.kt
@@ -1,7 +1,6 @@
package com.clemhaowen.dm_td2.tasklist
import android.os.Bundle
-import android.support.v4.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
diff --git a/app/src/main/java/com/clemhaowen/dm_td2/tasklist/TaskListFragment.kt b/app/src/main/java/com/clemhaowen/dm_td2/tasklist/TaskListFragment.kt
index eca2d32..10bde32 100644
--- a/app/src/main/java/com/clemhaowen/dm_td2/tasklist/TaskListFragment.kt
+++ b/app/src/main/java/com/clemhaowen/dm_td2/tasklist/TaskListFragment.kt
@@ -1,10 +1,10 @@
package com.clemhaowen.dm_td2.tasklist
import android.os.Bundle
-import android.support.v4.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.clemhaowen.dm_td2.R
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b37a591..2989414 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.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"
@@ -18,4 +18,4 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.ConstraintLayout>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 4214b38..dcdc79c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,4 +13,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# org.gradle.parallel=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
-android.useAndroidX=true
\ No newline at end of file
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file
gradle.properties
+ 2
− 1
Voir le fichier @ 1969c5c2
......@@ -13,4 +13,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# org.gradle.parallel=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
android.useAndroidX=true
\ No newline at end of file
android.useAndroidX=true
android.enableJetifier=true
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter