aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/preference_frost.xml58
-rw-r--r--app/src/main/res/values/ids.xml10
-rw-r--r--app/src/main/res/values/strings.xml2
-rw-r--r--app/src/main/res/values/strings_preferences5
-rw-r--r--app/src/main/res/xml/preferences_appearance.xml12
5 files changed, 47 insertions, 40 deletions
diff --git a/app/src/main/res/layout/preference_frost.xml b/app/src/main/res/layout/preference_frost.xml
index bcbed7f2..939c6d32 100644
--- a/app/src/main/res/layout/preference_frost.xml
+++ b/app/src/main/res/layout/preference_frost.xml
@@ -2,63 +2,67 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeightSmall"
- android:gravity="center_vertical"
- android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:background="?android:attr/activatedBackgroundIndicator"
+ android:baselineAligned="false"
android:clipToPadding="false"
- android:baselineAligned="false">
+ android:gravity="center_vertical"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart">
<LinearLayout
- android:id="@+id/icon_frame"
+ android:id="@id/pref_view_icon_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="-4dp"
- android:minWidth="60dp"
android:gravity="start|center_vertical"
+ android:minWidth="60dp"
android:orientation="horizontal"
+ android:paddingBottom="4dp"
android:paddingEnd="12dp"
android:paddingTop="4dp"
- android:paddingBottom="4dp">
+ android:visibility="gone">
+
<ImageView
- android:id="@+id/icon"
+ android:id="@id/pref_view_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:maxWidth="48dp"
- android:maxHeight="48dp" />
+ android:maxHeight="48dp"
+ android:maxWidth="48dp" />
</LinearLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:paddingTop="16dp"
- android:paddingBottom="16dp">
+ android:paddingBottom="16dp"
+ android:paddingTop="16dp">
- <TextView android:id="@+id/title"
+ <TextView
+ android:id="@id/pref_view_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceListItem"
- android:ellipsize="marquee" />
+ android:ellipsize="marquee"
+ android:textAppearance="?android:attr/textAppearanceListItem" />
- <TextView android:id="@+id/summary"
+ <TextView
+ android:id="@id/pref_view_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@id/title"
- android:layout_alignStart="@id/title"
- android:textAppearance="?android:attr/textAppearanceListItemSecondary"
- android:textColor="?android:attr/textColorSecondary"
+ android:layout_alignStart="@id/pref_view_title"
+ android:layout_below="@id/pref_view_title"
+ android:ellipsize="end"
android:maxLines="10"
- android:ellipsize="end" />
+ android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+ android:textColor="?android:attr/textColorSecondary" />
</RelativeLayout>
- <CheckBox
- android:id="@+id/checkbox"
- android:visibility="gone"
- android:paddingStart="16dp"
+ <LinearLayout android:id="@id/pref_view_inner_frame"
android:layout_width="wrap_content"
- android:layout_height="wrap_content" />
+ android:layout_height="match_parent"
+ android:gravity="end|center_vertical"
+ android:paddingLeft="16dp"
+ android:orientation="vertical" />
</LinearLayout> \ No newline at end of file
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 8df89eb6..76a167af 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -1,4 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="item_account" type="id" />
+ <item name="pref_item_header" type="id" />
+ <item name="pref_item_text" type="id" />
+ <item name="pref_item_checkbox" type="id" />
+
+ <item name="pref_view_title" type="id" />
+ <item name="pref_view_desc" type="id" />
+ <item name="pref_view_icon" type="id" />
+ <item name="pref_view_icon_frame" type="id" />
+ <item name="pref_view_inner_frame" type="id" />
+ <item name="pref_view_checkbox" type="id" />
</resources> \ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7287c4c0..323cb42a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,4 +27,6 @@
<string name="login">Login</string>
<string name="select_facebook_account">Select Facebook Account</string>
<string name="add_account">Add Account</string>
+ <string name="add_account_desc">Add Facebook Account</string>
+ <string name="manage_account">Manage Account</string>
</resources>
diff --git a/app/src/main/res/values/strings_preferences b/app/src/main/res/values/strings_preferences
index 5b10d8ae..9cb29553 100644
--- a/app/src/main/res/values/strings_preferences
+++ b/app/src/main/res/values/strings_preferences
@@ -1,3 +1,6 @@
<resources>
- <string name="frost_pref_title_title">Settings</string>
+ <string name="settings">Settings</string>
+ <string name="text_color">Text Color</string>
+ <string name="background_color">Background Color</string>
+ <string name="header_color">Header Color</string>
</resources> \ No newline at end of file
diff --git a/app/src/main/res/xml/preferences_appearance.xml b/app/src/main/res/xml/preferences_appearance.xml
deleted file mode 100644
index 23e179fd..00000000
--- a/app/src/main/res/xml/preferences_appearance.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <!--<com.afollestad.materialdialogs.prefs.MaterialDialogPreference-->
- <!--android:dialogIcon="@mipmap/ic_launcher"-->
- <!--android:dialogMessage="@string/preference_dialog_message"-->
- <!--android:dialogTitle="Title Color"-->
- <!--android:key="unused_key00"-->
- <!--android:negativeButtonText="@android:string/cancel"-->
- <!--android:positiveButtonText="@android:string/ok"-->
- <!--android:summary="@string/material_dialog_pref_summary"-->
- <!--android:title="@string/material_dialog_pref_title" />-->
-</PreferenceScreen> \ No newline at end of file