Individual Assignment branch

.github/workflows/android.yml

@@ -0,0 +1,35 @@
+name: Android CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Test with Gradle
+        run: ./gradlew test
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup JDK
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+    - name: Verify Gradle
+      uses: gradle/actions/wrapper-validation@v4
+    - name: Build with Gradle
+      run: ./gradlew build
+    - name: Upload APK
+      uses: actions/upload-artifact@v4
+      with:
+        name: app-debug
+        path: app/build/outputs/apk/standard/debug/app-standard-debug.apk

.gitignore

@@ -1,3 +1,6 @@
 build/
 .gradle/
 local.properties
+.idea/
+*.iml
+app/fdroid/

README.md

@@ -1,22 +1,16 @@
 # Episodes
+![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/red-coracle/episodes/Android%20CI/master?style=flat-square)
+[![Translation status](https://img.shields.io/weblate/progress/episodes?style=flat-square)](https://hosted.weblate.org/engage/episodes/)
+[![F-Droid Version](https://img.shields.io/f-droid/v/com.redcoracle.episodes?style=flat-square&color=%235183C0)](https://f-droid.org/en/packages/com.redcoracle.episodes)
 
-Keep track of which episodes you've watched of your favourite TV shows.
+Keep track of which episodes you've watched of your favourite shows.
 
-TV Show information is supplied by TheTVDB.com.
+This product uses the [TMDB](https://www.themoviedb.org) API but is not endorsed or certified by TMDB.
 
 ## Contributing
 
-Contributions are very welcome. Please file bugs, fork the repository, and send pull requests.
-
-If you'd like to buy me a beer you can send bitcoins to 149XkMSs84ZyzNMqiQeJLt5DbPru16amwA
+Contributions are very welcome. Please file bugs, fork the repository, [translate](https://hosted.weblate.org/projects/episodes/) and send pull requests.
 
 ## License
 
-Licensed under the [GPLv3](http://www.gnu.org/licenses/gpl-3.0.txt) or later.
-
-## Google Play
-
-<a href="https://play.google.com/store/apps/details?id=com.vindustries.episodes">
-  <img alt="Get it on Google Play"
-       src="https://developer.android.com/images/brand/en_generic_rgb_wo_60.png" />
-</a>
+Copylefted libre software licensed [GPLv3](http://www.gnu.org/licenses/gpl-3.0.txt)+.

app/build.gradle

@@ -1,45 +1,82 @@
 apply plugin: 'com.android.application'
 
-android {
-    compileSdkVersion 21
-    buildToolsVersion "22.0.1"
+def getCommitId = { ->
+    def gitOutput = new ByteArrayOutputStream()
+    exec {
+        commandLine 'git', 'rev-parse', '--short', 'HEAD'
+        standardOutput = gitOutput
+    }
+    return gitOutput.toString().trim()
+}
 
+android {
+    namespace 'com.redcoracle.episodes'
+    compileSdkVersion 33
     defaultConfig {
-        applicationId "org.jamienicol.episodes"
-        minSdkVersion 11
-        targetSdkVersion 21
-        versionCode 11
-        versionName "0.11"
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 25
+        versionName "0.16.1"
+        buildConfigField "String", "TMDB_KEY", "\"1553d2e4fa2912fc0953305d4d3e7c44\""
+        buildConfigField "String", "GIT_COMMIT_ID", "\"${getCommitId()}\""
     }
+    flavorDimensions "flavor"
     productFlavors {
-        fdroid {
-            applicationId = "org.jamienicol.episodes"
-        }
-        playstore {
-            applicationId = "com.vindustries.episodes"
+        standard {
+            dimension "flavor"
+            applicationId = "com.redcoracle.episodes"
         }
     }
     buildTypes {
         debug {
             applicationIdSuffix '.debug'
             versionNameSuffix '-DEBUG'
+            multiDexEnabled true
         }
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    lintOptions {
+    lint {
         abortOnError false
     }
+    compileOptions {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
+    if (project.hasProperty('signingStoreLocation') &&
+            project.hasProperty('signingStorePassword') &&
+            project.hasProperty('signingKeyAlias') &&
+            project.hasProperty('signingKeyPassword')) {
+        println "Found sign properties in gradle.properties! Signing build…"
+
+        signingConfigs {
+            release {
+                storeFile file(signingStoreLocation)
+                storePassword signingStorePassword
+                keyAlias signingKeyAlias
+                keyPassword signingKeyPassword
+            }
+        }
+
+        buildTypes.release.signingConfig = signingConfigs.release
+    } else {
+        buildTypes.release.signingConfig = null
+    }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:22.2.0'
-    compile 'com.android.support:appcompat-v7:22.2.0'
-    compile 'com.android.support:design:22.2.0'
-    compile 'com.android.support:recyclerview-v7:22.2.0'
-    compile 'com.squareup.okhttp:okhttp:2.1.0'
-    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.3'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.github.bumptech.glide:glide:4.14.1'
+    implementation 'com.uwetrottmann.tmdb2:tmdb-java:2.8.1'
+    implementation 'org.apache.commons:commons-collections4:4.4'
+    debugImplementation 'com.android.support:multidex:2.0.1'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.14.1'
 }

app/proguard-rules.pro

@@ -9,9 +9,23 @@
 
 # Add any project specific keep options here:
 
-# 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 *;
-#}
+# Glide
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+
+# TMDB
+-keep class com.uwetrottmann.tmdb2.entities.** { *; }
+-keep class com.uwetrottmann.tmdb2.enumerations.** { *; }
+
+# OkHttp platform used only on JVM and when Conscrypt and other security providers are available.
+-dontwarn okhttp3.internal.platform.**
+-dontwarn org.conscrypt.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.openjsse.**
+
+# R8 said to add these
+-dontwarn kotlin.coroutines.Continuation

app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@mipmap/ic_launcher_background" />
+  <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+  <monochrome android:drawable="@mipmap/ic_launcher_foreground" />
+</adaptive-icon>

app/src/main/AndroidManifest.xml

@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.jamienicol.episodes">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-  <uses-permission
-      android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission
-      android:name="android.permission.INTERNET"/>
-  <uses-permission
-      android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-  <uses-permission
-      android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-  <uses-permission
-      android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" />
 
   <application
       android:name=".EpisodesApplication"
@@ -24,7 +18,8 @@
     <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
-        android:launchMode="singleTop">
+        android:launchMode="singleTop"
+        android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
@@ -71,14 +66,6 @@
         android:label="" >
     </activity>
 
-    <service
-        android:name=".services.AddShowService" >
-    </service>
-
-    <service
-        android:name=".services.RefreshShowService" >
-    </service>
-
     <service
         android:name=".AutoRefreshHelper$Service" >
     </service>

app/src/main/java/org/jamienicol/episodes/AboutActivity.java → app/src/main/java/com/redcoracle/episodes/AboutActivity.java

@@ -15,21 +15,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.jamienicol.episodes;
+package com.redcoracle.episodes;
 
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
 import android.view.MenuItem;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 public class AboutActivity
-	extends ActionBarActivity
+	extends AppCompatActivity
 {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
 		setContentView(R.layout.about_activity);
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+		TextView versionInfoView = findViewById(R.id.version_view);
+		versionInfoView.setText(
+				getBaseContext().getString(
+						R.string.version,
+						BuildConfig.VERSION_NAME,
+						BuildConfig.GIT_COMMIT_ID));
 	}
 
 	@Override

app/src/main/java/org/jamienicol/episodes/AddShowPreviewActivity.java → app/src/main/java/com/redcoracle/episodes/AddShowPreviewActivity.java

@@ -15,18 +15,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.jamienicol.episodes;
+package com.redcoracle.episodes;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.ActionBarActivity;
 import android.view.MenuItem;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.redcoracle.episodes.tvdb.Show;
+
 import java.util.List;
-import org.jamienicol.episodes.tvdb.Show;
 
 public class AddShowPreviewActivity
-	extends ActionBarActivity
+	extends AppCompatActivity
 {
 	@Override
 	public void onCreate(Bundle savedInstanceState)

app/src/main/java/org/jamienicol/episodes/AddShowPreviewFragment.java → app/src/main/java/com/redcoracle/episodes/AddShowPreviewFragment.java

@@ -15,24 +15,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.jamienicol.episodes;
+package com.redcoracle.episodes;
 
-import android.content.Intent;
-import android.database.Cursor;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+
+import androidx.fragment.app.Fragment;
+
+import com.redcoracle.episodes.services.AddShowTask;
+import com.redcoracle.episodes.services.AsyncTask;
+import com.redcoracle.episodes.tvdb.Show;
+
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.List;
-import org.jamienicol.episodes.services.AddShowService;
-import org.jamienicol.episodes.tvdb.Show;
 
 public class AddShowPreviewFragment
 	extends Fragment
@@ -110,10 +112,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
 	}
 
 	private void addShow() {
-		Intent intent = new Intent(getActivity(), AddShowService.class);
-		intent.putExtra("tvdbId", show.getId());
-		intent.putExtra("showName", show.getName());
-
-		getActivity().startService(intent);
+		new AsyncTask().executeAsync(new AddShowTask(show.getId(), show.getName(), show.getLanguage()));
 	}
 }

app/src/main/java/org/jamienicol/episodes/AddShowSearchActivity.java → app/src/main/java/com/redcoracle/episodes/AddShowSearchActivity.java

@@ -15,17 +15,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.jamienicol.episodes;
+package com.redcoracle.episodes;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.ActionBarActivity;
 import android.view.MenuItem;
 import android.view.Window;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentTransaction;
+
 public class AddShowSearchActivity
-	extends ActionBarActivity
+	extends AppCompatActivity
 {
 	@Override
 	public void onCreate(Bundle savedInstanceState)