Skip to content

Commit 598da3f

Browse files
astonbitecodeastonbitecode
committed
Implemented CheckPasswords functionality
1 parent f2ed3bc commit 598da3f

File tree

11 files changed

+58
-9
lines changed

11 files changed

+58
-9
lines changed

‎java/res/drawable-hdpi/health.png‎

2.25 KB
Loading

‎java/res/drawable-ldpi/health.png‎

965 Bytes
Loading

‎java/res/drawable-mdpi/health.png‎

1.45 KB
Loading

‎java/res/drawable-xhdpi/health.png‎

5.11 KB
Loading

‎java/res/drawable-xxhdpi/health.png‎

11.4 KB
Loading

‎java/res/layout/fragment_list_entries.xml‎

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,67 @@
1717
android:layout_height="wrap_content"
1818
android:orientation="horizontal"
1919
android:weightSum="3">
20+
<TextView
21+
android:id="@+id/listMenuLabel"
22+
android:layout_width="wrap_content"
23+
android:layout_height="wrap_content"
24+
android:text="Passwords"
25+
android:layout_centerInParent="true"
26+
android:textAppearance="?android:attr/textAppearanceLarge"/>
27+
</RelativeLayout>
28+
29+
<View
30+
android:layout_width="fill_parent"
31+
android:layout_height="1dp"
32+
android:layout_marginTop="9dp"
33+
android:layout_marginBottom="9dp"
34+
android:background="#cce594"/>
35+
36+
<LinearLayout
37+
android:layout_width="match_parent"
38+
android:layout_height="wrap_content"
39+
android:orientation="horizontal"
40+
android:layout_gravity="center"
41+
android:gravity="center">
2042
<Button
2143
android:id="@+id/mainMenuButton"
2244
android:layout_width="wrap_content"
2345
android:layout_height="wrap_content"
24-
android:layout_alignParentLeft="true"
2546
android:background="@android:color/transparent"
2647
android:drawableTop="@drawable/home"
48+
android:layout_centerInParent="true"
2749
android:text="Home"/>
2850

29-
<TextView
30-
android:id="@+id/listMenuLabel"
51+
<Button
52+
android:id="@+id/checkPasswordsButton"
3153
android:layout_width="wrap_content"
3254
android:layout_height="wrap_content"
33-
android:text="Passwords"
34-
android:layout_centerInParent="true"
35-
android:textAppearance="?android:attr/textAppearanceLarge"/>
55+
android:layout_marginLeft="10dp"
56+
android:layout_marginRight="10dp"
57+
android:background="@android:color/transparent"
58+
android:drawableTop="@drawable/health"
59+
android:text="Health"/>
3660

3761
<Button
3862
android:id="@+id/addNewButton"
3963
android:layout_width="wrap_content"
4064
android:layout_height="wrap_content"
41-
android:layout_alignParentRight="true"
4265
android:background="@android:color/transparent"
4366
android:drawableTop="@drawable/newimage"
4467
android:text="New"/>
45-
</RelativeLayout>
68+
</LinearLayout>
69+
70+
<View
71+
android:layout_width="fill_parent"
72+
android:layout_height="1dp"
73+
android:layout_marginTop="9dp"
74+
android:layout_marginBottom="9dp"
75+
android:background="#cce594"/>
4676

4777
<RelativeLayout
4878
android:layout_width="match_parent"
4979
android:layout_height="wrap_content"
5080
android:orientation="horizontal"
51-
android:layout_marginTop="16dp"
5281
android:weightSum="2">
5382
<EditText
5483
android:id="@+id/editFilter"

‎java/src/main/java/org/astonbitecode/rustkeylock/api/InterfaceWithRust.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ public void copy(String data) {
9898
call(m);
9999
}
100100

101+
public void check_passwords() {
102+
call(GuiResponse.CheckPasswords());
103+
}
104+
101105
public void setCallback(NativeCallbackToRustChannelSupport newCallback) {
102106
callback.set(newCallback);
103107
}

‎java/src/main/java/org/astonbitecode/rustkeylock/api/stubs/GuiResponse.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import org.astonbitecode.rustkeylock.api.JavaEntry;
2020
import org.astonbitecode.rustkeylock.api.JavaUserOption;
21+
import org.astonbitecode.rustkeylock.utils.Defs;
2122

2223
import java.util.HashMap;
2324
import java.util.Map;
@@ -116,4 +117,8 @@ public static Map<String, Object> Copy(String data) {
116117
map.put("Copy", inner);
117118
return map;
118119
}
120+
121+
public static String CheckPasswords() {
122+
return Defs.CHECK_PASSWORDS;
123+
}
119124
}

‎java/src/main/java/org/astonbitecode/rustkeylock/fragments/ListEntries.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
6565
nb.setOnClickListener(this);
6666
Button mmb = (Button) rootView.findViewById(R.id.mainMenuButton);
6767
mmb.setOnClickListener(this);
68+
Button cp = (Button) rootView.findViewById(R.id.checkPasswordsButton);
69+
cp.setOnClickListener(this);
6870
Button fb = (Button) rootView.findViewById(R.id.filterButton);
6971
fb.setOnClickListener(this);
7072

@@ -105,6 +107,9 @@ public void onClick(View view) {
105107
} else if (view.getId() == R.id.addNewButton) {
106108
Log.d(TAG, "Clicked add new entry");
107109
InterfaceWithRust.INSTANCE.go_to_menu(JavaMenu.NewEntry());
110+
} else if (view.getId() == R.id.checkPasswordsButton) {
111+
Log.d(TAG, "Clicked check passwords");
112+
InterfaceWithRust.INSTANCE.check_passwords();
108113
} else if (view.getId() == R.id.filterButton) {
109114
Log.d(TAG, "Applying filter");
110115
InterfaceWithRust.INSTANCE.go_to_menu(JavaMenu.EntriesList(filterEditText.getText() != null ? filterEditText.getText().toString() : ""));

‎java/src/main/java/org/astonbitecode/rustkeylock/utils/Defs.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,5 @@ public class Defs {
3333
public static final String MENU_SET_DB_TOKEN = "SetDbxToken";
3434
public static final String MENU_CURRENT = "Current";
3535
public static final String EMPTY_ARG = "null";
36+
public static final String CHECK_PASSWORDS = "CheckPasswords";
3637
}

0 commit comments

Comments
 (0)