aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libs/MemorizingTrustManager/res/values-v21/themes.xml7
-rw-r--r--libs/MemorizingTrustManager/res/values/themes.xml7
-rw-r--r--libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java8
-rw-r--r--src/main/res/values-v21/themes.xml65
-rw-r--r--src/main/res/values/themes.xml45
5 files changed, 23 insertions, 109 deletions
diff --git a/libs/MemorizingTrustManager/res/values-v21/themes.xml b/libs/MemorizingTrustManager/res/values-v21/themes.xml
deleted file mode 100644
index c2bd573f0..000000000
--- a/libs/MemorizingTrustManager/res/values-v21/themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar" />
- <style name="ConversationsTheme.Dark" parent="android:Theme.Material" />
-
-</resources> \ No newline at end of file
diff --git a/libs/MemorizingTrustManager/res/values/themes.xml b/libs/MemorizingTrustManager/res/values/themes.xml
deleted file mode 100644
index 2b0643154..000000000
--- a/libs/MemorizingTrustManager/res/values/themes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <style name="ConversationsTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar" />
- <style name="ConversationsTheme.Dark" parent="@android:style/Theme.Holo" />
-
-</resources> \ No newline at end of file
diff --git a/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java b/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java
index dd1649c94..29b192093 100644
--- a/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java
+++ b/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java
@@ -49,7 +49,7 @@ public class MemorizingActivity extends Activity
@Override
public void onCreate(Bundle savedInstanceState) {
LOGGER.log(Level.FINE, "onCreate");
- setTheme(findTheme());
+// setTheme(findTheme());
super.onCreate(savedInstanceState);
}
@@ -84,9 +84,9 @@ public class MemorizingActivity extends Activity
finish();
}
- protected int findTheme() {
- return getPreferences().getString(THEME, getResources().getString(R.string.theme)).equals("dark") ? R.style.ConversationsTheme_Dark : R.style.ConversationsTheme;
- }
+// protected int findTheme() {
+// return getPreferences().getString(THEME, getResources().getString(R.string.theme)).equals("dark") ? R.style.ConversationsTheme_Dark : R.style.ConversationsTheme;
+// }
protected SharedPreferences getPreferences() {
return PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
deleted file mode 100644
index 8d0de873f..000000000
--- a/src/main/res/values-v21/themes.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <style name="ConversationsTheme" parent="Theme.AppCompat.Light.DarkActionBar">
- <item name="colorPrimary">@color/primary</item>
- <item name="colorPrimaryDark">@color/primary_dark</item>
- <item name="colorAccent">@color/accent</item>
- <item name="homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item>
-
- <item name="android:windowActionModeOverlay">true</item>
- <item name="android:actionModeBackground">@color/accent</item>
-
- <item name="TextSizeInfo">12sp</item>
- <item name="TextSizeBody">14sp</item>
- <item name="IconSize">16sp</item>
- <item name="TextSizeHeadline">18sp</item>
- <item name="TextSeparation">5sp</item>
-
- <!--<item type="reference" name="infocard_border">@drawable/infocard_border</item>-->
- <item name="divider">@color/black12</item>
-
- <item name="color_text_primary">@color/black87</item>
- <item name="color_text_secondary">@color/black54</item>
-
- <!--<item name="color_background_primary">@color/grey50</item>-->
- <!--<item name="color_background_secondary">@color/grey200</item>-->
-
- <!--<item name="unread_count">@color/unreadcountlight</item>-->
- <!--<item name="conversations_overview_background">@color/primary700</item>-->
-
- <item name="dialog_horizontal_padding">24dp</item>
- <item name="dialog_vertical_padding">16dp</item>
-
- <item name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
- <item name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
- <item name="icon_cancel">@drawable/ic_cancel_white_24dp</item>
- <item name="icon_copy">@drawable/ic_content_copy_grey600_24dp</item>
- <item name="icon_discard">@drawable/ic_delete_white_24dp</item>
- <item name="icon_download">@drawable/ic_file_download_white_24dp</item>
- <item name="icon_edit">@drawable/ic_edit_white_24dp</item>
- <item name="icon_edit_dark">@drawable/ic_edit_grey600_24dp</item>
- <item name="icon_done">@drawable/ic_done_black_24dp</item>
- <item name="icon_quote">@drawable/ic_reply_white_24dp</item>
- <item name="icon_group">@drawable/ic_group_white_24dp</item>
- <item name="icon_new">@drawable/ic_contacts_white_24dp</item>
- <item name="icon_refresh">@drawable/ic_refresh_grey600_24dp</item>
- <item name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
- <item name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
- <item name="icon_remove">@drawable/ic_delete_grey600_24dp</item>
- <item name="icon_search">@drawable/ic_search_white_24dp</item>
- <item name="icon_secure">@drawable/ic_lock_open_white_24dp</item>
- <item name="icon_settings">@drawable/ic_settings_grey600_24dp</item>
- <item name="icon_import_export">@drawable/ic_import_export_white_24dp</item>
- <item name="icon_share">@drawable/ic_share_white_24dp</item>
- <item name="icon_scan_qr_code">@drawable/ic_barcode_scan_white_24dp</item>
-
- <item name="ic_attach_camera">@drawable/ic_attach_camera</item>
- <item name="ic_attach_document">@drawable/ic_attach_document</item>
- <item name="ic_attach_location">@drawable/ic_attach_location</item>
- <item name="ic_attach_photo">@drawable/ic_attach_photo</item>
- <item name="ic_attach_video">@drawable/ic_attach_video</item>
- <item name="ic_attach_record">@drawable/ic_attach_record</item>
-
- </style>
-</resources> \ No newline at end of file
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index ce8506c89..b2fb36418 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -1,19 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <style name="ConversationsTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
- <item name="android:actionBarStyle">@style/ConversationsActionBar</item>
- <item name="android:actionBarWidgetTheme">@style/ConversationsActionBarWidget</item>
- <item name="android:actionBarTabStyle">@style/ConversationsActionBarTabs</item>
+ <style name="ConversationsTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+ <item name="colorPrimary">@color/primary</item>
+ <item name="colorPrimaryDark">@color/primary_dark</item>
+ <item name="colorAccent">@color/accent</item>
+
+ <item name="color_text_primary">@color/black87</item>
+ <item name="color_text_secondary">@color/black54</item>
+
+ <!--<item name="color_background_primary">@color/grey50</item>-->
+ <!--<item name="color_background_secondary">@color/grey200</item>-->
+
+ <item name="android:windowActionModeOverlay">true</item>
+ <item name="android:actionModeBackground">@color/accent</item>
+
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item>
+
<item name="TextSizeInfo">12sp</item>
<item name="TextSizeBody">14sp</item>
+ <item name="TextSeparation">5sp</item>
<item name="IconSize">16sp</item>
<item name="TextSizeHeadline">18sp</item>
- <item name="TextSeparation">5sp</item>
- <item name="color_text_primary">@color/black87</item>
- <item name="color_text_secondary">@color/black54</item>
+ <!--<item type="reference" name="infocard_border">@drawable/infocard_border</item>-->
+ <item name="divider">@color/black12</item>
<item name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
<item name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
@@ -61,25 +72,7 @@
<item name="TextSizeHeadline">20sp</item>
</style>
- <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
- <item name="android:background">@color/primary</item>
- <item name="android:backgroundStacked">@color/primary_dark</item>
- <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
- <item name="android:icon">@android:color/transparent</item>
- </style>
-
- <style name="ConversationsActionBarWidget" parent="android:Theme.Holo.Light">
- <item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item>
- <item name="android:dropDownListViewStyle">
- @android:style/Widget.Holo.Light.ListView.DropDown
- </item>
- </style>
-
- <style name="ConversationsActionBarTabs" parent="@android:style/Widget.Holo.ActionBar.TabView">
- <item name="android:background">@drawable/actionbar_tab_indicator</item>
- </style>
-
- <style name="ConversationsDialog" parent="@android:style/Theme.Holo.Light.Dialog">
+ <style name="ConversationsDialog" parent="Theme.AppCompat.Light.Dialog">
<item name="android:windowNoTitle">true</item>
<item name="TextSizeInfo">12sp</item>
<item name="TextSizeBody">14sp</item>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 14:47:36 +0000