diff --git a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/SettingsFragment.java b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/SettingsFragment.java index c379213..007f587 100644 --- a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/SettingsFragment.java +++ b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/SettingsFragment.java @@ -1,15 +1,29 @@ package com.blackforestbytes.simplecloudnotifier.view; import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.v4.app.Fragment; import android.support.v7.preference.PreferenceFragmentCompat; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; import com.blackforestbytes.simplecloudnotifier.R; -public class SettingsFragment extends PreferenceFragmentCompat +public class SettingsFragment extends Fragment { - @Override - public void onCreatePreferences(Bundle savedInstanceState, String rootKey) + public SettingsFragment() { - setPreferencesFromResource(R.xml.preferences, rootKey); + // Required empty public constructor } -} + + @Override + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) + { + View v = inflater.inflate(R.layout.fragment_settings, container, false); + + return v; + } +} \ No newline at end of file diff --git a/android/app/src/main/res/drawable/circle.xml b/android/app/src/main/res/drawable/circle.xml new file mode 100644 index 0000000..af90e5f --- /dev/null +++ b/android/app/src/main/res/drawable/circle.xml @@ -0,0 +1,6 @@ + + + diff --git a/android/app/src/main/res/layout/fragment_settings.xml b/android/app/src/main/res/layout/fragment_settings.xml new file mode 100644 index 0000000..0a42063 --- /dev/null +++ b/android/app/src/main/res/layout/fragment_settings.xml @@ -0,0 +1,685 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 4b59520..e1d892d 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -15,4 +15,16 @@ not connected reload Priority icon + Common Settings + Enabled + Remember the last x notifications locally + Notifications (low priority) + Notifications (normal priority) + Notifications (high priority) + Enable notification sound + Notification sound + Repeat notification sound + Enable notification light + Notification light color + Enable notification vibration diff --git a/android/app/src/main/res/xml/preferences.xml b/android/app/src/main/res/xml/preferences.xml deleted file mode 100644 index 7771bdc..0000000 --- a/android/app/src/main/res/xml/preferences.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - -