Progress bars
This commit is contained in:
parent
b405f22c68
commit
70ad81014d
8 changed files with 91 additions and 26 deletions
app/src/main
java/info/nerull7/mysqlbrowser
res/layout
|
@ -11,6 +11,7 @@ import android.widget.AdapterView;
|
||||||
import android.widget.ArrayAdapter;
|
import android.widget.ArrayAdapter;
|
||||||
import android.widget.ListAdapter;
|
import android.widget.ListAdapter;
|
||||||
import android.widget.ListView;
|
import android.widget.ListView;
|
||||||
|
import android.widget.ProgressBar;
|
||||||
import android.widget.RelativeLayout;
|
import android.widget.RelativeLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
@ -25,6 +26,7 @@ public class DatabaseFragment extends Fragment implements AdapterView.OnItemClic
|
||||||
private ListView databasesListView;
|
private ListView databasesListView;
|
||||||
private ListAdapter listAdapter;
|
private ListAdapter listAdapter;
|
||||||
private RelativeLayout rootView;
|
private RelativeLayout rootView;
|
||||||
|
private ProgressBar progressBar;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){
|
||||||
|
@ -32,6 +34,7 @@ public class DatabaseFragment extends Fragment implements AdapterView.OnItemClic
|
||||||
View rootView = inflater.inflate(R.layout.fragment_database, container, false);
|
View rootView = inflater.inflate(R.layout.fragment_database, container, false);
|
||||||
databasesListView = (ListView) rootView.findViewById(R.id.databaseList);
|
databasesListView = (ListView) rootView.findViewById(R.id.databaseList);
|
||||||
this.rootView = (RelativeLayout) rootView;
|
this.rootView = (RelativeLayout) rootView;
|
||||||
|
progressBar = (ProgressBar) rootView.findViewById(R.id.loginProgressBar);
|
||||||
|
|
||||||
Static.asyncDatabaseConnector.setListReturnListener(this);
|
Static.asyncDatabaseConnector.setListReturnListener(this);
|
||||||
Static.asyncDatabaseConnector.getDatabases();
|
Static.asyncDatabaseConnector.getDatabases();
|
||||||
|
@ -62,5 +65,6 @@ public class DatabaseFragment extends Fragment implements AdapterView.OnItemClic
|
||||||
rootView.addView(errorMessage);
|
rootView.addView(errorMessage);
|
||||||
rootView.removeView(databasesListView);
|
rootView.removeView(databasesListView);
|
||||||
}
|
}
|
||||||
|
progressBar.setVisibility(View.INVISIBLE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@ import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.widget.FrameLayout;
|
import android.widget.FrameLayout;
|
||||||
|
import android.widget.ProgressBar;
|
||||||
import android.widget.RelativeLayout;
|
import android.widget.RelativeLayout;
|
||||||
import android.widget.ScrollView;
|
import android.widget.ScrollView;
|
||||||
import android.widget.TableLayout;
|
import android.widget.TableLayout;
|
||||||
|
@ -35,6 +36,7 @@ public class EntriesFragment extends Fragment implements AsyncDatabaseConnector.
|
||||||
private String tableName;
|
private String tableName;
|
||||||
private int entriesLimit;
|
private int entriesLimit;
|
||||||
private int page;
|
private int page;
|
||||||
|
private ProgressBar progressBar;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
@ -48,6 +50,7 @@ public class EntriesFragment extends Fragment implements AsyncDatabaseConnector.
|
||||||
entriesLimit = getActivity().getSharedPreferences(SettingsFragment.PREFERENCE_FILE, Context.MODE_PRIVATE).getInt(SettingsFragment.ENTRIES_PAGE_LIMIT, SettingsFragment.ENTRIES_PAGE_LIMIT_DEF);
|
entriesLimit = getActivity().getSharedPreferences(SettingsFragment.PREFERENCE_FILE, Context.MODE_PRIVATE).getInt(SettingsFragment.ENTRIES_PAGE_LIMIT, SettingsFragment.ENTRIES_PAGE_LIMIT_DEF);
|
||||||
this.rootView = (RelativeLayout) rootView;
|
this.rootView = (RelativeLayout) rootView;
|
||||||
page = getArguments().getInt("Page");
|
page = getArguments().getInt("Page");
|
||||||
|
progressBar = (ProgressBar) rootView.findViewById(R.id.loginProgressBar);
|
||||||
// setupActionBar();
|
// setupActionBar();
|
||||||
|
|
||||||
headerRow = new TableRow(getActivity());
|
headerRow = new TableRow(getActivity());
|
||||||
|
@ -90,6 +93,7 @@ public class EntriesFragment extends Fragment implements AsyncDatabaseConnector.
|
||||||
headerFrame.addView(headerRow);
|
headerFrame.addView(headerRow);
|
||||||
headerRow.setVisibility(View.VISIBLE);
|
headerRow.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
progressBar.setVisibility(View.INVISIBLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -9,6 +9,7 @@ import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
import android.widget.EditText;
|
import android.widget.EditText;
|
||||||
|
import android.widget.ProgressBar;
|
||||||
|
|
||||||
import info.nerull7.mysqlbrowser.db.AsyncDatabaseConnector;
|
import info.nerull7.mysqlbrowser.db.AsyncDatabaseConnector;
|
||||||
|
|
||||||
|
@ -19,6 +20,7 @@ public class LoginFragment extends Fragment implements View.OnClickListener, Asy
|
||||||
private EditText urlTextbox;
|
private EditText urlTextbox;
|
||||||
private EditText loginTextbox;
|
private EditText loginTextbox;
|
||||||
private EditText passwordTextbox; // TODO: Mega super epic security (RSA/AES maybe?)
|
private EditText passwordTextbox; // TODO: Mega super epic security (RSA/AES maybe?)
|
||||||
|
private ProgressBar progressBar;
|
||||||
|
|
||||||
AsyncDatabaseConnector asyncDatabaseConnector;
|
AsyncDatabaseConnector asyncDatabaseConnector;
|
||||||
|
|
||||||
|
@ -30,15 +32,17 @@ public class LoginFragment extends Fragment implements View.OnClickListener, Asy
|
||||||
View rootView = inflater.inflate(R.layout.fragment_login, container, false);
|
View rootView = inflater.inflate(R.layout.fragment_login, container, false);
|
||||||
rootView.findViewById(R.id.buttonLogin).setOnClickListener(this);
|
rootView.findViewById(R.id.buttonLogin).setOnClickListener(this);
|
||||||
|
|
||||||
this.urlTextbox = (EditText) rootView.findViewById(R.id.editURL);
|
urlTextbox = (EditText) rootView.findViewById(R.id.editURL);
|
||||||
this.loginTextbox = (EditText) rootView.findViewById(R.id.editLogin);
|
loginTextbox = (EditText) rootView.findViewById(R.id.editLogin);
|
||||||
this.passwordTextbox = (EditText) rootView.findViewById(R.id.editPassowrd);
|
passwordTextbox = (EditText) rootView.findViewById(R.id.editPassowrd);
|
||||||
|
progressBar = (ProgressBar) rootView.findViewById(R.id.loginProgressBar);
|
||||||
|
|
||||||
return rootView;
|
return rootView;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View view) {
|
public void onClick(View view) {
|
||||||
|
progressBar.setVisibility(View.VISIBLE);
|
||||||
checkAsycnLogin();
|
checkAsycnLogin();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -79,5 +83,6 @@ public class LoginFragment extends Fragment implements View.OnClickListener, Asy
|
||||||
builder.create();
|
builder.create();
|
||||||
builder.show();
|
builder.show();
|
||||||
}
|
}
|
||||||
|
progressBar.setVisibility(View.INVISIBLE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,6 +12,7 @@ import android.widget.AdapterView;
|
||||||
import android.widget.ArrayAdapter;
|
import android.widget.ArrayAdapter;
|
||||||
import android.widget.ListAdapter;
|
import android.widget.ListAdapter;
|
||||||
import android.widget.ListView;
|
import android.widget.ListView;
|
||||||
|
import android.widget.ProgressBar;
|
||||||
import android.widget.RelativeLayout;
|
import android.widget.RelativeLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
@ -27,6 +28,7 @@ public class TableFragment extends Fragment implements AdapterView.OnItemClickLi
|
||||||
private ListView tablesList;
|
private ListView tablesList;
|
||||||
private ListAdapter listAdapter;
|
private ListAdapter listAdapter;
|
||||||
private RelativeLayout rootView;
|
private RelativeLayout rootView;
|
||||||
|
private ProgressBar progressBar;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
@ -35,6 +37,7 @@ public class TableFragment extends Fragment implements AdapterView.OnItemClickLi
|
||||||
databaseName = getArguments().getString("DatabaseName");
|
databaseName = getArguments().getString("DatabaseName");
|
||||||
tablesList = (ListView) rootView.findViewById(R.id.tableList);
|
tablesList = (ListView) rootView.findViewById(R.id.tableList);
|
||||||
this.rootView = (RelativeLayout) rootView;
|
this.rootView = (RelativeLayout) rootView;
|
||||||
|
progressBar = (ProgressBar) rootView.findViewById(R.id.loginProgressBar);
|
||||||
Static.asyncDatabaseConnector.setListReturnListener(this);
|
Static.asyncDatabaseConnector.setListReturnListener(this);
|
||||||
Static.asyncDatabaseConnector.getTables();
|
Static.asyncDatabaseConnector.getTables();
|
||||||
return rootView;
|
return rootView;
|
||||||
|
@ -64,5 +67,6 @@ public class TableFragment extends Fragment implements AdapterView.OnItemClickLi
|
||||||
rootView.addView(errorMessage);
|
rootView.addView(errorMessage);
|
||||||
rootView.removeView(tablesList);
|
rootView.removeView(tablesList);
|
||||||
}
|
}
|
||||||
|
progressBar.setVisibility(View.INVISIBLE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,14 +2,23 @@
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
tools:context="info.nerull7.mysqlbrowser.DatabaseFragment">
|
||||||
|
|
||||||
|
<ProgressBar
|
||||||
|
style="?android:attr/progressBarStyleHorizontal"
|
||||||
|
android:indeterminate="true"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/loginProgressBar"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_alignParentTop="false"
|
||||||
|
android:layout_marginTop="-7dp" />
|
||||||
|
|
||||||
|
<ListView
|
||||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||||
android:paddingTop="@dimen/activity_vertical_margin"
|
android:paddingTop="@dimen/activity_vertical_margin"
|
||||||
android:paddingBottom="@dimen/activity_vertical_margin"
|
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||||
tools:context="info.nerull7.mysqlbrowser.DatabaseFragment">
|
|
||||||
|
|
||||||
|
|
||||||
<ListView
|
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
|
|
|
@ -2,22 +2,36 @@
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
|
||||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
|
||||||
android:paddingTop="@dimen/activity_vertical_margin"
|
|
||||||
android:paddingBottom="@dimen/activity_vertical_margin"
|
|
||||||
tools:context="info.nerull7.mysqlbrowser.EntriesFragment">
|
tools:context="info.nerull7.mysqlbrowser.EntriesFragment">
|
||||||
|
|
||||||
|
<ProgressBar
|
||||||
|
style="?android:attr/progressBarStyleHorizontal"
|
||||||
|
android:indeterminate="true"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/loginProgressBar"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_alignParentTop="false"
|
||||||
|
android:layout_marginTop="-7dp" />
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:id="@+id/headerFrame"></FrameLayout>
|
android:id="@+id/headerFrame"
|
||||||
|
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||||
|
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||||
|
android:paddingTop="@dimen/activity_vertical_margin"
|
||||||
|
android:paddingBottom="@dimen/activity_vertical_margin"></FrameLayout>
|
||||||
|
|
||||||
<ScrollView
|
<ScrollView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:id="@+id/entriesScrollView"
|
android:id="@+id/entriesScrollView"
|
||||||
android:layout_below="@+id/headerFrame">
|
android:layout_below="@+id/headerFrame"
|
||||||
|
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||||
|
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||||
|
android:paddingTop="@dimen/activity_vertical_margin"
|
||||||
|
android:paddingBottom="@dimen/activity_vertical_margin">
|
||||||
<TableLayout
|
<TableLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|
|
@ -2,24 +2,35 @@
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
|
||||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
|
||||||
android:paddingTop="@dimen/activity_vertical_margin"
|
|
||||||
android:paddingBottom="@dimen/activity_vertical_margin"
|
|
||||||
tools:context="info.nerull7.mysqlbrowser.LoginFragment">
|
tools:context="info.nerull7.mysqlbrowser.LoginFragment">
|
||||||
|
|
||||||
|
<ProgressBar
|
||||||
|
style="?android:attr/progressBarStyleHorizontal"
|
||||||
|
android:indeterminate="true"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/loginProgressBar"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_alignParentTop="false"
|
||||||
|
android:layout_marginTop="-7dp"
|
||||||
|
android:visibility="invisible"/>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent">
|
android:layout_height="fill_parent"
|
||||||
|
android:id="@+id/linearLayout2"
|
||||||
|
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||||
|
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||||
|
android:paddingTop="@dimen/activity_vertical_margin">
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:id="@+id/editURL"
|
android:id="@+id/editURL"
|
||||||
android:hint="@string/hint_url"
|
android:hint="@string/hint_url"
|
||||||
android:inputType="textUri" />
|
android:inputType="textUri"
|
||||||
|
/>
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
|
@ -28,7 +39,8 @@
|
||||||
android:hint="@string/username"
|
android:hint="@string/username"
|
||||||
android:lines="1"
|
android:lines="1"
|
||||||
android:inputType="text"
|
android:inputType="text"
|
||||||
android:maxLines="1" />
|
android:maxLines="1"
|
||||||
|
/>
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
|
@ -36,7 +48,8 @@
|
||||||
android:inputType="textPassword"
|
android:inputType="textPassword"
|
||||||
android:ems="10"
|
android:ems="10"
|
||||||
android:id="@+id/editPassowrd"
|
android:id="@+id/editPassowrd"
|
||||||
android:hint="@string/password"/>
|
android:hint="@string/password"
|
||||||
|
/>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@ -45,5 +58,7 @@
|
||||||
android:id="@+id/buttonLogin"
|
android:id="@+id/buttonLogin"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:layout_gravity="center_horizontal" />
|
android:layout_gravity="center_horizontal" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
|
@ -2,15 +2,25 @@
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
|
||||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
|
||||||
android:paddingTop="@dimen/activity_vertical_margin"
|
|
||||||
android:paddingBottom="@dimen/activity_vertical_margin"
|
|
||||||
tools:context="info.nerull7.mysqlbrowser.TableFragment">
|
tools:context="info.nerull7.mysqlbrowser.TableFragment">
|
||||||
|
|
||||||
|
<ProgressBar
|
||||||
|
style="?android:attr/progressBarStyleHorizontal"
|
||||||
|
android:indeterminate="true"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/loginProgressBar"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_alignParentTop="false"
|
||||||
|
android:layout_marginTop="-7dp" />
|
||||||
|
|
||||||
<ListView
|
<ListView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:id="@+id/tableList" />
|
android:id="@+id/tableList"
|
||||||
|
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||||
|
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||||
|
android:paddingTop="@dimen/activity_vertical_margin"
|
||||||
|
android:paddingBottom="@dimen/activity_vertical_margin"/>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue