Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@


# gradle
gradle/
gradlew*
#gradle/
#gradlew*
44 changes: 30 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,22 @@
*
*/

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: "androidx.navigation.safeargs"
apply plugin: 'kotlin-android-extensions'
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'kotlin-kapt'
id 'kotlin-parcelize'
// id 'kotlin-android-extensions'
id 'androidx.navigation.safeargs.kotlin'
id 'org.jetbrains.kotlin.android'
}

android {
compileSdkVersion 30
compileSdkVersion 33
defaultConfig {
applicationId "com.example.android.devbyteviewer"
minSdkVersion 19
targetSdkVersion 30
targetSdkVersion 33
versionCode 1
versionName "1.0"
multiDexEnabled true
Expand All @@ -41,11 +45,13 @@ android {

buildFeatures {
dataBinding true
viewBinding true
}

kotlinOptions {
jvmTarget = "1.8"
}
namespace 'com.example.android.devbyteviewer'

}

Expand All @@ -55,15 +61,14 @@ dependencies {

// Support libraries
implementation "androidx.appcompat:appcompat:$version_appcompat"
implementation "androidx.fragment:fragment:$version_fragment"
implementation "androidx.fragment:fragment-ktx:$version_fragment"
implementation "androidx.constraintlayout:constraintlayout:$version_constraint_layout"

// Android KTX
implementation "androidx.core:core-ktx:$version_core"

// Navigation
implementation "android.arch.navigation:navigation-fragment-ktx:$version_navigation"
implementation "android.arch.navigation:navigation-ui-ktx:$version_navigation"
// implementation "android.arch.navigation:navigation-fragment-ktx:$version_navigation"
// implementation "android.arch.navigation:navigation-ui-ktx:$version_navigation"
implementation "androidx.navigation:navigation-fragment-ktx:$version_navigation"
implementation "androidx.navigation:navigation-ui-ktx:$version_navigation"

// Coroutines for getting off the UI thread
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version_kotlin_coroutines"
Expand All @@ -82,14 +87,25 @@ dependencies {
implementation "joda-time:joda-time:$version_joda"

// ViewModel and LiveData (arch components)
implementation "androidx.lifecycle:lifecycle-extensions:$version_lifecycle_extensions"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"

implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"

// Saved state module for ViewModel
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"

// Annotation processor
kapt "androidx.lifecycle:lifecycle-common-java8:$version_lifecycle_extensions"

// Logging
implementation "com.jakewharton.timber:timber:$version_timber"

// Glide for images
implementation "com.github.bumptech.glide:glide:$version_glide"
implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
kapt "com.github.bumptech.glide:compiler:$version_glide"

// Room database
implementation "androidx.room:room-runtime:$version_room"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.example.android.devbyteviewer">
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />

Expand All @@ -31,7 +30,8 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name=".ui.DevByteActivity">
<activity android:name=".ui.DevByteActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.example.android.devbyteviewer.util

import android.content.Context
import com.bumptech.glide.GlideBuilder
import com.bumptech.glide.annotation.GlideModule
import com.bumptech.glide.load.engine.DiskCacheStrategy
import com.bumptech.glide.module.AppGlideModule
import com.bumptech.glide.request.RequestOptions

@GlideModule
class AppNameGlideModule: AppGlideModule() {
override fun applyOptions(context: Context, builder: GlideBuilder) {
super.applyOptions(context, builder)
builder.apply { RequestOptions().diskCacheStrategy(DiskCacheStrategy.ALL) }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package com.example.android.devbyteviewer.util
import android.view.View
import android.widget.ImageView
import androidx.databinding.BindingAdapter
import com.bumptech.glide.Glide

/**
* Binding adapter used to hide the spinner once data is available
Expand All @@ -35,5 +34,5 @@ fun goneIfNotNull(view: View, it: Any?) {
*/
@BindingAdapter("imageUrl")
fun setImageUrl(imageView: ImageView, url: String) {
Glide.with(imageView.context).load(url).into(imageView)
GlideApp.with(imageView.context).load(url).into(imageView)
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class DevByteViewModel(application: Application) : AndroidViewModel(application)
* Factory for constructing DevByteViewModel with parameter
*/
class Factory(val app: Application) : ViewModelProvider.Factory {
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
override fun <T : ViewModel> create(modelClass: Class<T>): T {
if (modelClass.isAssignableFrom(DevByteViewModel::class.java)) {
@Suppress("UNCHECKED_CAST")
return DevByteViewModel(app) as T
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<resources>

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
Expand Down
27 changes: 15 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,36 +19,38 @@

buildscript {
ext {
version_core = "1.3.1"
version_core = "1.7.0"
version_coroutine = "1.3.7"
version_retrofit_coroutines_adapter = "0.9.2"
version_navigation = '1.0.0'
version_constraint_layout = "2.0.0"
version_gradle = '4.0.1'
version_kotlin = "1.3.72"
version_lifecycle_extensions = "2.2.0"
lifecycle_version = "2.2.0"
version_room = "2.2.5"
version_appcompat = "1.2.0"
version_fragment = "1.0.0"
version_navigation = '2.5.3'
version_constraint_layout = "2.1.4"
version_gradle = '7.4.1'
version_kotlin = "1.8.0"
version_lifecycle_extensions = "2.5.1"
lifecycle_version = "2.5.1"
version_room = "2.5.0"
version_appcompat = "1.6.1"
version_fragment = "1.5.5"
version_retrofit = "2.5.0"
version_kotlin_coroutines = "1.1.0"
version_moshi = "1.8.0"
version_glide = "4.8.0"
version_joda = "2.10"
version_work = "2.4.0"
version_work = "2.8.0"
version_timber = "4.7.1"
}

repositories {
google()
mavenCentral()
jcenter()
}

dependencies {
classpath "com.android.tools.build:gradle:$version_gradle"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$version_kotlin"
classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:$version_navigation"
// classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:$version_navigation"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$version_navigation"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -58,6 +60,7 @@ buildscript {
allprojects {
repositories {
google()
mavenCentral()
jcenter()
}
}
Expand Down
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading