diff --git a/.gitignore b/.gitignore index f6b286cea..d3571e1bf 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ captures/ # Intellij *.iml .idea/workspace.xml +.idea/* # Keystore files *.jks diff --git a/README.adoc b/README.adoc index 66481b6e2..22f6075fe 100644 --- a/README.adoc +++ b/README.adoc @@ -1,3 +1,7 @@ = XYZ Reader Starter Code This repository stores the starter code for the XYZ Reader project in Udacity's Android Nanodegree. + +This repo was forked from Udacity by ivoGanev. Which i thank very much. I additionally deleted the .idea directory. + +In here is only the starter code as provided from udacity, but with updated gradle wrapper and dependencies diff --git a/XYZReader/build.gradle b/XYZReader/build.gradle index 93b2ea3e5..5ca8fc8c0 100755 --- a/XYZReader/build.gradle +++ b/XYZReader/build.gradle @@ -1,34 +1,46 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:2.2.0' - } -} apply plugin: 'com.android.application' -repositories { - mavenCentral() -} - android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 29 + buildToolsVersion "29.0.3" + + buildFeatures { + viewBinding true + } + + compileOptions { + targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_1_8 + } defaultConfig { + applicationId "android.ivo.xyzreader" minSdkVersion 19 - targetSdkVersion 25 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + + vectorDrawables{ + useSupportLibrary true + } + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } } } dependencies { - compile "com.android.support:support-v4:$androidSupportVersion" - compile "com.android.support:support-v13:$androidSupportVersion" - compile "com.android.support:appcompat-v7:$androidSupportVersion" - compile "com.android.support:palette-v7:$androidSupportVersion" - compile "com.android.support:recyclerview-v7:$androidSupportVersion" - compile "com.android.support:cardview-v7:$androidSupportVersion" - compile 'com.squareup.okhttp3:okhttp:3.1.2' - compile files('libs/volley.jar') + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.legacy:legacy-support-v13:1.0.0' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.palette:palette:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'com.squareup.okhttp3:okhttp:3.10.0' + implementation files('libs/volley.jar') } diff --git a/XYZReader/src/main/java/com/example/xyzreader/ui/ArticleDetailActivity.java b/XYZReader/src/main/java/com/example/xyzreader/ui/ArticleDetailActivity.java index 0de370f6d..715b9889f 100755 --- a/XYZReader/src/main/java/com/example/xyzreader/ui/ArticleDetailActivity.java +++ b/XYZReader/src/main/java/com/example/xyzreader/ui/ArticleDetailActivity.java @@ -8,9 +8,11 @@ import android.graphics.drawable.ColorDrawable; import android.os.Build; import android.os.Bundle; -import android.support.v13.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.ActionBarActivity; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.legacy.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; + import android.util.TypedValue; import android.view.View; import android.view.ViewGroup; @@ -23,7 +25,7 @@ /** * An activity representing a single Article detail screen, letting you swipe between articles. */ -public class ArticleDetailActivity extends ActionBarActivity +public class ArticleDetailActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks { private Cursor mCursor; diff --git a/XYZReader/src/main/java/com/example/xyzreader/ui/ArticleDetailFragment.java b/XYZReader/src/main/java/com/example/xyzreader/ui/ArticleDetailFragment.java index 357646044..eafed0a71 100755 --- a/XYZReader/src/main/java/com/example/xyzreader/ui/ArticleDetailFragment.java +++ b/XYZReader/src/main/java/com/example/xyzreader/ui/ArticleDetailFragment.java @@ -17,8 +17,8 @@ import java.util.GregorianCalendar; import android.os.Bundle; -import android.support.v4.app.ShareCompat; -import android.support.v7.graphics.Palette; +import androidx.core.app.ShareCompat; +import androidx.palette.graphics.Palette; import android.text.Html; import android.text.format.DateUtils; import android.text.method.LinkMovementMethod; diff --git a/XYZReader/src/main/java/com/example/xyzreader/ui/ArticleListActivity.java b/XYZReader/src/main/java/com/example/xyzreader/ui/ArticleListActivity.java index 8538d9ce1..f03063a3b 100755 --- a/XYZReader/src/main/java/com/example/xyzreader/ui/ArticleListActivity.java +++ b/XYZReader/src/main/java/com/example/xyzreader/ui/ArticleListActivity.java @@ -8,16 +8,15 @@ import android.content.Loader; import android.database.Cursor; import android.os.Bundle; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.app.ActionBarActivity; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.StaggeredGridLayoutManager; -import android.support.v7.widget.Toolbar; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; +import androidx.appcompat.widget.Toolbar; import android.text.Html; import android.text.format.DateUtils; import android.util.Log; -import android.util.TypedValue; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; @@ -38,7 +37,7 @@ * touched, lead to a {@link ArticleDetailActivity} representing item details. On tablets, the * activity presents a grid of items as cards. */ -public class ArticleListActivity extends ActionBarActivity implements +public class ArticleListActivity extends AppCompatActivity implements LoaderManager.LoaderCallbacks { private static final String TAG = ArticleListActivity.class.toString(); diff --git a/XYZReader/src/main/java/com/example/xyzreader/ui/DividerItemDecoration.java b/XYZReader/src/main/java/com/example/xyzreader/ui/DividerItemDecoration.java index e1cb4cf95..8dd280f38 100755 --- a/XYZReader/src/main/java/com/example/xyzreader/ui/DividerItemDecoration.java +++ b/XYZReader/src/main/java/com/example/xyzreader/ui/DividerItemDecoration.java @@ -19,8 +19,8 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; public class DividerItemDecoration extends RecyclerView.ItemDecoration { diff --git a/XYZReader/src/main/java/com/example/xyzreader/ui/ImageLoaderHelper.java b/XYZReader/src/main/java/com/example/xyzreader/ui/ImageLoaderHelper.java index e6f34b832..a18ba207c 100755 --- a/XYZReader/src/main/java/com/example/xyzreader/ui/ImageLoaderHelper.java +++ b/XYZReader/src/main/java/com/example/xyzreader/ui/ImageLoaderHelper.java @@ -2,7 +2,7 @@ import android.content.Context; import android.graphics.Bitmap; -import android.support.v4.util.LruCache; +import androidx.collection.LruCache; import com.android.volley.RequestQueue; import com.android.volley.toolbox.ImageLoader; diff --git a/XYZReader/src/main/res/layout/activity_article_detail.xml b/XYZReader/src/main/res/layout/activity_article_detail.xml index 6151b44dc..9b6d8ce52 100755 --- a/XYZReader/src/main/res/layout/activity_article_detail.xml +++ b/XYZReader/src/main/res/layout/activity_article_detail.xml @@ -2,7 +2,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - diff --git a/XYZReader/src/main/res/layout/activity_article_list.xml b/XYZReader/src/main/res/layout/activity_article_list.xml index 9259aac11..8612ca7dc 100755 --- a/XYZReader/src/main/res/layout/activity_article_list.xml +++ b/XYZReader/src/main/res/layout/activity_article_list.xml @@ -4,12 +4,12 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - + - - + \ No newline at end of file diff --git a/XYZReader/src/main/res/layout/list_item_article.xml b/XYZReader/src/main/res/layout/list_item_article.xml index 858d2468c..752f4f14e 100755 --- a/XYZReader/src/main/res/layout/list_item_article.xml +++ b/XYZReader/src/main/res/layout/list_item_article.xml @@ -1,4 +1,4 @@ - - + diff --git a/build.gradle b/build.gradle index 64b789d7f..2e2073b1a 100755 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:4.0.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } ext { diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..5465fec0e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5fd3d46c5..64dd7ac53 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Mar 26 16:58:07 PDT 2017 +#Thu Sep 10 13:09:33 BST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip