Merge pull request #122 from SecUSo/development

Update to version 1.2.0

Author: coderPaddyS

.github/workflows/changelog.yml

@@ -2,7 +2,7 @@ name: Changelog Generation
 
 on:
   release:
-    types: [published, released]
+    types: [published]
   workflow_dispatch:
 
 jobs:
@@ -16,6 +16,7 @@ jobs:
       - uses: rhysd/changelog-from-release/action@v3
         with:
           file: CHANGELOG.md
+          pull_request: true
           github_token: ${{ secrets.GITHUB_TOKEN }}
           commit_summary_template: 'update changelog for %s changes'
           args: -l 2

.github/workflows/ci.yml

@@ -0,0 +1,67 @@
+name: Continuous Integration
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: "recursive"
+
+      - name: Set up JDK environment
+        uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: 17
+
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
+      - name: Run local unit tests
+        run: bash ./gradlew test --stacktrace
+
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: "recursive"
+
+      - name: Set up JDK environment
+        uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: 17
+
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
+      - name: Run lint check
+        run: bash ./gradlew lint
+
+      - name: Upload lint result
+        uses: actions/upload-artifact@v4
+        with:
+          name: lint-results-debug
+          path: app/build/reports/lint-results-debug.html
+
+      - name: Build the app
+        run: bash ./gradlew build --stacktrace
+
+      - name: Build debug apk
+        run: bash ./gradlew assembleDebug
+
+      - name: Upload debug apk
+        uses: actions/upload-artifact@v4
+        with:
+          name: debug-apk
+          path: app/build/outputs/apk/debug/*.apk

.gitignore

@@ -26,3 +26,15 @@ local.properties
 .Trashes
 ehthumbs.db
 Thumbs.db
+
+# Documents
+*.pdf
+*.doc
+*.docx
+*.odt
+
+# APKs
+*.apk
+/pfa.properties
+/.idea/
+/app/release

README.md

@@ -1,11 +1,11 @@
 [![PFA](https://img.shields.io/static/v1?label=Privacy%20Friendly%20Apps&message=Project%20Page&style=flat-square&color=3680BB&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADIGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4wLWMwNjAgNjEuMTM0Nzc3LCAyMDEwLzAyLzEyLTE3OjMyOjAwICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MDAzNUZBOTQ0M0IyMTFFQzk4QURGMzg0MzM0MDlCODYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MDAzNUZBOTU0M0IyMTFFQzk4QURGMzg0MzM0MDlCODYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMDM1RkE5MjQzQjIxMUVDOThBREYzODQzMzQwOUI4NiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowMDM1RkE5MzQzQjIxMUVDOThBREYzODQzMzQwOUI4NiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pkwoi3oAAANmSURBVFhH7ZZdSFRBFIDnzO5tV1dTEqOMSiitIAuJTCyCCgSlh6xYSQj79yURNBEJsoceUjPMfCiCIsv8i0QfoiCTotDIMPuDHpJNiSjoRy11vffOdO443e7dtYgeaiE/9uycn5m5Z3fOzB0yzX8PyNak4nLfLs54ri0EMEaYeqQkd1VPZ+cFd3QYLecElsjod3qS17jLALz66LuWNHDQYgqgyBhhnDMK9LArJuupdAlsCXDOafmlvkEAiJMuK7UlO1fmP+6u28iBdEifCY7l4FKSkpNznvs/tl5HR4YMmeC4RvesrTukKaCyFbS0tACmFClNOwyHIzroQf+aASYNTk7DhcF+PYcVWwL/glBMAAvuDzBqAOvML/Vx4fwNbAl4vV6dEjiGap9NALodCm1DnXDHRBfn5DLh5KFVABwXkobnvhB9gFdg080Jf2AK510490kjHlIEVeWG/DOLBj6NbpKmwKVQNXZmVOudU7s/4y+Bg5XNqRM6t23VMMXlqzmU9cjQa5s7I/zj2jrGmDk/ABru4btF2dm2JbYlUFbW6WzwPXmuM54oXSZOCg0vLxbk5FU0ruU6uSfdJpjY1xh35IrjhZv7T9TdrMfDLEeGfsD4ueI9GQekJbDVQHw8ceJE86RpgxMi/Ewnc4QjADwGPCqoC4TOSYJwBoCnQNDY6XMgtBLw+YhGKQxK0wYA8RmtExxvcV8z4bSAh9AX4qCvhU74S+EMgHJ4I1WToG2YXnh+fv/7kfXSFChO0BJiw6+3V+4bEduw4lqypqu2gnIpykBN8bZnhn72bHv48IywFGp9cQFly2LjuzMzE8VpGTIE/gOwNDO/UtO07dIWAFBVAXr0xY3T9al7axcPM34J1y5WhgW4Jq/iZs/w3irPG6q+8iRLB1pqn5xxQmlpYfby29IhsNVAVVWTe9Tvz/Nr+kKrjKvq4jFd3W/0+aDqW9CXOqbpi6yCvvSJIWea0cd4OC7VarwFWQRSdI0VGHErQbsAbyQ/2xmOyQbck20w+BISY4MKyyQ48rOH/TVCLwE88/EzJarxxYFNCGsKKOBrSoAFNyV4kwjAlkBRUfZYhEupxI54EbEK6Y32eGqNPvM9EU143e7AIuu1ikLp1SgP3Df6GNWOvnZ8nEV4G75Rq0V8mmlMCPkGEv2I2wFovg8AAAAASUVORK5CYII=)][PFA]
-[![Twitter](https://img.shields.io/badge/twitter-@SECUSOResearch-%231DA1F2.svg?&style=flat-square&logo=twitter&logoColor=1DA1F2)][Twitter]
+[![Bluesky](https://img.shields.io/badge/[email protected]-%231DA1F2.svg?&style=flat-square&logo=twitter&logoColor=1DA1F2)][Bluesky]
 [![Mastodon](https://img.shields.io/badge/mastodon-@SECUSO__Research@baw%C3%BC.social-%233088D4.svg?&style=flat-square&logo=mastodon&logoColor=3088D4)][Mastodon]
 [![Translation status](https://hosted.weblate.org/widget/pfa/shopping-list/shopping-list-android-app/svg-badge.svg)](https://hosted.weblate.org/engage/pfa/)
 
 [PFA]: https://secuso.org/pfa
 [Mastodon]: https://xn--baw-joa.social/@SECUSO_Research
-[Twitter]: https://twitter.com/SECUSOResearch
+[Bluesky]: https://bsky.app/profile/secusoresearch.bsky.social
 <img src="https://raw.githubusercontent.com/SecUSo/privacy-friendly-shopping-list/master/fastlane/metadata/android/en-US/images/website_icon.png"
 alt="Privacy Friendly Notes Icon"
 width="120px"

app/build.gradle

@@ -1,16 +1,19 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
 
 android {
-    compileSdkVersion 33
-
+    namespace "privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist"
     defaultConfig {
         applicationId "privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist"
-        minSdkVersion 17
-        targetSdkVersion 33
-        versionCode 8
-        versionName "1.1"
+        minSdkVersion 19
+        compileSdk 34
+        targetSdkVersion 34
+        versionCode 10
+        versionName "1.2.0-rc1"
         multiDexEnabled true
+
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
     buildTypes {
@@ -21,8 +24,16 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+
+    kotlin {
+        jvmToolchain {17}
     }
 
     testOptions {
@@ -53,14 +64,14 @@ android {
                     ]
         }
     }
-
     lint {
         lintConfig = file("lint.xml")
     }
+    namespace 'privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist'
 }
 
-android.applicationVariants.all { variant ->
-    variant.outputs.all {
+android.applicationVariants.configureEach { variant ->
+    variant.outputs.configureEach {
         def appName = "pfa-shopping-list"
         outputFileName = appName + "-${variant.name}-v${variant.versionName}.apk"
     }
@@ -69,19 +80,21 @@ android.applicationVariants.all { variant ->
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     // android
-    androidTestImplementation 'androidx.annotation:annotation:1.0.0'
 
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.11.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'androidx.cardview:cardview:1.0.0'
 
     // tests
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:2.7.6'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test:rules:1.1.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test:rules:1.6.1'
+    androidTestImplementation 'androidx.test:core:1.6.1'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2'
     testImplementation 'pl.pragmatists:JUnitParams:0.3.6'
     // dependency injection
     implementation 'com.squareup.dagger:dagger:1.2.5'
@@ -100,17 +113,17 @@ dependencies {
     // image zoom
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.5.0'
 
-    implementation 'androidx.sqlite:sqlite:2.3.0'
-    implementation 'androidx.sqlite:sqlite-ktx:2.3.0'
+    implementation 'androidx.sqlite:sqlite:2.4.0'
+    implementation 'androidx.sqlite:sqlite-ktx:2.4.0'
 
     // Backup API
     implementation project(':backup-api')
-    def work_version = '2.7.1'
+    def work_version = '2.9.0'
     implementation "androidx.work:work-runtime:$work_version"
     implementation "androidx.work:work-runtime-ktx:$work_version"
     androidTestImplementation "androidx.work:work-testing:$work_version"
 
-    implementation 'androidx.core:core-ktx:1.7.20'
+    implementation "androidx.core:core-ktx:1.9.0"
 
     // Multi-Dex
     def multidex_version = "2.0.1"

app/lint.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
+    <!-- Disable the NotificationPermission check for glide -->
+    <issue id="NotificationPermission">
+        <ignore regexp="com.bumptech.glide.request.target.NotificationTarget" />
+    </issue>
+
     <!-- Set the severity of missing translations to warning instead of error -->
     <issue id="MissingTranslation" severity="warning" />
     <issue id="MissingQuantity" severity="warning" />
-</lint>
+</lint>

app/src/androidTest/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/AbstractDatabaseTest.java

@@ -1,8 +1,12 @@
 package privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist;
 
-import android.support.test.runner.AndroidJUnit4;
-import android.test.AndroidTestCase;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.After;
+import org.junit.Before;
 import org.junit.runner.RunWith;
+
 import privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist.framework.persistence.DB;
 
 /**
@@ -11,24 +15,22 @@
  * Created: 31.05.16 creation date
  */
 @RunWith(AndroidJUnit4.class)
-abstract public class AbstractDatabaseTest extends AndroidTestCase
-{
+abstract public class AbstractDatabaseTest {
 
-    protected void setUp() throws Exception
-    {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         // delete database before each test
-        getContext().deleteDatabase(DB.TEST.getDbName());
+        InstrumentationRegistry.getInstrumentation().getContext().deleteDatabase(DB.TEST.getDbName());
         setupBeforeEachTest();
     }
 
-    protected void tearDown() throws Exception
-    {
-        super.tearDown();
+    @After
+    public void tearDown() throws Exception {
         cleanAfterEachTest();
     }
 
     abstract protected void setupBeforeEachTest();
 
-    protected void cleanAfterEachTest(){}
+    protected void cleanAfterEachTest() {
+    }
 }

app/src/androidTest/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/ApplicationTest.java

@@ -1,15 +1,26 @@
 package privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist;
 
-import android.app.Application;
-import android.test.ApplicationTestCase;
+import static org.junit.Assert.assertEquals;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /**
  * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
  */
-public class ApplicationTest extends ApplicationTestCase<Application>
-{
-    public ApplicationTest()
-    {
-        super(Application.class);
+@RunWith(AndroidJUnit4.class)
+public class ApplicationTest {
+    @Test
+    public void useApplicationContext() {
+        assertEquals("privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist", ApplicationProvider.getApplicationContext().getPackageName());
+    }
+
+    @Test
+    public void useContext() {
+        assertEquals("privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist.test", InstrumentationRegistry.getInstrumentation().getContext().getPackageName());
     }
 }

app/src/androidTest/java/privacyfriendlyshoppinglist/secuso/org/privacyfriendlyshoppinglist/MainActivityBasicTest.kt

@@ -0,0 +1,26 @@
+package privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist.ui.main.MainActivity
+
+@RunWith(AndroidJUnit4::class)
+class MainActivityBasicTest {
+    @get: Rule
+    var mActivityRule = ActivityScenarioRule(MainActivity::class.java)
+
+    @Test
+    fun launchActivity() {
+    }
+
+    @Test
+    fun openDrawer() {
+        onView(withContentDescription(R.string.navigation_drawer_open)).perform(click())
+    }
+}