blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Style settings theme, add about category

master
Emily Kager 2019-01-31 11:33:56 -08:00 committed by Jeff Boek
parent bc30589180
commit 3c48b3eeca
21 changed files with 133 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -49,7 +49,7 @@
android:name=".settings.SettingsActivity"
android:label="@string/settings"
android:parentActivityName=".HomeActivity"
android:theme="@style/LightAppTheme" />
android:theme="@style/SettingsAppTheme" />
</application>
</manifest>

12
app/src/main/java/org/mozilla/fenix/HomeActivity.kt
View File

@ -18,9 +18,17 @@ class HomeActivity : AppCompatActivity() {
setContentView(R.layout.activity_home)
}
override fun onCreateView(parent: View?, name: String?, context: Context, attrs: AttributeSet?): View? =
override fun onCreateView(
parent: View?,
name: String,
context: Context,
attrs: AttributeSet
): View? =
when (name) {
EngineView::class.java.name -> components.core.engine.createView(context, attrs).asView()
EngineView::class.java.name -> components.core.engine.createView(
context,
attrs
).asView()
else -> super.onCreateView(parent, name, context, attrs)
}
}

3
app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
View File

@ -8,6 +8,7 @@ import android.content.Intent
import android.os.Bundle
import android.provider.Settings
import android.widget.Toast
import androidx.preference.Preference
import androidx.preference.Preference.OnPreferenceClickListener
import androidx.preference.PreferenceFragmentCompat
import org.mozilla.fenix.R
@ -37,7 +38,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
private fun setupPreferences() {
val makeDefaultBrowserKey = context?.getPreferenceKey(pref_key_make_default_browser)
val preferenceMakeDefaultBrowser = findPreference(makeDefaultBrowserKey)
val preferenceMakeDefaultBrowser = findPreference<Preference>(makeDefaultBrowserKey)
preferenceMakeDefaultBrowser.onPreferenceClickListener = getClickListenerForMakeDefaultBrowser()
}

13
app/src/main/res/drawable/ic_about.xml
View File

@ -1,8 +1,13 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<vector android:height="24dp" android:viewportHeight="16"
android:viewportWidth="16" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#0C0C0D" android:fillType="evenOdd" android:pathData="M8,15a7,7 0,1 1,7 -7,7 7,0 0,1 -7,7zM8,2a6,6 0,1 0,6 6,6 6,0 0,0 -6,-6zM8,12a1,1 0,0 1,-1 -1L7,8a1,1 0,0 1,2 0v3a1,1 0,0 1,-1 1zM8,6a1,1 0,1 1,1 -1,1 1,0 0,1 -1,1z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="16"
android:viewportHeight="16">
<path
android:fillColor="#0C0C0D"
android:fillType="evenOdd"
android:pathData="M8,15a7,7 0,1 1,7 -7,7 7,0 0,1 -7,7zM8,2a6,6 0,1 0,6 6,6 6,0 0,0 -6,-6zM8,12a1,1 0,0 1,-1 -1L7,8a1,1 0,0 1,2 0v3a1,1 0,0 1,-1 1zM8,6a1,1 0,1 1,1 -1,1 1,0 0,1 -1,1z" />
</vector>

3
app/src/main/res/drawable/ic_accessibility.xml
View File

@ -9,6 +9,5 @@
android:viewportHeight="24">
<path
android:pathData="m12,7c1.3807,0 2.5,-1.1193 2.5,-2.5s-1.1193,-2.5 -2.5,-2.5 -2.5,1.1193 -2.5,2.5 1.1193,2.5 2.5,2.5zM4,9c0,-0.5523 0.4477,-1 1,-1h14c0.5523,0 1,0.4477 1,1s-0.4477,1 -1,1h-4v6,5c0,0.5523 -0.4477,1 -1,1s-1,-0.4477 -1,-1v-5h-2v5c0,0.5523 -0.4477,1 -1,1 -0.5523,0 -1,-0.4477 -1,-1v-5,-6h-4c-0.5523,0 -1,-0.4477 -1,-1z"
android:fillColor="#0c0c0d"
android:fillAlpha=".8"/>
android:fillColor="#0c0c0d" />
</vector>

1
app/src/main/res/drawable/ic_bookmark_outline.xml
View File

File diff suppressed because one or more lines are too long

1
app/src/main/res/drawable/ic_data_collection.xml
View File

@ -10,6 +10,5 @@
<path
android:pathData="M22,6a2,2 0,0 1,-2.07 1.999l-3.164,5.062a2,2 0,1 1,-3.762 0.81l-3.117,-2.078A1.992,1.992 0,0 1,8.93 12l-3.164,5.06A2,2 0,1 1,4.07 16l3.164,-5.062a2,2 0,1 1,3.762 -0.81l3.117,2.078A1.992,1.992 0,0 1,15.07 12l3.164,-5.062A2,2 0,1 1,22 6z"
android:fillColor="#0C0C0D"
android:fillAlpha=".8"
android:fillType="evenOdd"/>
</vector>

16
app/src/main/res/drawable/ic_feedback.xml
View File

@ -1,9 +1,15 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<vector android:height="24dp" android:viewportHeight="16"
android:viewportWidth="16" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#0C0C0D" android:pathData="M13.577,1H2.423A2.426,2.426 0,0 0,0 3.423v6.154A2.426,2.426 0,0 0,2.423 12H8.26l2.966,3.633A1,1 0,0 0,13 15v-3h0.577A2.426,2.426 0,0 0,16 9.577V3.423A2.426,2.426 0,0 0,13.577 1zM14,9.577a0.423,0.423 0,0 1,-0.423 0.423H12a1,1 0,0 0,-1 1v1.194l-1.491,-1.827A1,1 0,0 0,8.734 10H2.423A0.423,0.423 0,0 1,2 9.577V3.423A0.423,0.423 0,0 1,2.423 3h11.154a0.423,0.423 0,0 1,0.423 0.423z"/>
<path android:fillColor="#0C0C0D" android:pathData="M11.5,5h-7a0.5,0.5 0,0 0,0 1h7a0.5,0.5 0,0 0,0 -1zM11.5,7h-7a0.5,0.5 0,0 0,0 1h7a0.5,0.5 0,0 0,0 -1z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="16"
android:viewportHeight="16">
<path
android:fillColor="#0C0C0D"
android:pathData="M13.577,1H2.423A2.426,2.426 0,0 0,0 3.423v6.154A2.426,2.426 0,0 0,2.423 12H8.26l2.966,3.633A1,1 0,0 0,13 15v-3h0.577A2.426,2.426 0,0 0,16 9.577V3.423A2.426,2.426 0,0 0,13.577 1zM14,9.577a0.423,0.423 0,0 1,-0.423 0.423H12a1,1 0,0 0,-1 1v1.194l-1.491,-1.827A1,1 0,0 0,8.734 10H2.423A0.423,0.423 0,0 1,2 9.577V3.423A0.423,0.423 0,0 1,2.423 3h11.154a0.423,0.423 0,0 1,0.423 0.423z" />
<path
android:fillColor="#0C0C0D"
android:pathData="M11.5,5h-7a0.5,0.5 0,0 0,0 1h7a0.5,0.5 0,0 0,0 -1zM11.5,7h-7a0.5,0.5 0,0 0,0 1h7a0.5,0.5 0,0 0,0 -1z" />
</vector>

2
app/src/main/res/drawable/ic_help.xml
View File

File diff suppressed because one or more lines are too long

1
app/src/main/res/drawable/ic_language.xml
View File

File diff suppressed because one or more lines are too long

1
app/src/main/res/drawable/ic_library.xml
View File

@ -7,7 +7,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillAlpha=".8"
android:fillColor="#0C0C0D"
android:fillType="evenOdd"
android:pathData="M5,4a1,1 0,1 0,-2 0v16a1,1 0,1 0,2 0L5,4zM9,7a1,1 0,1 0,-2 0v13a1,1 0,1 0,2 0L9,7zM12,5a1,1 0,0 1,1 1v14a1,1 0,1 1,-2 0L11,6a1,1 0,0 1,1 -1zM16.452,5.694a1,1 0,1 0,-1.904 0.612l4.5,14a1,1 0,1 0,1.904 -0.612l-4.5,-14z" />

1
app/src/main/res/drawable/ic_menu.xml
View File

@ -10,6 +10,5 @@
<path
android:pathData="M14,6a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM14,12a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM12,20a2,2 0,1 0,0 -4,2 2,0 0,0 0,4z"
android:fillColor="#0C0C0D"
android:fillAlpha=".8"
android:fillType="evenOdd"/>
</vector>

1
app/src/main/res/drawable/ic_new.xml
View File

@ -7,7 +7,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillAlpha=".8"
android:fillColor="#0C0C0D"
android:fillType="evenOdd"
android:pathData="M13,4a1,1 0,1 0,-2 0v7H4a1,1 0,1 0,0 2h7v7a1,1 0,1 0,2 0v-7h7a1,1 0,1 0,0 -2h-7V4z" />

3
app/src/main/res/drawable/ic_permission.xml
View File

File diff suppressed because one or more lines are too long

3
app/src/main/res/drawable/ic_private_browsing.xml
View File

@ -9,6 +9,5 @@
android:viewportHeight="24">
<path
android:pathData="M17.5,17c-2.1,0 -3.5,-2.5 -5.5,-2.5S8.4,17 6.5,17C3.9,17 2,14.6 2,10.4 2,7.8 2.8,7 6.1,7s4.3,1.4 5.9,1.4c1.6,0 2.6,-1.4 5.9,-1.4 3.3,0 4.1,0.8 4.1,3.4 0,4.2 -1.9,6.6 -4.5,6.6zM7.7,10.2c-2,0.1 -2.9,1.3 -2.9,1.6 0,0.3 1.3,1.1 2.7,1.1 1.3,0 2.9,-0.5 2.9,-0.9 0,-0.5 -0.8,-1.9 -2.7,-1.8zM16.3,10.2c-1.9,-0.1 -2.7,1.3 -2.7,1.8 0,0.4 1.5,0.9 2.9,0.9s2.7,-0.8 2.7,-1.1c-0.1,-0.3 -0.9,-1.5 -2.9,-1.6z"
android:fillColor="#0C0C0D"
android:fillAlpha=".8"/>
android:fillColor="#0C0C0D" />
</vector>

13
app/src/main/res/drawable/ic_search.xml 100644
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#0c0c0d"
android:pathData="M21.457,20.043l-6,-6a7.528,7.528 0,1 0,-1.414 1.414l6,6a1,1 0,0 0,1.414 -1.414ZM9.5,15A5.5,5.5 0,1 1,15 9.5,5.507 5.507,0 0,1 9.5,15Z"/>
</vector>

1
app/src/main/res/drawable/ic_settings.xml
View File

File diff suppressed because one or more lines are too long

29
app/src/main/res/values/strings.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
<?xml version="1.0" encoding="utf-8"?><!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<resources>
@ -24,12 +23,33 @@
<string name="search_scan_button">Scan</string>
<string name="search_shortcuts_button">Shortcuts</string>
<!-- Menu option on the toolbar that takes you to settings page-->
<string name="settings">Settings</string>
<string name="awesomebar_clipboard_title">Fill link from Clipboard</string>
<!-- Preferences -->
<!-- Preference category for basic settings -->
<string name="preferences_category_basics">Basics</string>
<!-- Preference category for all links about Fenix -->
<string name="preferences_category_about">About</string>
<!-- Preference for settings related to changing the default search engine -->
<string name="preferences_search_engine">Search engine</string>
<!-- Preference linking to help about Fenix -->
<string name="preferences_help">Help</string>
<!-- Preference link to rating Fenix on the Play Store -->
<string name="preferences_rate">Rate on Play Store</string>
<!-- Preference for giving feedback about Fenix -->
<string name="preferences_feedback">Give feedback</string>
<!-- Preference linking to about page for Fenix -->
<string name="preferences_about">About Fenix</string>
<!-- Preference for settings related to saved passwords -->
<string name="preferences_passwords">Passwords</string>
@ -53,9 +73,4 @@
<!-- Preference for data choices -->
<string name="preferences_data_choices">Data choices</string>
<!-- Menu option on the toolbar that takes you to settings page-->
<string name="settings">Settings</string>
<string name="awesomebar_clipboard_title">Fill link from Clipboard</string>
</resources>

9
app/src/main/res/values/styles.xml
View File

@ -2,7 +2,7 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="LightAppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
@ -10,6 +10,13 @@
<item name="colorAccent">@color/colorAccent</item>
</style>
<style name="SettingsAppTheme" parent="Theme.MaterialComponents.Light">
<item name="colorPrimary">@color/offwhite</item>
<item name="colorPrimaryDark">@color/offwhite</item>
<item name="colorAccent">@color/icons</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
</style>
<style name="search_pill" parent="Widget.AppCompat.Button.Borderless">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>

80
app/src/main/res/xml/preferences.xml
View File

@ -3,45 +3,71 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory android:title="@string/preferences_category_basics">
<PreferenceCategory
android:title="@string/preferences_category_basics"
app:iconSpaceReserved="false">
<androidx.preference.Preference
android:icon="@drawable/mozac_ic_search"
android:key="@string/pref_key_search_engine"
android:title="@string/preferences_search_engine"/>
android:icon="@drawable/ic_search"
android:key="@string/pref_key_search_engine"
android:title="@string/preferences_search_engine" />
<androidx.preference.Preference
android:icon="@drawable/ic_login"
android:key="@string/pref_key_passwords"
android:title="@string/preferences_passwords"/>
android:icon="@drawable/ic_login"
android:key="@string/pref_key_passwords"
android:title="@string/preferences_passwords" />
<androidx.preference.Preference
android:icon="@drawable/ic_formfill"
android:key="@string/pref_key_credit_cards_addresses"
android:title="@string/preferences_credit_cards_addresses"/>
android:icon="@drawable/ic_formfill"
android:key="@string/pref_key_credit_cards_addresses"
android:title="@string/preferences_credit_cards_addresses" />
<androidx.preference.Preference
android:key="@string/pref_key_make_default_browser"
android:title="@string/preferences_set_as_default_browser"/>
<androidx.preference.SwitchPreference
android:key="@string/pref_key_make_default_browser"
android:title="@string/preferences_set_as_default_browser" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/preferences_category_advanced">
<PreferenceCategory
android:title="@string/preferences_category_advanced"
app:iconSpaceReserved="false">
<androidx.preference.Preference
android:icon="@drawable/ic_permission"
android:key="@string/pref_key_site_permissions"
android:title="@string/preferences_site_permissions"/>
android:icon="@drawable/ic_permission"
android:key="@string/pref_key_site_permissions"
android:title="@string/preferences_site_permissions" />
<androidx.preference.Preference
android:icon="@drawable/ic_accessibility"
android:key="@string/pref_key_accessibility"
android:title="@string/preferences_accessibility"/>
android:icon="@drawable/ic_accessibility"
android:key="@string/pref_key_accessibility"
android:title="@string/preferences_accessibility" />
<androidx.preference.Preference
android:icon="@drawable/ic_language"
android:key="@string/pref_key_language"
android:title="@string/preferences_language"/>
android:icon="@drawable/ic_language"
android:key="@string/pref_key_language"
android:title="@string/preferences_language" />
<androidx.preference.Preference
android:icon="@drawable/ic_data_collection"
android:key="@string/pref_key_data_choices"
android:title="@string/preferences_data_choices"/>
android:icon="@drawable/ic_data_collection"
android:key="@string/pref_key_data_choices"
android:title="@string/preferences_data_choices" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/preferences_category_about"
app:iconSpaceReserved="false">
<androidx.preference.Preference
android:icon="@drawable/ic_help"
android:key="@string/pref_key_help"
android:title="@string/preferences_help" />
<androidx.preference.Preference
android:icon="@drawable/ic_bookmark_outline"
android:key="@string/pref_key_rate"
android:title="@string/preferences_rate" />
<androidx.preference.Preference
android:icon="@drawable/ic_feedback"
android:key="@string/pref_key_feedback"
android:title="@string/preferences_feedback" />
<androidx.preference.Preference
android:icon="@drawable/ic_about"
android:key="@string/pref_key_about"
android:title="@string/preferences_about" />
</PreferenceCategory>
</androidx.preference.PreferenceScreen>

2
buildSrc/src/main/java/Dependencies.kt
View File

@ -13,7 +13,7 @@ private object Versions {
const val androidx_appcompat = "1.0.2"
const val androidx_constraint_layout = "2.0.0-alpha3"
const val androidx_preference = "1.0.0"
const val androidx_preference = "1.1.0-alpha02"
const val mozilla_android_components = "0.41.0-SNAPSHOT"