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

Release 1.6 #58

Merged
merged 41 commits into from
Mar 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
d20b434
Fix Badge With Issues
CrazyMarvin May 26, 2020
90999c5
Bump gradle from 3.6.3 to 4.0.0
dependabot-preview[bot] Jun 1, 2020
2c5e855
Merge pull request #35 from Crazy-Marvin/dependabot/gradle/com.androi…
FahadSaleem Jun 6, 2020
e44fb49
Update To 1.6
CrazyMarvin Jul 23, 2020
0403984
Add fastlane Folder Structure
PoopJournal Jul 23, 2020
dcb4e3d
Activate CodeQL Code Scanning
CrazyMarvin Jul 28, 2020
24e68aa
Bump gradle from 4.0.0 to 4.0.1
dependabot-preview[bot] Aug 1, 2020
bae1862
Merge pull request #40 from Crazy-Marvin/dependabot/gradle/com.androi…
CrazyMarvin Aug 1, 2020
2ad6d9a
Rename full-description.txt to full_description.txt
CrazyMarvin Aug 2, 2020
d11de22
Rename short-description.txt to short_description.txt
CrazyMarvin Aug 2, 2020
3798d30
Don't open and close camera constantly
luc65r Aug 23, 2020
ab86730
Merge pull request #42 from luc65r/camera
CrazyMarvin Aug 24, 2020
162e445
Update Languages
PoopJournal Aug 24, 2020
896ea2d
Update Brazilian Portuguese
CrazyMarvin Aug 25, 2020
befcd3b
Update Brazilian Portuguese
CrazyMarvin Aug 25, 2020
f4d7db3
Update Brazilian Portuguese
CrazyMarvin Aug 25, 2020
2fda6d0
Update Brazilian Portuguese
CrazyMarvin Aug 25, 2020
4840f7c
Bump material from 1.1.0 to 1.2.0
dependabot-preview[bot] Sep 1, 2020
1f6180a
Bump appcompat from 1.1.0 to 1.2.0
dependabot-preview[bot] Sep 1, 2020
f17eeb7
Merge pull request #43 from Crazy-Marvin/dependabot/gradle/com.google…
CrazyMarvin Sep 21, 2020
3a86d30
Merge pull request #45 from Crazy-Marvin/dependabot/gradle/androidx.a…
CrazyMarvin Sep 21, 2020
0931902
Bump constraintlayout from 1.1.3 to 2.0.1
dependabot-preview[bot] Sep 21, 2020
00586e4
Merge pull request #44 from Crazy-Marvin/dependabot/gradle/androidx.c…
CrazyMarvin Sep 21, 2020
39da979
Bump material from 1.2.0 to 1.2.1
dependabot-preview[bot] Oct 1, 2020
3585325
Merge pull request #47 from Crazy-Marvin/dependabot/gradle/com.google…
CrazyMarvin Oct 1, 2020
7f55cb5
Add Indonesian Translation
andriannobella Oct 5, 2020
ca39d9a
Merge pull request #49 from andriannobella/indonesia
CrazyMarvin Oct 5, 2020
8bac708
Bump constraintlayout from 2.0.1 to 2.0.4
dependabot-preview[bot] Nov 1, 2020
2d297ad
Bump gradle from 4.0.1 to 4.1.0
dependabot-preview[bot] Nov 1, 2020
4438997
Merge pull request #51 from Crazy-Marvin/dependabot/gradle/androidx.c…
CrazyMarvin Nov 1, 2020
244ee1a
Merge pull request #52 from Crazy-Marvin/dependabot/gradle/com.androi…
CrazyMarvin Nov 1, 2020
0aa0636
Bump gradle from 4.1.0 to 4.1.1
dependabot-preview[bot] Dec 1, 2020
9b2cf88
Merge pull request #53 from Crazy-Marvin/dependabot/gradle/com.androi…
CrazyMarvin Dec 1, 2020
5360b3e
Bump gradle from 4.1.1 to 4.1.2
dependabot-preview[bot] Feb 1, 2021
23492fa
Merge pull request #54 from Crazy-Marvin/dependabot/gradle/com.androi…
CrazyMarvin Feb 1, 2021
4f00b7f
Bump material from 1.2.1 to 1.3.0
dependabot-preview[bot] Mar 1, 2021
8e4bad0
Merge pull request #56 from Crazy-Marvin/dependabot/gradle/com.google…
CrazyMarvin Mar 1, 2021
8fd7581
Update 7.txt
CrazyMarvin Mar 22, 2021
98d92a2
Create 8.txt
CrazyMarvin Mar 22, 2021
ad25c3f
new changes
FahadSaleem Mar 23, 2021
45dfba0
Merge branch 'development' of https://github.com/Crazy-Marvin/Morse i…
FahadSaleem Mar 23, 2021
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
  •  
  •  
  •  
54 changes: 54 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: "CodeQL"

on:
push:
branches: [development, master]
pull_request:
# The branches below must be a subset of the branches above
branches: [development]
schedule:
- cron: '0 12 * * 0'

jobs:
analyse:
name: Analyse
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
# Override language selection by uncommenting this and choosing your languages
# with:
# languages: go, javascript, csharp, python, cpp, java

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
1 change: 1 addition & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Last commit](https://img.shields.io/github/last-commit/Crazy-Marvin/Morse.svg?style=flat)](https://github.com/Crazy-Marvin/Morse/commits)
[![Releases](https://img.shields.io/github/downloads/Crazy-Marvin/Morse/total.svg?style=flat)](https://github.com/Crazy-Marvin/Morse/releases)
[![Latest tag](https://img.shields.io/github/tag/Crazy-Marvin/Morse.svg?style=flat)](https://github.com/Crazy-Marvin/Morse/tags)
[![Issues](https://img.shields.io/github/issues/Crazy-Marvin/MetadataRemover.svg?style=flat)](https://github.com/Crazy-Marvin/Morse/issues)
[![Issues](https://img.shields.io/github/issues/Crazy-Marvin/Morse.svg?style=flat)](https://github.com/Crazy-Marvin/Morse/issues)
[![Pull requests](https://img.shields.io/github/issues-pr/Crazy-Marvin/Morse.svg?style=flat)](https://github.com/Crazy-Marvin/Morse/pulls)
[![Codacy](https://api.codacy.com/project/badge/Grade/49d72132eca54aa9b68056d3dce5c019)](https://www.codacy.com/app/CrazyMarvin/Morse?utm_source=github.com&utm_medium=referral&utm_content=Crazy-Marvin/Morse&utm_campaign=Badge_Grade)
[![codecov](https://codecov.io/gh/Crazy-Marvin/Morse/branch/master/graph/badge.svg)](https://codecov.io/gh/Crazy-Marvin/Morse)
Expand Down
14 changes: 7 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 29
compileSdkVersion 30
defaultConfig {
applicationId "rocks.poopjournal.morse"
minSdkVersion 19
targetSdkVersion 29
versionCode 5
versionName "1.5"
targetSdkVersion 30
versionCode 7
versionName "1.6"
}

buildTypes {
Expand All @@ -29,7 +29,7 @@ android {
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.google.android.material:material:1.1.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'com.google.android.material:material:1.3.0'
}
60 changes: 60 additions & 0 deletions app/src/main/java/rocks/poopjournal/morse/LoopMediaPlayer.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package rocks.poopjournal.morse;

import android.content.Context;
import android.media.MediaPlayer;
import android.util.Log;

public class LoopMediaPlayer {

public static final String TAG = LoopMediaPlayer.class.getSimpleName();

private Context mContext = null;
private int mResId = 0;
private int mCounter = 1;

private MediaPlayer mCurrentPlayer = null;
private MediaPlayer mNextPlayer = null;

public static LoopMediaPlayer create(Context context, int resId) {
return new LoopMediaPlayer(context, resId);
}

private LoopMediaPlayer(Context context, int resId) {
mContext = context;
mResId = resId;

mCurrentPlayer = MediaPlayer.create(mContext, mResId);
mCurrentPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
@Override
public void onPrepared(MediaPlayer mediaPlayer) {
mCurrentPlayer.start();
}
});

createNextMediaPlayer();
}

private void createNextMediaPlayer() {
mNextPlayer = MediaPlayer.create(mContext, mResId);
mCurrentPlayer.setNextMediaPlayer(mNextPlayer);
mCurrentPlayer.setOnCompletionListener(onCompletionListener);
}

private MediaPlayer.OnCompletionListener onCompletionListener = new MediaPlayer.OnCompletionListener() {
@Override
public void onCompletion(MediaPlayer mediaPlayer) {
mediaPlayer.release();
mCurrentPlayer = mNextPlayer;

createNextMediaPlayer();

Log.d(TAG, String.format("Loop #%d", ++mCounter));
}
};

public void stopPlayers(){
if (mCurrentPlayer.isPlaying()){
mCurrentPlayer.stop();
}
}
}
Loading