diff --git a/.gitignore b/.gitignore
index 5f94008..59827f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,41 @@
-*.iml
-.gradle
-/local.properties
-/.idea
+# Custom
+_site
+
+# Ant
+MANIFEST.MF
+./*.jar
+build.num
+build
+
+# ADT
+.classpath
+.project
+.settings
+local.properties
+bin
+gen
+_layouts
+proguard.cfg
+-
+
+# OSX
.DS_Store
-/build
-/captures
+
+# Github
+gh-pages
+
+# Gradle
+.gradle
+build
+
+# IDEA
+*.iml
+*.ipr
+*.iws
+out
+.idea
+
+# Maven
+target
+release.properties
+pom.xml.*
\ No newline at end of file
diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index d3441be..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-Horizon
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 9a8b7e5..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 7dbd80f..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 2fb4746..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1.7
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index b184ff9..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/.gitignore b/app/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/app/build.gradle b/app/build.gradle
index acda71c..5278f37 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 23
- buildToolsVersion "23.0.2"
+ buildToolsVersion "23.0.3"
defaultConfig {
applicationId "com.yalantis.horizon"
@@ -17,19 +17,18 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
- signingConfigs {
- release {
- storeFile file(RELEASE_STORE_FILE)
- storePassword RELEASE_KEYSTORE_PASSWORD
- keyAlias RELEASE_KEY_ALIAS_NAME
- keyPassword RELEASE_KEY_ALIAS_PASSWORD
- }
- }
+// signingConfigs {
+// release {
+// storeFile file(RELEASE_STORE_FILE)
+// storePassword RELEASE_KEYSTORE_PASSWORD
+// keyAlias RELEASE_KEY_ALIAS_NAME
+// keyPassword RELEASE_KEY_ALIAS_PASSWORD
+// }
+// }
}
dependencies {
- compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'
- compile 'com.android.support:appcompat-v7:23.2.0'
+ compile 'com.android.support:appcompat-v7:24.0.0-alpha1'
compile project(':horizon')
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b0fb826..5a9e256 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,6 @@
-
diff --git a/app/src/main/java/com/yalantis/horizon/DemoActivity.java b/app/src/main/java/com/yalantis/horizon/DemoActivity.java
index b68795a..24f2f97 100644
--- a/app/src/main/java/com/yalantis/horizon/DemoActivity.java
+++ b/app/src/main/java/com/yalantis/horizon/DemoActivity.java
@@ -58,7 +58,7 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_demo);
glSurfaceView = (GLSurfaceView) findViewById(R.id.gl_surface);
- mHorizon = new Horizon(glSurfaceView, getResources().getColor(R.color.background),
+ mHorizon = new Horizon(glSurfaceView, getResources().getColor(R.color.background_color),
RECORDER_SAMPLE_RATE, RECORDER_CHANNELS, RECORDER_ENCODING_BIT);
mHorizon.setMaxVolumeDb(MAX_DECIBELS);
}
diff --git a/app/src/main/res/drawable/recording_icon.xml b/app/src/main/res/drawable/recording_icon.xml
new file mode 100644
index 0000000..c551277
--- /dev/null
+++ b/app/src/main/res/drawable/recording_icon.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_demo.xml b/app/src/main/res/layout/activity_demo.xml
index 1b75485..992fe34 100644
--- a/app/src/main/res/layout/activity_demo.xml
+++ b/app/src/main/res/layout/activity_demo.xml
@@ -1,18 +1,43 @@
+ android:background="@color/background_color">
+
+
+
+
+
+
+
+
+
+
+
+
+ android:layout_gravity="center"/>
+
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 84dbe58..d525db5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,8 @@
- #3F51B5
- #303F9F
- #FF4081
- #354852
+ #2A3B3F
+ #3D565D
+ #34494D
+ #4ACDB1
+ #EB7F79
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 15ea881..c478716 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
Horizon
+ Recording…
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5885930..999dbf1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,11 +1,7 @@
-
-
-
-
diff --git a/horizon/.gitignore b/horizon/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/horizon/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build