AndroidX

amanmehara · Sep 6, 2020 · b881547 · b881547
1 parent 30a55d2
commit b881547
Show file tree

Hide file tree

Showing 19 changed files with 46 additions and 44 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.0.1'
     }
 }
 apply plugin: 'com.android.application'
@@ -15,15 +15,15 @@ repositories {
 }
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "29.0.3"
 
     defaultConfig {
         applicationId "com.amanmehara.programming.android"
         minSdkVersion 24
-        targetSdkVersion 28
-        versionCode 16
-        versionName "16.0"
+        targetSdkVersion 30
+        versionCode 17
+        versionName "17.0"
     }
     compileOptions {
         targetCompatibility JavaVersion.VERSION_1_8
@@ -40,6 +40,6 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    implementation 'com.android.support:cardview-v7:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
 }
diff --git a/android/src/main/java/com/amanmehara/programming/android/activities/BaseActivity.java b/android/src/main/java/com/amanmehara/programming/android/activities/BaseActivity.java
@@ -28,8 +28,8 @@
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import java.io.Serializable;
 import java.util.Collections;

diff --git a/android/src/main/java/com/amanmehara/programming/android/activities/DetailActivity.java b/android/src/main/java/com/amanmehara/programming/android/activities/DetailActivity.java
@@ -23,7 +23,7 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/android/src/main/java/com/amanmehara/programming/android/activities/GithubOAuthActivity.java b/android/src/main/java/com/amanmehara/programming/android/activities/GithubOAuthActivity.java
@@ -24,7 +24,7 @@
 import android.annotation.SuppressLint;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;

diff --git a/android/src/main/java/com/amanmehara/programming/android/activities/LanguageActivity.java b/android/src/main/java/com/amanmehara/programming/android/activities/LanguageActivity.java
@@ -23,7 +23,7 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/android/src/main/java/com/amanmehara/programming/android/activities/ProgramActivity.java b/android/src/main/java/com/amanmehara/programming/android/activities/ProgramActivity.java
@@ -24,7 +24,7 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/android/src/main/java/com/amanmehara/programming/android/adapters/DetailAdapter.java b/android/src/main/java/com/amanmehara/programming/android/adapters/DetailAdapter.java
@@ -24,8 +24,8 @@
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Html;
 import android.util.Base64;
 import android.util.Log;

diff --git a/android/src/main/java/com/amanmehara/programming/android/adapters/LanguageAdapter.java b/android/src/main/java/com/amanmehara/programming/android/adapters/LanguageAdapter.java
@@ -25,8 +25,8 @@
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Base64;
 import android.util.Log;
 import android.view.LayoutInflater;

diff --git a/android/src/main/java/com/amanmehara/programming/android/adapters/ProgramAdapter.java b/android/src/main/java/com/amanmehara/programming/android/adapters/ProgramAdapter.java
@@ -21,8 +21,8 @@
 
 package com.amanmehara.programming.android.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/android/src/main/res/layout/activity_detail.xml b/android/src/main/res/layout/activity_detail.xml
@@ -19,7 +19,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:cardBackgroundColor="@color/primary">
@@ -33,9 +33,9 @@
                 android:textSize="20sp"
                 android:fontFamily="@font/fira_sans" />
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/files_recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

diff --git a/android/src/main/res/layout/activity_language.xml b/android/src/main/res/layout/activity_language.xml
@@ -18,7 +18,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/language_recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

diff --git a/android/src/main/res/layout/activity_main.xml b/android/src/main/res/layout/activity_main.xml
@@ -20,7 +20,7 @@
             android:orientation="vertical"
             android:padding="8dp">
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"
@@ -67,9 +67,9 @@
                     </LinearLayout>
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"
@@ -107,9 +107,9 @@
                         android:fontFamily="@font/fira_sans_light" />
 
                 </LinearLayout>
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"
@@ -137,7 +137,7 @@
                         android:fontFamily="@font/fira_sans_semibold" />
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
         </LinearLayout>
 

diff --git a/android/src/main/res/layout/activity_programs.xml b/android/src/main/res/layout/activity_programs.xml
@@ -19,7 +19,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?android:attr/selectableItemBackground"
@@ -54,9 +54,9 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/programs_recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

diff --git a/android/src/main/res/layout/files_list.xml b/android/src/main/res/layout/files_list.xml
@@ -6,7 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:cardBackgroundColor="@color/primary">
@@ -38,6 +38,6 @@
 
         </LinearLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </LinearLayout>
diff --git a/android/src/main/res/layout/language_list.xml b/android/src/main/res/layout/language_list.xml
@@ -6,7 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
@@ -41,6 +41,6 @@
 
         </LinearLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </LinearLayout>
diff --git a/android/src/main/res/layout/programs_list.xml b/android/src/main/res/layout/programs_list.xml
@@ -6,7 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
@@ -23,6 +23,6 @@
             android:textSize="16sp"
             android:fontFamily="@font/fira_sans_light" />
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </LinearLayout>
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        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

diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,6 @@
 # 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
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 20 01:14:09 IST 2017
+#Sun Sep 06 13:57:10 IST 2020
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
+zipStoreBase=GRADLE_USER_HOME