Skip to content

Add Set Favorite account functionality #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stupidly-logical wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add Set Favorite account functionality #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
40700c0
Add Set Favorite account functionality
stupidly-logical Oct 2, 2018
f99262b
Resolve PMD issues
stupidly-logical Oct 2, 2018
56af8f4
Screenshot added
stupidly-logical Oct 4, 2018
d31a8d8
Merge branch 'master' into favorite-account
stupidly-logical Oct 5, 2018
2df6e3f
Fix adapter update issue
stupidly-logical Oct 5, 2018
0cb4127
Merge branch 'favorite-account' of https://github.com/stupidly-logica…
stupidly-logical Oct 5, 2018
24beeae
Fix PMD issue
stupidly-logical Oct 5, 2018
d74c7e7
Remove private keyword
stupidly-logical Oct 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Screenshots/Screenshot_2018-10-04-13-13-12.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/src/main/java/com/nitsilchar/hp/passwordStorage/activity/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ public void onClick(DialogInterface dialog, int which) {
if(!isDuplicate(collection,acnt.getText().toString())){
if(!TextUtils.isEmpty(acnt.getText().toString())){
passwordDatabase.addCredentials(getApplicationContext(),acnt.getText().toString(),
pass.getText().toString(), description.getText().toString(), link.getText().toString());
Accounts account = new Accounts(acnt.getText().toString(), pass.getText().toString(), description.getText().toString(), link.getText().toString());
pass.getText().toString(), description.getText().toString(), link.getText().toString(), "0");
Accounts account = new Accounts(acnt.getText().toString(), pass.getText().toString(), description.getText().toString(), link.getText().toString(), "0");
accountsList.add(account);
adapter.notifyDataSetChanged();
Toast.makeText(getApplicationContext(),
Expand Down
27 changes: 24 additions & 3 deletions app/src/main/java/com/nitsilchar/hp/passwordStorage/adapter/PasswordRecyclerViewAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import android.widget.Filterable;
import com.nitsilchar.hp.passwordStorage.R;
import com.nitsilchar.hp.passwordStorage.activity.DetailsActivity;
import com.nitsilchar.hp.passwordStorage.activity.MainActivity;
import com.nitsilchar.hp.passwordStorage.activity.SplashActivity;
import com.nitsilchar.hp.passwordStorage.database.PasswordDatabase;
import com.nitsilchar.hp.passwordStorage.model.Accounts;
Expand Down Expand Up @@ -57,12 +56,16 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
}

@Override
public void onBindViewHolder(ViewHolder holder, final int position) {
public void onBindViewHolder(final ViewHolder holder, final int position) {
holder.accountName.setText(accountsFiltered.get(position).getmAccountName());
holder.description.setText(accountsFiltered.get(position).getmDescription());
holder.iconText.setText(accountsFiltered.get(position).getmAccountName().substring(0,1).toUpperCase());
holder.iconBg.setImageResource(R.drawable.bg_circle);
holder.iconBg.setColorFilter(getRandomMaterialColor());
if (!accountsFiltered.get(position).getmFav().equals("0"))
holder.iconFav.setImageResource(R.drawable.ic_star_black_24dp);
else
holder.iconFav.setImageResource(R.drawable.ic_star_border_black_24dp);
holder.accountContainer.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Expand Down Expand Up @@ -109,6 +112,21 @@ public void onClick(DialogInterface dialog, int which) {
return false;
}
});
holder.iconFav.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
String clickedAccount = accountsFiltered.get(position).getmAccountName();
if (!accountsFiltered.get(position).getmFav().equals("0")){
if (passwordDatabase.setFavorite(clickedAccount, "0") == 1)
accountsFiltered.get(position).setmFav("0");
}
else{
if (passwordDatabase.setFavorite(clickedAccount, "1") == 1)
accountsFiltered.get(position).setmFav("1");
}
notifyDataSetChanged();
}
});
}

private int getRandomMaterialColor() {
Expand Down Expand Up @@ -180,12 +198,15 @@ class ViewHolder extends RecyclerView.ViewHolder {
TextView iconText;
@BindView(R.id.icon_bg)
ImageView iconBg;
@BindView(R.id.icon_fav)
ImageView iconFav;

public ViewHolder(View itemView) {
super(itemView);

ButterKnife.bind(this,itemView);

itemView.setOnClickListener(new View.OnClickListener() {
itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
// send selected contact in callback
Expand Down
28 changes: 22 additions & 6 deletions app/src/main/java/com/nitsilchar/hp/passwordStorage/database/PasswordDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
import android.database.sqlite.SQLiteOpenHelper;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.util.Log;

import com.nitsilchar.hp.passwordStorage.model.Accounts;
Expand All @@ -33,6 +31,7 @@ public final class PasswordDatabase extends SQLiteOpenHelper {
public static final String COLUMN_DESCRIPTION = "Description";
public static final String COLUMN_LINK = "Link";
public static final String COLUMN_PHOTO = "Photo";
public static final String COLUMN_FAV = "Favorite";
public static final String ID = "id";
public static final String PHOTO_TABLE = "Profile";

Expand All @@ -44,7 +43,7 @@ public final class PasswordDatabase extends SQLiteOpenHelper {

private static final String TABLE_CREATE = "CREATE TABLE "
+ TABLE_NAME + " (" + COLUMN_ACCOUNT + " TEXT, " + COLUMN_PASSWORD
+ " TEXT, " + COLUMN_LINK + " TEXT, " + COLUMN_DESCRIPTION + " TEXT,UNIQUE("+ COLUMN_ACCOUNT + "));";
+ " TEXT, " + COLUMN_LINK + " TEXT, " + COLUMN_FAV + " TEXT, " + COLUMN_DESCRIPTION + " TEXT,UNIQUE("+ COLUMN_ACCOUNT + "));";

private static final String DATABASE_ALTER_CREDENTIALS_DESCR = "ALTER TABLE "
+ TABLE_NAME + " ADD COLUMN " + COLUMN_DESCRIPTION + " TEXT;";
Expand All @@ -66,6 +65,9 @@ public PasswordDatabase(Context context) {
public void onCreate(SQLiteDatabase db) {
db.execSQL(TABLE_CREATE);
db.execSQL(CREATE_PHOTO_TABLE);
Cursor cursor = db.query(TABLE_NAME, null, null, null, null, null
, null);
String[] names = cursor.getColumnNames();
}

@Override
Expand All @@ -88,16 +90,17 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion){
onUpgrade(db, oldVersion, newVersion);
}
public void addCredentials(Context context,String account, String password, String description, String link){
public void addCredentials(Context context,String account, String password, String description, String link, String fav){
SQLiteDatabase db = this.getWritableDatabase();
long newRowId=0;
Boolean flag=false;
ContentValues values = new ContentValues();
values.put(COLUMN_ACCOUNT, account);
values.put(COLUMN_PASSWORD, password);
values.put(COLUMN_DESCRIPTION, description);
values.put(COLUMN_FAV, fav);
values.put(COLUMN_LINK, link);
newRowId = db.insert(TABLE_NAME, null, values);
newRowId = db.insert(TABLE_NAME, null, values);
}

public void deleteRow(String account){
Expand All @@ -124,6 +127,18 @@ public int modifyCredentials(String account,String newPass){
return update;
}

public int setFavorite(String account, String val){

SQLiteDatabase db = this.getWritableDatabase();
ContentValues contentValues = new ContentValues();
contentValues.put(COLUMN_FAV, val);
String whereClause = COLUMN_ACCOUNT + " =?";
String[] whereArgs = new String[]{account};
int update = db.update(TABLE_NAME, contentValues, whereClause, whereArgs);
return update;

}

public void deleteAllCredentials(){
SQLiteDatabase db = this.getWritableDatabase();
db.delete(TABLE_NAME, null, null);
Expand Down Expand Up @@ -213,7 +228,8 @@ public List<Accounts> getAccData(){
String pass = c.getString(c.getColumnIndex(COLUMN_PASSWORD));
String description = c.getString(c.getColumnIndex(COLUMN_DESCRIPTION));
String link = c.getString(c.getColumnIndex(COLUMN_LINK));
accountData.add(new Accounts(account, pass, description, link));
String fav = c.getString(c.getColumnIndex(COLUMN_FAV));
accountData.add(new Accounts(account, pass, description, link, fav));
}
while (c.moveToNext());
}
Expand Down
12 changes: 11 additions & 1 deletion app/src/main/java/com/nitsilchar/hp/passwordStorage/model/Accounts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ public class Accounts {
private String mPass;
private String mDescription;
private String mLink;
private String mFav;

public Accounts(String accountName, String pass, String description, String link) {
public Accounts(String accountName, String pass, String description, String link, String fav) {
mAccountName = accountName;
mPass = pass;
mDescription = description;
mLink = link;
mFav = fav;
}

public Accounts(){
Expand Down Expand Up @@ -49,4 +51,12 @@ public String getmLink() {
public void setmLink(String mLink) {
this.mLink = mLink;
}

public String getmFav() {
return mFav;
}

public void setmFav(String mFav) {
this.mFav = mFav;
}
}
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_star_black_24dp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
</vector>
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/ic_star_border_black_24dp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
</vector>
48 changes: 31 additions & 17 deletions app/src/main/res/layout-v21/linear_layout_simple_text.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,44 @@
android:id="@+id/account_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:layout_toRightOf="@+id/icon_container">

<TextView
android:id="@+id/account_name"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/account_name"
android:textSize="@dimen/acc_text_primary"
android:textStyle="bold"
tool:text="Account Name"/>
android:layout_weight="1"
android:orientation="vertical">

<TextView
android:id="@+id/description"
android:layout_width="match_parent"
<TextView
android:id="@+id/account_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/account_name"
android:textSize="@dimen/acc_text_primary"
android:textStyle="bold"
tool:text="Account Name"/>

<TextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/icon_tint_normal"
android:textSize="@dimen/acc_text_secondary"
tool:text="Description"/>

</LinearLayout>

<ImageView
android:id="@+id/icon_fav"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/icon_tint_normal"
android:textSize="@dimen/acc_text_secondary"
tool:text="description"/>
android:layout_gravity="center"/>

</LinearLayout>

Expand Down
48 changes: 31 additions & 17 deletions app/src/main/res/layout/linear_layout_simple_text.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,44 @@
android:id="@+id/account_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:orientation="horizontal"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:layout_toRightOf="@+id/icon_container">

<TextView
android:id="@+id/account_name"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/account_name"
android:textSize="@dimen/acc_text_primary"
android:textStyle="bold"
tool:text="Account Name"/>
android:layout_weight="1"
android:orientation="vertical">

<TextView
android:id="@+id/description"
android:layout_width="match_parent"
<TextView
android:id="@+id/account_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/account_name"
android:textSize="@dimen/acc_text_primary"
android:textStyle="bold"
tool:text="Account Name"/>

<TextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/icon_tint_normal"
android:textSize="@dimen/acc_text_secondary"
tool:text="Description"/>

</LinearLayout>

<ImageView
android:id="@+id/icon_fav"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
android:textColor="@color/icon_tint_normal"
android:textSize="@dimen/acc_text_secondary"
tool:text="description"/>
android:layout_gravity="center"/>

</LinearLayout>

Expand Down