Skip to content

Commit fb48551

Browse files
committed
fixes and stuff
1 parent 031e5f8 commit fb48551

File tree

7 files changed

+19
-7
lines changed

7 files changed

+19
-7
lines changed

app/build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ android {
1616
minSdkVersion project.ext.minimumSdkVersion
1717
targetSdkVersion 25
1818
versionCode generateVersionCode()
19-
versionName "Keyboard"
19+
versionName getVersionName()
2020
}
2121

2222
buildTypes {
@@ -32,13 +32,17 @@ private Integer generateVersionCode() {
3232
return ext.minimumSdkVersion * 10000000 + ext.versionMajor * 10000 + ext.versionMinor * 100 + ext.versionPatch
3333
}
3434

35+
private String getVersionName() {
36+
String[] versionNames = ["A", "B", "Chimes", "Drums", "Ektara", "Flute", "Guitar", "Harpsichord", "Igil", "J", "Keyboard", "Longhorn", "M", "N", "O"]
37+
return versionNames[ext.versionMajor - 1]
38+
}
39+
3540

3641
dependencies {
3742
compile 'com.android.volley:volley:1.0.0'
3843
compile 'net.gotev:uploadservice:3.1'
3944
compile 'com.j256.ormlite:ormlite-android:5.0'
4045
compile 'com.j256.ormlite:ormlite-core:5.0'
41-
compile 'com.rollbar:rollbar-android:0.2.0'
4246
compile "com.android.support:appcompat-v7:$supportLibrariesVersion"
4347
compile "com.android.support:support-v13:$supportLibrariesVersion"
4448
compile "com.android.support:design:$supportLibrariesVersion"

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<uses-permission android:name="android.permission.WAKE_LOCK" />
1111

1212
<application
13+
android:name=".CircleOfMusic"
1314
android:allowBackup="false"
1415
android:icon="@mipmap/ic_launcher"
1516
android:label="@string/app_name"

app/src/main/java/com/sidzi/circleofmusic/CircleOfMusic.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ public class CircleOfMusic extends Application {
88
@Override
99
public void onCreate() {
1010
super.onCreate();
11-
VolleyLog.DEBUG = true;
11+
if (BuildConfig.DEBUG)
12+
VolleyLog.DEBUG = true;
1213
}
1314
}

app/src/main/java/com/sidzi/circleofmusic/activities/MainActivity.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import com.android.volley.VolleyError;
4242
import com.android.volley.toolbox.JsonObjectRequest;
4343
import com.android.volley.toolbox.Volley;
44-
import com.rollbar.android.Rollbar;
4544
import com.sidzi.circleofmusic.BuildConfig;
4645
import com.sidzi.circleofmusic.R;
4746
import com.sidzi.circleofmusic.config;
@@ -66,7 +65,6 @@ public class MainActivity extends AppCompatActivity {
6665
@Override
6766
protected void onCreate(Bundle savedInstanceState) {
6867
super.onCreate(savedInstanceState);
69-
Rollbar.init(this, config.rollbar_key, config.rollbar_environment);
7068
setTheme(R.style.AppTheme_NoActionBar);
7169
setContentView(R.layout.activity_main);
7270

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package com.sidzi.circleofmusic;
2+
3+
import android.os.Environment;
4+
5+
public class config {
6+
public static String com_url = "https://circleofmusic-sidzi.rhcloud.com/";
7+
public static String com_local_url = Environment.getExternalStorageDirectory() + "/com-data/alarms/";
8+
}

app/src/main/java/com/sidzi/circleofmusic/helpers/BucketSaver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void saveFile() {
7373
}
7474
}
7575

76-
public boolean importFile() {
76+
boolean importFile() {
7777
try {
7878
if (blcom_file.exists()) {
7979
InputStream inputStream = new FileInputStream(blcom_file);

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Thu Oct 13 16:45:28 IST 2016
1+
#Sun Apr 30 16:19:05 IST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)