kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to floating button

Browse source
This commit is contained in:
Bruno Bierbaumer 2015-11-24 12:24:29 +01:00
parent 2c893baee9
commit 3f6d97da43
8 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/net/bierbaumer/otp_authenticator/MainActivity.java
View file

@ -7,6 +7,7 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
@ -33,10 +34,11 @@ public class MainActivity extends AppCompatActivity implements ActionMode.Callb
private ArrayList<Entry> entries;
private EntriesAdapter adapter;
private FloatingActionButton fab;
private Entry nextSelection = null;
private void showNoAccount(){
Snackbar noAccountSnackbar = Snackbar.make(findViewById(R.id.listView), R.string.no_accounts, Snackbar.LENGTH_INDEFINITE)
Snackbar noAccountSnackbar = Snackbar.make(fab, R.string.no_accounts, Snackbar.LENGTH_INDEFINITE)
.setAction("Add", new View.OnClickListener() {
@Override
public void onClick(View view) {
@ -62,6 +64,14 @@ public class MainActivity extends AppCompatActivity implements ActionMode.Callb
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
fab = (FloatingActionButton) findViewById(R.id.action_scan);
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
scanQRCode();
}
});
final ListView listView = (ListView) findViewById(R.id.listView);
final ProgressBar progressBar = (ProgressBar) findViewById(R.id.progressBar);
@ -137,9 +147,9 @@ public class MainActivity extends AppCompatActivity implements ActionMode.Callb
adapter.notifyDataSetChanged();
Snackbar.make(findViewById(R.id.listView), "Account added", Snackbar.LENGTH_LONG).show();
Snackbar.make(fab, "Account added", Snackbar.LENGTH_LONG).show();
} catch (Exception e) {
Snackbar.make(findViewById(R.id.listView), "Invalid QR Code", Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
Snackbar.make(fab, "Invalid QR Code", Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
@Override
public void onDismissed(Snackbar snackbar, int event) {
super.onDismissed(snackbar, event);
@ -169,18 +179,13 @@ public class MainActivity extends AppCompatActivity implements ActionMode.Callb
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
if (id == R.id.action_scan) {
scanQRCode();
return true;
} else if(id == R.id.action_about){
if(id == R.id.action_about){
WebView view = (WebView) LayoutInflater.from(this).inflate(R.layout.dialog_about, null);
view.loadUrl("file:///android_res/raw/about.html");
new AlertDialog.Builder(this).setView(view).show();
return true;
}
return super.onOptionsItemSelected(item);
}
@ -214,7 +219,7 @@ public class MainActivity extends AppCompatActivity implements ActionMode.Callb
public void onClick(DialogInterface dialog, int whichButton) {
entries.remove(adapter.getCurrentSelection());
Snackbar.make(findViewById(R.id.listView), "Account removed", Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
Snackbar.make(fab, "Account removed", Snackbar.LENGTH_LONG).setCallback(new Snackbar.Callback() {
@Override
public void onDismissed(Snackbar snackbar, int event) {
super.onDismissed(snackbar, event);

2
app/src/main/java/net/bierbaumer/otp_authenticator/MyApplication.java
View file

@ -7,8 +7,6 @@ public class MyApplication extends Application {
@Override
public void onCreate() {
super.onCreate();
PRNGFixes.apply();
Log.e("AAA", "AAAA");
}
}

BIN
app/src/main/res/drawable-hdpi/ic_add_white_24dp.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 223 B

BIN
app/src/main/res/drawable-mdpi/ic_add_white_24dp.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 174 B

BIN
app/src/main/res/drawable-xhdpi/ic_add_white_24dp.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 198 B

BIN
app/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 222 B

8
app/src/main/res/layout/activity_main.xml
View file

@ -19,7 +19,6 @@
android:layout_height="wrap_content">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
@ -50,5 +49,12 @@
<include layout="@layout/content_main" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/action_scan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/ic_add_white_24dp"></android.support.design.widget.FloatingActionButton>
</android.support.design.widget.CoordinatorLayout>

9
app/src/main/res/menu/menu_main.xml
View file

@ -1,12 +1,5 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<item
android:id="@+id/action_scan"
android:orderInCategory="100"
android:title="@string/menu_scan"
android:icon="@android:drawable/ic_menu_camera"
app:showAsAction="ifRoom" />
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_about"