mirror of https://github.com/tasks/tasks
Remove unused classes, update translations
* AlarmDatabase * TransitionalAlarm * AstridDialog * FeedbackPromptDialogs * TouchInterceptingFrameLayout * Update Spanish (judmezago)pull/46/head
Alex Baker
11 years ago
parent
283423cd27
commit
65f990f927
@ -1,34 +0,0 @@
|
||||
package com.todoroo.astrid.dao;
|
||||
|
||||
import com.todoroo.andlib.data.TodorooCursor;
|
||||
import com.todoroo.andlib.sql.Query;
|
||||
import com.todoroo.astrid.data.Task;
|
||||
import com.todoroo.astrid.test.DatabaseTestCase;
|
||||
|
||||
public class DatabaseDaoTests extends DatabaseTestCase {
|
||||
|
||||
private TaskDao dao;
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
RemoteModelDao.setOutstandingEntryFlags(RemoteModelDao.OUTSTANDING_ENTRY_FLAG_RECORD_OUTSTANDING);
|
||||
}
|
||||
|
||||
public void testFailedTransactionCreatesNoRows() {
|
||||
dao = new TaskDao();
|
||||
dao.setDatabase(database);
|
||||
|
||||
Task t = new Task();
|
||||
t.setValue(Task.TITLE, "Should not appear");
|
||||
dao.createNew(t);
|
||||
|
||||
TodorooCursor<Task> tasks = dao.query(Query.select(Task.ID));
|
||||
try {
|
||||
assertEquals(0, tasks.getCount());
|
||||
} finally {
|
||||
tasks.close();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,80 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) 2012 Todoroo Inc
|
||||
*
|
||||
* See the file "LICENSE" for the full license governing this code.
|
||||
*/
|
||||
package com.todoroo.astrid.legacy;
|
||||
|
||||
import com.todoroo.andlib.data.AbstractDatabase;
|
||||
import com.todoroo.andlib.data.DatabaseDao;
|
||||
import com.todoroo.andlib.data.Table;
|
||||
|
||||
/**
|
||||
* Database wrapper
|
||||
*
|
||||
* @author Tim Su <tim@todoroo.com>
|
||||
*
|
||||
*/
|
||||
public class AlarmDatabase extends AbstractDatabase {
|
||||
|
||||
// --- constants
|
||||
|
||||
/**
|
||||
* Database version number. This variable must be updated when database
|
||||
* tables are updated, as it determines whether a database needs updating.
|
||||
*/
|
||||
public static final int VERSION = 1;
|
||||
|
||||
/**
|
||||
* Database name (must be unique)
|
||||
*/
|
||||
public static final String NAME = "alarms";
|
||||
|
||||
/**
|
||||
* List of table/ If you're adding a new table, add it to this list and
|
||||
* also make sure that our SQLite helper does the right thing.
|
||||
*/
|
||||
public static final Table[] TABLES = new Table[] {
|
||||
TransitionalAlarm.TABLE
|
||||
};
|
||||
|
||||
// --- implementation
|
||||
|
||||
private final DatabaseDao<TransitionalAlarm> dao = new DatabaseDao<TransitionalAlarm>(TransitionalAlarm.class, this);
|
||||
|
||||
@Override
|
||||
protected String getName() {
|
||||
return NAME;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getVersion() {
|
||||
return VERSION;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Table[] getTables() {
|
||||
return TABLES;
|
||||
}
|
||||
|
||||
public DatabaseDao<TransitionalAlarm> getDao() {
|
||||
return dao;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected synchronized void onCreateTables() {
|
||||
StringBuilder sql = new StringBuilder();
|
||||
sql.append("CREATE INDEX IF NOT EXISTS a_task ON ").
|
||||
append(TransitionalAlarm.TABLE).append('(').
|
||||
append(TransitionalAlarm.TASK.name).
|
||||
append(')');
|
||||
database.execSQL(sql.toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean onUpgrade(int oldVersion, int newVersion) {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,103 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) 2012 Todoroo Inc
|
||||
*
|
||||
* See the file "LICENSE" for the full license governing this code.
|
||||
*/
|
||||
package com.todoroo.astrid.legacy;
|
||||
|
||||
|
||||
import android.content.ContentValues;
|
||||
|
||||
import com.todoroo.andlib.data.AbstractModel;
|
||||
import com.todoroo.andlib.data.Property;
|
||||
import com.todoroo.andlib.data.Property.LongProperty;
|
||||
import com.todoroo.andlib.data.Table;
|
||||
import com.todoroo.andlib.data.TodorooCursor;
|
||||
import com.todoroo.astrid.data.Task;
|
||||
|
||||
/**
|
||||
* Data Model which represents an alarm. This is a transitional class -
|
||||
* Alarms are moved over to metadata
|
||||
*
|
||||
* @author Tim Su <tim@todoroo.com>
|
||||
*
|
||||
*/
|
||||
public class TransitionalAlarm extends AbstractModel {
|
||||
|
||||
// --- table
|
||||
|
||||
public static final Table TABLE = new Table("alarm", TransitionalAlarm.class);
|
||||
|
||||
// --- properties
|
||||
|
||||
/** ID */
|
||||
public static final LongProperty ID = new LongProperty(
|
||||
TABLE, ID_PROPERTY_NAME);
|
||||
|
||||
/** Associated Task */
|
||||
public static final LongProperty TASK = new LongProperty(
|
||||
TABLE, "task");
|
||||
|
||||
/** Alarm Time */
|
||||
public static final LongProperty TIME = new LongProperty(
|
||||
TABLE, "time");
|
||||
|
||||
/** List of all properties for this model */
|
||||
public static final Property<?>[] PROPERTIES = generateProperties(TransitionalAlarm.class);
|
||||
|
||||
// --- constants
|
||||
|
||||
/** this alarm was already triggered */
|
||||
public static final int TYPE_TRIGGERED = 0;
|
||||
|
||||
/** this alarm is single-shot */
|
||||
public static final int TYPE_SINGLE = 1;
|
||||
|
||||
/** this alarm repeats itself until turned off */
|
||||
public static final int TYPE_REPEATING = 2;
|
||||
|
||||
// --- defaults
|
||||
|
||||
/** Default values container */
|
||||
private static final ContentValues defaultValues = new ContentValues();
|
||||
|
||||
static {
|
||||
//
|
||||
}
|
||||
|
||||
@Override
|
||||
public ContentValues getDefaultValues() {
|
||||
return defaultValues;
|
||||
}
|
||||
|
||||
// --- data access boilerplate
|
||||
|
||||
@Deprecated
|
||||
public TransitionalAlarm() {
|
||||
super();
|
||||
}
|
||||
|
||||
public TransitionalAlarm(TodorooCursor<TransitionalAlarm> cursor) {
|
||||
this();
|
||||
readPropertiesFromCursor(cursor);
|
||||
}
|
||||
|
||||
public void readFromCursor(TodorooCursor<TransitionalAlarm> cursor) {
|
||||
super.readPropertiesFromCursor(cursor);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getId() {
|
||||
return getIdHelper(ID);
|
||||
};
|
||||
|
||||
// --- parcelable helpers
|
||||
|
||||
private static final Creator<Task> CREATOR = new ModelCreator<Task>(Task.class);
|
||||
|
||||
@Override
|
||||
protected Creator<? extends AbstractModel> getCreator() {
|
||||
return CREATOR;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,84 +0,0 @@
|
||||
package com.todoroo.astrid.ui;
|
||||
|
||||
import android.app.Dialog;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.todoroo.astrid.activity.AstridActivity;
|
||||
|
||||
import org.tasks.R;
|
||||
|
||||
public class AstridDialog extends Dialog {
|
||||
|
||||
private final Button[] buttons;
|
||||
private final TextView title;
|
||||
private final TextView message;
|
||||
private final LinearLayout root;
|
||||
|
||||
public AstridDialog(AstridActivity activity, boolean forcePortrait) {
|
||||
super(activity, R.style.ReminderDialog);
|
||||
setContentView(forcePortrait ? R.layout.astrid_dialog_view_portrait : R.layout.astrid_dialog_view);
|
||||
|
||||
buttons = new Button[3];
|
||||
buttons[0] = (Button) findViewById(R.id.button0);
|
||||
buttons[1] = (Button) findViewById(R.id.button1);
|
||||
buttons[2] = (Button) findViewById(R.id.button2);
|
||||
|
||||
title = (TextView) findViewById(R.id.dialog_title);
|
||||
message = (TextView) findViewById(R.id.reminder_message);
|
||||
root = (LinearLayout) findViewById(R.id.dialog_root);
|
||||
|
||||
findViewById(R.id.dismiss).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
dismiss();
|
||||
}
|
||||
});
|
||||
setOwnerActivity(activity);
|
||||
}
|
||||
|
||||
public AstridDialog setButtonText(int resId, int buttonIndex) {
|
||||
buttons[buttonIndex].setText(resId);
|
||||
buttons[buttonIndex].setVisibility(View.VISIBLE);
|
||||
return this;
|
||||
}
|
||||
|
||||
public AstridDialog setButtonColor(int color, int buttonIndex) {
|
||||
buttons[buttonIndex].setBackgroundColor(color);
|
||||
return this;
|
||||
}
|
||||
|
||||
public AstridDialog setButtonListener(View.OnClickListener listener, int buttonIndex) {
|
||||
buttons[buttonIndex].setOnClickListener(listener);
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setButtonListeners(View.OnClickListener... listeners) {
|
||||
int index = 0;
|
||||
for (View.OnClickListener l : listeners) {
|
||||
buttons[index].setOnClickListener(l);
|
||||
index++;
|
||||
if (index >= buttons.length) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public AstridDialog setAstridText(int resId) {
|
||||
message.setText(resId);
|
||||
return this;
|
||||
}
|
||||
|
||||
public AstridDialog setAstridTitle(int resId) {
|
||||
title.setText(resId);
|
||||
return this;
|
||||
}
|
||||
|
||||
public AstridDialog addView(View v, int index) {
|
||||
root.addView(v, index);
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,49 +0,0 @@
|
||||
package com.todoroo.astrid.ui;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.view.View;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.todoroo.astrid.activity.AstridActivity;
|
||||
|
||||
import org.tasks.R;
|
||||
|
||||
public class FeedbackPromptDialogs {
|
||||
|
||||
public static void showFeedbackDialog(final AstridActivity activity, boolean positive) {
|
||||
final AstridDialog d = new AstridDialog(activity, false);
|
||||
|
||||
int titleRes = positive ? R.string.feedback_positive_title : R.string.feedback_negative_title;
|
||||
int bodyRes = positive ? R.string.feedback_positive_body : R.string.feedback_negative_body;
|
||||
int buttonRes = positive ? R.string.feedback_positive_button : R.string.feedback_negative_button;
|
||||
|
||||
final String url = positive ? "https://play.google.com/store/apps/details?id=org.tasks&write_review=true" : "http://weloveastrid.com/problem_astrid_android.html";
|
||||
|
||||
d.setAstridTitle(titleRes)
|
||||
.setAstridText(bodyRes)
|
||||
.setButtonText(buttonRes, 0)
|
||||
.setButtonText(R.string.feedback_not_now, 1)
|
||||
.setButtonListeners(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
Intent intent = new Intent(Intent.ACTION_VIEW,
|
||||
Uri.parse(url));
|
||||
try {
|
||||
activity.startActivity(intent);
|
||||
} catch (Exception e) {
|
||||
Toast.makeText(activity, R.string.feedback_activity_error, Toast.LENGTH_LONG).show();
|
||||
}
|
||||
d.dismiss();
|
||||
}
|
||||
}, new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
d.dismiss();
|
||||
}
|
||||
});
|
||||
|
||||
d.show();
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) 2012 Todoroo Inc
|
||||
*
|
||||
* See the file "LICENSE" for the full license governing this code.
|
||||
*/
|
||||
package com.todoroo.astrid.ui;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.Color;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.KeyEvent;
|
||||
import android.widget.FrameLayout;
|
||||
|
||||
public class TouchInterceptingFrameLayout extends FrameLayout {
|
||||
|
||||
public interface InterceptTouchListener {
|
||||
public boolean didInterceptTouch(KeyEvent event);
|
||||
}
|
||||
|
||||
private InterceptTouchListener mListener;
|
||||
|
||||
public TouchInterceptingFrameLayout(Context context, AttributeSet attrs) {
|
||||
super(context, attrs);
|
||||
setBackgroundColor(Color.TRANSPARENT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean dispatchKeyEvent(KeyEvent event) {
|
||||
if (mListener != null && mListener.didInterceptTouch(event)) {
|
||||
return true;
|
||||
}
|
||||
return super.dispatchKeyEvent(event);
|
||||
}
|
||||
|
||||
public InterceptTouchListener getInterceptTouchListener() {
|
||||
return mListener;
|
||||
}
|
||||
|
||||
public void setInterceptTouchListener(InterceptTouchListener mListener) {
|
||||
this.mListener = mListener;
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.5 KiB |
@ -1,91 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
** Copyright (c) 2012 Todoroo Inc
|
||||
**
|
||||
** See the file "LICENSE" for the full license governing this code.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/dialog_root"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="15dip"
|
||||
android:layout_marginRight="15dip"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="260dip"
|
||||
android:layout_height="fill_parent"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginTop="5dip"
|
||||
android:layout_marginRight="5dip"
|
||||
android:layout_marginBottom="20dip"
|
||||
android:layout_marginLeft="10dip">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/dialog_title"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="20sp"
|
||||
android:textColor="@android:color/white"
|
||||
android:layout_weight="1"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<include layout="@layout/astrid_speech_bubble"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="170dip"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical">
|
||||
<ImageView
|
||||
android:id="@+id/dismiss"
|
||||
android:layout_width="25dip"
|
||||
android:layout_height="25dip"
|
||||
android:scaleType="fitCenter"
|
||||
android:layout_gravity="right"
|
||||
android:layout_marginBottom="10dip"
|
||||
android:src="@drawable/ic_menu_close"/>
|
||||
<Button
|
||||
android:id="@+id/button0"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="35dip"
|
||||
android:layout_marginLeft="10dip"
|
||||
android:layout_marginRight="10dip"
|
||||
android:layout_marginBottom="10dip"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="20sp"
|
||||
android:visibility="gone"
|
||||
android:background="?attr/asThemeTextColor"/>
|
||||
<Button
|
||||
android:id="@+id/button1"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="35dip"
|
||||
android:layout_marginLeft="10dip"
|
||||
android:layout_marginRight="10dip"
|
||||
android:layout_marginBottom="10dip"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="20sp"
|
||||
android:visibility="gone"
|
||||
android:background="?attr/asThemeTextColor"/>
|
||||
<Button
|
||||
android:id="@+id/button2"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="35dip"
|
||||
android:layout_marginLeft="10dip"
|
||||
android:layout_marginRight="10dip"
|
||||
android:layout_marginBottom="10dip"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="20sp"
|
||||
android:visibility="gone"
|
||||
android:background="?attr/asThemeTextColor"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@ -1,76 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
** Copyright (c) 2012 Todoroo Inc
|
||||
**
|
||||
** See the file "LICENSE" for the full license governing this code.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/dialog_root"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingLeft="10dip"
|
||||
android:paddingRight="10dip"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginTop="5dip"
|
||||
android:layout_marginRight="5dip"
|
||||
android:layout_marginBottom="20dip"
|
||||
android:layout_marginLeft="5dip">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/dialog_title"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="20sp"
|
||||
android:textColor="@android:color/white"
|
||||
android:layout_weight="1"/>
|
||||
<ImageView
|
||||
android:id="@+id/dismiss"
|
||||
android:layout_width="25dip"
|
||||
android:layout_height="25dip"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@drawable/ic_menu_close"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<include layout="@layout/astrid_speech_bubble"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/button0"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="35dip"
|
||||
android:layout_marginLeft="5dip"
|
||||
android:layout_marginRight="5dip"
|
||||
android:layout_marginBottom="10dip"
|
||||
android:textColor="@android:color/white"
|
||||
android:visibility="gone"
|
||||
android:textSize="20sp"
|
||||
android:background="?attr/asThemeTextColor"/>
|
||||
<Button
|
||||
android:id="@+id/button1"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="35dip"
|
||||
android:layout_marginLeft="5dip"
|
||||
android:layout_marginRight="5dip"
|
||||
android:layout_marginBottom="10dip"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="20sp"
|
||||
android:visibility="gone"
|
||||
android:background="?attr/asThemeTextColor"/>
|
||||
<Button
|
||||
android:id="@+id/button2"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="35dip"
|
||||
android:layout_marginLeft="5dip"
|
||||
android:layout_marginRight="5dip"
|
||||
android:layout_marginBottom="10dip"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="20sp"
|
||||
android:visibility="gone"
|
||||
android:background="?attr/asThemeTextColor"/>
|
||||
|
||||
</LinearLayout>
|
||||
@ -1,76 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
** Copyright (c) 2012 Todoroo Inc
|
||||
**
|
||||
** See the file "LICENSE" for the full license governing this code.
|
||||
-->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/dialog_root"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingLeft="10dip"
|
||||
android:paddingRight="10dip"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginTop="5dip"
|
||||
android:layout_marginRight="5dip"
|
||||
android:layout_marginBottom="20dip"
|
||||
android:layout_marginLeft="5dip">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/dialog_title"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="20sp"
|
||||
android:textColor="@android:color/white"
|
||||
android:layout_weight="1"/>
|
||||
<ImageView
|
||||
android:id="@+id/dismiss"
|
||||
android:layout_width="25dip"
|
||||
android:layout_height="25dip"
|
||||
android:scaleType="fitCenter"
|
||||
android:src="@drawable/ic_menu_close"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<include layout="@layout/astrid_speech_bubble"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/button0"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="35dip"
|
||||
android:layout_marginLeft="5dip"
|
||||
android:layout_marginRight="5dip"
|
||||
android:layout_marginBottom="10dip"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="20sp"
|
||||
android:visibility="gone"
|
||||
android:background="?attr/asThemeTextColor"/>
|
||||
<Button
|
||||
android:id="@+id/button1"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="35dip"
|
||||
android:layout_marginLeft="5dip"
|
||||
android:layout_marginRight="5dip"
|
||||
android:layout_marginBottom="10dip"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="20sp"
|
||||
android:visibility="gone"
|
||||
android:background="?attr/asThemeTextColor"/>
|
||||
<Button
|
||||
android:id="@+id/button2"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="35dip"
|
||||
android:layout_marginLeft="5dip"
|
||||
android:layout_marginRight="5dip"
|
||||
android:layout_marginBottom="10dip"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="20sp"
|
||||
android:visibility="gone"
|
||||
android:background="?attr/asThemeTextColor"/>
|
||||
|
||||
</LinearLayout>
|
||||
@ -1,41 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/feedback_banner"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="43dip"
|
||||
android:gravity="center_vertical"
|
||||
android:background="?attr/asThemeTextColor"
|
||||
android:orientation="horizontal" >
|
||||
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_marginLeft="10dip"
|
||||
android:gravity="center_vertical"
|
||||
style="@style/TextAppearance"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
android:textColor="?attr/asTextColorInverse"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/feedback_banner_text"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/positiveFeedback"
|
||||
android:layout_width="24dip"
|
||||
android:layout_height="26dip"
|
||||
android:gravity="center"
|
||||
android:scaleType="fitCenter"
|
||||
android:layout_marginRight="10dip"
|
||||
android:src="@drawable/icn_thumbsup"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/negativeFeedback"
|
||||
android:layout_width="24dip"
|
||||
android:layout_height="26dip"
|
||||
android:gravity="center"
|
||||
android:scaleType="fitCenter"
|
||||
android:layout_marginLeft="10dip"
|
||||
android:layout_marginRight="10dip"
|
||||
android:src="@drawable/icn_thumbsdown"/>
|
||||
|
||||
</LinearLayout>
|
||||
Loading…
Reference in New Issue