Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Opentask view Support #1279

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
28 changes: 17 additions & 11 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,45 @@
name: Android CI with Gradle

on:
pull_request:
push:
workflow_dispatch:
branches:
- '*'
pull_request:
branches: [ master ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
- name: set up JDK 17
uses: actions/[email protected]
uses: actions/checkout@v3
- name: set up JDK 11
uses: actions/[email protected]
with:
distribution: 'zulu'
java-version: '17'
java-version: '11'
- name: Restore Cache
uses: actions/cache@v4.0.2
uses: actions/cache@v3.0.11
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Checkout submodules # checkout rest
shell: bash
run: |
git submodule update --init
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v2
uses: gradle/wrapper-validation-action@v1
- name: Build with Gradle
run: |
./gradlew :app:assembleDebug
- name: Upload APK
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: Etar_apk
path: app/build/outputs/apk/debug/app-debug.apk
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ this app would be just a dream. So thanks to them!
## Features
- Month view.
- Week, day & agenda view.
- view task on day, week, month and agenda view
- Uses Android calendar sync. Works with Google Calendar, Exchange, etc.
- Material designed.
- Support offline calendar.
- Agenda widget.
- Agenda and task widget.
- Multilingual UI.

## How to use Etar
Expand All @@ -36,6 +37,8 @@ Sync your calendar to a server:
need yet another app, e. g. DAVx5. That’s necessary because a Caldav client
isn't included in Etar.

The following [link](https://ownyourbits.com/2017/12/30/sync-nextcloud-tasks-calendars-and-contacts-on-your-android-device/) provides a tutorial how to use Nextcloud + DAVx5 + Etar.

### Technical explanation
On Android there are "Calendar providers". These can be calendars that are
synchronized with a cloud service or local calendars. Basically any app
Expand Down
46 changes: 17 additions & 29 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@ editorconfig {
}

android {
namespace 'ws.xsoh.etar'
testNamespace 'com.android.calendar.tests'
compileSdk 34
compileSdk 33

defaultConfig {
minSdk 21
targetSdk 34
versionCode 43
versionName "1.0.43"
targetSdk 33
versionCode 34
versionName "1.0.34"
applicationId "ws.xsoh.etar"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
Expand Down Expand Up @@ -75,52 +73,42 @@ android {
}

lint {
lintConfig = file("lint.xml")
// TODO: Resolve lint errors due to 363aa9c237a33e9e1a40bdfd9039dcaaa855a5a0
checkReleaseBuilds false
// Or, if you prefer, you can continue to check for errors in release builds,
// but continue the build even when errors are found:
abortOnError false
}

compileOptions {
coreLibraryDesugaringEnabled true

sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "17"
jvmTarget = "11"
}

useLibrary 'android.test.base'
useLibrary 'android.test.mock'

androidResources {
generateLocaleConfig true
}

}

dependencies {

// Core
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.core:core-ktx:1.8.0'
implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
implementation 'androidx.preference:preference:1.2.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'com.google.android.material:material:1.11.0'
implementation 'androidx.preference:preference:1.1.1'
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation 'com.google.android.material:material:1.5.0'
testImplementation 'junit:junit:4.13.2'

coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'

// Coroutines
def coroutines_version = "1.8.0"
def coroutines_version = "1.6.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"

// https://mvnrepository.com/artifact/org.dmfs/lib-recur
implementation 'org.dmfs:lib-recur:0.16.0'

}

preBuild.dependsOn (":aarGen")
4 changes: 0 additions & 4 deletions app/lint.xml

This file was deleted.

22 changes: 12 additions & 10 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,19 @@
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
<uses-permission android:name="android.permission.USE_EXACT_ALARM" />
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" android:maxSdkVersion="32" />
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<uses-permission android:name="org.dmfs.permission.READ_TASKS" />
<uses-permission android:name="org.dmfs.permission.WRITE_TASKS" />

<queries>
<intent>
<action android:name="android.content.SyncAdapter" />
</intent>
<package android:name="at.bitfire.davdroid" />
<package android:name="com.etesync.syncadapter" />
<package android:name="com.google.android.gm" />
<package android:name="org.birthdayadapter" />
<package android:name="org.decsync.cc" />

<intent>
<action android:name="android.intent.action.VIEW" />
Expand All @@ -52,6 +55,8 @@
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" />
</intent>
<provider android:authorities="org.tasks" android:exported="false" />
<provider android:authorities="org.dmfs.tasks" android:exported="false" />
</queries>

<application android:name="com.android.calendar.CalendarApplication"
Expand Down Expand Up @@ -112,7 +117,6 @@
</activity>

<activity android:name="com.android.calendar.event.EditEventActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:theme="@style/Base.CalendarAppThemeWithActionBar">
</activity>

Expand Down Expand Up @@ -268,9 +272,7 @@
</intent-filter>
</receiver>

<service android:name="com.android.calendar.alerts.AlertService"
android:exported="false"
android:foregroundServiceType="dataSync|systemExempted" />
<service android:name="com.android.calendar.alerts.AlertService" />

<service android:name="com.android.calendar.alerts.DismissAlarmsService" />

Expand Down
Loading