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/.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/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/.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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/.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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/.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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..cd7fe4a --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..cd7fe4a --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..cd7fe4a --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..69a359d --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + AtelierPlayerMVVM + \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..cd7fe4a --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..69a359d --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + AtelierPlayerMVVM + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..f29ec83 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..cd7fe4a --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..69a359d --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + AtelierPlayerMVVM + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..f29ec83 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..cd7fe4a --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..69a359d --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + AtelierPlayerMVVM + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..f29ec83 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..cd7fe4a --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..69a359d --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + AtelierPlayerMVVM + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..f29ec83 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt b/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt new file mode 100644 index 0000000..2d90aa1 --- /dev/null +++ b/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package fr.tf1.player.atelierplayermvvm + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..cd7fe4a --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..69a359d --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + AtelierPlayerMVVM + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..f29ec83 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt b/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt new file mode 100644 index 0000000..2d90aa1 --- /dev/null +++ b/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package fr.tf1.player.atelierplayermvvm + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..23e6fc8 --- /dev/null +++ b/build.gradle @@ -0,0 +1,7 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.20' apply false + id 'com.google.dagger.hilt.android' version '2.44' apply false +} \ No newline at end of file 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..cd7fe4a --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..69a359d --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + AtelierPlayerMVVM + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..f29ec83 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt b/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt new file mode 100644 index 0000000..2d90aa1 --- /dev/null +++ b/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package fr.tf1.player.atelierplayermvvm + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..23e6fc8 --- /dev/null +++ b/build.gradle @@ -0,0 +1,7 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.20' apply false + id 'com.google.dagger.hilt.android' version '2.44' apply false +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..3c5031e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,23 @@ +# 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 +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# 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/.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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..cd7fe4a --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..69a359d --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + AtelierPlayerMVVM + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..f29ec83 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt b/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt new file mode 100644 index 0000000..2d90aa1 --- /dev/null +++ b/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package fr.tf1.player.atelierplayermvvm + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..23e6fc8 --- /dev/null +++ b/build.gradle @@ -0,0 +1,7 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.20' apply false + id 'com.google.dagger.hilt.android' version '2.44' apply false +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..3c5031e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,23 @@ +# 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 +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# 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/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.jar Binary files differ 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..cd7fe4a --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..69a359d --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + AtelierPlayerMVVM + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..f29ec83 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt b/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt new file mode 100644 index 0000000..2d90aa1 --- /dev/null +++ b/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package fr.tf1.player.atelierplayermvvm + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..23e6fc8 --- /dev/null +++ b/build.gradle @@ -0,0 +1,7 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.20' apply false + id 'com.google.dagger.hilt.android' version '2.44' apply false +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..3c5031e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,23 @@ +# 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 +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# 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/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.jar Binary files differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..657524c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Dec 06 11:04:40 CET 2022 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME 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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..cd7fe4a --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..69a359d --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + AtelierPlayerMVVM + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..f29ec83 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt b/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt new file mode 100644 index 0000000..2d90aa1 --- /dev/null +++ b/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package fr.tf1.player.atelierplayermvvm + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..23e6fc8 --- /dev/null +++ b/build.gradle @@ -0,0 +1,7 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.20' apply false + id 'com.google.dagger.hilt.android' version '2.44' apply false +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..3c5031e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,23 @@ +# 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 +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# 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/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.jar Binary files differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..657524c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Dec 06 11:04:40 CET 2022 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/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/.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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..cd7fe4a --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..69a359d --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + AtelierPlayerMVVM + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..f29ec83 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt b/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt new file mode 100644 index 0000000..2d90aa1 --- /dev/null +++ b/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package fr.tf1.player.atelierplayermvvm + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..23e6fc8 --- /dev/null +++ b/build.gradle @@ -0,0 +1,7 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.20' apply false + id 'com.google.dagger.hilt.android' version '2.44' apply false +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..3c5031e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,23 @@ +# 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 +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# 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/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.jar Binary files differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..657524c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Dec 06 11:04:40 CET 2022 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/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/.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/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 b/app/build.gradle new file mode 100644 index 0000000..d53b70e --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,80 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.dagger.hilt.android' +} + +android { + namespace 'fr.tf1.player.atelierplayermvvm' + compileSdk 33 + + defaultConfig { + applicationId "fr.tf1.player.atelierplayermvvm" + minSdk 23 + targetSdk 33 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = '1.8' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +// Allow references to generated code +kapt { + correctErrorTypes true +} + +dependencies { + + implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'com.google.android.material:material:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.4' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0' + + // AAC + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" + + implementation "androidx.activity:activity-ktx:1.6.1" + //implementation "androidx.fragment:fragment-ktx:1.3.6" + + //Coroutines + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" + + // Retrofit + implementation "com.squareup.retrofit2:retrofit:2.9.0" + implementation "com.squareup.retrofit2:converter-gson:2.9.0" + + //Hiilt + implementation "com.google.dagger:hilt-android:2.44" + kapt "com.google.dagger:hilt-compiler:2.44" + + //Glide + implementation "com.github.bumptech.glide:glide:4.13.2" + annotationProcessor "com.github.bumptech.glide:compiler:4.13.2" +} \ 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/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..97fcf2a --- /dev/null +++ b/app/src/androidTest/java/fr/tf1/player/atelierplayermvvm/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package fr.tf1.player.atelierplayermvvm + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("fr.tf1.player.atelierplayermvvm", appContext.packageName) + } +} \ 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..e5f69bd --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt new file mode 100644 index 0000000..7dec4ba --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/MyApp.kt @@ -0,0 +1,10 @@ +package fr.tf1.player.atelierplayermvvm + +import android.app.Application +import dagger.hilt.android.HiltAndroidApp + +@HiltAndroidApp +class MyApp: Application() { + + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt new file mode 100644 index 0000000..b096b47 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/Book.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class Book( + var id: String? = null, + var bookName: String? = null, + var picUrl: String? = null, + var authorName: String? = null, + var bookDesc: String? = null +) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt new file mode 100644 index 0000000..093551a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/BookListPager.kt @@ -0,0 +1,9 @@ +package fr.tf1.player.atelierplayermvvm.data.model + +data class BookListPager( + var pageNum: Int? = null, + var pageSize: Int? = null, + var total: Int? = null, + var list: List? = null, + + ) \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt new file mode 100644 index 0000000..af80c0a --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/model/ResponseWrapper.kt @@ -0,0 +1,8 @@ +package fr.tf1.player.atelierplayermvvm.data.model + + +class ResponseWrapper { + var code: Int? = null + var msg: String? = null + var data: T? = null +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt new file mode 100644 index 0000000..00d7916 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/network/BookApi.kt @@ -0,0 +1,21 @@ +package fr.tf1.player.atelierplayermvvm.data.network + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.model.BookListPager +import fr.tf1.player.atelierplayermvvm.data.model.ResponseWrapper +import retrofit2.Response +import retrofit2.http.GET +import retrofit2.http.Path +import retrofit2.http.Query + +interface BookApi { + + @GET("book/searchByPage") + suspend fun fetchBookList( + @Query("curr") currentPage: Int = 0, + @Query("limit") limit: Int = 20 + ): Response> + + @GET("book/queryBookDetail/{bookId}") + suspend fun fetchBookDetailById(@Path("bookId") bookId: Int = 0): Response> +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt new file mode 100644 index 0000000..de31d71 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/repo/BookRepository.kt @@ -0,0 +1,33 @@ +package fr.tf1.player.atelierplayermvvm.data.repo + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import javax.inject.Inject + +interface BookRepository { + suspend fun fetchList(): List + suspend fun fetchDetail(id: Int): Book? +} + + +class BookRepositoryImpl @Inject constructor(val bookApi: BookApi) : BookRepository { + + override suspend fun fetchList(): List { + val response = bookApi.fetchBookList() + return if (response.isSuccessful) { + response.body()?.data?.list ?: emptyList() + } else { + emptyList() + } + } + + override suspend fun fetchDetail(id: Int): Book? { + val response = bookApi.fetchBookDetailById(id) + return if (response.isSuccessful) { + response.body()?.data + } else { + null + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt new file mode 100644 index 0000000..29e34ab --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchDetailUseCase.kt @@ -0,0 +1,11 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchDetailUseCase @Inject constructor(val bookRepository: BookRepository) { + suspend fun fetchBookDetail(bookId: Int): Book? { + return bookRepository.fetchDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt new file mode 100644 index 0000000..7cf37dc --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/data/usecases/FetchListUseCase.kt @@ -0,0 +1,14 @@ +package fr.tf1.player.atelierplayermvvm.data.usecases + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import javax.inject.Inject + +class FetchListUseCase @Inject constructor(val bookRepository: BookRepository) { + + suspend fun fetchList(): List { + return bookRepository.fetchList() + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt new file mode 100644 index 0000000..9d86be1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/di/module/AppModule.kt @@ -0,0 +1,58 @@ +package fr.tf1.player.atelierplayermvvm.di.module + +import com.google.gson.Gson +import com.google.gson.GsonBuilder +import dagger.Module +import dagger.Provides +import dagger.hilt.InstallIn +import dagger.hilt.components.SingletonComponent +import fr.tf1.player.atelierplayermvvm.data.network.BookApi +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepository +import fr.tf1.player.atelierplayermvvm.data.repo.BookRepositoryImpl +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory + + +@InstallIn(SingletonComponent::class) +@Module +class AppModule { + + @Provides + fun providesOkHttpClientFactory(): OkHttpClient { + return OkHttpClient.Builder() + .build() + } + + @Provides + fun providesBookApi( + okHttpClient: OkHttpClient + ): BookApi { + return Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(BookApi::class.java) + } + + @Provides + fun provideBookRepository(bookApi: BookApi): BookRepository { + return BookRepositoryImpl(bookApi) + } + + @Provides + fun provideFetchListUseCase(bookRepository: BookRepository): FetchListUseCase { + return FetchListUseCase(bookRepository) + } + + @Provides + fun provideFetchDetailUseCase(bookRepository: BookRepository): FetchDetailUseCase { + return FetchDetailUseCase(bookRepository) + } + +} + +const val BASE_URL = "https://duoyi.org/" \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt new file mode 100644 index 0000000..f6b6960 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailActivity.kt @@ -0,0 +1,48 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import android.os.Bundle +import android.widget.ImageView +import android.widget.TextView +import android.widget.Toast +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import com.bumptech.glide.Glide +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.list.ListViewModel + +@AndroidEntryPoint +class BookDetailActivity : AppCompatActivity() { + private val viewModel: BookDetailViewModel by viewModels() + + private lateinit var bookCover: ImageView + private lateinit var bookTitle: TextView + private lateinit var authorName: TextView + private lateinit var bookDescription: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.book_detail) + + bookTitle = findViewById(R.id.bookTitle) + authorName = findViewById(R.id.authorName) + bookDescription = findViewById(R.id.bookDescription) + bookCover = findViewById(R.id.bookCover) + + val bookId = intent.getIntExtra("BOOK_ID", 0) + viewModel.book.observe(this) { book -> + if (book != null) { + bookTitle.text = book.bookName + authorName.text = book.authorName + bookDescription.text = book.bookDesc + Glide.with(this@BookDetailActivity) + .load(book.picUrl) + .into(bookCover) + } else { + Toast.makeText(this@BookDetailActivity, "No book found", Toast.LENGTH_LONG).show() + } + + } + viewModel.fetchBookDetail(bookId) + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt new file mode 100644 index 0000000..45517d0 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/details/BookDetailViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.details + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchDetailUseCase +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class BookDetailViewModel @Inject constructor(val fetchDetailUseCase: FetchDetailUseCase) : + ViewModel() { + val book: MutableLiveData + + init { + book = MutableLiveData() + + } + + fun fetchBookDetail(bookId: Int) { + viewModelScope.launch { + book.value = fetchDetailUseCase.fetchBookDetail(bookId) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt new file mode 100644 index 0000000..630f1a1 --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/BookListAdapter.kt @@ -0,0 +1,55 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.view.LayoutInflater +import android.view.View +import android.view.View.OnClickListener +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.data.model.Book + +class BookListAdapter(val onBookItemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + private val items: MutableList = ArrayList() + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BooklListViewHolder { + val v: View = + LayoutInflater.from(parent.context).inflate(R.layout.book_item, parent, false) + return BooklListViewHolder(v) + } + + override fun onBindViewHolder(holder: BooklListViewHolder, position: Int) { + val book = items[position] + holder.bookName.text = book.bookName + val context = holder.bookCover.context + Glide.with(context) + .load(book.picUrl) + .into(holder.bookCover) + holder.itemView.setOnClickListener{ + book.id?.let { + onBookItemClick(it.toInt()) + } + } + } + + fun refresh(newItems: List? = null) { + newItems?.let { + items.clear() + items.addAll(newItems) + } + notifyDataSetChanged() + } + + override fun getItemCount(): Int { + return items.size + } + + class BooklListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + val bookCover: ImageView = itemView.findViewById(R.id.bookCover) + val bookName: TextView = itemView.findViewById(R.id.bookName) + + } +} + diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt new file mode 100644 index 0000000..fab08ec --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListActivity.kt @@ -0,0 +1,34 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.activity.viewModels +import androidx.recyclerview.widget.RecyclerView +import dagger.hilt.android.AndroidEntryPoint +import fr.tf1.player.atelierplayermvvm.R +import fr.tf1.player.atelierplayermvvm.ui.details.BookDetailActivity + +@AndroidEntryPoint +class ListActivity : AppCompatActivity() { + + private val viewModel: ListViewModel by viewModels() + private lateinit var bookListView: RecyclerView + private var bookListAdapter = BookListAdapter { bookId -> + val intent = Intent(this@ListActivity, BookDetailActivity::class.java) + intent.putExtra("BOOK_ID", bookId) + startActivity(intent) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_list) + bookListView = findViewById(R.id.booklist) + bookListView.adapter = bookListAdapter + viewModel.books.observe(this) { bookList -> + bookListAdapter.refresh(bookList) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt new file mode 100644 index 0000000..d32da0d --- /dev/null +++ b/app/src/main/java/fr/tf1/player/atelierplayermvvm/ui/list/ListViewModel.kt @@ -0,0 +1,28 @@ +package fr.tf1.player.atelierplayermvvm.ui.list + +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import fr.tf1.player.atelierplayermvvm.data.model.Book +import fr.tf1.player.atelierplayermvvm.data.usecases.FetchListUseCase +import kotlinx.coroutines.launch +import javax.inject.Inject + +@HiltViewModel +class ListViewModel @Inject constructor(val fetchListUseCase: FetchListUseCase) : ViewModel() { + + val books: MutableLiveData> + + init { + books = MutableLiveData>() + fetchList() + } + + fun fetchList() { + viewModelScope.launch { + books.value = fetchListUseCase.fetchList() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file 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/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml new file mode 100644 index 0000000..08bebc3 --- /dev/null +++ b/app/src/main/res/layout/activity_list.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_detail.xml b/app/src/main/res/layout/book_detail.xml new file mode 100644 index 0000000..9729ec8 --- /dev/null +++ b/app/src/main/res/layout/book_detail.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/book_item.xml b/app/src/main/res/layout/book_item.xml new file mode 100644 index 0000000..ada1307 --- /dev/null +++ b/app/src/main/res/layout/book_item.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp Binary files differ diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml new file mode 100644 index 0000000..cd7fe4a --- /dev/null +++ b/app/src/main/res/values-night/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..69a359d --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + AtelierPlayerMVVM + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..f29ec83 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt b/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt new file mode 100644 index 0000000..2d90aa1 --- /dev/null +++ b/app/src/test/java/fr/tf1/player/atelierplayermvvm/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package fr.tf1.player.atelierplayermvvm + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..23e6fc8 --- /dev/null +++ b/build.gradle @@ -0,0 +1,7 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.20' apply false + id 'com.google.dagger.hilt.android' version '2.44' apply false +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..3c5031e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,23 @@ +# 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 +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# 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/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.jar Binary files differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..657524c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Dec 06 11:04:40 CET 2022 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..4e78155 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} +rootProject.name = "AtelierPlayerMVVM" +include ':app'