Skip to content

Commit

Permalink
notifications-mute checkbox
Browse files Browse the repository at this point in the history
  • Loading branch information
@c99koder
c99koder committed Apr 1, 2019
1 parent 6fa4753 commit d8ad821
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 68 deletions.
4 changes: 2 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ android {
testBuildType "mockdata"

defaultConfig {
versionCode 225
versionName "4.16"
versionCode 226
versionName "4.16.1"
minSdkVersion 17
targetSdkVersion 28
multiDexEnabled true
Expand Down
109 changes: 43 additions & 66 deletions irccloud-android.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,58 +8,52 @@
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="mockdata" />
<option name="ASSEMBLE_TASK_NAME" value="assembleMockdata" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileMockdataSources" />
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<afterSyncTasks>
<task>generateMockdataSources</task>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res;file://$MODULE_DIR$/themes;file://$MODULE_DIR$/build/generated/fabric/res/mockdata;file://$MODULE_DIR$/build/generated/res/rs/mockdata;file://$MODULE_DIR$/build/generated/res/resValues/mockdata" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res;file://$MODULE_DIR$/themes;file://$MODULE_DIR$/build/generated/fabric/res/debug;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/build/intermediates/javac/mockdata/compileMockdataJavaWithJavac/classes" />
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/mockdataUnitTest/compileMockdataUnitTestJavaWithJavac/classes" />
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/mockdata" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/mockdata/compileMockdataAidl/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/mockdata" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/mockdata/compileMockdataRenderscript/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/data_binding_base_class_source_out/mockdata/dataBindingGenBaseClassesMockdata/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/fabric/res/mockdata" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/mockdata" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/mockdata" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/mockdata" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/mockdataAndroidTest/compileMockdataAndroidTestAidl/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/mockdata" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/mockdataAndroidTest/compileMockdataAndroidTestRenderscript/out" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/mockdata" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/mockdata" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/mockdata" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/mockdata/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/mockdata/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/mockdata/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/mockdata/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/mockdata/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/mockdata/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/mockdata/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestMockdata/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestMockdata/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestMockdata/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestMockdata/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestMockdata/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestMockdata/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestMockdata/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testMockdata/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testMockdata/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testMockdata/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testMockdata/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testMockdata/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testMockdata/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testMockdata/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/data_binding_base_class_source_out/debug/dataBindingGenBaseClassesDebug/out" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/fabric/res/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/themes" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
Expand All @@ -80,11 +74,12 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
<excludeFolder url="file://$MODULE_DIR$/build/filtered_resources" />
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/app_classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
Expand All @@ -95,7 +90,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/data_binding_dependency_artifacts" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/data_binding_layout_info_type_merge" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/external_libs_dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/feature_data_binding_base_feature_info" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
Expand All @@ -104,18 +98,21 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/legacy_multidex_aapt_derived_proguard_rules" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/legacy_multidex_main_dex_list" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/linked_res_for_bundle" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/module_bundle" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-files" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/validate_signing_config" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
Expand Down Expand Up @@ -215,25 +212,5 @@
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:16.0.1@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-process:2.0.0@aar" level="project" />
<orderEntry type="module" module-name="android-websockets" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.1.0-alpha3@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.1.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test:runner:1.1.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-core:3.1.0-alpha3@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.jraska:falcon:1.0.4@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: tools.fastlane:screengrab:1.2.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.uiautomator:uiautomator-v18:2.1.2@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test:rules:1.1.1@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.multidex:multidex-instrumentation:2.0.0@aar" level="project" />
<orderEntry type="module" module-name="android-websockets" />
<orderEntry type="module" module-name="android-websockets" />
<orderEntry type="module" module-name="android-websockets" />
</component>
</module>
4 changes: 4 additions & 0 deletions res/xml-v26/preferences_notifications.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,9 @@
android:key="enableReadOnSelect"
android:defaultValue="false"
android:title="Mark as read automatically"/>
<SwitchPreference
android:key="notifications_mute"
android:defaultValue="false"
android:title="Mute notifications"/>
</PreferenceCategory>
</PreferenceScreen>
4 changes: 4 additions & 0 deletions res/xml/preferences_notifications.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,9 @@
android:key="enableReadOnSelect"
android:defaultValue="false"
android:title="Mark as read automatically"/>
<SwitchPreference
android:key="notifications_mute"
android:defaultValue="false"
android:title="Mute notifications"/>
</PreferenceCategory>
</PreferenceScreen>
1 change: 1 addition & 0 deletions src/com/irccloud/android/NetworkConnection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2062,6 +2062,7 @@ public void parse(IRCCloudJSONObject object) throws JSONException {
editor.putBoolean("hideJoinPart", !(userInfo.prefs.has("hideJoinPart") && userInfo.prefs.get("hideJoinPart") instanceof Boolean && userInfo.prefs.getBoolean("hideJoinPart")));
editor.putBoolean("expandJoinPart", !(userInfo.prefs.has("expandJoinPart") && userInfo.prefs.get("expandJoinPart") instanceof Boolean && userInfo.prefs.getBoolean("expandJoinPart")));
editor.putBoolean("notifications_all", (userInfo.prefs.has("notifications-all") && userInfo.prefs.get("notifications-all") instanceof Boolean && userInfo.prefs.getBoolean("notifications-all")));
editor.putBoolean("notifications_mute", (userInfo.prefs.has("notifications-mute") && userInfo.prefs.get("notifications-mute") instanceof Boolean && userInfo.prefs.getBoolean("notifications-mute")));
editor.putBoolean("disableTrackUnread", !(userInfo.prefs.has("disableTrackUnread") && userInfo.prefs.get("disableTrackUnread") instanceof Boolean && userInfo.prefs.getBoolean("disableTrackUnread")));
editor.putBoolean("enableReadOnSelect", (userInfo.prefs.has("enableReadOnSelect") && userInfo.prefs.get("enableReadOnSelect") instanceof Boolean && userInfo.prefs.getBoolean("enableReadOnSelect")));
editor.putBoolean("ascii-compact", (userInfo.prefs.has("ascii-compact") && userInfo.prefs.get("ascii-compact") instanceof Boolean && userInfo.prefs.getBoolean("ascii-compact")));
Expand Down
3 changes: 3 additions & 0 deletions src/com/irccloud/android/activity/PreferencesActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ public boolean onPreferenceClick(Preference preference) {
findPreference("hideJoinPart").setOnPreferenceChangeListener(prefstoggle);
findPreference("expandJoinPart").setOnPreferenceChangeListener(prefstoggle);
findPreference("notifications_all").setOnPreferenceChangeListener(prefstoggle);
findPreference("notifications_mute").setOnPreferenceChangeListener(prefstoggle);
findPreference("disableTrackUnread").setOnPreferenceChangeListener(prefstoggle);
findPreference("enableReadOnSelect").setOnPreferenceChangeListener(prefstoggle);
findPreference("ascii-compact").setOnPreferenceChangeListener(prefstoggle);
Expand Down Expand Up @@ -667,6 +668,8 @@ else if(preference.getKey().equals("monospace"))
prefs.put("font", ((Boolean)newValue)?"mono":"sans");
else if(preference.getKey().equals("notifications_all"))
prefs.put("notifications-all", newValue);
else if(preference.getKey().equals("notifications_mute"))
prefs.put("notifications-mute", newValue);
else
prefs.put(preference.getKey(), newValue);

Expand Down

0 comments on commit d8ad821

Please sign in to comment.