diff --git a/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt b/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt index 8cdd691..debf26b 100644 --- a/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt +++ b/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt @@ -51,6 +51,9 @@ class SettingsActivity : AppCompatActivity() { // As older APIs somehow do not recognize the xml defined onClick activity_settings_close.setOnClickListener() { finish() } + activity_settings_device_settings.setOnClickListener { + startActivityForResult(Intent(android.provider.Settings.ACTION_SETTINGS), 0) + } } fun backHome(view: View) { finish() } diff --git a/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentMeta.kt b/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentMeta.kt index 1d3f498..16f721d 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentMeta.kt +++ b/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentMeta.kt @@ -82,8 +82,12 @@ class SettingsFragmentMeta : Fragment() { .show() } + // Footer onClicks + fragment_settings_meta_footer_github_icon.setOnClickListener { + openNewTabWindow(getString(R.string.settings_footer_repo), this.context!!) + } // rate app - fragment_settings_meta_rate_app_btn.setOnClickListener { + fragment_settings_meta_footer_play_icon.setOnClickListener { try { val rateIntent = rateIntentForUrl("market://details") startActivity(rateIntent) @@ -93,11 +97,10 @@ class SettingsFragmentMeta : Fragment() { } } - // Footer onClicks - fragment_settings_meta_footer_github_link.setOnClickListener { - openNewTabWindow(getString(R.string.settings_footer_repo), this.context!!) - } - fragment_settings_meta_footer_website_link.setOnClickListener { + /*fragment_settings_meta_footer_website_icon.setOnClickListener { + openNewTabWindow(getString(R.string.settings_footer_web), this.context!!) + }*/ + fragment_settings_meta_footer_globe_icon.setOnClickListener { openNewTabWindow(getString(R.string.settings_footer_web), this.context!!) } diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index e39271d..5e700e1 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -37,7 +37,7 @@ android:id="@+id/activity_settings_close" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="8dp" + android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:gravity="center" android:includeFontPadding="true" @@ -51,6 +51,23 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" custom:type="solid" /> + + - diff --git a/app/src/main/res/layout/fragment_settings_meta.xml b/app/src/main/res/layout/fragment_settings_meta.xml index 7fd9e58..3bd2fcb 100644 --- a/app/src/main/res/layout/fragment_settings_meta.xml +++ b/app/src/main/res/layout/fragment_settings_meta.xml @@ -1,7 +1,7 @@ - @@ -36,50 +36,61 @@ android:text="@string/settings_reset" android:textAllCaps="false" /> -