diff --git a/.gradle/2.4/taskArtifacts/cache.properties.lock b/.gradle/2.4/taskArtifacts/cache.properties.lock index 975e616..2c0d1be 100644 Binary files a/.gradle/2.4/taskArtifacts/cache.properties.lock and b/.gradle/2.4/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.4/taskArtifacts/fileHashes.bin b/.gradle/2.4/taskArtifacts/fileHashes.bin index b6f6652..549b3a1 100644 Binary files a/.gradle/2.4/taskArtifacts/fileHashes.bin and b/.gradle/2.4/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.4/taskArtifacts/fileSnapshots.bin b/.gradle/2.4/taskArtifacts/fileSnapshots.bin index e7adb13..d61669e 100644 Binary files a/.gradle/2.4/taskArtifacts/fileSnapshots.bin and b/.gradle/2.4/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.4/taskArtifacts/outputFileStates.bin b/.gradle/2.4/taskArtifacts/outputFileStates.bin index 7a7cdd0..397aac1 100644 Binary files a/.gradle/2.4/taskArtifacts/outputFileStates.bin and b/.gradle/2.4/taskArtifacts/outputFileStates.bin differ diff --git a/.gradle/2.4/taskArtifacts/taskArtifacts.bin b/.gradle/2.4/taskArtifacts/taskArtifacts.bin index d835044..8d0442e 100644 Binary files a/.gradle/2.4/taskArtifacts/taskArtifacts.bin and b/.gradle/2.4/taskArtifacts/taskArtifacts.bin differ diff --git a/.idea/.name b/.idea/.name index be01e39..2555e9d 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -Android-SenZ-Services \ No newline at end of file +senz-service \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 53db169..4fdfa73 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,9 +3,8 @@ \ No newline at end of file diff --git a/.idea/libraries/design_23_1_1.xml b/.idea/libraries/design_23_1_1.xml index 2c01465..63befbc 100644 --- a/.idea/libraries/design_23_1_1.xml +++ b/.idea/libraries/design_23_1_1.xml @@ -9,7 +9,7 @@ - + \ No newline at end of file diff --git a/.idea/libraries/recyclerview_v7_23_1_1.xml b/.idea/libraries/recyclerview_v7_23_1_1.xml index 5f04bab..17615ff 100644 --- a/.idea/libraries/recyclerview_v7_23_1_1.xml +++ b/.idea/libraries/recyclerview_v7_23_1_1.xml @@ -9,7 +9,7 @@ - + \ No newline at end of file diff --git a/.idea/libraries/support_annotations_21_0_3.xml b/.idea/libraries/support_annotations_21_0_3.xml deleted file mode 100644 index 5b6bf88..0000000 --- a/.idea/libraries/support_annotations_21_0_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_annotations_23_1_1.xml b/.idea/libraries/support_annotations_23_1_1.xml index a70b14d..eec3bce 100644 --- a/.idea/libraries/support_annotations_23_1_1.xml +++ b/.idea/libraries/support_annotations_23_1_1.xml @@ -1,11 +1,11 @@ - + - + \ No newline at end of file diff --git a/.idea/libraries/support_v4_21_0_3.xml b/.idea/libraries/support_v4_21_0_3.xml deleted file mode 100644 index 30220b1..0000000 --- a/.idea/libraries/support_v4_21_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_23_1_1.xml b/.idea/libraries/support_v4_23_1_1.xml index 042cfc9..c07fb7a 100644 --- a/.idea/libraries/support_v4_23_1_1.xml +++ b/.idea/libraries/support_v4_23_1_1.xml @@ -4,13 +4,13 @@ - - + + - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 1d9d626..fbb6828 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,32 @@ + + + + + + + @@ -10,7 +37,7 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 8b10b79..4ca11ec 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 621d823..673b654 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,11 +1,23 @@ + + + + + + + + @android:style/Theme.Material.Light + + + + - - - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -2243,7 +2332,7 @@ - + @@ -2255,195 +2344,156 @@ - - + + - - - - - - - + + - - - - - - - - - - - - - - - - - - - + + - - - - - - - + + - + - - - - - - - - - + + + - @@ -2480,7 +2530,10 @@ - + + - @@ -2568,44 +2611,47 @@ - - 1452410471248 + + 1452722599631 - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - - - + + + @@ -2615,4 +2661,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index c16ca7e..b5e835c 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ - + @@ -65,28 +65,21 @@ - - + - - - - - - - + diff --git a/app/src/main/java/com/score/senzservices/ui/MainActivity.java b/app/src/main/java/com/score/senzservices/ui/MainActivity.java index c7f09ae..3d9c693 100644 --- a/app/src/main/java/com/score/senzservices/ui/MainActivity.java +++ b/app/src/main/java/com/score/senzservices/ui/MainActivity.java @@ -47,6 +47,8 @@ public boolean onOptionsItemSelected(MenuItem item) { //noinspection SimplifiableIfStatement if (id == R.id.action_settings) { return true; + }else if(id == R.id.action_unregister){ + //unregister code } return super.onOptionsItemSelected(item); diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index b1cb908..0e3a543 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -1,6 +1,16 @@ - + xmlns:tools="http://schemas.android.com/tools" + tools:context=".MainActivity"> + + + diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml index fa28e8a..ba07de0 100644 --- a/build/intermediates/dex-cache/cache.xml +++ b/build/intermediates/dex-cache/cache.xml @@ -2,53 +2,53 @@ - + sha1="6cbc7773921fcfedbe55657578f0cbfe614778dc"> + - + sha1="c9ddf166184420a6dd1d41f1a470448e354bca30"> + - + sha1="09c5e804bc67fc0580360043dff067df574a60d4"> + - + - + sha1="5c5699834e9722f1c288fea2de82725d078ba127"> + - + sha1="379471b2bd17d9737c050345c08e8c7d16589784"> + - + sha1="8d680ba5a623724d1fb0e81c36a790f023a6cede"> + diff --git a/local.properties b/local.properties index 7e1e306..21188fc 100644 --- a/local.properties +++ b/local.properties @@ -1,10 +1,11 @@ ## This file is automatically generated by Android Studio. # Do not modify this file -- YOUR CHANGES WILL BE ERASED! # -# This file should *NOT* be checked into Version Control Systems, +# This file must *NOT* be checked into Version Control Systems, # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -sdk.dir=/home/namal/Android/Sdk \ No newline at end of file +#Wed Jan 13 16:03:19 CST 2016 +sdk.dir=C\:\\Users\\Anesu\\AppData\\Local\\Android\\sdk diff --git a/senz-service.iml b/senz-service.iml new file mode 100644 index 0000000..e0d7b64 --- /dev/null +++ b/senz-service.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/senzc/build.gradle b/senzc/build.gradle index f749f28..d64bcbb 100644 --- a/senzc/build.gradle +++ b/senzc/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 21 - buildToolsVersion "21.0.0" + compileSdkVersion 23 + buildToolsVersion "23.0.2" defaultConfig { minSdkVersion 14 - targetSdkVersion 20 + targetSdkVersion 23 versionCode 1 versionName "1.0" } @@ -21,5 +21,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:21.0.3' + compile 'com.android.support:appcompat-v7:23+' } diff --git a/senzc/senzc.iml b/senzc/senzc.iml index 5c9e150..02a2473 100644 --- a/senzc/senzc.iml +++ b/senzc/senzc.iml @@ -1,5 +1,5 @@ - + @@ -65,34 +65,23 @@ + - - - - - - - - - - - - - + - - - + + + \ No newline at end of file