Skip to content

Commit

Permalink
Merge pull request #14 from sbxcloud/annotationlib
Browse files Browse the repository at this point in the history
delete dependence appcompat
  • Loading branch information
lgguzman authored Mar 27, 2017
2 parents 5039dc6 + 205509a commit 2bee7d0
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 11 deletions.
4 changes: 1 addition & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'com.android.library'
apply plugin: 'com.github.dcendents.android-maven'

group='com.github.sbxcloud'
group='com.github.sbxcloud'
android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
Expand Down Expand Up @@ -34,8 +34,6 @@ dependencies {
})
compile 'com.squareup.okhttp3:logging-interceptor:3.4.1'
compile 'com.squareup.okhttp3:okhttp:3.4.1'
//androidTestCompile 'com.android.support:support-annotations:24.0.0'
compile 'com.android.support:appcompat-v7:25.1.1'
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
// Because RxAndroid releases are few and far between, it is recommended you also
// explicitly depend on RxJava's latest version for bug fixes and new features.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ public void run() {
sbxMessage.setSederEmail(message.getString("user_email"));
sbxMessage.setSenderLogin(message.getString("user_login"));
SbxJsonModeler sbxJsonModeler = clazz.newInstance();
sbxJsonModeler.wrapFromJson(message.getJSONObject("body"));
sbxJsonModeler.wrapFromJson(new JSONObject(message.getString("body")));
sbxMessage.setSbxJsonModeler(sbxJsonModeler);
messages.add(sbxMessage);

Expand Down
7 changes: 0 additions & 7 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
<resources>

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>

</resources>

0 comments on commit 2bee7d0

Please sign in to comment.