-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
lots of internal upgrades and colour is now chanageable
Signed-off-by: Zade Viggers <[email protected]>
- Loading branch information
1 parent
143022b
commit 1006454
Showing
6 changed files
with
106 additions
and
58 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 32 additions & 21 deletions
53
app/src/main/java/net/viggers/zade/wallpaper/PreferencesActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,45 @@ | ||
package net.viggers.zade.wallpaper | ||
|
||
import android.preference.PreferenceActivity | ||
import android.os.Bundle | ||
import net.viggers.zade.wallpaper.R | ||
import android.preference.Preference | ||
import android.preference.Preference.OnPreferenceChangeListener | ||
import android.widget.Toast | ||
import androidx.appcompat.app.AppCompatActivity | ||
import androidx.preference.EditTextPreference | ||
import androidx.preference.PreferenceFragmentCompat | ||
|
||
class PreferencesActivity : PreferenceActivity() { | ||
|
||
class PreferencesActivity : AppCompatActivity() { | ||
override fun onCreate(savedInstance: Bundle?) { | ||
super.onCreate(savedInstance) | ||
addPreferencesFromResource(R.xml.prefs) | ||
|
||
val maxShapeNumberPreference = preferenceScreen.findPreference("numberOfShapes") | ||
maxShapeNumberPreference.onPreferenceChangeListener = numberCheckListener | ||
|
||
val shapeSpawnDelayPreference = preferenceScreen.findPreference("randomShapeSpawnDelay") | ||
shapeSpawnDelayPreference.onPreferenceChangeListener = numberCheckListener | ||
if (savedInstance == null) { | ||
supportFragmentManager.beginTransaction() | ||
.replace(android.R.id.content, PreferencesFragment()) | ||
.commit() | ||
} | ||
} | ||
|
||
private var numberCheckListener = OnPreferenceChangeListener { _, o -> | ||
if (o != null && o.toString().isNotEmpty() && o.toString().matches(Regex("\\d*"))) { | ||
return@OnPreferenceChangeListener true | ||
class PreferencesFragment : PreferenceFragmentCompat() { | ||
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { | ||
setPreferencesFromResource(R.xml.prefs, rootKey) | ||
|
||
val maxShapeNumberPreference = preferenceScreen.findPreference<EditTextPreference>("numberOfShapes") | ||
maxShapeNumberPreference?.onPreferenceChangeListener = numberCheckListener | ||
|
||
val shapeSpawnDelayPreference = preferenceScreen.findPreference<EditTextPreference>("randomShapeSpawnDelay") | ||
shapeSpawnDelayPreference?.onPreferenceChangeListener = numberCheckListener | ||
} | ||
|
||
private var numberCheckListener = androidx.preference.Preference.OnPreferenceChangeListener { _, o -> | ||
if (o != null && o.toString().isNotEmpty() && o.toString().matches(Regex("\\d*"))) { | ||
return@OnPreferenceChangeListener true | ||
} | ||
Toast.makeText( | ||
activity, | ||
R.string.invalid_number_input_toast, | ||
Toast.LENGTH_SHORT | ||
) | ||
.show() | ||
false | ||
} | ||
Toast.makeText( | ||
this@PreferencesActivity, | ||
R.string.invalid_number_input_toast, | ||
Toast.LENGTH_SHORT | ||
) | ||
.show() | ||
false | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,23 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> | ||
<PreferenceScreen | ||
xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:theme="@style/Theme.Wallpaper"> | ||
<EditTextPreference | ||
android:key="numberOfShapes" | ||
android:title="@string/number_of_shapes_preference_title" | ||
android:summary="@string/number_of_shapes_preference_summary" | ||
android:defaultValue="4" /> | ||
<SwitchPreference | ||
<com.kizitonwose.colorpreferencecompat.ColorPreferenceCompat | ||
android:key="shapeColour" | ||
android:title="@string/shape_colour_preference_title" /> | ||
<SwitchPreferenceCompat | ||
android:key="enableRandomShapes" | ||
android:title="@string/enable_random_shapes_preference_title" | ||
android:summary="@string/enable_random_shapes_preference_summary" | ||
android:defaultValue="true" /> | ||
<EditTextPreference | ||
android:key="randomShapeSpawnDelay" | ||
android:title="@string/random_shape_spawn_delay_preference_title" | ||
android:defaultValue="500" /> | ||
android:defaultValue="500" | ||
android:summary="@string/random_shape_spawn_delay_preference_summary" /> | ||
</PreferenceScreen> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters