From 9350f362b793723db1dda52268f5df65c8dcd30d Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Thu, 22 Mar 2018 23:21:10 +0100 Subject: vastly untested refactor. pushing for backup purposes --- .../pixart/messenger/utils/SendButtonAction.java | 77 ---------------------- .../java/de/pixart/messenger/utils/UIHelper.java | 17 ----- 2 files changed, 94 deletions(-) delete mode 100644 src/main/java/de/pixart/messenger/utils/SendButtonAction.java (limited to 'src/main/java/de/pixart/messenger/utils') diff --git a/src/main/java/de/pixart/messenger/utils/SendButtonAction.java b/src/main/java/de/pixart/messenger/utils/SendButtonAction.java deleted file mode 100644 index a3d548c15..000000000 --- a/src/main/java/de/pixart/messenger/utils/SendButtonAction.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2018, Daniel Gultsch All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation and/or - * other materials provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors - * may be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package de.pixart.messenger.utils; - -import static de.pixart.messenger.ui.ConversationActivity.ATTACHMENT_CHOICE_CHOOSE_IMAGE; -import static de.pixart.messenger.ui.ConversationActivity.ATTACHMENT_CHOICE_LOCATION; -import static de.pixart.messenger.ui.ConversationActivity.ATTACHMENT_CHOICE_RECORD_VOICE; -import static de.pixart.messenger.ui.ConversationActivity.ATTACHMENT_CHOICE_TAKE_FROM_CAMERA; - -public enum SendButtonAction { - TEXT, TAKE_FROM_CAMERA, SEND_LOCATION, RECORD_VOICE, CANCEL, CHOOSE_PICTURE; - - public static SendButtonAction valueOfOrDefault(String setting, SendButtonAction text) { - try { - return valueOf(setting); - } catch (IllegalArgumentException e) { - return TEXT; - } - } - - public static SendButtonAction of(int attachmentChoice) { - switch (attachmentChoice) { - case ATTACHMENT_CHOICE_LOCATION: - return SEND_LOCATION; - case ATTACHMENT_CHOICE_RECORD_VOICE: - return RECORD_VOICE; - case ATTACHMENT_CHOICE_TAKE_FROM_CAMERA: - return TAKE_FROM_CAMERA; - case ATTACHMENT_CHOICE_CHOOSE_IMAGE: - return CHOOSE_PICTURE; - default: - throw new IllegalArgumentException("Not a known attachment choice"); - } - } - - public int toChoice() { - switch (this) { - case TAKE_FROM_CAMERA: - return ATTACHMENT_CHOICE_TAKE_FROM_CAMERA; - case SEND_LOCATION: - return ATTACHMENT_CHOICE_LOCATION; - case RECORD_VOICE: - return ATTACHMENT_CHOICE_RECORD_VOICE; - case CHOOSE_PICTURE: - return ATTACHMENT_CHOICE_CHOOSE_IMAGE; - default: - return 0; - } - } -} \ No newline at end of file diff --git a/src/main/java/de/pixart/messenger/utils/UIHelper.java b/src/main/java/de/pixart/messenger/utils/UIHelper.java index 08e1d7dad..f42d6b73e 100644 --- a/src/main/java/de/pixart/messenger/utils/UIHelper.java +++ b/src/main/java/de/pixart/messenger/utils/UIHelper.java @@ -540,21 +540,4 @@ public class UIHelper { return new ListItem.Tag(context.getString(R.string.presence_online), 0xff259b24, 0); } } - - public static String tranlasteType(Context context, String type) { - switch (type.toLowerCase()) { - case "pc": - return context.getString(R.string.type_pc); - case "phone": - return context.getString(R.string.type_phone); - case "tablet": - return context.getString(R.string.type_tablet); - case "web": - return context.getString(R.string.type_web); - case "console": - return context.getString(R.string.type_console); - default: - return type; - } - } } -- cgit v1.2.3