summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/drawable/apply_circle_bg.xml2
-rw-r--r--res/layout/confirm_cancel_overlay.xml (renamed from res/layout/apply_theme_layout.xml)20
-rw-r--r--res/layout/customize_reset_theme_layout.xml4
-rw-r--r--res/layout/fragment_pager_list.xml2
-rw-r--r--res/values/colors.xml9
-rw-r--r--res/values/strings.xml3
-rw-r--r--res/values/styles.xml4
7 files changed, 24 insertions, 20 deletions
diff --git a/res/drawable/apply_circle_bg.xml b/res/drawable/apply_circle_bg.xml
index fa1a040..0ecea85 100644
--- a/res/drawable/apply_circle_bg.xml
+++ b/res/drawable/apply_circle_bg.xml
@@ -5,6 +5,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
- <solid android:color="@color/apply_layout_button_bg_color"/>
+ <solid android:color="@color/apply_overlay_button_bg_color"/>
</shape> \ No newline at end of file
diff --git a/res/layout/apply_theme_layout.xml b/res/layout/confirm_cancel_overlay.xml
index fa3c74a..51ee6a0 100644
--- a/res/layout/apply_theme_layout.xml
+++ b/res/layout/confirm_cancel_overlay.xml
@@ -2,20 +2,22 @@
<!--
Copyright (C) 2014 Cyanogen, Inc.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/apply_theme_layout"
+<com.cyngn.theme.widget.ConfirmCancelOverlay
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/confirm_cancel_overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
- android:background="@color/apply_layout_background">
+ android:background="@color/apply_overlay_background">
<com.cyngn.theme.widget.LatoTextView
+ android:id="@+id/overlay_title"
android:layout_width="wrap_content"
android:layout_height="132dp"
android:layout_gravity="top|center_horizontal"
android:gravity="center"
- style="@style/apply_layout_text_style"
- android:text="@string/apply_theme_layout_title"/>
+ style="@style/apply_overlay_text_style"
+ android:text="@string/apply_theme_overlay_title"/>
<LinearLayout
android:layout_width="wrap_content"
@@ -23,7 +25,7 @@
android:layout_gravity="center">
<ImageView
- android:id="@+id/apply_cancel"
+ android:id="@+id/cancel"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_gravity="center_vertical"
@@ -36,12 +38,12 @@
android:layout_width="2dp"
android:layout_height="56dp"
android:layout_gravity="center_vertical"
- android:background="@color/apply_layout_separator_color"
+ android:background="@color/apply_overlay_separator_color"
android:layout_marginStart="31dp"
android:layout_marginEnd="31dp"/>
<ImageView
- android:id="@+id/apply_apply"
+ android:id="@+id/accept"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_gravity="center_vertical"
@@ -52,4 +54,4 @@
</LinearLayout>
-</FrameLayout> \ No newline at end of file
+</com.cyngn.theme.widget.ConfirmCancelOverlay> \ No newline at end of file
diff --git a/res/layout/customize_reset_theme_layout.xml b/res/layout/customize_reset_theme_layout.xml
index ca744ba..cd8a6cc 100644
--- a/res/layout/customize_reset_theme_layout.xml
+++ b/res/layout/customize_reset_theme_layout.xml
@@ -7,7 +7,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
- android:background="@color/apply_layout_background">
+ android:background="@color/apply_overlay_background">
<ImageView
android:id="@+id/btn_dismiss"
@@ -53,7 +53,7 @@
android:layout_width="2dp"
android:layout_height="56dp"
android:layout_gravity="center_vertical"
- android:background="@color/apply_layout_separator_color"
+ android:background="@color/apply_overlay_separator_color"
android:layout_marginTop="-12dp"
android:layout_marginStart="31dp"
android:layout_marginEnd="31dp"/>
diff --git a/res/layout/fragment_pager_list.xml b/res/layout/fragment_pager_list.xml
index 7f342a2..9e9b69c 100644
--- a/res/layout/fragment_pager_list.xml
+++ b/res/layout/fragment_pager_list.xml
@@ -46,7 +46,7 @@
<include layout="@layout/icon_card"/>
<include layout="@layout/navbar_card"/>
</LinearLayout>
- <include layout="@layout/apply_theme_layout"/>
+ <include layout="@layout/confirm_cancel_overlay"/>
<include layout="@layout/customize_reset_theme_layout"/>
<View
android:id="@+id/clickable_view"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 750eaea..2f51e9d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -33,10 +33,11 @@
<color name="shop_themes_text_color">#ffffff</color>
- <color name="apply_layout_background">#cd000000</color>
- <color name="apply_layout_text_color">#ffffff</color>
- <color name="apply_layout_separator_color">#bdbdbd</color>
- <color name="apply_layout_button_bg_color">#66ffffff</color>
+ <color name="apply_overlay_background">#cd000000</color>
+ <color name="apply_overlay_text_color">#ffffff</color>
+ <color name="apply_overlay_separator_color">#bdbdbd</color>
+ <color name="apply_overlay_button_bg_color">#66ffffff</color>
+ <color name="delete_overlay_background">#cd600000</color>
<color name="customize_layout_text_color">#bdbdbd</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d9fb9fc..1589a62 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -52,7 +52,8 @@
<string name="audible_title_none">None</string>
- <string name="apply_theme_layout_title">Apply</string>
+ <string name="apply_theme_overlay_title">Apply</string>
+ <string name="delete_theme_overlay_title">Delete</string>
<string name="default_tag_text">Default</string>
<string name="customized_tag_text">Customized</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c51a1a9..1853066 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -103,10 +103,10 @@
<item name="android:text">@string/wallpaper_none</item>
</style>
- <style name="apply_layout_text_style">
+ <style name="apply_overlay_text_style">
<item name="android:textStyle">bold</item>
<item name="android:textSize">20sp</item>
- <item name="android:textColor">@color/apply_layout_text_color</item>
+ <item name="android:textColor">@color/apply_overlay_text_color</item>
<item name="android:textAllCaps">true</item>
</style>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 20:05:17 +0000