diff --git a/app/build.gradle b/app/build.gradle index 4fd4de88de9be15f38d6e736e316c078bf162842..82808285cacc7a70f5ed3261c2f42a81044eac01 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,9 +29,16 @@ android { dataBinding { enabled = true } + + aaptOptions { + additionalParameters '-I', 'e-ui-sdk.jar' + } + } dependencies { + compileOnly files("../e-ui-sdk.jar") + implementation project(':cert4android') implementation 'io.reactivex:rxandroid:1.2.1' diff --git a/app/src/main/java/foundation/e/notes/android/activity/AboutActivity.java b/app/src/main/java/foundation/e/notes/android/activity/AboutActivity.java index 7ffab1d5d6e2b740327e40c58aca44b0c8ac62cf..3ccb1b849f1c73ce3877d8791a206a360a105f5a 100644 --- a/app/src/main/java/foundation/e/notes/android/activity/AboutActivity.java +++ b/app/src/main/java/foundation/e/notes/android/activity/AboutActivity.java @@ -8,6 +8,7 @@ import android.view.WindowManager; import androidx.annotation.ColorInt; import androidx.appcompat.app.AppCompatActivity; + import butterknife.ButterKnife; import foundation.e.notes.R; import foundation.e.notes.android.fragment.about.AboutFragment; @@ -20,27 +21,6 @@ public class AboutActivity extends AppCompatActivity { setContentView(R.layout.activity_about); ButterKnife.bind(this); getFragmentManager().beginTransaction().replace(R.id.container, new AboutFragment()).commit(); - updateAccentColor(); } - private void updateAccentColor(){ - //change toolbar color - getSupportActionBar().setBackgroundDrawable( - new ColorDrawable(NotesListViewActivity.ACCENT_COLOR)); - - //change status bar color - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - Window window = getWindow(); - window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - window.setStatusBarColor(darkenColor(NotesListViewActivity.ACCENT_COLOR)); - } - } - - @ColorInt - int darkenColor(@ColorInt int color) { - float[] hsv = new float[3]; - android.graphics.Color.colorToHSV(color, hsv); - hsv[2] *= 0.8f; - return android.graphics.Color.HSVToColor(hsv); - } } \ No newline at end of file diff --git a/app/src/main/java/foundation/e/notes/android/activity/AccountActivity.java b/app/src/main/java/foundation/e/notes/android/activity/AccountActivity.java index 21ab641fe9b8d17ae8323bcd192cbae8fbfc00ff..e0cd549dd98c9e145fb029a479e78951fd3bbc17 100644 --- a/app/src/main/java/foundation/e/notes/android/activity/AccountActivity.java +++ b/app/src/main/java/foundation/e/notes/android/activity/AccountActivity.java @@ -10,6 +10,7 @@ import android.preference.PreferenceManager; import androidx.annotation.ColorInt; import androidx.appcompat.app.AppCompatActivity; + import android.os.Bundle; import android.view.View; import android.view.Window; @@ -77,16 +78,14 @@ public class AccountActivity extends AppCompatActivity implements View.OnClickLi } initview(); - updateAccentColor(); + } private void initview() { - btn_eelo_Login=(Button)findViewById(R.id.eelo_account_login_button); - btn_eelo_Login.setBackgroundColor(NotesListViewActivity.ACCENT_COLOR); + btn_eelo_Login = (Button) findViewById(R.id.eelo_account_login_button); btn_eelo_Login.setOnClickListener(this); - btn_manualLogin=(Button)findViewById(R.id.manual_account_login_button); - btn_manualLogin.setBackgroundColor(NotesListViewActivity.ACCENT_COLOR); + btn_manualLogin = (Button) findViewById(R.id.manual_account_login_button); btn_manualLogin.setOnClickListener(this); } @@ -122,49 +121,26 @@ public class AccountActivity extends AppCompatActivity implements View.OnClickLi } } - private void updateAccentColor(){ - //change toolbar color - getSupportActionBar().setBackgroundDrawable( - new ColorDrawable(NotesListViewActivity.ACCENT_COLOR)); - - //change status bar color - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - Window window = getWindow(); - window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - window.setStatusBarColor(darkenColor(NotesListViewActivity.ACCENT_COLOR)); - } - } - - @ColorInt - int darkenColor(@ColorInt int color) { - float[] hsv = new float[3]; - android.graphics.Color.colorToHSV(color, hsv); - hsv[2] *= 0.8f; - return android.graphics.Color.HSVToColor(hsv); - } - @Override public void onClick(View view) { - if(view==btn_manualLogin){ + if (view == btn_manualLogin) { if (getIntent().getBooleanExtra("preference", false)) { startActivity(new Intent(AccountActivity.this, SettingsActivity.class)); - } - else { + } else { Intent resultIntent = new Intent(); resultIntent.putExtra(key_login_account, login_account_manual); setResult(RESULT_OK, resultIntent); } finish(); - } - else if(view==btn_eelo_Login){ + } else if (view == btn_eelo_Login) { String[] accountTypes = new String[]{eelo_account_type}; Intent intent = AccountManager.newChooseAccountIntent( null, null, accountTypes, null, - null, null,null); + null, null, null); startActivityForResult(intent, pick_account_request_code); } diff --git a/app/src/main/java/foundation/e/notes/android/activity/EditNoteActivity.java b/app/src/main/java/foundation/e/notes/android/activity/EditNoteActivity.java index f17111cc03803d2069ef8bc17ab89e4ceec0bd58..8c21059eef0fb4e6704a50200ccee2470f0defb8 100644 --- a/app/src/main/java/foundation/e/notes/android/activity/EditNoteActivity.java +++ b/app/src/main/java/foundation/e/notes/android/activity/EditNoteActivity.java @@ -54,7 +54,6 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm actionBar.setDisplayHomeAsUpEnabled(true); } - updateAccentColor(); } @Override @@ -222,24 +221,4 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm } } - private void updateAccentColor(){ - //change toolbar color - getSupportActionBar().setBackgroundDrawable( - new ColorDrawable(NotesListViewActivity.ACCENT_COLOR)); - - //change status bar color - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - Window window = getWindow(); - window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - window.setStatusBarColor(darkenColor(NotesListViewActivity.ACCENT_COLOR)); - } - } - - @ColorInt - int darkenColor(@ColorInt int color) { - float[] hsv = new float[3]; - android.graphics.Color.colorToHSV(color, hsv); - hsv[2] *= 0.8f; - return android.graphics.Color.HSVToColor(hsv); - } } diff --git a/app/src/main/java/foundation/e/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/foundation/e/notes/android/activity/NotesListViewActivity.java index 98b479b669ea9915ac74cdac57de6db58d4cdca8..4a52a32c4fb72bb9dadcf6b4c95259f7c23aecb4 100644 --- a/app/src/main/java/foundation/e/notes/android/activity/NotesListViewActivity.java +++ b/app/src/main/java/foundation/e/notes/android/activity/NotesListViewActivity.java @@ -111,9 +111,6 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap private final static String login_account_eelo = "login_account_eelo"; private final static String key_email_address = "email_address"; - public static int ACCENT_COLOR; - - @BindView(R.id.notesListActivityActionBar) Toolbar toolbar; @BindView(R.id.drawerLayout) @@ -168,7 +165,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap newShortcuts.add(new ShortcutInfo.Builder(getApplicationContext(), note.getId() + "") .setShortLabel(note.getTitle()) - .setIcon(Icon.createWithResource(getApplicationContext(), note.isFavorite() ? R.drawable.ic_star_yellow_24dp : R.drawable.ic_star_grey_ccc_24dp)) + .setIcon(Icon.createWithResource(getApplicationContext(), note.isFavorite() ? R.drawable.ic_star_yellow_24dp : R.drawable.ic_star_border_white_24dp)) .setIntent(intent) .build()); } @@ -248,10 +245,6 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap // dialog.getButton(DialogInterface.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.fg_default)); //} - - ACCENT_COLOR= fetchAccentColor(this); - fabCreate.setBackgroundTintList(ColorStateList.valueOf(darkenColor20(ACCENT_COLOR))); - headerView.setBackgroundColor(ACCENT_COLOR); } private void migrateUrl() { @@ -306,16 +299,15 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap if (db.getNoteServerSyncHelper().isSyncPossible()) { synchronize(); } - } - else { + } else { Snackbar.make(coordinatorLayout, getString(R.string.error_sync_disabled), Snackbar.LENGTH_LONG).setAction(R.string.action_enable_sync, new View.OnClickListener() { - @Override - public void onClick(View view) { - startActivity(new Intent(Settings.ACTION_SYNC_SETTINGS)); - } - }).show(); + @Override + public void onClick(View view) { + startActivity(new Intent(Settings.ACTION_SYNC_SETTINGS)); + } + }).show(); } super.onResume(); } @@ -350,6 +342,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap private void setupNotesList() { initList(); // Pull to Refresh + swipeRefreshLayout.setColorSchemeColors(getColor(R.color.accent_color)); swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { @Override public void onRefresh() { @@ -360,8 +353,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap swipeRefreshLayout.setRefreshing(false); Toast.makeText(getApplicationContext(), getString(R.string.error_sync, getString(NotesClientUtil.LoginStatus.NO_NETWORK.str)), Toast.LENGTH_LONG).show(); } - } - else { + } else { swipeRefreshLayout.setRefreshing(false); Snackbar.make(coordinatorLayout, getString(R.string.error_sync_disabled), Snackbar.LENGTH_LONG).setAction(R.string.action_enable_sync, new @@ -778,13 +770,11 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap } else { Toast.makeText(getApplicationContext(), getString(R.string.error_sync, getString(NotesClientUtil.LoginStatus.NO_NETWORK.str)), Toast.LENGTH_LONG).show(); } - } - else { + } else { Intent settingsIntent = new Intent(this, SettingsActivity.class); startActivityForResult(settingsIntent, server_settings); } - } - else { + } else { finish(); } } else if (requestCode == server_settings) { @@ -798,8 +788,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap } else { Toast.makeText(getApplicationContext(), getString(R.string.error_sync, getString(NotesClientUtil.LoginStatus.NO_NETWORK.str)), Toast.LENGTH_LONG).show(); } - } - else { + } else { finish(); } } @@ -948,47 +937,4 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap } } - /* - * get Accent color from OS - * */ - private int fetchAccentColor(Context context) { - - TypedValue typedValue = new TypedValue(); - ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(this, - android.R.style.Theme_DeviceDefault); - contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent, - typedValue, true); - int color_accent = typedValue.data; - Log.e("TAG", "accent Colour #"+Integer.toHexString(color_accent)); - - //change toolbar color - getSupportActionBar().setBackgroundDrawable( - new ColorDrawable(color_accent)); - - //change status bar color - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - Window window = getWindow(); - window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - window.setStatusBarColor(darkenColor(color_accent)); - } - - return color_accent; - } - - - @ColorInt - int darkenColor(@ColorInt int color) { - float[] hsv = new float[3]; - android.graphics.Color.colorToHSV(color, hsv); - hsv[2] *= 0.8f; - return android.graphics.Color.HSVToColor(hsv); - } - - @ColorInt int darkenColor20(@ColorInt int color) { - float[] hsv = new float[3]; - android.graphics.Color.colorToHSV(color, hsv); - hsv[2] *= 0.6f; - return android.graphics.Color.HSVToColor(hsv); - } - } diff --git a/app/src/main/java/foundation/e/notes/android/activity/PreferencesActivity.java b/app/src/main/java/foundation/e/notes/android/activity/PreferencesActivity.java index b1fa2dca8669c98a698b1257d6cd4ba2585ec23f..0ebe351acb0fb371efb857003e1e1720ffe508a3 100644 --- a/app/src/main/java/foundation/e/notes/android/activity/PreferencesActivity.java +++ b/app/src/main/java/foundation/e/notes/android/activity/PreferencesActivity.java @@ -27,27 +27,6 @@ public class PreferencesActivity extends AppCompatActivity { .replace(android.R.id.content, new PreferencesFragment()) .commit(); - updateAccentColor(); } - private void updateAccentColor(){ - //change toolbar color - getSupportActionBar().setBackgroundDrawable( - new ColorDrawable(NotesListViewActivity.ACCENT_COLOR)); - - //change status bar color - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - Window window = getWindow(); - window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - window.setStatusBarColor(darkenColor(NotesListViewActivity.ACCENT_COLOR)); - } - } - - @ColorInt - int darkenColor(@ColorInt int color) { - float[] hsv = new float[3]; - android.graphics.Color.colorToHSV(color, hsv); - hsv[2] *= 0.8f; - return android.graphics.Color.HSVToColor(hsv); - } } diff --git a/app/src/main/java/foundation/e/notes/android/activity/SelectSingleNoteActivity.java b/app/src/main/java/foundation/e/notes/android/activity/SelectSingleNoteActivity.java index c9306682b74b2fb84d5c8d11324371e379b36bf9..6a1f8c434b0584e935f040e7a9c2f5f4408946fb 100644 --- a/app/src/main/java/foundation/e/notes/android/activity/SelectSingleNoteActivity.java +++ b/app/src/main/java/foundation/e/notes/android/activity/SelectSingleNoteActivity.java @@ -49,7 +49,6 @@ public class SelectSingleNoteActivity extends NotesListViewActivity { swipeRefreshLayout.setEnabled(false); swipeRefreshLayout.setRefreshing(false); - updateAccentColor(); } @Override @@ -84,24 +83,4 @@ public class SelectSingleNoteActivity extends NotesListViewActivity { finish(); } - private void updateAccentColor(){ - //change toolbar color - getSupportActionBar().setBackgroundDrawable( - new ColorDrawable(NotesListViewActivity.ACCENT_COLOR)); - - //change status bar color - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - Window window = getWindow(); - window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - window.setStatusBarColor(darkenColor(NotesListViewActivity.ACCENT_COLOR)); - } - } - - @ColorInt - int darkenColor(@ColorInt int color) { - float[] hsv = new float[3]; - android.graphics.Color.colorToHSV(color, hsv); - hsv[2] *= 0.8f; - return android.graphics.Color.HSVToColor(hsv); - } } diff --git a/app/src/main/java/foundation/e/notes/android/activity/SettingsActivity.java b/app/src/main/java/foundation/e/notes/android/activity/SettingsActivity.java index 1237012b8039008681654c0eaf4ce793bfbaac21..dab548e04a5a271f680b3aae10fdaa27c82be938 100644 --- a/app/src/main/java/foundation/e/notes/android/activity/SettingsActivity.java +++ b/app/src/main/java/foundation/e/notes/android/activity/SettingsActivity.java @@ -61,7 +61,7 @@ import static android.os.Process.myPid; /** * @author Nihar Thakkar - * + *

* Allows to set Settings like URL, Username and Password for Server-Synchronization * Created by stefan on 22.09.15. */ @@ -143,8 +143,6 @@ public class SettingsActivity extends AppCompatActivity { handleSubmitButtonEnabled(); - updateAccentColor(); - } private void setupListener() { @@ -347,7 +345,7 @@ public class SettingsActivity extends AppCompatActivity { // show snackbar after 60s to switch back to old login method new Handler().postDelayed(() -> { Snackbar.make(webView, R.string.fallback_weblogin_text, Snackbar.LENGTH_INDEFINITE) - .setAction(R.string.fallback_weblogin_back, (View.OnClickListener) v -> initLegacyLogin(field_url.getText().toString())).show(); + .setAction(R.string.fallback_weblogin_back, (View.OnClickListener) v -> initLegacyLogin(field_url.getText().toString())).show(); }, 45 * 1000); } @@ -553,26 +551,4 @@ public class SettingsActivity extends AppCompatActivity { String password; } - private void updateAccentColor(){ - //change toolbar color - getSupportActionBar().setBackgroundDrawable( - new ColorDrawable(NotesListViewActivity.ACCENT_COLOR)); - - //change status bar color - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - Window window = getWindow(); - window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - window.setStatusBarColor(darkenColor(NotesListViewActivity.ACCENT_COLOR)); - } - - btn_submit.setBackgroundColor(NotesListViewActivity.ACCENT_COLOR); - } - - @ColorInt - int darkenColor(@ColorInt int color) { - float[] hsv = new float[3]; - android.graphics.Color.colorToHSV(color, hsv); - hsv[2] *= 0.8f; - return android.graphics.Color.HSVToColor(hsv); - } } diff --git a/app/src/main/java/foundation/e/notes/android/appwidget/NoteListWidgetConfiguration.java b/app/src/main/java/foundation/e/notes/android/appwidget/NoteListWidgetConfiguration.java index 27b936d2959e8484529d66716a96e713a013c70e..d21a855593c9c98d27c4d63448661fcb74b89450 100644 --- a/app/src/main/java/foundation/e/notes/android/appwidget/NoteListWidgetConfiguration.java +++ b/app/src/main/java/foundation/e/notes/android/appwidget/NoteListWidgetConfiguration.java @@ -15,6 +15,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + import android.util.Log; import android.view.Window; import android.view.WindowManager; @@ -64,7 +65,7 @@ public class NoteListWidgetConfiguration extends AppCompatActivity { if (extras != null) { appWidgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, - AppWidgetManager.INVALID_APPWIDGET_ID); + AppWidgetManager.INVALID_APPWIDGET_ID); } if (appWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) { @@ -73,13 +74,13 @@ public class NoteListWidgetConfiguration extends AppCompatActivity { } itemRecent = new NavigationAdapter.NavigationItem(NotesListViewActivity.ADAPTER_KEY_RECENT, - getString(foundation.e.notes.R.string.label_all_notes), - null, - foundation.e.notes.R.drawable.ic_access_time_grey600_24dp); + getString(foundation.e.notes.R.string.label_all_notes), + null, + foundation.e.notes.R.drawable.ic_access_time_grey600_24dp); itemFavorites = new NavigationAdapter.NavigationItem(NotesListViewActivity.ADAPTER_KEY_STARRED, - getString(foundation.e.notes.R.string.label_favorites), - null, - foundation.e.notes.R.drawable.ic_star_yellow_24dp); + getString(foundation.e.notes.R.string.label_favorites), + null, + foundation.e.notes.R.drawable.ic_star_yellow_24dp); RecyclerView recyclerView; RecyclerView.LayoutManager layoutManager; @@ -104,8 +105,8 @@ public class NoteListWidgetConfiguration extends AppCompatActivity { sp.putBoolean(NoteListWidget.DARK_THEME_KEY + appWidgetId, Notes.getAppTheme(getApplicationContext())); sp.apply(); - Intent updateIntent = new Intent( AppWidgetManager.ACTION_APPWIDGET_UPDATE, null, - getApplicationContext(), NoteListWidget.class); + Intent updateIntent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE, null, + getApplicationContext(), NoteListWidget.class); updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId); setResult(RESULT_OK, updateIntent); getApplicationContext().sendBroadcast(updateIntent); @@ -122,8 +123,6 @@ public class NoteListWidgetConfiguration extends AppCompatActivity { layoutManager = new LinearLayoutManager(this); recyclerView.setLayoutManager(layoutManager); recyclerView.setAdapter(adapterCategories); - - updateAccentColor(); } @Override @@ -170,26 +169,4 @@ public class NoteListWidgetConfiguration extends AppCompatActivity { adapterCategories.setItems(items); } } - - - private void updateAccentColor(){ - //change toolbar color - getSupportActionBar().setBackgroundDrawable( - new ColorDrawable(NotesListViewActivity.ACCENT_COLOR)); - - //change status bar color - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - Window window = getWindow(); - window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - window.setStatusBarColor(darkenColor(NotesListViewActivity.ACCENT_COLOR)); - } - } - - @ColorInt - int darkenColor(@ColorInt int color) { - float[] hsv = new float[3]; - android.graphics.Color.colorToHSV(color, hsv); - hsv[2] *= 0.8f; - return android.graphics.Color.HSVToColor(hsv); - } } diff --git a/app/src/main/java/foundation/e/notes/android/appwidget/NoteListWidgetFactory.java b/app/src/main/java/foundation/e/notes/android/appwidget/NoteListWidgetFactory.java index 0f1398440e95111b2a0cfe0fa6c9a4528eec63e5..c289202c8726dfe78240c35b0a3fd0148e441f95 100644 --- a/app/src/main/java/foundation/e/notes/android/appwidget/NoteListWidgetFactory.java +++ b/app/src/main/java/foundation/e/notes/android/appwidget/NoteListWidgetFactory.java @@ -96,7 +96,7 @@ public class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFact if (note.isFavorite()) { note_content.setImageViewResource(R.id.widget_entry_fav_icon_dark, R.drawable.ic_star_yellow_24dp); } else { - note_content.setImageViewResource(R.id.widget_entry_fav_icon_dark, R.drawable.ic_star_grey_ccc_24dp); + note_content.setImageViewResource(R.id.widget_entry_fav_icon_dark, R.drawable.ic_star_border_white_24dp); } } else { note_content = new RemoteViews(context.getPackageName(), R.layout.widget_entry); @@ -106,7 +106,7 @@ public class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFact if (note.isFavorite()) { note_content.setImageViewResource(R.id.widget_entry_fav_icon, R.drawable.ic_star_yellow_24dp); } else { - note_content.setImageViewResource(R.id.widget_entry_fav_icon, R.drawable.ic_star_grey_ccc_24dp); + note_content.setImageViewResource(R.id.widget_entry_fav_icon, R.drawable.ic_star_border_white_24dp); } } diff --git a/app/src/main/java/foundation/e/notes/android/fragment/BaseNoteFragment.java b/app/src/main/java/foundation/e/notes/android/fragment/BaseNoteFragment.java index b3536b0790b32a6760d0f54b3cf29250bae81747..f15637116512df08c0aea2c9ff6410e1f8ef5ca5 100644 --- a/app/src/main/java/foundation/e/notes/android/fragment/BaseNoteFragment.java +++ b/app/src/main/java/foundation/e/notes/android/fragment/BaseNoteFragment.java @@ -277,7 +277,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo ShortcutInfo pinShortcutInfo = new ShortcutInfo.Builder(getActivity(), note.getId() + "") .setShortLabel(note.getTitle()) - .setIcon(Icon.createWithResource(getActivity().getApplicationContext(), note.isFavorite() ? R.drawable.ic_star_yellow_24dp : R.drawable.ic_star_grey_ccc_24dp)) + .setIcon(Icon.createWithResource(getActivity().getApplicationContext(), note.isFavorite() ? R.drawable.ic_star_yellow_24dp : R.drawable.ic_star_border_white_24dp)) .setIntent(intent) .build(); diff --git a/app/src/main/java/foundation/e/notes/model/ItemAdapter.java b/app/src/main/java/foundation/e/notes/model/ItemAdapter.java index 15963a9e906a7a084ae1fe330a24f46a20781401..654dc9102bff417535f28a262353b68a389f59b8 100644 --- a/app/src/main/java/foundation/e/notes/model/ItemAdapter.java +++ b/app/src/main/java/foundation/e/notes/model/ItemAdapter.java @@ -105,7 +105,7 @@ public class ItemAdapter extends RecyclerView.Adapter { nvHolder.noteCategory.setText(Html.fromHtml(note.getCategory())); nvHolder.noteExcerpt.setText(Html.fromHtml(note.getExcerpt())); nvHolder.noteStatus.setVisibility(DBStatus.VOID.equals(note.getStatus()) ? View.INVISIBLE : View.VISIBLE); - nvHolder.noteFavorite.setImageResource(note.isFavorite() ? R.drawable.ic_star_yellow_24dp : R.drawable.ic_star_grey_ccc_24dp); + nvHolder.noteFavorite.setImageResource(note.isFavorite() ? R.drawable.ic_star_yellow_24dp : R.drawable.ic_star_border_white_24dp); nvHolder.noteFavorite.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/app/src/main/java/foundation/e/notes/model/NavigationAdapter.java b/app/src/main/java/foundation/e/notes/model/NavigationAdapter.java index 203c71e2e6ee195f5edd9b48e53d067919e41e04..6dda112fdc9fd0ade2b47a8d809fb82e041585bf 100644 --- a/app/src/main/java/foundation/e/notes/model/NavigationAdapter.java +++ b/app/src/main/java/foundation/e/notes/model/NavigationAdapter.java @@ -1,10 +1,13 @@ package foundation.e.notes.model; import android.graphics.Color; + import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; + +import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -97,8 +100,8 @@ public class NavigationAdapter extends RecyclerView.Adapter - + + diff --git a/app/src/main/res/drawable/ic_star_grey_ccc_24dp.xml b/app/src/main/res/drawable/ic_star_grey_ccc_24dp.xml index 6b71fadc193cde310c1bec154a28d1801fd74c2d..1c7ebd95791e0ae8c49be719f5bb2e737fb89f9e 100644 --- a/app/src/main/res/drawable/ic_star_grey_ccc_24dp.xml +++ b/app/src/main/res/drawable/ic_star_grey_ccc_24dp.xml @@ -1,5 +1,11 @@ - - + + diff --git a/app/src/main/res/drawable/ic_star_white_24dp.xml b/app/src/main/res/drawable/ic_star_white_24dp.xml index 605eae53c2a5768c067a13a9f1cc518fa18f56ca..fd8103b86cfd90722f6116c49d7472a5463f4709 100644 --- a/app/src/main/res/drawable/ic_star_white_24dp.xml +++ b/app/src/main/res/drawable/ic_star_white_24dp.xml @@ -1,5 +1,11 @@ - - + + diff --git a/app/src/main/res/drawable/ic_star_yellow_24dp.xml b/app/src/main/res/drawable/ic_star_yellow_24dp.xml index 1d147436162108bbde12c0fb9845f585a3290f38..1196fde751a1311efe6816ec8e92f3bbcf1198e6 100644 --- a/app/src/main/res/drawable/ic_star_yellow_24dp.xml +++ b/app/src/main/res/drawable/ic_star_yellow_24dp.xml @@ -1,5 +1,10 @@ - - + + diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml index dd91cbb26c872e215cd24775b4e3590b2289557a..e81e9c23ec9478cc2caa82d68f11b0e478417480 100644 --- a/app/src/main/res/layout/activity_account.xml +++ b/app/src/main/res/layout/activity_account.xml @@ -33,6 +33,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:layout_marginStart="16dp" + android:background="@color/accent_color" android:layout_marginTop="32dp" android:text="@string/login_with_e_account" android:textColor="#FFFFFF" /> @@ -43,6 +44,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="16dp" android:layout_marginStart="16dp" + android:background="@color/accent_color" android:layout_marginTop="16dp" android:text="@string/Other" android:textColor="#FFFFFF" /> diff --git a/app/src/main/res/layout/activity_exception.xml b/app/src/main/res/layout/activity_exception.xml index d512dfa7935672e9435c61600120416379c7ca46..b39d760a3a283af5b0b0fc80dd14245954bf1289 100644 --- a/app/src/main/res/layout/activity_exception.xml +++ b/app/src/main/res/layout/activity_exception.xml @@ -39,13 +39,19 @@ android:weightSum="1.0">