aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java33
-rw-r--r--src/main/res/drawable-hdpi/ic_settings_grey600_24dp.pngbin493 -> 0 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_settings_grey600_24dp.pngbin344 -> 0 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.pngbin625 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.pngbin915 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.pngbin1220 -> 0 bytes
-rw-r--r--src/main/res/menu/fragment_conversation.xml5
-rw-r--r--src/main/res/values/strings.xml1
-rw-r--r--src/main/res/values/themes.xml48
9 files changed, 0 insertions, 87 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index bf16aa428..bfdd15b03 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -1159,7 +1159,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
menuInflater.inflate(R.menu.fragment_conversation, menu);
final MenuItem menuInviteContact = menu.findItem(R.id.action_invite);
final MenuItem menuNeedHelp = menu.findItem(R.id.action_create_issue);
- final MenuItem menuSearchHistory = menu.findItem(R.id.action_search_history);
final MenuItem menuSearchUpdates = menu.findItem(R.id.action_check_updates);
final MenuItem menuArchiveChat = menu.findItem(R.id.action_archive_chat);
final MenuItem menuEditProfiles = menu.findItem(R.id.action_accounts);
@@ -1174,13 +1173,11 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
}
menuEditProfiles.setVisible(false);
menuNeedHelp.setVisible(true);
- menuSearchHistory.setVisible(true);
menuSearchUpdates.setVisible(false);
ConversationMenuConfigurator.configureAttachmentMenu(conversation, menu);
ConversationMenuConfigurator.configureEncryptionMenu(conversation, menu);
} else {
menuNeedHelp.setVisible(false);
- menuSearchHistory.setVisible(false);
menuSearchUpdates.setVisible(true);
}
super.onCreateOptionsMenu(menu, menuInflater);
@@ -1473,9 +1470,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
BlockContactDialog.show((XmppActivity) activity, conversation);
}
break;
- case R.id.action_search_history:
- showSearchField();
- break;
default:
break;
}
@@ -2630,33 +2624,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
this.binding.messagehint.setVisibility(View.GONE);
}
- protected void showSearchField() {
- this.binding.textsend.setVisibility(View.GONE);
- this.binding.searchfield.setVisibility(View.VISIBLE);
- this.binding.searchfieldInput.addTextChangedListener(mSearchTextWatcher);
- this.binding.searchfieldInput.requestFocus();
- final InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
- if (imm != null) {
- imm.showSoftInput(this.binding.searchfieldInput, InputMethodManager.SHOW_IMPLICIT);
- }
- }
-
- protected void hideSearchField() {
- this.binding.textsend.setVisibility(View.VISIBLE);
- this.binding.searchfield.setVisibility(View.GONE);
- if (activity != null) {
- final InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
- if (imm != null) {
- imm.hideSoftInputFromWindow(this.binding.searchfieldInput.getWindowToken(), InputMethodManager.HIDE_IMPLICIT_ONLY);
- }
- }
- this.binding.searchfieldInput.setText("");
- }
-
- protected boolean isSearchFieldVisible() {
- return this.binding.searchfield.getVisibility() == View.VISIBLE;
- }
-
protected void sendMessage(Message message) {
activity.xmppConnectionService.sendMessage(message);
messageSent();
diff --git a/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 63ccb6504..000000000
--- a/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index a4a5ba2fb..000000000
--- a/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index a74ea93d7..000000000
--- a/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 3245c133d..000000000
--- a/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 0c464d4a9..000000000
--- a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/menu/fragment_conversation.xml b/src/main/res/menu/fragment_conversation.xml
index 1fb3f1391..d67bf5253 100644
--- a/src/main/res/menu/fragment_conversation.xml
+++ b/src/main/res/menu/fragment_conversation.xml
@@ -77,9 +77,4 @@
android:orderInCategory="100"
app:showAsAction="never"
android:title="@string/create_issue" />
- <item
- android:id="@+id/action_search_history"
- android:icon="?attr/icon_search"
- app:showAsAction="ifRoom"
- android:title="@string/search" />
</menu> \ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 85ecacdf8..e8edc5d50 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -781,7 +781,6 @@
<string name="create_shortcut">Create Shortcut</string>
<string name="not_encrypted_for_this_device">Message was not encrypted for this device.</string>
<string name="no_microphone_permission">Conversations needs access to the microphone</string>
- <string name="title_activity_search">Search</string>
<string name="search_messages">Search messages</string>
<string name="gif">GIF</string>
</resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 69603f4c6..aef7c7daa 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -248,54 +248,6 @@
<item name="ic_settings_about" type="reference">@drawable/ic_help_circle_white_24dp</item>
</style>
- <style name="ConversationsDialog" parent="Theme.AppCompat.Light.Dialog">
- <item name="android:windowNoTitle">true</item>
- <item name="android:windowActionBar">false</item>
-
- <item name="TextSizeCaption">12sp</item>
- <item name="TextSizeBody1">14sp</item>
- <item name="TextSizeBody2">14sp</item>
- <item name="TextSizeDisplay2">45sp</item>
- <item name="TextSizeSubhead">16sp</item>
- <item name="TextSizeTitle">20sp</item>
- <item name="TextSizeInput">16sp</item>
- <item name="TextSeparation">5sp</item>
- <item name="IconSize">18sp</item>
- <item name="TextSizeInfo">12sp</item>
- <item name="TextSizeBody">14sp</item>
- <item name="TextSizeHeadline">18sp</item>
-
- <item name="colorAccent">@color/accent</item>
- <item name="color_background_primary">@color/grey50</item>
- <item name="color_background_secondary">@color/grey200</item>
-
- <item name="android:background">@color/grey50</item>
- </style>
-
- <style name="ConversationsDialog.Dark" parent="Theme.AppCompat.Dialog">
- <item name="android:windowNoTitle">true</item>
- <item name="android:windowActionBar">false</item>
-
- <item name="TextSizeCaption">12sp</item>
- <item name="TextSizeBody1">14sp</item>
- <item name="TextSizeBody2">14sp</item>
- <item name="TextSizeDisplay2">45sp</item>
- <item name="TextSizeSubhead">16sp</item>
- <item name="TextSizeTitle">20sp</item>
- <item name="TextSizeInput">16sp</item>
- <item name="TextSeparation">5sp</item>
- <item name="IconSize">18sp</item>
- <item name="TextSizeInfo">12sp</item>
- <item name="TextSizeBody">14sp</item>
- <item name="TextSizeHeadline">18sp</item>
-
- <item name="colorAccent">@color/accent</item>
- <item name="color_background_primary">@color/grey900</item>
- <item name="color_background_secondary">@color/realblack</item>
-
- <item name="android:background">@color/grey900</item>
- </style>
-
<style name="ConversationsTheme.Dialog" parent="@style/Theme.AppCompat.Light.Dialog">
<item name="colorPrimary">@color/primary</item>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 01:59:08 +0000