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

Commit 4bb2b129 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '4339-Update_with_upstream_v3_7_1' into 'main'

4339-Update_with_upstream_v3.7.1

See merge request !28
parents 075ce5f8 97580a34
Loading
Loading
Loading
Loading
Loading

.gitlab-ci.yml

0 → 100644
+30 −0
Original line number Diff line number Diff line
image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"

stages:
- build

before_script:
- if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
- eval $(ssh-agent -s)
- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
- mkdir -p ~/.ssh
- chmod 700 ~/.ssh
- echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
- chmod 644 ~/.ssh/known_hosts
- export GRADLE_USER_HOME=$(pwd)/.gradle
- chmod +x ./gradlew

cache:
  key: ${CI_PROJECT_ID}
  paths:
  - .gradle/

build:
  stage: build
  script:
  - git submodule update --recursive --init
  - ./gradlew build -x test
  artifacts:
    paths:
    - app/build/outputs/apk/

AUTHORS

0 → 100644
+2 −0
Original line number Diff line number Diff line
© e Foundation 2018-2019 - Author: Nihar Thakkar
© ECORP SAS 2018-2019 - Author: Romain Hunault
 No newline at end of file
+13 −59
Original line number Diff line number Diff line
# Nextcloud Notes for Android
An android client for [Nextcloud Notes App](https://github.com/nextcloud/notes/).
# Notes
An android client for [Nextcloud Notes App](https://github.com/nextcloud/notes/)  
Notes is forked from [Nextcloud Notes](https://github.com/stefan-niedermann/nextcloud-notes)

[![Android CI](https://github.com/stefan-niedermann/nextcloud-notes/workflows/Android%20CI/badge.svg)](https://github.com/stefan-niedermann/nextcloud-notes/actions)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/9f784826834042e8b512d531cab84711)](https://www.codacy.com/manual/info_147/nextcloud-notes?utm_source=github.com&utm_medium=referral&utm_content=stefan-niedermann/nextcloud-notes&utm_campaign=Badge_Grade)
[![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)
[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
## Authors

## :arrow_forward: Access
[Authors](https://gitlab.e.foundation/e/apps/Notes/-/blob/master/AUTHORS)

[![Latest Release](https://img.shields.io/github/v/tag/stefan-niedermann/nextcloud-notes?label=latest+release&sort=semver)](https://github.com/stefan-niedermann/nextcloud-notes/tags)
[![F-Droid Release](https://img.shields.io/f-droid/v/it.niedermann.owncloud.notes)](https://f-droid.org/de/packages/it.niedermann.owncloud.notes/)
## Release Notes

[<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
      alt="Get it on Play Store"
      height="80">](https://play.google.com/store/apps/details?id=it.niedermann.owncloud.notes)
[<img src="https://f-droid.org/badge/get-it-on.png"
      alt="Get it on F-Droid"
      height="80">](https://f-droid.org/repository/browse/?fdid=it.niedermann.owncloud.notes)
[<img src="https://raw.githubusercontent.com/stefan-niedermann/paypal-donate-button/master/paypal-donate-button.png"
      alt="Donate with PayPal"
      height="80">](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=K7HVLE6J7SXXA)
[<img src="https://raw.githubusercontent.com/stefan-niedermann/DonateButtons/master/LiberaPay.png"
      alt="Donate using Liberapay"
      height="80">](https://liberapay.com/stefan-niedermann/donate)
Check out the [Release Notes](https://gitlab.e.foundation/e/apps/Notes/-/releases) to find out what changed
in each version of Notes.

## :eyes: Screenshots
## Privacy Policy

| _ | _ | _ |
| :--: | :--: | :--: |
| ![Screenshot of list view](/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png) | ![Screenshot of edit mode](/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png) | ![Screenshot of preview](/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png) |
[Privacy Policy](https://e.foundation/legal-notice-privacy)  
[Terms of service](https://e.foundation/legal-notice-privacy)

## :rocket: Features
  * Multiple accounts
  * List, create, edit, share, search and delete notes
  * Share text and links as new note into the app
  * Toggling checkboxes in view mode
  * Mark notes as favorite
  * Bulk delete
  * In-note search
  * Single note widget and note list widget
  * Render Markdown (using [Markwon](https://noties.io/Markwon))
  * Translated in many languages on [Transifex](https://www.transifex.com/nextcloud/nextcloud/android-notes/)
  * Context based formatting ([#363](https://github.com/stefan-niedermann/nextcloud-notes/issues/363))
  * Password protection ([#354](https://github.com/stefan-niedermann/nextcloud-notes/issues/354))
## License

## :checkered_flag: Roadmap
  * We usually focus on [pinned issues](https://github.com/stefan-niedermann/nextcloud-notes/issues) in our issue tracker
  * Since this is an Open Source freetime project, there is no guarantee when and if and how we implement new features

## :family: Join the team
  * Test the app with different devices
  * Report issues in the [issue tracker](https://github.com/stefan-niedermann/nextcloud-notes/issues)
  * [Pick a good first issue](https://github.com/stefan-niedermann/nextcloud-notes/labels/Good%20first%20issue) :notebook:
  * Create a [Pull Request](https://opensource.guide/how-to-contribute/#opening-a-pull-request)
  * Help translating this app on [Transifex](https://www.transifex.com/nextcloud/nextcloud/android-notes/) 🌎
  * Buy this app on [Google Play Store](https://play.google.com/store/apps/details?id=it.niedermann.owncloud.notes)
  * Send me a bottle of your favorite beer :beers: :wink:

## :link: Requirements
  * [Nextcloud](https://nextcloud.com/) instance running
  * [Nextcloud Android](https://github.com/nextcloud/android) app installed (≥ 3.9.0)
  * [Nextcloud Notes](https://github.com/nextcloud/notes) app enabled

## :notebook: License
This project is licensed under the [GNU GENERAL PUBLIC LICENSE](/LICENSE).
Notes is licensed under the [GNU General Public License v3.0](https://gitlab.e.foundation/e/apps/Notes/-/blob/master/LICENSE)
 No newline at end of file
+4 −26
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ android {
    }

    defaultConfig {
        applicationId "it.niedermann.owncloud.notes"
        minSdkVersion 23
        applicationId "foundation.e.notes"
        minSdkVersion 24
        targetSdkVersion 33
        versionCode 3007001
        versionName "3.7.1"
@@ -39,30 +39,6 @@ android {
        }
    }


    flavorDimensions "version"

    productFlavors {
        fdroid {
            dimension "version"
        }
        dev {
            dimension "version"
            applicationIdSuffix ".dev"
        }
        play {
            dimension "version"
        }
        pfungstadt {
            dimension "version"
            applicationIdSuffix ".pfungstadt"
        }
        mdm {
            dimension "version"
            applicationIdSuffix ".mdm"
        }
    }

    testOptions {
        unitTests {
            includeAndroidResources true
@@ -73,6 +49,7 @@ android {
        disable 'MissingTranslation'
    }
    namespace 'it.niedermann.owncloud.notes'

}

dependencies {
@@ -124,4 +101,5 @@ dependencies {
    testImplementation 'org.robolectric:robolectric:4.9'

    implementation fileTree(dir: 'libs', include: ['*.jar'])
    implementation 'foundation.e:elib:0.0.1-alpha11'
}
+0 −29
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="108dp"
    android:height="108dp"
    android:viewportWidth="66.666664"
    android:viewportHeight="66.666664">
    <group
        android:translateX="17.333334"
        android:translateY="17.333334">
        <path
            android:fillColor="#fff"
            android:pathData="m24.484 3.5156c-1.0237 0-2.0471 0.38887-2.8281 1.1699l5.6582 5.6582c1.5621-1.5621 1.5621-4.0961 0-5.6582-0.78105-0.78105-1.8064-1.1699-2.8301-1.1699zm-4.2422 2.584-12.02 12.021 5.6562 5.6562 12.021-12.02-5.6582-5.6582zm-13.436 13.436-2.1211 7.7793 7.7793-2.1211-5.6582-5.6582z" />
    </group>
    <group
        android:scaleX=".20"
        android:scaleY=".23"
        android:translateX="33"
        android:translateY="38">
        <path
            android:fillColor="#ffffff"
            android:pathData="M11.908125 40h11.4c4.44 0 7.24 -1.04 9.2 -3.4 2.32 -2.72 3.56 -6.68 3.56 -11.2 0 -4.48 -1.24 -8.44 -3.56 -11.2 -1.96 -2.36 -4.72 -3.36 -9.2 -3.36h-11.4zm6 -5V15.84h5.4c4.52 0 6.76 3.16 6.76 9.6 0 6.4 -2.24 9.56 -6.76 9.56z" />
        <path
            android:fillColor="#ffffff"
            android:pathData="M46.894375 27.44h13.96v-5h-13.96v-6.6h15.08v-5h-21.08V40h21.8v-5h-15.8z" />
        <path
            android:fillColor="#ffffff"
            android:pathData="M80.333125 40l10 -29.16h-6.04l-6.36 21.96 -6.48 -21.96h-6.04l9.84 29.16z" />
    </group>
</vector>
Loading