diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92bc54bd1d..69f1ba41ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Android Pull Request on: pull_request: branches: - - master + - main concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/post_merge.yml b/.github/workflows/post_merge.yml index cbf51911ec..184d864313 100644 --- a/.github/workflows/post_merge.yml +++ b/.github/workflows/post_merge.yml @@ -2,7 +2,7 @@ name: Upload Dependency List and Debug App on: push: branches: - - master + - main workflow_dispatch: concurrency: diff --git a/README.md b/README.md index 59cf7092f3..55540937b2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@
-Quran for Android logo +Quran for Android logo # Quran for Android @@ -30,11 +30,11 @@ This is a simple (Madani based) Quran app for Android. If you'd like to contribute, please take a look at the [PRs Welcome](https://github.com/quran/quran_android/issues?q=is%3Aissue+is%3Aopen+label%3A%22PRs+Welcome%22) label on the issue tracker. For new features, please open an issue to discuss it before beginning implementation. -Use [`quran_android-code_style.xml`](https://github.com/quran/quran_android/blob/master/quran_android-code_style.xml) for Android Studio / IntelliJ code styles. Import it by copying it to the Android Studio/IntelliJ IDEA codestyles folder. For Android Studio, that folder is located at `~/.AndroidStudio[Version]/config/codestyles` (the root folder name may differ depending on the host machine and Android Studio version, but the rest of the path should be same). After copying the `quran_android-code_style.xml`, go to Code Style preferences screen and choose `quran_android-code_style` from Code Style Schemes. +Use [`quran_android-code_style.xml`](https://github.com/quran/quran_android/blob/main/quran_android-code_style.xml) for Android Studio / IntelliJ code styles. Import it by copying it to the Android Studio/IntelliJ IDEA codestyles folder. For Android Studio, that folder is located at `~/.AndroidStudio[Version]/config/codestyles` (the root folder name may differ depending on the host machine and Android Studio version, but the rest of the path should be same). After copying the `quran_android-code_style.xml`, go to Code Style preferences screen and choose `quran_android-code_style` from Code Style Schemes. Please set your Android studio kotlin code style based on [Kotlin Coding Conventions](https://kotlinlang.org/docs/reference/coding-conventions.html). You can configure it from menu Settings | Editor | Code Style | Kotlin, click on "Set from…" link in the upper right corner, and select "Predefined style / Kotlin style guide" from the menu. -May Allah reward all the awesome [Contributors and Translators](https://github.com/quran/quran_android/blob/master/CONTRIBUTORS.md). +May Allah reward all the awesome [Contributors and Translators](https://github.com/quran/quran_android/blob/main/CONTRIBUTORS.md). ## Setup diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index eb224010b9..dfa30c5aa2 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -106,8 +106,6 @@ Bijdragers Een lijst met mensen die hebben bijgedragen aan de ontwikkeling van Koran voor Android - - https://github.com/quran/quran_android/blob/master/CONTRIBUTORS.md Veel Gestelde Vragen diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6bc12f4030..e4040b0749 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -95,7 +95,7 @@ Others Contributors A list of people who contributed to the development of Quran for Android - https://github.com/quran/quran_android/blob/master/CONTRIBUTORS.md + https://github.com/quran/quran_android/blob/main/CONTRIBUTORS.md Frequently Asked Questions