Skip to content

Commit

Permalink
del:删除了通知栏自定义设置的功能
Browse files Browse the repository at this point in the history
  • Loading branch information
maoruibin committed Aug 20, 2017
1 parent 9be9c2d commit 83eec8d
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 17,6 @@
import name.gudong.translate.manager.ReciteModulePreference;
import name.gudong.translate.mvp.model.type.EDurationTipTime;
import name.gudong.translate.mvp.model.type.EIntervalTipTime;
import name.gudong.translate.util.Utils;

public class SettingActivity extends AppCompatActivity {

Expand Down Expand Up @@ -56,7 55,6 @@ public static class SettingsFragment extends PreferenceFragment implements Prefe

private com.jenzz.materialpreference.Preference mDurationPreference;
private com.jenzz.materialpreference.Preference mIntervalPreference;
private com.jenzz.materialpreference.SwitchPreference mShowIconInNotification;
private com.jenzz.materialpreference.SwitchPreference mUseReciteOrNot;

ReciteModulePreference mRecitePreference;
Expand All @@ -74,19 72,15 @@ public static class SettingsFragment extends PreferenceFragment implements Prefe
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);

mShowIconInNotification = (com.jenzz.materialpreference.SwitchPreference) findPreference("preference_show_icon_in_notification");
mUseReciteOrNot = (com.jenzz.materialpreference.SwitchPreference) findPreference("preference_use_recite_or_not");

mDurationPreference = (com.jenzz.materialpreference.Preference) findPreference("preference_show_time");
EDurationTipTime durationTime = mRecitePreference.getDurationTimeWay();
mDurationPreference.setSummary(getArrayValue(R.array.tip_time,durationTime.getIndex()));
mDurationPreference.setOnPreferenceClickListener(this);

mShowIconInNotification.setOnPreferenceChangeListener(this);
mUseReciteOrNot.setOnPreferenceChangeListener(this);

findPreference("preference_show_float_view_use_system").setEnabled(Utils.isSDKHigh5());

mIntervalPreference = (com.jenzz.materialpreference.Preference) findPreference("preference_recite_time");
mIntervalPreference.setOnPreferenceClickListener(this);
findPreference("preference_auto_play_sound").setOnPreferenceChangeListener(this);
Expand Down Expand Up @@ -208,13 202,6 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
mRecitePreference.setReciteOpenOrNot((Boolean) newValue);
shiftRecite();
break;
case "preference_show_icon_in_notification":
if((Boolean) newValue){
Utils.showNormalNotification(getActivity());
}else{
Utils.cancelNotification(getActivity());
}
break;
case "preference_auto_play_sound":
mRecitePreference.setPlaySoundAuto((Boolean) newValue);
break;
Expand Down
13 changes: 0 additions & 13 deletions app/src/main/res/xml/prefs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 38,6 @@
android:key="preference_recite_time"
android:title="自动提示间隔时间"
android:summary="背单词时两次显示的间隔时间"/>
</com.jenzz.materialpreference.PreferenceCategory>

<com.jenzz.materialpreference.PreferenceCategory android:title="高级">
<com.jenzz.materialpreference.SwitchPreference
android:key="preference_show_icon_in_notification"
android:title="通知栏图标"
android:summary="开启后,通知栏将会常驻图标,方便快速打开 App。"
android:defaultValue="false" />
<com.jenzz.materialpreference.SwitchPreference
android:key="preference_show_float_view_use_system"
android:title="Android 5.0 设备使用系统通知显示结果"
android:summary="开启后,在 5.0 设备上以系统中会以系统通知的方式显示翻译结果。"
android:defaultValue="false"/>
<com.jenzz.materialpreference.Preference
android:key="preference_show_time"
android:title="@string/tip_time_duration"
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 41,7 @@ buildscript {
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:2.3.3'

classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'

Expand Down

0 comments on commit 83eec8d

Please sign in to comment.