ref #5 und #9- ui inkl. funktionalitäten implementiert.
- circular progressbar - callbacks für BPM schätzung und metronom - Vibration Metronom - Input einer BPM Zahl
This commit is contained in:
1
android/ConductorsWatch/app/.gitignore
vendored
Normal file
1
android/ConductorsWatch/app/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
/build
|
||||
45
android/ConductorsWatch/app/build.gradle
Normal file
45
android/ConductorsWatch/app/build.gradle
Normal file
@@ -0,0 +1,45 @@
|
||||
apply plugin: 'com.android.application'
|
||||
|
||||
android {
|
||||
compileSdkVersion 26
|
||||
publishNonDefault true
|
||||
flavorDimensions "minSdk"
|
||||
defaultConfig {
|
||||
applicationId "de.tonifetzer.conductorswatch"
|
||||
minSdkVersion 23
|
||||
targetSdkVersion 26
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
}
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
}
|
||||
productFlavors {
|
||||
wear1 {
|
||||
dimension "minSdk"
|
||||
// Use the defaultConfig value
|
||||
}
|
||||
wear2 {
|
||||
dimension "minSdk"
|
||||
minSdkVersion 25
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||
implementation 'com.google.android.support:wearable:2.1.0'
|
||||
implementation 'com.google.android.gms:play-services-wearable:11.6.0'
|
||||
implementation 'com.android.support:percent:26.1.0'
|
||||
implementation 'com.android.support:animated-vector-drawable:26.1.0'
|
||||
implementation 'com.android.support:appcompat-v7:26.1.0'
|
||||
implementation 'com.android.support:support-v4:26.1.0'
|
||||
implementation 'com.android.support:recyclerview-v7:26.1.0'
|
||||
implementation 'com.android.support:wear:26.1.0'
|
||||
compileOnly 'com.google.android.wearable:wearable:2.1.0'
|
||||
compile 'com.sdsmdg.harjot:croller:1.0.7'
|
||||
}
|
||||
21
android/ConductorsWatch/app/proguard-rules.pro
vendored
Normal file
21
android/ConductorsWatch/app/proguard-rules.pro
vendored
Normal file
@@ -0,0 +1,21 @@
|
||||
# Add project specific ProGuard rules here.
|
||||
# You can control the set of applied configuration files using the
|
||||
# proguardFiles setting in build.gradle.
|
||||
#
|
||||
# For more details, see
|
||||
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||
|
||||
# If your project uses WebView with JS, uncomment the following
|
||||
# and specify the fully qualified class name to the JavaScript interface
|
||||
# class:
|
||||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||
# public *;
|
||||
#}
|
||||
|
||||
# Uncomment this to preserve the line number information for
|
||||
# debugging stack traces.
|
||||
#-keepattributes SourceFile,LineNumberTable
|
||||
|
||||
# If you keep the line number information, uncomment this to
|
||||
# hide the original source file name.
|
||||
#-renamesourcefileattribute SourceFile
|
||||
38
android/ConductorsWatch/app/src/main/AndroidManifest.xml
Normal file
38
android/ConductorsWatch/app/src/main/AndroidManifest.xml
Normal 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>
|
||||
@@ -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);}
|
||||
}
|
||||
@@ -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");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -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);}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 3.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.5 KiB |
@@ -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
15
android/ConductorsWatch/app/src/main/res/values/dimens.xml
Normal 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
11
android/ConductorsWatch/app/src/main/res/values/strings.xml
Normal 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>
|
||||
27
android/ConductorsWatch/build.gradle
Normal file
27
android/ConductorsWatch/build.gradle
Normal file
@@ -0,0 +1,27 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
|
||||
buildscript {
|
||||
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.0.0'
|
||||
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
}
|
||||
}
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
}
|
||||
}
|
||||
|
||||
task clean(type: Delete) {
|
||||
delete rootProject.buildDir
|
||||
}
|
||||
17
android/ConductorsWatch/gradle.properties
Normal file
17
android/ConductorsWatch/gradle.properties
Normal file
@@ -0,0 +1,17 @@
|
||||
# Project-wide Gradle settings.
|
||||
|
||||
# IDE (e.g. Android Studio) users:
|
||||
# Gradle settings configured through the IDE *will override*
|
||||
# any settings specified in this file.
|
||||
|
||||
# For more details on how to configure your build environment visit
|
||||
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
||||
|
||||
# Specifies the JVM arguments used for the daemon process.
|
||||
# The setting is particularly useful for tweaking memory settings.
|
||||
org.gradle.jvmargs=-Xmx1536m
|
||||
|
||||
# When configured, Gradle will run in incubating parallel mode.
|
||||
# This option should only be used with decoupled projects. More details, visit
|
||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||
# org.gradle.parallel=true
|
||||
BIN
android/ConductorsWatch/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
android/ConductorsWatch/gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
6
android/ConductorsWatch/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
6
android/ConductorsWatch/gradle/wrapper/gradle-wrapper.properties
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
#Mon Nov 13 10:12:40 CET 2017
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
|
||||
160
android/ConductorsWatch/gradlew
vendored
Executable file
160
android/ConductorsWatch/gradlew
vendored
Executable file
@@ -0,0 +1,160 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS=""
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
|
||||
warn ( ) {
|
||||
echo "$*"
|
||||
}
|
||||
|
||||
die ( ) {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
esac
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin, switch paths to Windows format before running java
|
||||
if $cygwin ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=$((i+1))
|
||||
done
|
||||
case $i in
|
||||
(0) set -- ;;
|
||||
(1) set -- "$args0" ;;
|
||||
(2) set -- "$args0" "$args1" ;;
|
||||
(3) set -- "$args0" "$args1" "$args2" ;;
|
||||
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
|
||||
function splitJvmOpts() {
|
||||
JVM_OPTS=("$@")
|
||||
}
|
||||
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
|
||||
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
|
||||
|
||||
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
|
||||
90
android/ConductorsWatch/gradlew.bat
vendored
Normal file
90
android/ConductorsWatch/gradlew.bat
vendored
Normal file
@@ -0,0 +1,90 @@
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS=
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto init
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto init
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:init
|
||||
@rem Get command-line arguments, handling Windowz variants
|
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||
if "%@eval[2+2]" == "4" goto 4NT_args
|
||||
|
||||
:win9xME_args
|
||||
@rem Slurp the command line arguments.
|
||||
set CMD_LINE_ARGS=
|
||||
set _SKIP=2
|
||||
|
||||
:win9xME_args_slurp
|
||||
if "x%~1" == "x" goto execute
|
||||
|
||||
set CMD_LINE_ARGS=%*
|
||||
goto execute
|
||||
|
||||
:4NT_args
|
||||
@rem Get arguments from the 4NT Shell from JP Software
|
||||
set CMD_LINE_ARGS=%$
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
||||
1
android/ConductorsWatch/settings.gradle
Normal file
1
android/ConductorsWatch/settings.gradle
Normal file
@@ -0,0 +1 @@
|
||||
include ':app'
|
||||
Reference in New Issue
Block a user