diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b44ebf8..2e8c037 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,6 +16,7 @@ android:theme="@style/AppTheme"> diff --git a/app/src/main/java/com/babanomania/pdfscanner/MainActivity.java b/app/src/main/java/com/babanomania/pdfscanner/MainActivity.java index 1cc1bc3..5fc3db9 100644 --- a/app/src/main/java/com/babanomania/pdfscanner/MainActivity.java +++ b/app/src/main/java/com/babanomania/pdfscanner/MainActivity.java @@ -6,6 +6,7 @@ import android.app.SearchManager; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.icu.text.SimpleDateFormat; @@ -21,6 +22,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; import androidx.lifecycle.LiveData; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProviders; @@ -71,6 +73,17 @@ public MainActivity() { @Override protected void onCreate(Bundle savedInstanceState) { + + SharedPreferences prefs = getSharedPreferences("save", MODE_PRIVATE); + boolean isDark = prefs.getBoolean("DarkMode", true); + + if(isDark){ + setTheme(R.style.AppThemeDark); + } + else { + setTheme(R.style.AppTheme); + } + super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); @@ -92,7 +105,7 @@ protected void onCreate(Bundle savedInstanceState) { viewModel = ViewModelProviders.of(this).get(DocumentViewModel.class); - fileAdapter = new FLAdapter( viewModel, this); + fileAdapter = new FLAdapter( viewModel, this, isDark); recyclerView.setAdapter( fileAdapter ); liveData = viewModel.getAllDocuments(); @@ -166,6 +179,8 @@ public void openCamera(View v){ // } private void saveBitmap( final Bitmap bitmap, final boolean addMore ){ + SharedPreferences prefs = getSharedPreferences("save", MODE_PRIVATE); + boolean isDark = prefs.getBoolean("DarkMode", true); final String baseDirectory = getApplicationContext().getString( addMore ? R.string.base_staging_path : R.string.base_storage_path); final File sd = Environment.getExternalStorageDirectory(); @@ -195,7 +210,7 @@ public void write(FileOutputStream out) { } else { - DialogUtil.askUserFilaname( c, null, null, new DialogUtilCallback() { + DialogUtil.askUserFilaname( c, null, null, isDark, new DialogUtilCallback() { @Override public void onSave(String textValue, String category) { @@ -262,6 +277,8 @@ public void write(FileOutputStream out) { } private void savePdf() { + SharedPreferences prefs = getSharedPreferences("save", MODE_PRIVATE); + boolean isDark = prefs.getBoolean("DarkMode", true); final String baseDirectory = getApplicationContext().getString(R.string.base_storage_path); final File sd = Environment.getExternalStorageDirectory(); @@ -270,7 +287,7 @@ private void savePdf() { final String timestamp = simpleDateFormat.format(new Date()); - DialogUtil.askUserFilaname(c, null, null, new DialogUtilCallback() { + DialogUtil.askUserFilaname(c, null, null, isDark, new DialogUtilCallback() { @Override public void onSave(String textValue, String category) { diff --git a/app/src/main/java/com/babanomania/pdfscanner/MultiPageActivity.java b/app/src/main/java/com/babanomania/pdfscanner/MultiPageActivity.java index 0802bfe..93f9846 100644 --- a/app/src/main/java/com/babanomania/pdfscanner/MultiPageActivity.java +++ b/app/src/main/java/com/babanomania/pdfscanner/MultiPageActivity.java @@ -9,6 +9,7 @@ import android.app.ActivityOptions; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.database.DataSetObserver; import android.graphics.Bitmap; @@ -48,6 +49,17 @@ public class MultiPageActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + SharedPreferences prefs = getSharedPreferences("save", MODE_PRIVATE); + boolean isDark = prefs.getBoolean("DarkMode", true); + + if(isDark){ + setTheme(R.style.AppThemeDark); + } + else { + setTheme(R.style.AppTheme); + } + setContentView(R.layout.activity_multi_page); setTitle( getResources().getString(R.string.multi_page_title) ); diff --git a/app/src/main/java/com/babanomania/pdfscanner/OCRActivity.java b/app/src/main/java/com/babanomania/pdfscanner/OCRActivity.java index 8d1acce..e38c94e 100644 --- a/app/src/main/java/com/babanomania/pdfscanner/OCRActivity.java +++ b/app/src/main/java/com/babanomania/pdfscanner/OCRActivity.java @@ -2,6 +2,7 @@ import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.graphics.Bitmap; import android.graphics.pdf.PdfRenderer; import android.os.AsyncTask; @@ -33,6 +34,17 @@ public class OCRActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + SharedPreferences prefs = getSharedPreferences("save", MODE_PRIVATE); + boolean isDark = prefs.getBoolean("DarkMode", true); + + if(isDark){ + setTheme(R.style.AppThemeDark); + } + else { + setTheme(R.style.AppTheme); + } + setContentView(R.layout.activity_ocr); RelativeLayout relativeLayout = findViewById(R.id.rl); diff --git a/app/src/main/java/com/babanomania/pdfscanner/SearchableActivity.java b/app/src/main/java/com/babanomania/pdfscanner/SearchableActivity.java index 5a6716d..3732861 100644 --- a/app/src/main/java/com/babanomania/pdfscanner/SearchableActivity.java +++ b/app/src/main/java/com/babanomania/pdfscanner/SearchableActivity.java @@ -3,6 +3,7 @@ import android.app.SearchManager; import android.app.SearchableInfo; import android.content.Context; +import android.content.SharedPreferences; import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; @@ -11,6 +12,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.widget.SearchView; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProviders; @@ -33,6 +35,20 @@ public class SearchableActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { + + + SharedPreferences prefs = getSharedPreferences("save", MODE_PRIVATE); + boolean isDark = prefs.getBoolean("DarkMode", true); + + if(isDark){ + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); + setTheme(R.style.AppThemeSearchDark); + } + else { + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); + setTheme(R.style.AppThemeSearch); + } + super.onCreate(savedInstanceState); setContentView(R.layout.activity_searchable); @@ -44,7 +60,7 @@ protected void onCreate(Bundle savedInstanceState) { DocumentViewModel viewModel = ViewModelProviders.of(this).get(DocumentViewModel.class); - final FLAdapter fileAdapter = new FLAdapter( viewModel, this); + final FLAdapter fileAdapter = new FLAdapter( viewModel, this, isDark); recyclerView.setAdapter( fileAdapter ); this.emptyLayout = findViewById(R.id.empty_search_list); @@ -77,6 +93,9 @@ public void onChanged(@Nullable List documents) { @Override public boolean onCreateOptionsMenu(Menu menu) { + SharedPreferences prefs = getSharedPreferences("save", MODE_PRIVATE); + final boolean isDark = prefs.getBoolean("DarkMode", true); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); getMenuInflater().inflate(R.menu.searchview_menu, menu); @@ -100,7 +119,7 @@ public boolean onQueryTextSubmit(String query) { @Override public boolean onQueryTextChange(String newText) { - doMySearch( newText ); + doMySearch( newText, isDark); return false; } }); @@ -108,7 +127,7 @@ public boolean onQueryTextChange(String newText) { return true; } - public void doMySearch( String query ){ + public void doMySearch( String query, boolean isDark ){ this.recyclerView = findViewById(R.id.rwSearch); @@ -116,7 +135,7 @@ public void doMySearch( String query ){ DocumentViewModel viewModel = ViewModelProviders.of(this).get(DocumentViewModel.class); - final FLAdapter fileAdapter = new FLAdapter( viewModel, this); + final FLAdapter fileAdapter = new FLAdapter( viewModel, this, isDark); recyclerView.setAdapter( fileAdapter ); viewModel.search( '%' + query + '%').observe(this, new Observer>() { diff --git a/app/src/main/java/com/babanomania/pdfscanner/SettingsActivity.java b/app/src/main/java/com/babanomania/pdfscanner/SettingsActivity.java index 100e3be..2e39145 100644 --- a/app/src/main/java/com/babanomania/pdfscanner/SettingsActivity.java +++ b/app/src/main/java/com/babanomania/pdfscanner/SettingsActivity.java @@ -1,15 +1,36 @@ package com.babanomania.pdfscanner; +import android.content.SharedPreferences; import android.os.Bundle; +import android.view.View; +import android.widget.CompoundButton; +import android.widget.Toast; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; +import androidx.appcompat.widget.SwitchCompat; import androidx.preference.PreferenceFragmentCompat; +import com.babanomania.pdfscanner.persistance.DocumentDatabase; + public class SettingsActivity extends AppCompatActivity { + SwitchCompat switchCompat; + @Override protected void onCreate(Bundle savedInstanceState) { + + DocumentDatabase.getInstance(getApplicationContext()); + if (loadState()) { + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); + setTheme(R.style.AppThemeDark); + } else { + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); + setTheme(R.style.AppTheme); + } + + super.onCreate(savedInstanceState); setContentView(R.layout.settings_activity); @@ -22,8 +43,61 @@ protected void onCreate(Bundle savedInstanceState) { if (actionBar != null) { actionBar.setDisplayHomeAsUpEnabled(true); } + + switchCompat = findViewById(R.id.bt_switch); + + SharedPreferences sharedPreferences = getSharedPreferences("save", MODE_PRIVATE); + switchCompat.setChecked(sharedPreferences.getBoolean("DarkMode", true)); + + switchCompat.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + if(isChecked){ + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); + saveSwitchState(true); + switchCompat.setChecked(true); + } + else{ + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); + saveSwitchState(false); + switchCompat.setChecked(false); + } + } + }); +// +// switchCompat.setOnCheckedChangeListener(new View.OnClickListener() { +// @Override +// public void onClick(View v) { +// if (switchCompat.isChecked()){ +// AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); +// saveSwitchState(true); +// switchCompat.setChecked(true); +// } +// else { +// AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); +// saveSwitchState(false); +// switchCompat.setChecked(false); +// } +// } +// }); } + + public void saveSwitchState(Boolean state){ + SharedPreferences sharedPreferences = getSharedPreferences("save", MODE_PRIVATE); + SharedPreferences.Editor editor = sharedPreferences.edit(); + editor.putBoolean("DarkMode", state); + editor.apply(); + } + + private Boolean loadState(){ + SharedPreferences sharedPreferences = getApplicationContext().getSharedPreferences("save", MODE_PRIVATE); + return sharedPreferences.getBoolean("DarkMode", false); + } + + + + public static class SettingsFragment extends PreferenceFragmentCompat { @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { diff --git a/app/src/main/java/com/babanomania/pdfscanner/fileView/FLAdapter.java b/app/src/main/java/com/babanomania/pdfscanner/fileView/FLAdapter.java index 0b5171b..d6b103b 100644 --- a/app/src/main/java/com/babanomania/pdfscanner/fileView/FLAdapter.java +++ b/app/src/main/java/com/babanomania/pdfscanner/fileView/FLAdapter.java @@ -46,6 +46,7 @@ public class FLAdapter extends RecyclerView.Adapter { public boolean multiSelect = false; private List documentList = new ArrayList<>(); public List selectedItems = new ArrayList<>(); + public boolean isDark; private DocumentViewModel viewModel; @@ -104,7 +105,7 @@ public boolean onActionItemClicked(final ActionMode mode, final MenuItem item) { case R.id.menu_edit: final Document docToRename = selectedItems.get(0); - DialogUtil.askUserFilaname(context, docToRename.getName(), docToRename.getCategory(), new DialogUtilCallback() { + DialogUtil.askUserFilaname(context, docToRename.getName(), docToRename.getCategory(),isDark, new DialogUtilCallback() { @Override public void onSave(String textValue, String category) { @@ -163,9 +164,10 @@ public void onDestroyActionMode(ActionMode mode) { } }; - public FLAdapter( DocumentViewModel viewModel, Context context ){ + public FLAdapter( DocumentViewModel viewModel, Context context, boolean isDark ){ this.viewModel = viewModel; this.context = context; + this.isDark = isDark; } public void setData(List documents){ @@ -180,7 +182,7 @@ public FLViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) { LayoutInflater layoutInflater = LayoutInflater.from(viewGroup.getContext()); View listItem = layoutInflater.inflate( R.layout.file_item_view, viewGroup, false ); - FLViewHolder viewHolder = new FLViewHolder(listItem, actionModeCallbacks, this ); + FLViewHolder viewHolder = new FLViewHolder(listItem, actionModeCallbacks, this, isDark ); return viewHolder; } diff --git a/app/src/main/java/com/babanomania/pdfscanner/fileView/FLViewHolder.java b/app/src/main/java/com/babanomania/pdfscanner/fileView/FLViewHolder.java index 87b1f5e..e552fcc 100644 --- a/app/src/main/java/com/babanomania/pdfscanner/fileView/FLViewHolder.java +++ b/app/src/main/java/com/babanomania/pdfscanner/fileView/FLViewHolder.java @@ -1,6 +1,7 @@ package com.babanomania.pdfscanner.fileView; import android.content.Intent; +import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.graphics.Color; import android.net.Uri; @@ -33,10 +34,11 @@ public class FLViewHolder extends RecyclerView.ViewHolder { private ActionMode.Callback actionModeCallbacks; private FLAdapter adapter; private Document documnt; + private boolean isDark; private Map categoryImageMap = new HashMap<>(); - public FLViewHolder(View itemView, ActionMode.Callback actionModeCallbacks, FLAdapter adapter ) { + public FLViewHolder(View itemView, ActionMode.Callback actionModeCallbacks, FLAdapter adapter, boolean isDark ) { super(itemView); this.categoryIcon = itemView.findViewById(R.id.imageView); this.textViewLabel = itemView.findViewById(R.id.fileName); @@ -46,6 +48,7 @@ public FLViewHolder(View itemView, ActionMode.Callback actionModeCallbacks, FLAd this.itemLayout = itemView.findViewById(R.id.relativeLayout); this.adapter = adapter; this.actionModeCallbacks = actionModeCallbacks; + this.isDark = isDark; categoryImageMap.put( "Others", R.drawable.ic_category_others ); categoryImageMap.put( "Shopping", R.drawable.ic_category_shopping ); @@ -67,7 +70,18 @@ void selectItem(Document item) { if (this.adapter.multiSelect) { if (this.adapter.selectedItems.contains(item)) { this.adapter.selectedItems.remove(item); - itemLayout.setBackgroundColor(Color.WHITE); +// itemLayout.setBackgroundColor(Color.WHITE); +// if dark itemLayout.setBackgroundColor(Color.DARK); +// else +// white + + if(isDark){ + itemLayout.setBackgroundResource(R.color.colorDark); + } + else{ + itemLayout.setBackgroundColor(Color.WHITE); + } + } else { this.adapter.selectedItems.add(item); @@ -94,11 +108,14 @@ public void setDocument(final Document document ){ } if (adapter.selectedItems.contains(document)) { - itemLayout.setBackgroundColor(Color.LTGRAY); - + itemLayout.setBackgroundColor(Color.LTGRAY); } else { - itemLayout.setBackgroundColor(Color.WHITE); - + if(isDark){ + itemLayout.setBackgroundResource(R.color.colorDark); + } + else{ + itemLayout.setBackgroundColor(Color.WHITE); + } } Integer resourceId = categoryImageMap.get( document.getCategory() ); diff --git a/app/src/main/java/com/babanomania/pdfscanner/utils/DialogUtil.java b/app/src/main/java/com/babanomania/pdfscanner/utils/DialogUtil.java index 286d6ab..9ab98f5 100644 --- a/app/src/main/java/com/babanomania/pdfscanner/utils/DialogUtil.java +++ b/app/src/main/java/com/babanomania/pdfscanner/utils/DialogUtil.java @@ -13,11 +13,11 @@ public class DialogUtil { - public static void askUserFilaname( Context context, String promptFileName, String promptCategory, final DialogUtilCallback callback ){ + public static void askUserFilaname( Context context, String promptFileName, String promptCategory, boolean isDark, final DialogUtilCallback callback ){ LayoutInflater layoutInflaterAndroid = LayoutInflater.from(context); View mView = layoutInflaterAndroid.inflate(R.layout.file_input_dialog_box, null); - AlertDialog.Builder alertDialogBuilderUserInput = new AlertDialog.Builder(context); + AlertDialog.Builder alertDialogBuilderUserInput = new AlertDialog.Builder(context, isDark ? R.style.AlertDialogDark : R.style.AlertDialogLight); alertDialogBuilderUserInput.setView(mView); final EditText fileNameText = mView.findViewById(R.id.userInputDialog); @@ -27,7 +27,7 @@ public static void askUserFilaname( Context context, String promptFileName, Stri final Spinner categorySelection = mView.findViewById(R.id.userInputCategory); ArrayAdapter adapter = ArrayAdapter.createFromResource(context, R.array.category_array, android.R.layout.simple_spinner_item); - adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + adapter.setDropDownViewResource(R.layout.layout_spinner); categorySelection.setAdapter(adapter); if( promptCategory != null ){ diff --git a/app/src/main/res/drawable/ic_baseline_bedtime_24.xml b/app/src/main/res/drawable/ic_baseline_bedtime_24.xml new file mode 100644 index 0000000..d40b667 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_bedtime_24.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_category_banking.xml b/app/src/main/res/drawable/ic_category_banking.xml index 9789414..b9e19a3 100644 --- a/app/src/main/res/drawable/ic_category_banking.xml +++ b/app/src/main/res/drawable/ic_category_banking.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_category_books.xml b/app/src/main/res/drawable/ic_category_books.xml index f9ecdde..b1b7e28 100644 --- a/app/src/main/res/drawable/ic_category_books.xml +++ b/app/src/main/res/drawable/ic_category_books.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_category_food.xml b/app/src/main/res/drawable/ic_category_food.xml index 2a5892e..1ec58d3 100644 --- a/app/src/main/res/drawable/ic_category_food.xml +++ b/app/src/main/res/drawable/ic_category_food.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_category_housing.xml b/app/src/main/res/drawable/ic_category_housing.xml index 44b5cf6..93ee143 100644 --- a/app/src/main/res/drawable/ic_category_housing.xml +++ b/app/src/main/res/drawable/ic_category_housing.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_category_id.xml b/app/src/main/res/drawable/ic_category_id.xml index f3dd1c2..787ed6c 100644 --- a/app/src/main/res/drawable/ic_category_id.xml +++ b/app/src/main/res/drawable/ic_category_id.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_category_legal.xml b/app/src/main/res/drawable/ic_category_legal.xml index 509f062..0652417 100644 --- a/app/src/main/res/drawable/ic_category_legal.xml +++ b/app/src/main/res/drawable/ic_category_legal.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_category_manuals.xml b/app/src/main/res/drawable/ic_category_manuals.xml index 934d1b6..1cb81da 100644 --- a/app/src/main/res/drawable/ic_category_manuals.xml +++ b/app/src/main/res/drawable/ic_category_manuals.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_category_medical.xml b/app/src/main/res/drawable/ic_category_medical.xml index a913797..110f7a1 100644 --- a/app/src/main/res/drawable/ic_category_medical.xml +++ b/app/src/main/res/drawable/ic_category_medical.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_category_notes.xml b/app/src/main/res/drawable/ic_category_notes.xml index 9bed351..43cb784 100644 --- a/app/src/main/res/drawable/ic_category_notes.xml +++ b/app/src/main/res/drawable/ic_category_notes.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_category_others.xml b/app/src/main/res/drawable/ic_category_others.xml index e14173b..4976573 100644 --- a/app/src/main/res/drawable/ic_category_others.xml +++ b/app/src/main/res/drawable/ic_category_others.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_category_receipt.xml b/app/src/main/res/drawable/ic_category_receipt.xml index adedf1b..6f37aba 100644 --- a/app/src/main/res/drawable/ic_category_receipt.xml +++ b/app/src/main/res/drawable/ic_category_receipt.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable/ic_category_receipts.xml b/app/src/main/res/drawable/ic_category_receipts.xml index 08fb8b2..6a36e5c 100644 --- a/app/src/main/res/drawable/ic_category_receipts.xml +++ b/app/src/main/res/drawable/ic_category_receipts.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_category_shopping.xml b/app/src/main/res/drawable/ic_category_shopping.xml index dacc59c..a5f0e28 100644 --- a/app/src/main/res/drawable/ic_category_shopping.xml +++ b/app/src/main/res/drawable/ic_category_shopping.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_category_travel.xml b/app/src/main/res/drawable/ic_category_travel.xml index 439f7d3..964428a 100644 --- a/app/src/main/res/drawable/ic_category_travel.xml +++ b/app/src/main/res/drawable/ic_category_travel.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_category_vehicle.xml b/app/src/main/res/drawable/ic_category_vehicle.xml index 142b188..b73dd1d 100644 --- a/app/src/main/res/drawable/ic_category_vehicle.xml +++ b/app/src/main/res/drawable/ic_category_vehicle.xml @@ -4,12 +4,12 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5c685d7..d6870b6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -11,7 +11,8 @@ + android:layout_height="match_parent" + android:background="?attr/background_color"> + android:textColor="@android:color/white" /> - + android:layout_below="@+id/empty_list" /> + tools:context=".MultiPageActivity" + android:background="?attr/background_color"> + tools:context=".OCRActivity" + android:background="?attr/background_color"> + tools:context=".SearchableActivity" + android:background="?attr/background_color"> + android:layout_below="@+id/empty_search_list" + > diff --git a/app/src/main/res/layout/each_file_img.xml b/app/src/main/res/layout/each_file_img.xml index 127e286..beee959 100644 --- a/app/src/main/res/layout/each_file_img.xml +++ b/app/src/main/res/layout/each_file_img.xml @@ -3,7 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/each_file_img" android:layout_width="fill_parent" - android:layout_height="fill_parent"> + android:layout_height="fill_parent" + android:background="?attr/background_color"> + android:padding="16dp" + android:background="?attr/background_color"> + android:layout_height="20dp" + /> + android:orientation="horizontal" + android:background="?attr/background_color"> + app:srcCompat="@drawable/ic_category_receipt" + android:backgroundTint="@color/blue"/> + diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml index de6591a..0f5c5ee 100644 --- a/app/src/main/res/layout/settings_activity.xml +++ b/app/src/main/res/layout/settings_activity.xml @@ -1,9 +1,44 @@ - + android:layout_height="match_parent" + android:background="?attr/background_color"> + + - \ No newline at end of file + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/default_menu.xml b/app/src/main/res/menu/default_menu.xml index 2084deb..7be0c9f 100644 --- a/app/src/main/res/menu/default_menu.xml +++ b/app/src/main/res/menu/default_menu.xml @@ -7,12 +7,13 @@ android:iconTint="@android:color/white" android:onClick="goToSearch" android:title="@string/menu_search" - app:showAsAction="always"/> + app:showAsAction="always" + /> + app:showAsAction="never" /> \ No newline at end of file diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml new file mode 100644 index 0000000..d4bf906 --- /dev/null +++ b/app/src/main/res/values/attr.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 98c33be..9e81baf 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,4 +7,6 @@ #8A1C44 #ffffff #c0c0c0 + #393939 + #FF3680 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8e50994..ee29062 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -10,7 +10,29 @@ true @transition/fade @transition/fade + @color/white + @color/textColor + @color/white + @style/AlertDialogLight + @color/colorDark + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml index 8909895..a8e489c 100644 --- a/app/src/main/res/xml/root_preferences.xml +++ b/app/src/main/res/xml/root_preferences.xml @@ -9,7 +9,9 @@ app:entryValues="@array/image_quality_values" app:key="@string/key_image_quality" app:title="@string/image_quality_title" - app:useSimpleSummaryProvider="true" /> + app:useSimpleSummaryProvider="true" + + />