diff --git a/app/build.gradle b/app/build.gradle index eb23442..c4e8f3c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { applicationId "com.braintest.brain.iq" minSdk 23 targetSdk 34 - versionCode 2 - versionName "1.0.1" + versionCode 3 + versionName "1.0.2" setProperty("archivesBaseName", "Brain Test_V" + versionName + "(${versionCode})_$timestamp") } diff --git a/app/src/main/java/com/braintest/brain/test/InfoActivity.java b/app/src/main/java/com/braintest/brain/test/InfoActivity.java index 8a77c61..baaed31 100644 --- a/app/src/main/java/com/braintest/brain/test/InfoActivity.java +++ b/app/src/main/java/com/braintest/brain/test/InfoActivity.java @@ -149,10 +149,10 @@ public class InfoActivity extends AppCompatActivity { private void getNextQuestion() { getQuestionNumbers(questionNumber); - answer1.setBackground(getDrawable(R.drawable.background_item)); - answer2.setBackground(getDrawable(R.drawable.background_item)); - answer3.setBackground(getDrawable(R.drawable.background_item)); - answer4.setBackground(getDrawable(R.drawable.background_item)); + answer1.setBackground(getDrawable(R.drawable.dilaog_button)); + answer2.setBackground(getDrawable(R.drawable.dilaog_button)); + answer3.setBackground(getDrawable(R.drawable.dilaog_button)); + answer4.setBackground(getDrawable(R.drawable.dilaog_button)); textQuestionNumber.setText(getString(R.string.str_text_question) + " " + questionNumber); } diff --git a/app/src/main/java/com/braintest/brain/test/MyAdapter.java b/app/src/main/java/com/braintest/brain/test/MyAdapter.java index caed048..b364892 100644 --- a/app/src/main/java/com/braintest/brain/test/MyAdapter.java +++ b/app/src/main/java/com/braintest/brain/test/MyAdapter.java @@ -49,7 +49,7 @@ public class MyAdapter extends RecyclerView.Adapter holder.itemLevelsBinding.levelsBtn.setAlpha(1f); } else { holder.itemLevelsBinding.levelsBtn.setClickable(false); - holder.itemLevelsBinding.levelsBtn.setAlpha(0.64f); + holder.itemLevelsBinding.levelsBtn.setAlpha(0.44f); } diff --git a/app/src/main/java/com/braintest/brain/test/WelcomeActivity.java b/app/src/main/java/com/braintest/brain/test/WelcomeActivity.java index a4d6147..207aa82 100644 --- a/app/src/main/java/com/braintest/brain/test/WelcomeActivity.java +++ b/app/src/main/java/com/braintest/brain/test/WelcomeActivity.java @@ -9,7 +9,7 @@ import androidx.appcompat.app.AppCompatActivity; public class WelcomeActivity extends AppCompatActivity { - static int splashTimeOut = 3000 ; + static int splashTimeOut = 2000 ; @Override protected void onCreate(Bundle savedInstanceState) { @@ -18,7 +18,6 @@ public class WelcomeActivity extends AppCompatActivity { BrainTestApp.setStatusBar(this,true); - ImageView logo = findViewById(R.id.logo); new Handler().postDelayed(() -> { Intent mainActivity = new Intent(WelcomeActivity.this, MainActivity.class); @@ -27,9 +26,7 @@ public class WelcomeActivity extends AppCompatActivity { finish(); }, splashTimeOut); -// Animation myAnim = AnimationUtils.loadAnimation(this,R.anim.welcom_alpha); -// logo.startAnimation(myAnim); -// appNameText.startAnimation(myAnim); + } diff --git a/app/src/main/res/drawable/dilaog_button.xml b/app/src/main/res/drawable/dilaog_button.xml index 9ddb381..870dbf3 100644 --- a/app/src/main/res/drawable/dilaog_button.xml +++ b/app/src/main/res/drawable/dilaog_button.xml @@ -2,10 +2,11 @@ - - + + diff --git a/app/src/main/res/font/newfont.ttf b/app/src/main/res/font/newfont.ttf index 15181a4..3729151 100644 Binary files a/app/src/main/res/font/newfont.ttf and b/app/src/main/res/font/newfont.ttf differ diff --git a/app/src/main/res/layout/activity_game.xml b/app/src/main/res/layout/activity_game.xml index 838b6b3..4da72b5 100644 --- a/app/src/main/res/layout/activity_game.xml +++ b/app/src/main/res/layout/activity_game.xml @@ -84,7 +84,7 @@ android:layout_marginTop="@dimen/padding_19dp" android:layout_marginEnd="25dp" android:layout_weight="0.1" - android:background="@drawable/background_item" + android:background="@drawable/dilaog_button" android:fontFamily="@font/newfont" android:text="الزرافة" android:textColor="@color/white" @@ -98,7 +98,7 @@ android:layout_marginTop="@dimen/padding_19dp" android:layout_marginEnd="25dp" android:layout_weight="0.1" - android:background="@drawable/background_item" + android:background="@drawable/dilaog_button" android:fontFamily="@font/newfont" android:text="النعامة" android:textColor="@color/white" @@ -112,7 +112,7 @@ android:layout_marginTop="@dimen/padding_19dp" android:layout_marginEnd="25dp" android:layout_weight="0.1" - android:background="@drawable/background_item" + android:background="@drawable/dilaog_button" android:fontFamily="@font/newfont" android:text="الفيل" android:textColor="@color/white" @@ -126,7 +126,7 @@ android:layout_marginTop="@dimen/padding_19dp" android:layout_marginEnd="25dp" android:layout_weight="0.1" - android:background="@drawable/background_item" + android:background="@drawable/dilaog_button" android:fontFamily="@font/newfont" android:text="السلحفاة" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_set.xml b/app/src/main/res/layout/activity_set.xml index 251c4a8..4ea4506 100644 --- a/app/src/main/res/layout/activity_set.xml +++ b/app/src/main/res/layout/activity_set.xml @@ -44,7 +44,7 @@ android:layout_marginStart="25dp" android:layout_marginTop="90dp" android:layout_marginEnd="25dp" - android:background="@drawable/background_item" + android:background="@drawable/dilaog_button" android:orientation="vertical" android:paddingTop="14dp" android:paddingBottom="14dp"> diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml index d08c0c1..c97e026 100644 --- a/app/src/main/res/layout/activity_welcome.xml +++ b/app/src/main/res/layout/activity_welcome.xml @@ -1,37 +1,44 @@ + android:background="@drawable/background_home" + android:paddingTop="@dimen/top_dp"> - + app:cardCornerRadius="10dp"> + + + + android:text="@string/app_name_welcome" + android:textColor="@color/common_text_color" + android:textSize="25sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_win.xml b/app/src/main/res/layout/layout_win.xml index ed9881f..aa62ae9 100644 --- a/app/src/main/res/layout/layout_win.xml +++ b/app/src/main/res/layout/layout_win.xml @@ -33,9 +33,7 @@ + android:orientation="vertical"> #00f855 #D32F2F #D32F2F - #cd87be + #CCA7E6 + + #C8CD87 + #C8CD87 + #cd87be #2b2b2b #cd87be