diff --git a/.idea/misc.xml b/.idea/misc.xml index 4f2e8be..c298aa7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -72,6 +72,7 @@ + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15487_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15487_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15487_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15864_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15864_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15864_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_16193_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_16193_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_16193_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_16525_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_16525_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_16525_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_16811_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_16811_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_16811_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_17166_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_17166_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_17166_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_17490_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_17490_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_17490_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_17774_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_17774_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_17774_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18058_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18058_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18058_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18390_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18390_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18390_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18668_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18668_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18668_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18988_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18988_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_18988_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_15341_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_15341_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_15341_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_15699_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_15699_timing.txt new file mode 100644 index 0000000..c37f43a --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_15699_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_16044_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_16044_timing.txt new file mode 100644 index 0000000..e10017d --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_16044_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_16379_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_16379_timing.txt new file mode 100644 index 0000000..a3122bf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_16379_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_16662_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_16662_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_16662_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_16999_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_16999_timing.txt new file mode 100644 index 0000000..e10017d --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_16999_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_17328_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_17328_timing.txt new file mode 100644 index 0000000..952fea8 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_17328_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 22ms +create_cxx_tasks completed in 22ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_17611_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_17611_timing.txt new file mode 100644 index 0000000..1062c90 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_17611_timing.txt @@ -0,0 +1,15 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_18504_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_18504_timing.txt new file mode 100644 index 0000000..5215f74 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_18504_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 14ms +create_cxx_tasks completed in 15ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_18839_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_18839_timing.txt new file mode 100644 index 0000000..5215f74 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_18839_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 14ms +create_cxx_tasks completed in 15ms + diff --git a/app/src/main/java/com/qtagger/Activity/AccountAdd.java b/app/src/main/java/com/qtagger/Activity/AccountAdd.java index b59cf5e..580a2f4 100644 --- a/app/src/main/java/com/qtagger/Activity/AccountAdd.java +++ b/app/src/main/java/com/qtagger/Activity/AccountAdd.java @@ -4,9 +4,13 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.constraintlayout.utils.widget.ImageFilterButton; import androidx.core.content.ContextCompat; +import android.content.Context; import android.graphics.Color; import android.os.Bundle; +import android.text.Editable; +import android.text.TextWatcher; import android.view.View; +import android.widget.Button; import android.widget.EditText; import android.widget.Toast; @@ -15,7 +19,9 @@ import com.qtagger.R; import com.qtagger.util.DataManager; public class AccountAdd extends AppCompatActivity { + Context context; private EditText editAccountId, editAccountName, editAccountDapt; + private Button button_save; private ImageFilterButton backBtn; DataManager dataManager = DataManager.getInstance(); @@ -23,11 +29,12 @@ public class AccountAdd extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_account_add); - + context = this; editAccountId = (EditText) findViewById(R.id.textView_AccountId); editAccountName = (EditText) findViewById(R.id.textView_AccountName); editAccountDapt = (EditText) findViewById(R.id.textView_AccountDapt); backBtn = (ImageFilterButton) findViewById(R.id.imageFilterButton_Back); + button_save = findViewById(R.id.button_save); editAccountId.setOnFocusChangeListener(new View.OnFocusChangeListener() { @Override @@ -42,6 +49,18 @@ public class AccountAdd extends AppCompatActivity { } } }); + editAccountId.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + checkData(); + } + @Override + public void afterTextChanged(Editable s) { + } + }); editAccountName.setOnFocusChangeListener(new View.OnFocusChangeListener() { @Override @@ -56,6 +75,18 @@ public class AccountAdd extends AppCompatActivity { } } }); + editAccountName.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + checkData(); + } + @Override + public void afterTextChanged(Editable s) { + } + }); editAccountDapt.setOnFocusChangeListener(new View.OnFocusChangeListener() { @Override @@ -70,10 +101,20 @@ public class AccountAdd extends AppCompatActivity { } } }); + editAccountDapt.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + checkData(); + } + @Override + public void afterTextChanged(Editable s) { + } + }); - - - findViewById(R.id.button_save).setOnClickListener(new View.OnClickListener() { + button_save.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { String acId = editAccountId.getText().toString(); @@ -101,6 +142,24 @@ public class AccountAdd extends AppCompatActivity { finish(); } }); - } + + private void checkData(){ + String acId = editAccountId.getText().toString(); + String acName = editAccountName.getText().toString(); + String acDapt = editAccountDapt.getText().toString(); + if(acId.isEmpty() || acName.isEmpty() || acDapt.isEmpty()) + { + button_save.setBackgroundResource(R.drawable.button_new_default_disable_background); + button_save.setTextColor(ContextCompat.getColor(context,R.color.defaultDisableTextColor)); + } + else + { + button_save.setBackgroundResource(R.drawable.button_new_default_background); + button_save.setTextColor(Color.WHITE); + } + } + + + } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/AccountModify.java b/app/src/main/java/com/qtagger/Activity/AccountModify.java index cf1df6b..80bf28d 100644 --- a/app/src/main/java/com/qtagger/Activity/AccountModify.java +++ b/app/src/main/java/com/qtagger/Activity/AccountModify.java @@ -1,10 +1,15 @@ package com.qtagger.Activity; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import android.content.Context; import android.content.Intent; +import android.graphics.Color; import android.os.Bundle; import android.provider.ContactsContract; +import android.text.Editable; +import android.text.TextWatcher; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -18,19 +23,74 @@ import com.qtagger.util.DataManager; import java.util.List; public class AccountModify extends AppCompatActivity { -TextView textAccountId; + Context context; + TextView textAccountId; EditText editAccountName, editAccountDapt; -Button btnModify; + Button button_save; AccountData findAccount = null; + private DataManager dataManager = DataManager.getInstance(); @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_account_modify); + context = this; textAccountId = (TextView)findViewById(R.id.textView_AccountId); editAccountName = (EditText)findViewById(R.id.textView_AccountName); editAccountDapt = (EditText)findViewById(R.id.textView_AccountDapt); - btnModify = (Button) findViewById(R.id.button_save); + button_save = (Button) findViewById(R.id.button_save); + + editAccountName.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + + if(hasFocus) + { + editAccountName.setBackgroundResource(R.drawable.account_edit_focus_background); + } + else{ + editAccountName.setBackgroundResource(R.drawable.account_edit_background); + } + } + }); + editAccountName.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + checkData(); + } + @Override + public void afterTextChanged(Editable s) { + } + }); + + editAccountDapt.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + + if(hasFocus) + { + editAccountDapt.setBackgroundResource(R.drawable.account_edit_focus_background); + } + else{ + editAccountDapt.setBackgroundResource(R.drawable.account_edit_background); + } + } + }); + editAccountDapt.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + } + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + checkData(); + } + @Override + public void afterTextChanged(Editable s) { + } + }); findViewById(R.id.imageFilterButton_Back).setOnClickListener(new View.OnClickListener() { @Override @@ -51,17 +111,18 @@ Button btnModify; break; } } - if(findAccount != null) { textAccountId.setText(findAccount.getAccountId()); editAccountName.setText(findAccount.getAccountName()); editAccountDapt.setText(findAccount.getAccountDapt()); } - } - btnModify.setOnClickListener(new View.OnClickListener() { + + + + button_save.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -90,4 +151,19 @@ Button btnModify; } + + private void checkData(){ + String acName = editAccountName.getText().toString(); + String acDapt = editAccountDapt.getText().toString(); + if( acName.isEmpty() || acDapt.isEmpty()) + { + button_save.setBackgroundResource(R.drawable.button_new_default_disable_background); + button_save.setTextColor(ContextCompat.getColor(context,R.color.defaultDisableTextColor)); + } + else + { + button_save.setBackgroundResource(R.drawable.button_new_default_background); + button_save.setTextColor(Color.WHITE); + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java b/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java index 9ce8ab0..9bc177e 100644 --- a/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java +++ b/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java @@ -102,12 +102,18 @@ public class BarcodeFragment extends Fragment { && !"NR".equals(barcode) ) { barcodeStr = barcode; - showCustomDialog(); } } }); + view.findViewById(R.id.imageView2).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + barcodeReadData(); + } + }); + // Inflate the layout for this fragment return view; } diff --git a/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java b/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java index 5719746..2cda47d 100644 --- a/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java +++ b/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java @@ -7,6 +7,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.view.View; import android.widget.TextView; +import android.widget.Toast; import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; @@ -32,6 +33,8 @@ public class CommonNavigationView { TextView textId = activity.findViewById(R.id.textview_id); TextView textDapt = activity.findViewById(R.id.textview_dapt); TextView textName = activity.findViewById(R.id.textview_name); + DrawerLayout drawerLayout = (DrawerLayout) activity.findViewById(R.id.drawerLayout); + NavigationView navigationView = (NavigationView) activity.findViewById(R.id.navigationView); if(account == null) { @@ -52,6 +55,7 @@ public class CommonNavigationView { public void onClick(View v) { Intent intent = new Intent(activity.getApplicationContext(), DbSettingActivity.class); activity.startActivity(intent); + drawerLayout.closeDrawer(navigationView,true); } }); activity.findViewById(R.id.button_Upload).setOnClickListener(new View.OnClickListener() { @@ -80,6 +84,7 @@ public class CommonNavigationView { } } }).setNegativeButton("취소", null).show(); + drawerLayout.closeDrawer(navigationView,true); } }); @@ -96,6 +101,7 @@ public class CommonNavigationView { public void onClick(View v) { Intent intent = new Intent(activity.getApplicationContext(), AccountAdd.class); activity.startActivity(intent); + drawerLayout.closeDrawer(navigationView,true); } }); activity.findViewById(R.id.button_AccountModify).setOnClickListener(new View.OnClickListener() { @@ -104,35 +110,30 @@ public class CommonNavigationView { if(dataManager.loginAccount == null) { //알림 줄것 + Toast.makeText(activity, "계정 정보가 없습니다.", Toast.LENGTH_SHORT).show(); } else { Intent intent = new Intent(activity.getApplicationContext(), AccountModify.class); intent.putExtra("Id",dataManager.loginAccount.getId()); activity.startActivity(intent); + drawerLayout.closeDrawer(navigationView,true); } } }); activity.findViewById(R.id.button_small_close).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - DrawerLayout drawerLayout = (DrawerLayout) activity.findViewById(R.id.drawerLayout); - NavigationView navigationView = (NavigationView) activity.findViewById(R.id.navigationView); drawerLayout.closeDrawer(navigationView,true); - } }); activity.findViewById(R.id.button_Close).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - DrawerLayout drawerLayout = (DrawerLayout) activity.findViewById(R.id.drawerLayout); - NavigationView navigationView = (NavigationView) activity.findViewById(R.id.navigationView); drawerLayout.closeDrawer(navigationView,true); } }); - - } } diff --git a/app/src/main/java/com/qtagger/Database/DBHelper.java b/app/src/main/java/com/qtagger/Database/DBHelper.java index b55acd1..bbab5e0 100644 --- a/app/src/main/java/com/qtagger/Database/DBHelper.java +++ b/app/src/main/java/com/qtagger/Database/DBHelper.java @@ -216,10 +216,13 @@ public class DBHelper extends SQLiteOpenHelper { } public void updateAccount(AccountData ac){ - db.execSQL("Update Account set accountId ='"+ac.getAccountId()+"'" + db = getWritableDatabase(); + String query = "Update Account set accountId ='"+ac.getAccountId()+"'" +", accountName = '"+ac.getAccountName()+"'" +", accountDapt = '"+ac.getAccountDapt()+"'" - +" where id = '"+ac.getId()+"';"); + +" where id = '"+ac.getId()+"'"; + db.execSQL(query); + db.close(); } public void deleteAccount(AccountData ac){ diff --git a/app/src/main/res/drawable-v24/btn_menu_bl.png b/app/src/main/res/drawable-v24/btn_menu_bl.png new file mode 100644 index 0000000..c1337a3 Binary files /dev/null and b/app/src/main/res/drawable-v24/btn_menu_bl.png differ diff --git a/app/src/main/res/drawable-v24/btn_menu_wt.png b/app/src/main/res/drawable-v24/btn_menu_wt.png new file mode 100644 index 0000000..5447ba2 Binary files /dev/null and b/app/src/main/res/drawable-v24/btn_menu_wt.png differ diff --git a/app/src/main/res/drawable/account_edit_background.xml b/app/src/main/res/drawable/account_edit_background.xml index ac31f1b..83b1dfb 100644 --- a/app/src/main/res/drawable/account_edit_background.xml +++ b/app/src/main/res/drawable/account_edit_background.xml @@ -9,7 +9,7 @@ - - - - + + + + - + - + - + + + - + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e06420b..ec42e2b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -24,13 +24,13 @@ + app:srcCompat="@drawable/btn_menu_bl" /> diff --git a/app/src/main/res/layout/activity_test2.xml b/app/src/main/res/layout/activity_test2.xml index b3482e4..8088802 100644 --- a/app/src/main/res/layout/activity_test2.xml +++ b/app/src/main/res/layout/activity_test2.xml @@ -24,11 +24,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:layout_marginTop="8dp" android:background="@android:color/transparent" android:minWidth="48dp" android:minHeight="48dp" android:src="@drawable/back_arrow_5821" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -50,12 +50,12 @@ android:id="@+id/imageFilterButton_Setting" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="12dp" android:layout_marginEnd="16dp" android:background="@android:color/transparent" android:minWidth="32dp" android:minHeight="32dp" - android:src="@drawable/setting_32" + android:src="@drawable/btn_menu_wt" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/activity_test_select.xml b/app/src/main/res/layout/activity_test_select.xml index f8f41c7..b42523d 100644 --- a/app/src/main/res/layout/activity_test_select.xml +++ b/app/src/main/res/layout/activity_test_select.xml @@ -42,7 +42,7 @@ android:background="@android:color/transparent" android:minWidth="32dp" android:minHeight="32dp" - android:src="@drawable/setting_32" + android:src="@drawable/btn_menu_wt" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" />