diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ee6ddd0..fe72da5 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,19 +5,14 @@
-
+
-
+
diff --git a/app/app-release.apk b/app/app-release.apk
new file mode 100644
index 0000000..54085d5
Binary files /dev/null and b/app/app-release.apk differ
diff --git a/app/build.gradle b/app/build.gradle
index 33a0086..cc076d8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,20 +1,28 @@
apply plugin: 'com.android.application'
android {
+ signingConfigs {
+ config {
+ keyAlias 'AndroidKey'
+ storeFile file('C:/Users/Jonathan/Documents/Projects/Keystores/android.jks')
+ keyPassword 'jhwc2214'
+ storePassword 'jhwc2214'
+ }
+ }
compileSdkVersion 24
buildToolsVersion "24.0.1"
-
defaultConfig {
applicationId "nonphatic.quoz"
- minSdkVersion 23
+ minSdkVersion 19
targetSdkVersion 24
versionCode 1
versionName "1.0"
}
buildTypes {
release {
- minifyEnabled false
+ minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ signingConfig signingConfigs.config
}
}
}
@@ -25,5 +33,4 @@ dependencies {
compile 'com.android.support:appcompat-v7:24.1.1'
compile 'com.android.support:support-v4:24.1.1'
compile 'com.android.support:design:24.1.1'
- compile files('libs/TarsosDSP-Android-latest.jar')
}
diff --git a/app/libs/TarsosDSP-Android-latest.jar b/app/libs/TarsosDSP-Android-latest.jar
deleted file mode 100644
index 6958bc3..0000000
Binary files a/app/libs/TarsosDSP-Android-latest.jar and /dev/null differ
diff --git a/app/src/main/java/nonphatic/quoz/MainActivity.java b/app/src/main/java/nonphatic/quoz/MainActivity.java
index 23e8628..010d304 100644
--- a/app/src/main/java/nonphatic/quoz/MainActivity.java
+++ b/app/src/main/java/nonphatic/quoz/MainActivity.java
@@ -242,6 +242,7 @@ public class MainActivity extends AppCompatActivity {
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
preferences.edit().clear().commit();
PreferenceManager.setDefaultValues(context, R.xml.preferences, true);
+ Toast.makeText(getApplicationContext(), "Settings reset.", Toast.LENGTH_SHORT).show();
}
private void setBackgroundToRandomColour() {
diff --git a/app/src/main/java/nonphatic/quoz/preferences/SettingsActivity.java b/app/src/main/java/nonphatic/quoz/preferences/SettingsActivity.java
index a362f96..9dac628 100644
--- a/app/src/main/java/nonphatic/quoz/preferences/SettingsActivity.java
+++ b/app/src/main/java/nonphatic/quoz/preferences/SettingsActivity.java
@@ -18,6 +18,7 @@ import android.support.v7.app.ActionBar;
import android.preference.PreferenceFragment;
import android.preference.PreferenceManager;
import android.view.MenuItem;
+import android.widget.Toast;
import nonphatic.quoz.R;
@@ -161,11 +162,12 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
resetButton.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
- SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getContext());
+ SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext());
preferences.edit().clear().commit();
- PreferenceManager.setDefaultValues(getContext(), R.xml.preferences, true);
+ PreferenceManager.setDefaultValues(getActivity().getApplicationContext(), R.xml.preferences, true);
onStop();
onCreate(savedInstanceState);
+ Toast.makeText(getActivity().getApplicationContext(), "Settings reset.", Toast.LENGTH_SHORT).show();
return true;
}
});
diff --git a/app/src/main/res/drawable-hdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_info_black_24dp.png
deleted file mode 100644
index da56077..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_info_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png
deleted file mode 100644
index e200012..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_sync_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_sync_black_24dp.png
deleted file mode 100644
index a5ebdbd..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_sync_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_info_black_24dp.png
deleted file mode 100644
index 5ef3dc0..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_info_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png
deleted file mode 100644
index b36475d..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_sync_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_sync_black_24dp.png
deleted file mode 100644
index 9685e8e..0000000
Binary files a/app/src/main/res/drawable-mdpi/ic_sync_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-v21/ic_info_black_24dp.xml b/app/src/main/res/drawable-v21/ic_info_black_24dp.xml
deleted file mode 100644
index 34b8202..0000000
--- a/app/src/main/res/drawable-v21/ic_info_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml b/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml
deleted file mode 100644
index e3400cf..0000000
--- a/app/src/main/res/drawable-v21/ic_notifications_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml b/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml
deleted file mode 100644
index 5a283aa..0000000
--- a/app/src/main/res/drawable-v21/ic_sync_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png
deleted file mode 100644
index 46ed12a..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_info_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png
deleted file mode 100644
index 7de8581..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_sync_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_sync_black_24dp.png
deleted file mode 100644
index 860a5db..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_sync_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png
deleted file mode 100644
index a81eeb9..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_info_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png
deleted file mode 100644
index ab8a9c4..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_sync_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_sync_black_24dp.png
deleted file mode 100644
index f799008..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_sync_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_info_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_info_black_24dp.png
deleted file mode 100644
index c8f86b9..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_info_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png
deleted file mode 100644
index 86f89d7..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_sync_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_sync_black_24dp.png
deleted file mode 100644
index b9f56f3..0000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_sync_black_24dp.png and /dev/null differ
diff --git a/build.gradle b/build.gradle
index aff4f41..a3330d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.1.2'
+ classpath 'com.android.tools.build:gradle:2.2.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 122a0dc..e89d602 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Tue Aug 23 20:38:07 PDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/projectFilesBackup/.idea/workspace.xml b/projectFilesBackup/.idea/workspace.xml
new file mode 100644
index 0000000..14c19cb
--- /dev/null
+++ b/projectFilesBackup/.idea/workspace.xml
@@ -0,0 +1,1919 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1472009634069
+
+ 1472009634069
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file