Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 216ffd89 authored by Niedermann IT-Dienstleistungen's avatar Niedermann IT-Dienstleistungen Committed by GitHub
Browse files

Merge branch 'master' into 310-swipe-left-favorite

parents 21765daa ed64981b
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -4,13 +4,14 @@ An android client for [Nextcloud Notes App](https://github.com/nextcloud/notes/)
[![Build Status](https://travis-ci.org/stefan-niedermann/nextcloud-notes.svg?branch=master)](https://travis-ci.org/stefan-niedermann/nextcloud-notes)
[![GitHub issues](https://img.shields.io/github/issues/stefan-niedermann/nextcloud-notes.svg)](https://github.com/stefan-niedermann/nextcloud-notes/issues)
[![GitHub stars](https://img.shields.io/github/stars/stefan-niedermann/nextcloud-notes.svg)](https://github.com/stefan-niedermann/nextcloud-notes/stargazers)
[![GitHub license](https://img.shields.io/badge/license-GPL-blue.svg)](https://raw.githubusercontent.com/stefan-niedermann/nextcloud-notes/master/LICENSE)
[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)

## :arrow_forward: Access

[![Download from Google Play](http://www.android.com/images/brand/android_app_on_play_large.png)](https://play.google.com/store/apps/details?id=it.niedermann.owncloud.notes)
[![Nextcloud Notes App on fdroid.org](https://camo.githubusercontent.com/7df0eafa4433fa4919a56f87c3d99cf81b68d01c/68747470733a2f2f662d64726f69642e6f72672f77696b692f696d616765732f632f63342f462d44726f69642d627574746f6e5f617661696c61626c652d6f6e2e706e67)](https://f-droid.org/repository/browse/?fdid=it.niedermann.owncloud.notes)
[![Donate with PayPal](https://raw.githubusercontent.com/stefan-niedermann/paypal-donate-button/master/paypal-donate-button.png)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=K7HVLE6J7SXXA)
[![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/stefan-niedermann/donate)

## :eyes: Screenshots
![Screenshot of list view](/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png)
+8 −4
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ android {
        applicationId "it.niedermann.owncloud.notes"
        minSdkVersion 14
        targetSdkVersion 27
        versionCode 21
        versionName "0.14.0"
        versionCode 29
        versionName "0.17.0"
    }
    buildTypes {
        release {
@@ -28,12 +28,16 @@ dependencies {

    implementation 'com.yydcdut:rxmarkdown:0.1.1-beta'


    implementation 'com.jakewharton:butterknife:8.8.1'
    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'

    def supportLibVersion = '27.1.1'

    implementation "com.android.support:support-v4:${supportLibVersion}"
    implementation "com.android.support:appcompat-v7:${supportLibVersion}"
    implementation "com.android.support:design:${supportLibVersion}"
    implementation "com.android.support:recyclerview-v7:${supportLibVersion}"
    implementation "com.android.support:cardview-v7:${supportLibVersion}" // needed for cert4android (conflict resolution)
    // needed for cert4android (conflict resolution)
    implementation "com.android.support:cardview-v7:${supportLibVersion}"
    implementation fileTree(dir: 'libs', include: ['*.jar'])
}
+0 −1
Original line number Diff line number Diff line
@@ -9,6 +9,5 @@
#
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-19
+0 −2
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ package it.niedermann.owncloud.notes.util;

import junit.framework.TestCase;

import java.lang.reflect.Method;

/**
 * Tests the NotesClientUtil
 * Created by stefan on 24.09.15.
+16 −20
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

    <application
        android:name="it.niedermann.owncloud.notes.util.Notes"
        android:allowBackup="true"
        android:fullBackupContent="true"
        android:icon="@mipmap/ic_launcher"
@@ -22,13 +23,15 @@
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
            <meta-data
                android:name="android.app.shortcuts"
                android:resource="@xml/shortcuts" />
        </activity>

        <activity
            android:name="it.niedermann.owncloud.notes.android.activity.NotesListViewActivity"
            android:label="@string/app_name"
            android:theme="@style/AppTheme.NoActionBar"
            >
            android:theme="@style/AppTheme.NoActionBar">

            <intent-filter>
                <action android:name="android.intent.action.SEARCH" />
@@ -40,31 +43,28 @@
            <meta-data
                android:name="android.app.default_searchable"
                android:value="it.niedermann.owncloud.notes.android.activity.NotesListViewActivity" />
            <meta-data android:name="android.app.shortcuts"
                android:resource="@xml/shortcuts" />
        </activity>

        <activity
            android:name="it.niedermann.owncloud.notes.android.activity.SettingsActivity"
            android:label="@string/settings_server_settings"
            android:parentActivityName="it.niedermann.owncloud.notes.android.activity.PreferencesActivity"
            android:windowSoftInputMode="stateVisible"
            />
            android:windowSoftInputMode="stateVisible" />

        <activity
            android:name="it.niedermann.owncloud.notes.android.activity.PreferencesActivity"
            android:label="@string/action_settings"
            android:parentActivityName="it.niedermann.owncloud.notes.android.activity.NotesListViewActivity"
            android:windowSoftInputMode="stateHidden"
            android:theme="@style/Preferences"
            />

        <activity
            android:name="it.niedermann.owncloud.notes.android.activity.EditNoteActivity"
            android:label="@string/menu_edit"
            android:label="@string/simple_edit"
            android:parentActivityName="it.niedermann.owncloud.notes.android.activity.NotesListViewActivity"
            android:windowSoftInputMode="stateHidden"
            android:launchMode="singleTask"
            >
            android:launchMode="singleTask">
            <intent-filter android:label="@string/action_create">
                <action android:name="android.intent.action.SEND" />
                <category android:name="android.intent.category.DEFAULT" />
@@ -74,21 +74,18 @@

        <activity
            android:name="it.niedermann.owncloud.notes.android.activity.AboutActivity"
            android:label="@string/menu_about"
            android:parentActivityName="it.niedermann.owncloud.notes.android.activity.NotesListViewActivity"
            />
            android:label="@string/simple_about"
            android:parentActivityName="it.niedermann.owncloud.notes.android.activity.NotesListViewActivity" />

        <activity
            android:name=".android.activity.SelectSingleNoteActivity"
            android:theme="@style/AppTheme.NoActionBar"
            >
            android:theme="@style/AppTheme.NoActionBar">
            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
            </intent-filter>
        </activity>

        <activity
            android:name=".android.appwidget.NoteListWidgetConfiguration">
        <activity android:name=".android.appwidget.NoteListWidgetConfiguration">

            <intent-filter>
                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -149,8 +146,7 @@
            android:description="@string/action_create"
            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
            <intent-filter>
                <action
                    android:name="android.service.quicksettings.action.QS_TILE"/>
                <action android:name="android.service.quicksettings.action.QS_TILE" />
            </intent-filter>
        </service>

Loading