diff --git a/app/build.gradle b/app/build.gradle index 869e152..753a737 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "org.secuso.privacyfriendlysudoku" minSdkVersion 16 targetSdkVersion 29 - versionCode 8 - versionName "2.2.1" + versionCode 9 + versionName "3.0.0" vectorDrawables.useSupportLibrary = true } buildTypes { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f6c830e..9f25327 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,19 +23,19 @@ + android:theme="@style/AppTheme.NoActionBar" /> + android:theme="@style/AppTheme.NoActionBar" /> + android:theme="@style/AppTheme.NoActionBar" /> + android:theme="@style/AppTheme.NoActionBar" /> - - + - - extends AppCompatActivity { +public class DailySudokuActivity extends AppCompatActivity { List sudokuList; SharedPreferences settings; private final DatabaseHelper dbHelper = new DatabaseHelper(this); RatingBar difficultyBar; - static final int MAIN_CONTENT_FADEOUT_DURATION = 150; - static final int MAIN_CONTENT_FADEIN_DURATION = 250; - private Handler mHandler; - private StatsActivity.SectionsPagerAdapter mSectionsPagerAdapter; private SudokuListAdapter sudokuListAdapter; private int dailyId; @@ -111,11 +108,9 @@ public class DailySudokuActivity extends AppCompatActivity { difficultyBar = findViewById(R.id.first_diff_bar); settings = PreferenceManager.getDefaultSharedPreferences(this); - mHandler = new Handler(); - ListView listView = (ListView)findViewById(R.id.sudoku_list); - sudokuListAdapter = new DailySudokuActivity.SudokuListAdapter(this, sudokuList); + sudokuListAdapter = new SudokuListAdapter(this, sudokuList); listView.setAdapter(sudokuListAdapter); // Calculate the current date as an int id @@ -157,8 +152,6 @@ public class DailySudokuActivity extends AppCompatActivity { difficultyBar.setNumStars(GameDifficulty.getValidDifficultyList().size()); difficultyBar.setMax(GameDifficulty.getValidDifficultyList().size()); difficultyBar.setRating(GameDifficulty.getValidDifficultyList().indexOf(dailyDifficulty)+1); - - } public void onClick(View view) { @@ -196,11 +189,7 @@ public class DailySudokuActivity extends AppCompatActivity { } public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.menu_stats, menu); - //getMenuInflater().inflate(R.menu.menu_stats, menu); - return true; - //return false; + return false; } @Override @@ -210,20 +199,15 @@ public class DailySudokuActivity extends AppCompatActivity { // as you specify a parent activity in AndroidManifest.xml. //noinspection SimplifiableIfStatement - switch(item.getItemId()) { - case R.id.action_reset: - SaveLoadStatistics.resetStats(this); - mSectionsPagerAdapter.refresh(this); - return true; - case android.R.id.home: - finish(); - return true; + if (item.getItemId() == android.R.id.home) { + finish(); + return true; } return super.onOptionsItemSelected(item); } - private class SudokuListAdapter extends BaseAdapter { + private static class SudokuListAdapter extends BaseAdapter { private Context context; private List sudokuList; @@ -263,7 +247,7 @@ public class DailySudokuActivity extends AppCompatActivity { TextView playedTime = (TextView)convertView.findViewById(R.id.loadgame_listentry_timeplayed); TextView lastTimePlayed = (TextView)convertView.findViewById(R.id.loadgame_listentry_lasttimeplayed); ImageView image = (ImageView)convertView.findViewById(R.id.loadgame_listentry_gametypeimage); - ImageView customImage = (ImageView)convertView.findViewById(R.id.loadgame_listentry_custom_label); + ImageView customImage = (ImageView)convertView.findViewById(R.id.loadgame_listentry_custom_icon); image.setImageResource(R.drawable.icon_default_9x9); @@ -276,18 +260,16 @@ public class DailySudokuActivity extends AppCompatActivity { customImage.setVisibility(View.INVISIBLE); - Calendar currentDate = Calendar.getInstance(); - //int id = currentDate.get(Calendar.DAY_OF_MONTH) * 1000000 - // + (currentDate.get(Calendar.MONTH) + 1) * 10000 + currentDate.get(Calendar.YEAR); - int id = sudoku.getId(); - int dayOfMonth = id/1000000; - int month = (id/10000) % 100; - int year = id%10000; + Calendar cal = Calendar.getInstance(); + cal.set(id%10000, (id/10000) % 100, id/1000000, 0, 0, 0 ); - String str = String.format("%02d.%02d.%02d", dayOfMonth, month, year); - lastTimePlayed.setText(str); + DateFormat format = DateFormat.getDateInstance(); + format.setTimeZone(TimeZone.getDefault()); + + lastTimePlayed.setText(format.format(cal.getTime())); + playedTime.setText(sudoku.getTimeNeeded()); return convertView; } diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/LoadGameActivity.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/LoadGameActivity.java index 86c5aa2..ac152dd 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/LoadGameActivity.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/LoadGameActivity.java @@ -42,7 +42,6 @@ import android.widget.TextView; import org.secuso.privacyfriendlysudoku.controller.GameController; import org.secuso.privacyfriendlysudoku.controller.GameStateManager; -import org.secuso.privacyfriendlysudoku.controller.NewLevelManager; import org.secuso.privacyfriendlysudoku.controller.helper.GameInfoContainer; import org.secuso.privacyfriendlysudoku.game.GameDifficulty; import org.secuso.privacyfriendlysudoku.ui.listener.IDeleteDialogFragmentListener; @@ -229,7 +228,8 @@ public class LoadGameActivity extends BaseActivity implements IDeleteDialogFragm TextView playedTime = (TextView)convertView.findViewById(R.id.loadgame_listentry_timeplayed); TextView lastTimePlayed = (TextView)convertView.findViewById(R.id.loadgame_listentry_lasttimeplayed); ImageView image = (ImageView)convertView.findViewById(R.id.loadgame_listentry_gametypeimage); - ImageView customImage = (ImageView)convertView.findViewById(R.id.loadgame_listentry_custom_label); + ImageView customImage = (ImageView)convertView.findViewById(R.id.loadgame_listentry_custom_icon); + TextView customLabel = (TextView) convertView.findViewById(R.id.loadgame_listentry_custom_label); switch(gic.getGameType()) { case Default_6x6: @@ -250,11 +250,8 @@ public class LoadGameActivity extends BaseActivity implements IDeleteDialogFragm difficultyBar.setMax(GameDifficulty.getValidDifficultyList().size()); difficultyBar.setRating(GameDifficulty.getValidDifficultyList().indexOf(gic.getDifficulty())+1); - if(!gic.isCustom()) { - customImage.setVisibility(View.INVISIBLE); - } else { - customImage.setVisibility(View.VISIBLE); - } + customImage.setImageResource(gic.isCustom() ? R.drawable.ic_circle_blue_36dp : R.drawable.ic_circle_grey_36dp); + customLabel.setVisibility(gic.isCustom() ? View.VISIBLE : View.GONE); int time = gic.getTimePlayed(); int seconds = time % 60; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CellHighlightTypes.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CellHighlightTypes.java index af77d4d..09406ca 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CellHighlightTypes.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/CellHighlightTypes.java @@ -16,7 +16,6 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - package org.secuso.privacyfriendlysudoku.ui.view; /** diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuCellView.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuCellView.java index f48eb25..fc2a337 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuCellView.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuCellView.java @@ -20,6 +20,8 @@ package org.secuso.privacyfriendlysudoku.ui.view; import android.content.Context; +import android.content.res.Configuration; +import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; @@ -50,15 +52,32 @@ public class SudokuCellView extends View { Symbol symbolsToUse = Symbol.Default; RelativeLayout.LayoutParams params; - - public SudokuCellView(Context context) { - super(context); - } + int backgroundColor; + int backgroundErrorColor; + int backgroundSelectedColor; + int backgroundConnectedOuterColor; + int backgroundConnectedInnerColor; + int backgroundValueHighlightedColor; + int backgroundValueHighlightedSelectedColor; + int textColor; public SudokuCellView(Context context, AttributeSet attrs){ super(context, attrs); + + TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SudokuCellView); + backgroundColor = a.getColor(R.styleable.SudokuCellView_sudokuCellBackgroundColor, Color.argb(255, 200, 200, 200)); + backgroundErrorColor = a.getColor(R.styleable.SudokuCellView_sudokuCellBackgroundErrorColor, Color.argb(255, 200, 200, 200)); + backgroundSelectedColor = a.getColor(R.styleable.SudokuCellView_sudokuCellBackgroundSelectedColor, Color.argb(255, 200, 200, 200)); + backgroundConnectedOuterColor = a.getColor(R.styleable.SudokuCellView_sudokuCellBackgroundConnectedOuterColor, Color.argb(255, 200, 200, 200)); + backgroundConnectedInnerColor = a.getColor(R.styleable.SudokuCellView_sudokuCellBackgroundConnectedInnerColor, Color.argb(255, 200, 200, 200)); + backgroundValueHighlightedColor = a.getColor(R.styleable.SudokuCellView_sudokuCellBackgroundValueHighlightedColor, Color.argb(255, 200, 200, 200)); + backgroundValueHighlightedSelectedColor = a.getColor(R.styleable.SudokuCellView_sudokuCellBackgroundValueHighlightedSelectedColor, Color.argb(255, 200, 200, 200)); + textColor = a.getColor(R.styleable.SudokuCellView_sudokuCellTextColor, Color.argb(255, 200, 200, 200)); + a.recycle(); } + + public void setSelected(boolean b) { this.selected = b; } @@ -108,13 +127,6 @@ public class SudokuCellView extends View { return true; }*/ - @Override - protected void onLayout(boolean changed, int left, int top, int right, int bottom) { - super.onLayout(changed, left, top, right, bottom); - - - } - @Override public void onDraw(Canvas canvas) { super.onDraw(canvas); @@ -127,27 +139,28 @@ public class SudokuCellView extends View { Paint p = new Paint(); switch(highlightType) { case Default: - p.setColor(Color.WHITE); + p.setColor(backgroundColor); break; case Error: - p.setColor(Color.LTGRAY); + p.setColor(backgroundErrorColor); break; case Selected: - p.setColor(Color.GREEN); + p.setColor(backgroundSelectedColor); break; case Connected: - p.setColor(Color.WHITE); + p.setColor(backgroundConnectedOuterColor); drawBackground(canvas, 3, 3, mWidth - 3, mHeight - 3, p); - p.setColor(Color.YELLOW); + p.setColor(backgroundConnectedInnerColor); p.setAlpha(100); break; case Value_Highlighted: - p.setColor(Color.YELLOW); + p.setColor(backgroundValueHighlightedColor); break; case Value_Highlighted_Selected: - p.setColor(Color.CYAN); + p.setColor(backgroundValueHighlightedSelectedColor); + break; default: - p.setColor(Color.WHITE); + p.setColor(backgroundColor); } @@ -166,6 +179,7 @@ public class SudokuCellView extends View { public void drawValue(Canvas canvas) { Paint p = new Paint(); + p.setColor(textColor); int root = (int) Math.sqrt(size); int j= root+1; int k = root; diff --git a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuFieldLayout.java b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuFieldLayout.java index 055b5ef..f0aebef 100644 --- a/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuFieldLayout.java +++ b/app/src/main/java/org/secuso/privacyfriendlysudoku/ui/view/SudokuFieldLayout.java @@ -21,6 +21,8 @@ package org.secuso.privacyfriendlysudoku.ui.view; import android.content.Context; import android.content.SharedPreferences; +import android.content.res.Configuration; +import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; @@ -50,6 +52,9 @@ public class SudokuFieldLayout extends RelativeLayout implements IHighlightChang private int gameCellHeight; private SharedPreferences settings; private Paint p = new Paint(); + int backgroundColor; + int errorColor; + int sectionLineColor; private OnTouchListener listener = new OnTouchListener() { @Override @@ -74,8 +79,15 @@ public class SudokuFieldLayout extends RelativeLayout implements IHighlightChang public SudokuFieldLayout(Context context, AttributeSet attrs) { super(context, attrs); this.attrs=attrs; + + TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SudokuFieldLayout); + backgroundColor = a.getColor(R.styleable.SudokuFieldLayout_sudokuFieldGridColor, Color.argb(255, 200, 200, 200)); + errorColor = a.getColor(R.styleable.SudokuFieldLayout_sudokuFieldErrorColor, Color.RED); + sectionLineColor = a.getColor(R.styleable.SudokuFieldLayout_sudokuFieldSectionLineColor, Color.BLACK); + a.recycle(); + setWillNotDraw(false); - setBackgroundColor(Color.argb(255, 200, 200, 200)); + setBackgroundColor(backgroundColor); } public void setSettingsAndGame(SharedPreferences sharedPref, GameController gc) { @@ -117,7 +129,7 @@ public class SudokuFieldLayout extends RelativeLayout implements IHighlightChang if(gameController == null) return; - p.setColor(Color.BLACK); + p.setColor(sectionLineColor); p.setStrokeWidth(5); int horizontalSections = gameController.getSize() / sectionWidth; @@ -241,7 +253,7 @@ public class SudokuFieldLayout extends RelativeLayout implements IHighlightChang p = new Paint(Paint.ANTI_ALIAS_FLAG); p.setStyle(Paint.Style.STROKE); p.setStrokeWidth(4); - p.setColor(Color.RED); + p.setColor(errorColor); float offsetX = 0; float offsetY = 0; diff --git a/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_black_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_left_black_24dp.xml similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_keyboard_arrow_left_black_24dp.xml rename to app/src/main/res/drawable/ic_keyboard_arrow_left_black_24dp.xml diff --git a/app/src/main/res/drawable-hdpi/ic_keyboard_arrow_right_black_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_right_black_24dp.xml similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_keyboard_arrow_right_black_24dp.xml rename to app/src/main/res/drawable/ic_keyboard_arrow_right_black_24dp.xml diff --git a/app/src/main/res/drawable/ic_launcher_foreground_shadow.xml b/app/src/main/res/drawable/ic_launcher_foreground_shadow.xml index 4a5b108..207775b 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground_shadow.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground_shadow.xml @@ -2,16 +2,16 @@ xmlns:aapt="http://schemas.android.com/aapt" android:width="512dp" android:height="512dp" - android:viewportWidth="512" - android:viewportHeight="512"> + android:viewportWidth="600" + android:viewportHeight="600"> + android:pathData="M659,552.9V364.5L336.3,41.8h-12.6V93l-34.4,-34.4h-13.4v40.3l-40.3,-40.3h-13.4v16.8l-33.6,-33.6h-13.4l0.1,54.7l-40.8,-40.8L88.6,62L71.8,76.2l2.5,17.6l5,6.7l-5.9,-0.8l38.6,38.6l-44.5,-2.5v13.4l27,27l-53.8,-0.1v13.4l133.5,133.5H40.7v14.3l26.9,26.9v94l141.5,141.6L633,611.9C655.2,611.8 658.9,575.1 659,552.9z"> @@ -25,33 +25,33 @@ + android:pathData="M174.6,41.6h13.4v429.9h-13.4z" + android:fillColor="#FFFFFF"/> + android:pathData="M322.4,41.6h13.4v429.9h-13.4z" + android:fillColor="#FFFFFF"/> + android:pathData="M40.3,323.7h429.9v13.4h-429.9z" + android:fillColor="#FFFFFF"/> + android:pathData="M40.3,176h429.9v13.4h-429.9z" + android:fillColor="#FFFFFF"/> + android:pathData="M94.1,68.5h40.3V55.1H94.1c-14.8,0.3 -26.6,12.5 -26.3,27.4c0.3,14.4 11.9,26.1 26.3,26.3h13.4c7.4,-0.2 13.6,5.6 13.8,13.1c0.2,7.4 -5.6,13.6 -13.1,13.8c-0.2,0 -0.5,0 -0.7,0H67.2v13.4h40.3c14.8,-0.3 26.6,-12.5 26.3,-27.4c-0.3,-14.4 -11.9,-26.1 -26.3,-26.3H94.1C86.6,95.2 80.8,89 81,81.6C81.2,74.4 86.9,68.7 94.1,68.5z" + android:fillColor="#FFFFFF"/> + android:pathData="M262,206.2h-40.3v94H262c14.8,0 26.9,-12 26.9,-26.9c0,0 0,0 0,0V233C288.8,218.2 276.8,206.2 262,206.2zM262,286.8h-26.9v-67.2H262c7.4,0 13.4,6 13.4,13.4v40.3C275.4,280.8 269.4,286.8 262,286.8C262,286.8 262,286.8 262,286.8z" + android:fillColor="#FFFFFF"/> + android:pathData="M406.4,206.2h-13.4c-14.8,0 -26.9,12 -26.9,26.9v40.3c0,14.8 12,26.9 26.9,26.9c0,0 0,0 0,0h13.4c14.8,0 26.9,-12 26.9,-26.9v-40.3C433.2,218.2 421.2,206.2 406.4,206.2zM419.8,273.4c0,7.4 -6,13.4 -13.4,13.4h-13.4c-7.4,0 -13.4,-6 -13.4,-13.4v-40.3c0,-7.4 6,-13.4 13.4,-13.4h13.4c7.4,0 13.4,6 13.4,13.4V273.4z" + android:fillColor="#FFFFFF"/> + android:pathData="M134.4,374l0,0l0,0l0,0l0,-9.5l-9.4,0l-0.1,0.1l-0.1,-0.1l-37.9,37.9l-6.3,6.3l0,-12.5l0,-31.7l-13.4,0l0,19.8l0,17.4l0,20.5l0,17.6l0,18.7l13.4,0l0,-30.8l6.5,-6.4l37.7,37.2l0,0l9.6,0l0,-9.3l-37.9,-37.3l37.8,-37.9z" + android:fillColor="#FFFFFF"/> + android:pathData="M275.4,58.4v60.4c0,11.1 -9,20.2 -20.1,20.2s-20.2,-9 -20.2,-20.2l0,0V58.4h-13.4v60.4c0,18.5 15,33.6 33.6,33.6c18.5,0 33.6,-15 33.6,-33.6V58.4H275.4z" + android:fillColor="#FFFFFF"/> + android:pathData="M275.4,364.5V425c0,11.1 -9,20.1 -20.1,20.1s-20.2,-9 -20.2,-20.1l0,0v-60.5h-13.4V425c0,18.5 15,33.6 33.6,33.6c18.5,0 33.6,-15 33.6,-33.6v-60.5H275.4z" + android:fillColor="#FFFFFF"/> diff --git a/app/src/main/res/drawable/ic_launcher_foreground_shadow_old.xml b/app/src/main/res/drawable/ic_launcher_foreground_shadow_old.xml new file mode 100644 index 0000000..4a5b108 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground_shadow_old.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/list_entry_layout.xml b/app/src/main/res/layout/list_entry_layout.xml index 29eb03b..23a94ed 100644 --- a/app/src/main/res/layout/list_entry_layout.xml +++ b/app/src/main/res/layout/list_entry_layout.xml @@ -15,7 +15,7 @@ android:layout_height="match_parent" android:layout_marginRight="10dp" android:adjustViewBounds="true" - android:src="@drawable/icon_default_9x9" /> + app:srcCompat="@drawable/icon_default_9x9" /> + @@ -67,11 +75,12 @@ android:id="@+id/loadgame_listentry_difficultytext" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="8dp" android:text="Difficulty" app:layout_constraintBottom_toBottomOf="@+id/loadgame_listentry_difficultybar" - app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/loadgame_listentry_difficultybar" - app:layout_constraintTop_toTopOf="@+id/loadgame_listentry_difficultybar" /> + app:layout_constraintTop_toTopOf="@+id/loadgame_listentry_difficultybar" + android:layout_marginLeft="8dp" /> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index bb326ba..56153b0 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -3,6 +3,10 @@ + android:insetTop="22%" + android:insetLeft="22%" + android:insetRight="11%" + android:insetBottom="11%" + /> \ No newline at end of file diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index 82fab63..8fc418d 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -26,6 +26,19 @@ @color/colorPrimaryDark @color/white @color/colorAccent + + @color/vdarkgrey + @color/white + + + @color/darkgrey + @color/vdarkgrey + @color/darkgreen + @color/darkgrey + @color/yellow + @color/darkyellow + @color/darkcyan + @color/white + diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 7d299ab..21f406a 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -19,4 +19,21 @@ + + + + + + + + + + + + + + + + + \ 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 d7368c4..691f15a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -11,6 +11,16 @@ #ffffff #000000 #121212 + #ffff0000 + #CCCCCC + #333333 + #FF004400 + #FF444400 + #FF004444 + + #FF00FF00 + #388E3C + #FF00FFFF #026499 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b69155d..e265552 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -24,6 +24,21 @@ @color/white @null @color/colorPrimaryDark + + + @color/vlightgrey + @color/red + @color/black + + + @color/white + @color/vlightgrey + @color/lightgreen + @color/white + @color/yellow + @color/yellow + @color/cyan + @color/black -