Commit 5978e44e authored by Javier Romero's avatar Javier Romero

WIP - cleanup

parent cd46a416
......@@ -31,7 +31,7 @@
android:label="@string/activity_set_lock" />
<activity
android:name="app.devlife.connect2sql.ui.lock.ForgotLockActivity"
android:label="@string/title_activity_forgot_lock" />
android:label="@string/activity_forgot_lock" />
<activity
android:name="app.devlife.connect2sql.activity.DashboardActivity"
android:configChanges="screenSize|orientation|keyboardHidden"
......
......@@ -203,8 +203,8 @@ class QueryActivity : BaseActivity() {
/*****************************
* Set view display
*/
lblCurrentDatabase.setText(R.string.loading_placeholder)
lblCurrentTable.setText(R.string.loading_placeholder)
lblCurrentDatabase.setText(R.string.query_loading)
lblCurrentTable.setText(R.string.query_loading)
mQuickKeysList!!.setAdapter(quickKeysAdapter)
......@@ -214,7 +214,7 @@ class QueryActivity : BaseActivity() {
lblCurrentDatabase.setOnClickListener {
if (connectionInfo.driverType == DriverType.POSTGRES) {
Toast.makeText(this@QueryActivity, getString(R.string.postgres_changing_databases), Toast.LENGTH_SHORT).show()
Toast.makeText(this@QueryActivity, getString(R.string.error_postgres_changing_databases), Toast.LENGTH_SHORT).show()
} else if (databaseAdapter.isEmpty) {
Toast.makeText(this@QueryActivity, getString(R.string.error_no_detected_databases), Toast.LENGTH_SHORT).show()
} else {
......@@ -553,8 +553,8 @@ class QueryActivity : BaseActivity() {
fun loadCurrentDatabaseTableUi() {
if (currentDatabase == null) {
// lets update the UI
lblCurrentDatabase.setText(R.string.none_placeholder)
lblCurrentTable.setText(R.string.none_placeholder)
lblCurrentDatabase.setText(R.string.query_none)
lblCurrentTable.setText(R.string.query_none)
// nothing else to do without a database selected
return
......@@ -564,7 +564,7 @@ class QueryActivity : BaseActivity() {
if (currentTable == null) {
// update ui display of current table
lblCurrentTable.setText(R.string.none_placeholder)
lblCurrentTable.setText(R.string.query_none)
} else {
lblCurrentTable.text = currentTable
}
......
......@@ -7,7 +7,6 @@ import java.util.List;
import com.gitlab.connect2sql.R;
import app.devlife.connect2sql.fragment.BaseFragment;
import app.devlife.connect2sql.log.EzLogger;
import app.devlife.connect2sql.ui.results.ResultSetPullTask.CallbackListener;
import app.devlife.connect2sql.ui.widget.TableGrid;
import app.devlife.connect2sql.ui.widget.TableGrid.OnCellEventListener;
import app.devlife.connect2sql.ui.widget.Toast;
......@@ -53,7 +52,7 @@ public class ResultsTableFragment extends BaseFragment implements
super.onCreate(savedInstanceState);
mPagingString = getResources().getString(
R.string.showing_records_to);
R.string.results_showing_records_to);
}
@Override
......
......@@ -21,7 +21,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="@string/database"/>
android:text="@string/query_database"/>
<TextView
android:id="@+id/lblCurrentDatabase"
......@@ -32,7 +32,7 @@
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:singleLine="true"
android:text="@string/database"
android:text="@string/query_database"
android:textColor="@color/blueLight"/>
<TextView
......@@ -40,7 +40,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="@string/table"/>
android:text="@string/query_table"/>
<TextView
android:id="@+id/lblCurrentTable"
......@@ -51,7 +51,7 @@
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:singleLine="true"
android:text="@string/table"
android:text="@string/query_table"
android:textColor="@color/blueLight"/>
</LinearLayout>
......@@ -63,7 +63,7 @@
android:layout_toLeftOf="@+id/elvQuickKeys"
android:ems="10"
android:gravity="top"
android:hint="@string/sample_query"
android:hint="@string/query_hint"
android:inputType="textMultiLine|textNoSuggestions"
android:textColorHint="@color/greyDarker">
......
......@@ -21,7 +21,7 @@
android:gravity="center"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="@string/database"
android:text="@string/query_database"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<TextView
......@@ -35,7 +35,7 @@
android:paddingRight="15dp"
android:paddingTop="7dp"
android:singleLine="true"
android:text="@string/database"
android:text="@string/query_database"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/blueLight"/>
......@@ -46,7 +46,7 @@
android:gravity="center"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="@string/table"
android:text="@string/query_table"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<TextView
......@@ -60,7 +60,7 @@
android:paddingRight="15dp"
android:paddingTop="7dp"
android:singleLine="true"
android:text="@string/table"
android:text="@string/query_table"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/blueLight"/>
</LinearLayout>
......@@ -72,7 +72,7 @@
android:layout_below="@+id/llCurrentPath"
android:ems="10"
android:gravity="top"
android:hint="@string/sample_query"
android:hint="@string/query_hint"
android:inputType="textMultiLine|textNoSuggestions"
android:textColorHint="@color/greyDarker">
......
......@@ -9,7 +9,7 @@
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/name"
android:text="@string/dialog_name"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<EditText
......
......@@ -24,7 +24,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:text="@string/clear"/>
android:text="@string/qk_clear"/>
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
......@@ -13,7 +13,7 @@
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/name"
android:text="@string/dialog_name"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<EditText
......@@ -35,7 +35,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/query"
android:text="@string/dialog_query"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<EditText
......
......@@ -30,7 +30,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/test"/>
android:text="@string/form_test"/>
<Button
android:id="@+id/form_btn_save"
......@@ -38,7 +38,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/save"/>
android:text="@string/form_save"/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
......@@ -51,7 +51,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_form_header_connection"
android:text="@string/connection_details"
android:text="@string/form_connection_details"
android:drawablePadding="10dp"
android:textSize="20dp"
android:background="@drawable/form_header_underline"/>
......@@ -74,7 +74,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_form_header_gears"
android:text="@string/advanced_options"
android:text="@string/form_advanced_options"
android:drawablePadding="10dp"
android:textSize="20dp"
android:background="@drawable/form_header_underline"/>
......
......@@ -51,7 +51,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_form_header_connection"
android:text="@string/connection_details"
android:text="@string/form_connection_details"
android:drawablePadding="10dp"
android:textSize="20dp"
android:background="@drawable/form_header_underline"/>
......
......@@ -51,7 +51,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_form_header_connection"
android:text="@string/connection_details"
android:text="@string/form_connection_details"
android:drawablePadding="10dp"
android:textSize="20dp"
android:background="@drawable/form_header_underline"/>
......@@ -74,7 +74,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_form_header_gears"
android:text="@string/advanced_options"
android:text="@string/form_advanced_options"
android:drawablePadding="10dp"
android:textSize="20dp"
android:background="@drawable/form_header_underline"/>
......@@ -87,14 +87,14 @@
<Switch
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/use_ssl"
android:text="@string/form_use_ssl"
android:id="@+id/form_swtch_use_ssl"
android:layout_marginLeft="12dp"
android:focusable="true"
android:textSize="@dimen/form_field_text_size"
android:textColor="@color/greyDark"
android:textOn="@string/yes"
android:textOff="@string/no"
android:textOn="@string/form_yes"
android:textOff="@string/form_no"
android:layout_gravity="left"/>
<ImageView
......@@ -114,14 +114,14 @@
<Switch
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/trust_cert"
android:text="@string/form_trust_cert"
android:id="@+id/form_swtch_trust_cert"
android:layout_marginLeft="12dp"
android:focusable="true"
android:textSize="@dimen/form_field_text_size"
android:textColor="@color/greyDark"
android:textOn="@string/yes"
android:textOff="@string/no"
android:textOn="@string/form_yes"
android:textOff="@string/form_no"
android:layout_gravity="left"/>
<ImageView
......
......@@ -51,7 +51,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_form_header_connection"
android:text="@string/connection_details"
android:text="@string/form_connection_details"
android:drawablePadding="10dp"
android:textSize="20dp"
android:background="@drawable/form_header_underline"/>
......@@ -75,7 +75,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_form_header_gears"
android:text="@string/advanced_options"
android:text="@string/form_advanced_options"
android:drawablePadding="10dp"
android:textSize="20dp"
android:background="@drawable/form_header_underline"/>
......
......@@ -24,8 +24,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/arrow_left"
android:text="@string/previous"
android:contentDescription="@string/previous"
android:text="@string/results_previous"
android:contentDescription="@string/results_previous"
android:background="@color/transparent"/>
<TextView
......@@ -34,14 +34,14 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="@string/showing_records_to"/>
android:text="@string/results_showing_records_to"/>
<ImageButton
android:id="@+id/button2"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/next"
android:contentDescription="@string/results_next"
android:src="@drawable/arrow_right"
android:background="@color/transparent"/>
</LinearLayout>
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:paddingBottom="10dp"
android:paddingTop="10dp">
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:paddingBottom="10dp"
android:paddingTop="10dp">
<TextView
android:id="@+id/lblQueryName"
......@@ -12,9 +12,8 @@
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="@string/query"
android:textColor="@color/white"
android:textSize="16dp"/>
android:textSize="16dp" />
<TextView
android:id="@+id/lblQueryText"
......@@ -22,8 +21,7 @@
android:layout_height="wrap_content"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="@string/queries"
android:textColor="@color/greyDark"
android:textSize="14dp"/>
android:textSize="14dp" />
</LinearLayout>
\ No newline at end of file
......@@ -23,7 +23,6 @@
android:singleLine="true"
android:gravity="center"
android:tag="textTitle"
android:text="@string/name"
android:ellipsize="end"
android:textColor="@color/white"
android:textAppearance="?android:attr/textAppearanceMedium"/>
......
......@@ -6,17 +6,17 @@
<item
android:id="@+id/rate"
android:title="@string/rate_app"
android:title="@string/menu_rate_app"
app:showAsAction="never">
</item>
<item
android:id="@+id/beta"
android:title="@string/join_beta"
android:title="@string/menu_join_beta"
app:showAsAction="never">
</item>
<item
android:id="@+id/about"
android:title="@string/about_app"
android:title="@string/menu_about_app"
app:showAsAction="never">
</item>
......
......@@ -4,17 +4,17 @@
<item
android:id="@+id/configure"
android:title="@string/configure"
android:title="@string/menu_configure"
app:showAsAction="ifRoom">
</item>
<item
android:id="@+id/duplicate"
android:title="@string/duplicate"
android:title="@string/menu_duplicate"
app:showAsAction="ifRoom">
</item>
<item
android:id="@+id/delete"
android:title="@string/delete_connection"
android:title="@string/menu_delete_connection"
app:showAsAction="ifRoom">
</item>
......
......@@ -5,7 +5,7 @@
<item
android:id="@+id/clear"
app:showAsAction="ifRoom"
android:title="@string/clear">
android:title="@string/menu_clear">
</item>
</menu>
\ No newline at end of file
......@@ -10,26 +10,26 @@
<string name="activity_saved_queries">Consultas Guardadas</string>
<string name="activity_query_history">Historial de consultas</string>
<string name="activity_query_results">Resultados</string>
<string name="save">Guardar</string>
<string name="clear">Borrar</string>
<string name="form_save">Guardar</string>
<string name="menu_clear">Borrar</string>
<string name="menu_quick_keys">Teclas Rápidas</string>
<string name="test">Prueba</string>
<string name="form_test">Prueba</string>
<string name="menu_save">Guardar...</string>
<string name="name">Nombre</string>
<string name="dialog_name">Nombre</string>
<string name="queries">Consultas (para esta conexión)</string>
<string name="table">Tabla</string>
<string name="database">Base de datos</string>
<string name="sample_query">SELECT * FROM tabla;</string>
<string name="configure">Configurar</string>
<string name="delete_connection">Borrar</string>
<string name="duplicate">Duplicar</string>
<string name="query">Consulta</string>
<string name="rate_app">Valora</string>
<string name="join_beta">Únete a Beta</string>
<string name="about_app">Acerca...</string>
<string name="showing_records_to">registros %1$s - %1$s (%1$s)</string>
<string name="previous">Anterior</string>
<string name="next">Siguiente</string>
<string name="query_table">Tabla</string>
<string name="query_database">Base de datos</string>
<string name="query_hint">SELECT * FROM tabla;</string>
<string name="menu_configure">Configurar</string>
<string name="menu_delete_connection">Borrar</string>
<string name="menu_duplicate">Duplicar</string>
<string name="dialog_query">Consulta</string>
<string name="menu_rate_app">Valora</string>
<string name="menu_join_beta">Únete a Beta</string>
<string name="menu_about_app">Acerca...</string>
<string name="results_showing_records_to">registros %1$s - %1$s (%1$s)</string>
<string name="results_previous">Anterior</string>
<string name="results_next">Siguiente</string>
<string name="menu_saved">Abra...</string>
<string name="menu_history">Historia</string>
<string name="menu_open_">Abra...</string>
......@@ -49,7 +49,7 @@
<string name="form_action_keyboard_input">Alternar entrada de teclado</string>
<string name="form_action_visible">Alternar visibilidad</string>
<string name="form_action_help">Ayuda</string>
<string name="title_activity_forgot_lock">Olvidé el Patrón</string>
<string name="activity_forgot_lock">Olvidé el Patrón</string>
<string name="help_positive_btn_label">¡Ok, lo tengo!</string>
<string name="help_name">Escriba un nombre para asociarlo con la configuración determinada. Sólo se utilizará dentro de esta aplicación.</string>
<string name="help_host">Especifique el host donde está alojado el servidor. Puede ser un dominio o una dirección IP.</string>
......@@ -67,9 +67,9 @@
<string name="error_no_detected_databases">No se detectaron bases de datos.</string>
<string name="error_no_detected_tables">No se detectaron tablas.</string>
<string name="error_select_database">Por favor seleccione una base de datos.</string>
<string name="postgres_changing_databases">Postgres no admite el cambio de bases de datos una vez conectado.</string>
<string name="none_placeholder">[Ninguna]</string>
<string name="loading_placeholder">[Cargando]</string>
<string name="error_postgres_changing_databases">Postgres no admite el cambio de bases de datos una vez conectado.</string>
<string name="query_none">[Ninguna]</string>
<string name="query_loading">[Cargando]</string>
<string name="pl_draw_pattern_to_unlock">Dibuje el patrón para desbloquear</string>
<string name="pl_cancel">Cancelar</string>
<string name="pl_confirm">Confirmar</string>
......@@ -89,10 +89,10 @@
<string name="pl_access_pattern_cell_added_verbose">Celda <xliff:g ejemplo="3" id="cell_index">%1$d</xliff:g> añadida</string>
<string name="pl_access_pattern_detected">Patrón completado</string>
<string name="pl_access_pattern_area">Área de patrón.</string>
<string name="connection_details">Detalles de conexión</string>
<string name="advanced_options">Opciones Avanzadas</string>
<string name="use_ssl">Usar SSL?</string>
<string name="trust_cert">Confía el Cert?</string>
<string name="yes"></string>
<string name="no">NO</string>
<string name="form_connection_details">Detalles de conexión</string>
<string name="form_advanced_options">Opciones Avanzadas</string>
<string name="form_use_ssl">Usar SSL?</string>
<string name="form_trust_cert">Confía el Cert?</string>
<string name="form_yes"></string>
<string name="form_no">NO</string>
</resources>
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<resources>
<string name="app_name">Connect2SQL</string>
<string-array name="operators">
<item>=</item>
<item>!=</item>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment