toni/Dirigent
1
0
Fork 0
Code Issues 17 Pull Requests Releases 2 Wiki Activity

ref #5 und #9- ui inkl. funktionalitäten implementiert.

Browse Source 
- circular progressbar
- callbacks für BPM schätzung und metronom
- Vibration Metronom
- Input einer BPM Zahl
This commit is contained in:
toni
2017-11-14 01:43:45 +01:00
parent a1f002537c
commit 221970f336
24 changed files with 932 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
android/ConductorsWatch/app/src/main/AndroidManifest.xml Normal file
View File

@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.tonifetzer.conductorswatch">
<uses-feature android:name="android.hardware.type.watch" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@android:style/Theme.DeviceDefault">
<uses-library
android:name="com.google.android.wearable"
android:required="true" />
<!--
Set to true if your app is Standalone, that is, it does not require the handheld
app to run.
-->
<meta-data
android:name="com.google.android.wearable.standalone"
android:value="true" />
<activity
android:name=".MainActivity"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>

47
android/ConductorsWatch/app/src/main/java/de/tonifetzer/conductorswatch/BpmEstimator.java Normal file
View File

@@ -0,0 +1,47 @@
package de.tonifetzer.conductorswatch;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ThreadLocalRandom;
/**
* Created by toni on 13/11/17.
*/
public class BpmEstimator implements Runnable {
private volatile boolean mRunning = true;
@Override
public void run() {
while(mRunning){
int randomNum = ThreadLocalRandom.current().nextInt(0, 240 + 1);
for (OnBpmEstimatorListener listener:listeners) {
listener.onNewDataAvailable((float) randomNum);
}
try {
Thread.sleep(60000 / 60);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
public void stop() {
mRunning = false;
}
/**
* Interface for callback calculated bpm
*/
public interface OnBpmEstimatorListener {
void onNewDataAvailable(float bpm);
}
private List<OnBpmEstimatorListener> listeners = new CopyOnWriteArrayList<OnBpmEstimatorListener>();
public void add(OnBpmEstimatorListener listener){listeners.add(listener);}
public void remove(OnBpmEstimatorListener listener){listeners.remove(listener);}
}

106
android/ConductorsWatch/app/src/main/java/de/tonifetzer/conductorswatch/MainActivity.java Normal file
View File

@@ -0,0 +1,106 @@
package de.tonifetzer.conductorswatch;
import android.app.Fragment;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.content.Context;
import android.gesture.Gesture;
import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.view.GestureDetectorCompat;
import android.support.wearable.activity.WearableActivity;
import android.util.Log;
import android.view.GestureDetector;
import android.view.MotionEvent;
import android.widget.TextView;
import com.sdsmdg.harjot.crollerTest.Croller;
import java.util.Vector;
public class MainActivity extends WearableActivity implements WorkerFragment.OnFragmentInteractionListener{
// member
private TextView mTextView;
private Croller mCroller;
private GestureDetector mDetector;
private boolean mModeRecord;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
mModeRecord = false;
mTextView = (TextView) findViewById(R.id.bpmText);
// circular progress bar
mCroller = (Croller) findViewById(R.id.croller);
mCroller.setOnProgressChangedListener(new Croller.onProgressChangedListener() {
@Override
public void onProgressChanged(int progress) {
// use the progress
//Log.d("Progress: ", String.valueOf(progress));
mTextView.setText(String.valueOf(progress));
}
});
// detector for double clicks
mDetector = new GestureDetector(this, new GestureDetector.SimpleOnGestureListener() {
public boolean onDoubleTap(MotionEvent ev) {
Log.d("Test", "onDoubleTap: " + ev.toString());
mModeRecord = !mModeRecord;
if(mModeRecord){
WorkerFragment worker = new WorkerFragment();
//provide the fragment with the bpm set
Bundle args = new Bundle();
args.putInt("bpm", mCroller.getProgress());
worker.setArguments(args);
//create fragment instance
FragmentTransaction transaction = getFragmentManager().beginTransaction();
transaction.replace(R.id.layout, worker);
transaction.addToBackStack(null);
transaction.commit();
}
else {
getFragmentManager().popBackStack();
}
return true;
}
});
//TODO: Callback Function for BPM estimation for textview, processbar and BackCircle
// Enables Always-on
setAmbientEnabled();
}
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
//if record mode is on, we are not able to use the croller
if(mModeRecord){
return mDetector.onTouchEvent(ev);
}
else {
return mDetector.onTouchEvent(ev) || super.dispatchTouchEvent(ev);
}
}
@Override
public void onFragmentStopped(Vector<Float> bpmList) {
Log.d("FragmentListener", "Received bpmList");
}
}

53
android/ConductorsWatch/app/src/main/java/de/tonifetzer/conductorswatch/Metronome.java Normal file
View File

@@ -0,0 +1,53 @@
package de.tonifetzer.conductorswatch;
import android.os.Vibrator;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
/**
* Created by toni on 13/11/17.
*/
public class Metronome implements Runnable{
private volatile boolean mRunning = true;
private int mBPM;
public Metronome(int bpm){
mBPM = bpm;
}
@Override
public void run() {
while(mRunning){
for (OnMetronomeListener listener:listeners) {
listener.onNewClick();
}
try {
Thread.sleep(60000 / mBPM);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
public void stop() {
mRunning = false;
}
/**
* Interface for callback metronome clicks
* I know that java has observable.. but this why it is more clean and easy
*/
public interface OnMetronomeListener {
void onNewClick();
}
private List<OnMetronomeListener> listeners = new CopyOnWriteArrayList<OnMetronomeListener>();
public void add(OnMetronomeListener listener){listeners.add(listener);}
public void remove(OnMetronomeListener listener){listeners.remove(listener);}
}

179
android/ConductorsWatch/app/src/main/java/de/tonifetzer/conductorswatch/WorkerFragment.java Normal file
View File

@@ -0,0 +1,179 @@
package de.tonifetzer.conductorswatch;
import android.content.Context;
import android.os.Bundle;
import android.app.Fragment;
import android.os.Vibrator;
import android.support.annotation.Nullable;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.sdsmdg.harjot.crollerTest.Croller;
import java.util.Observable;
import java.util.Observer;
import java.util.Vector;
/**
* A simple {@link Fragment} subclass.
* Activities that contain this fragment must implement the
* {@link WorkerFragment.OnFragmentInteractionListener} interface
* to handle interaction events.
*/
public class WorkerFragment extends Fragment implements Metronome.OnMetronomeListener, BpmEstimator.OnBpmEstimatorListener{
private OnFragmentInteractionListener mListener;
private Vector<Float> mBpmList;
private BpmEstimator mBpmEstimator;
private Metronome mMetronome;
private Thread mBpmThread;
private Thread mMetronomeThread;
private Vibrator mVibrator;
private TextView mTextView;
private Croller mCroller;
public WorkerFragment() {
// Required empty public constructor
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
if (context instanceof OnFragmentInteractionListener) {
mListener = (OnFragmentInteractionListener) context;
} else {
throw new RuntimeException(context.toString()
+ " must implement OnFragmentInteractionListener");
}
Log.d("Recording", "Start Recording");
}
@Override
public void onCreate(Bundle savedInstanceState){
super.onCreate(savedInstanceState);
// init bpm estimator and listener
mBpmEstimator = new BpmEstimator();
mBpmEstimator.add(this);
mBpmThread = new Thread(mBpmEstimator, "estThread");
mBpmList = new Vector<Float>();
// init metronome and listener
mMetronome = new Metronome(getArguments().getInt("bpm"));
mMetronome.add(this);
mMetronomeThread = new Thread(mMetronome, "estThread");
mVibrator = (Vibrator) this.getActivity().getSystemService(Context.VIBRATOR_SERVICE);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_worker, container, false);
}
@Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState){
mTextView = (TextView) getView().findViewById(R.id.bpmTextRed);
mCroller = mCroller = (Croller) getView().findViewById(R.id.crollerRed);
}
@Override
public void onStart(){
super.onStart();
// start the worker thread for bpm estimator
mBpmThread.start();
// start the worker thread for metronom
mMetronomeThread.start();
}
@Override
public void onStop() {
super.onStop();
// stop the worker thread for bpm estimator
mBpmEstimator.stop();
mBpmThread.interrupt();
try {
mBpmThread.join();
} catch (InterruptedException e) {
e.printStackTrace();
}
// stop the worker thread for metronom
mMetronome.stop();
mMetronomeThread.interrupt();
try {
mMetronomeThread.join();
} catch (InterruptedException e) {
e.printStackTrace();
}
//private listener with list of all estimated bpm
if (mListener != null) {
mListener.onFragmentStopped(mBpmList);
}
}
@Override
public void onDetach() {
super.onDetach();
mListener = null;
Log.d("Recording", "Stop Recording");
}
/**
* Callback function for metronome update
*/
@Override
public void onNewClick() {
mVibrator.vibrate(10);
}
/**
* Callback function for Bpm estimation update
*/
@Override
public void onNewDataAvailable(float bpm) {
//TODO: what if multiple threads access mBpmList? put into synchronized? @frank fragen :D
mBpmList.add(bpm);
// we need this here, since ui elements can only be changed within activity thread and
// onNewDataAvailable lives inside the bpm estimation thread.
// TODO: is this really okay? also synchronized?
synchronized (this) {
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
mTextView.setText(String.valueOf(mBpmList.lastElement()));
mCroller.setProgress((Math.round(mBpmList.lastElement())));
}
});
}
}
/**
* Interface for connecting to WorkerFragment
*/
public interface OnFragmentInteractionListener {
void onFragmentStopped(Vector<Float> bpmList);
}
}

56
android/ConductorsWatch/app/src/main/res/layout/activity_main.xml Normal file
View File

@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.wear.widget.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#fff"
android:padding="@dimen/box_inset_layout_padding"
tools:context="de.tonifetzer.conductorswatch.MainActivity"
tools:deviceIds="wear">
<FrameLayout
android:id="@+id/layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.sdsmdg.harjot.crollerTest.Croller
android:id="@+id/croller"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:back_circle_color="#CCC"
app:back_circle_radius="100"
app:indicator_color="#CCC"
app:indicator_width="4"
app:is_continuous="true"
app:label=""
app:label_color="#000000"
app:main_circle_color="#ffffff"
app:main_circle_radius="90"
app:max="240"
app:min="0"
app:progress="80"
app:progress_primary_color="#158b69"
app:progress_primary_stroke_width="10"
app:progress_radius="120"
app:progress_secondary_color="#CCC"
app:progress_secondary_stroke_width="3"
app:start_offset="45" />
<TextView
android:id="@+id/bpmText"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="240"
android:textStyle="bold"
android:textColor="#158b69"
android:textSize="40sp"/>
</FrameLayout>
</android.support.wear.widget.BoxInsetLayout>

56
android/ConductorsWatch/app/src/main/res/layout/fragment_worker.xml Normal file
View File

@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.wear.widget.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#fff"
android:padding="@dimen/box_inset_layout_padding"
tools:context="de.tonifetzer.conductorswatch.MainActivity"
tools:deviceIds="wear">
<FrameLayout
android:id="@+id/layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.sdsmdg.harjot.crollerTest.Croller
android:id="@+id/crollerRed"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:back_circle_color="#EE693F"
app:back_circle_radius="100"
app:indicator_color="#fff"
app:indicator_width="4"
app:is_continuous="true"
app:label=""
app:label_color="#000000"
app:main_circle_color="#ffffff"
app:main_circle_radius="90"
app:max="240"
app:min="0"
app:progress="80"
app:progress_primary_color="#EE693F"
app:progress_primary_stroke_width="10"
app:progress_radius="120"
app:progress_secondary_color="#CCC"
app:progress_secondary_stroke_width="3"
app:start_offset="45" />
<TextView
android:id="@+id/bpmTextRed"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="80"
android:textStyle="bold"
android:textColor="#EE693F"
android:textSize="40sp"/>
</FrameLayout>
</android.support.wear.widget.BoxInsetLayout>

BIN
android/ConductorsWatch/app/src/main/res/mipmap-hdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
android/ConductorsWatch/app/src/main/res/mipmap-mdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
android/ConductorsWatch/app/src/main/res/mipmap-xhdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
android/ConductorsWatch/app/src/main/res/mipmap-xxhdpi/ic_launcher.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

3
android/ConductorsWatch/app/src/main/res/values-round/strings.xml Normal file
View File

@@ -0,0 +1,3 @@
<resources>
<string name="hello_world">Hello Round World!</string>
</resources>

15
android/ConductorsWatch/app/src/main/res/values/dimens.xml Normal file
View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--
Because the window insets on round devices are larger than 15dp, this padding only applies
to square screens.
-->
<dimen name="box_inset_layout_padding">0dp</dimen>
<!--
This padding applies to both square and round screens. The total padding between the buttons
and the window insets is box_inset_layout_padding (above variable) on square screens and
inner_frame_layout_padding (below variable) on round screens.
-->
<dimen name="inner_frame_layout_padding">5dp</dimen>
</resources>

11
android/ConductorsWatch/app/src/main/res/values/strings.xml Normal file
View File

@@ -0,0 +1,11 @@
<resources>
<string name="app_name">Conductor\'s Watch</string>
<!--
This string is used for square devices and overridden by hello_world in
values-round/strings.xml for round devices.
-->
<string name="hello_world">Hello Square World!</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources>