V1.0.2(3)

This commit is contained in:
litingting 2024-08-30 17:28:07 +08:00
parent feb862fd6e
commit 4debb0b843
11 changed files with 44 additions and 36 deletions

View File

@ -14,8 +14,8 @@ android {
applicationId "com.braintest.brain.iq" applicationId "com.braintest.brain.iq"
minSdk 23 minSdk 23
targetSdk 34 targetSdk 34
versionCode 2 versionCode 3
versionName "1.0.1" versionName "1.0.2"
setProperty("archivesBaseName", "Brain Test_V" + versionName + "(${versionCode})_$timestamp") setProperty("archivesBaseName", "Brain Test_V" + versionName + "(${versionCode})_$timestamp")
} }

View File

@ -149,10 +149,10 @@ public class InfoActivity extends AppCompatActivity {
private void getNextQuestion() { private void getNextQuestion() {
getQuestionNumbers(questionNumber); getQuestionNumbers(questionNumber);
answer1.setBackground(getDrawable(R.drawable.background_item)); answer1.setBackground(getDrawable(R.drawable.dilaog_button));
answer2.setBackground(getDrawable(R.drawable.background_item)); answer2.setBackground(getDrawable(R.drawable.dilaog_button));
answer3.setBackground(getDrawable(R.drawable.background_item)); answer3.setBackground(getDrawable(R.drawable.dilaog_button));
answer4.setBackground(getDrawable(R.drawable.background_item)); answer4.setBackground(getDrawable(R.drawable.dilaog_button));
textQuestionNumber.setText(getString(R.string.str_text_question) + " " + questionNumber); textQuestionNumber.setText(getString(R.string.str_text_question) + " " + questionNumber);
} }

View File

@ -49,7 +49,7 @@ public class MyAdapter extends RecyclerView.Adapter<MyAdapter.LevelsViewHolder>
holder.itemLevelsBinding.levelsBtn.setAlpha(1f); holder.itemLevelsBinding.levelsBtn.setAlpha(1f);
} else { } else {
holder.itemLevelsBinding.levelsBtn.setClickable(false); holder.itemLevelsBinding.levelsBtn.setClickable(false);
holder.itemLevelsBinding.levelsBtn.setAlpha(0.64f); holder.itemLevelsBinding.levelsBtn.setAlpha(0.44f);
} }

View File

@ -9,7 +9,7 @@ import androidx.appcompat.app.AppCompatActivity;
public class WelcomeActivity extends AppCompatActivity { public class WelcomeActivity extends AppCompatActivity {
static int splashTimeOut = 3000 ; static int splashTimeOut = 2000 ;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -18,7 +18,6 @@ public class WelcomeActivity extends AppCompatActivity {
BrainTestApp.setStatusBar(this,true); BrainTestApp.setStatusBar(this,true);
ImageView logo = findViewById(R.id.logo);
new Handler().postDelayed(() -> { new Handler().postDelayed(() -> {
Intent mainActivity = new Intent(WelcomeActivity.this, MainActivity.class); Intent mainActivity = new Intent(WelcomeActivity.this, MainActivity.class);
@ -27,9 +26,7 @@ public class WelcomeActivity extends AppCompatActivity {
finish(); finish();
}, splashTimeOut); }, splashTimeOut);
// Animation myAnim = AnimationUtils.loadAnimation(this,R.anim.welcom_alpha);
// logo.startAnimation(myAnim);
// appNameText.startAnimation(myAnim);
} }

View File

@ -2,10 +2,11 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<stroke
android:width="2dp" <gradient
android:color="@color/circle_levels_color" /> android:angle="0"
<solid android:color="@color/circle_levels_color" /> android:endColor="@color/bg_end"
android:startColor="@color/bg_start" />
<corners android:radius="@dimen/circle_20" /> <corners android:radius="@dimen/circle_20" />

Binary file not shown.

View File

@ -84,7 +84,7 @@
android:layout_marginTop="@dimen/padding_19dp" android:layout_marginTop="@dimen/padding_19dp"
android:layout_marginEnd="25dp" android:layout_marginEnd="25dp"
android:layout_weight="0.1" android:layout_weight="0.1"
android:background="@drawable/background_item" android:background="@drawable/dilaog_button"
android:fontFamily="@font/newfont" android:fontFamily="@font/newfont"
android:text="الزرافة" android:text="الزرافة"
android:textColor="@color/white" android:textColor="@color/white"
@ -98,7 +98,7 @@
android:layout_marginTop="@dimen/padding_19dp" android:layout_marginTop="@dimen/padding_19dp"
android:layout_marginEnd="25dp" android:layout_marginEnd="25dp"
android:layout_weight="0.1" android:layout_weight="0.1"
android:background="@drawable/background_item" android:background="@drawable/dilaog_button"
android:fontFamily="@font/newfont" android:fontFamily="@font/newfont"
android:text="النعامة" android:text="النعامة"
android:textColor="@color/white" android:textColor="@color/white"
@ -112,7 +112,7 @@
android:layout_marginTop="@dimen/padding_19dp" android:layout_marginTop="@dimen/padding_19dp"
android:layout_marginEnd="25dp" android:layout_marginEnd="25dp"
android:layout_weight="0.1" android:layout_weight="0.1"
android:background="@drawable/background_item" android:background="@drawable/dilaog_button"
android:fontFamily="@font/newfont" android:fontFamily="@font/newfont"
android:text="الفيل" android:text="الفيل"
android:textColor="@color/white" android:textColor="@color/white"
@ -126,7 +126,7 @@
android:layout_marginTop="@dimen/padding_19dp" android:layout_marginTop="@dimen/padding_19dp"
android:layout_marginEnd="25dp" android:layout_marginEnd="25dp"
android:layout_weight="0.1" android:layout_weight="0.1"
android:background="@drawable/background_item" android:background="@drawable/dilaog_button"
android:fontFamily="@font/newfont" android:fontFamily="@font/newfont"
android:text="السلحفاة" android:text="السلحفاة"
android:textColor="@color/white" android:textColor="@color/white"

View File

@ -44,7 +44,7 @@
android:layout_marginStart="25dp" android:layout_marginStart="25dp"
android:layout_marginTop="90dp" android:layout_marginTop="90dp"
android:layout_marginEnd="25dp" android:layout_marginEnd="25dp"
android:background="@drawable/background_item" android:background="@drawable/dilaog_button"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="14dp" android:paddingTop="14dp"
android:paddingBottom="14dp"> android:paddingBottom="14dp">

View File

@ -1,37 +1,44 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingTop="@dimen/top_dp" android:background="@drawable/background_home"
android:background="@drawable/background_home"> android:paddingTop="@dimen/top_dp">
<ImageView <androidx.cardview.widget.CardView
android:id="@+id/logo" android:id="@+id/logo"
android:layout_width="130dp" android:layout_width="wrap_content"
android:layout_height="130dp" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="230dp" android:layout_marginTop="230dp"
android:elevation="5dp" app:cardCornerRadius="10dp">
<ImageView
android:layout_width="130dp"
android:layout_height="130dp"
android:src="@mipmap/logo" /> android:src="@mipmap/logo" />
</androidx.cardview.widget.CardView>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/common_text_color"
android:layout_below="@id/logo" android:layout_below="@id/logo"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="40dp" android:layout_marginTop="40dp"
android:textSize="25sp"
android:fontFamily="@font/newfont" android:fontFamily="@font/newfont"
android:text="@string/app_name_welcome"/> android:text="@string/app_name_welcome"
android:textColor="@color/common_text_color"
android:textSize="25sp" />
<ProgressBar <ProgressBar
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="40dp" android:layout_marginBottom="40dp"
android:layout_alignParentBottom="true"
android:indeterminateTint="@color/splash_progress_color" /> android:indeterminateTint="@color/splash_progress_color" />
</RelativeLayout> </RelativeLayout>

View File

@ -33,9 +33,7 @@
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="-40dp" android:orientation="vertical">
android:orientation="vertical"
android:padding="@dimen/dp_16dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -84,6 +82,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_47dp" android:layout_height="@dimen/dp_47dp"
android:gravity="center" android:gravity="center"
android:layout_marginTop="12dp"
android:text="@string/str_text_next_level" android:text="@string/str_text_next_level"
android:textColor="@color/white" android:textColor="@color/white"
app:fontFamily="@font/newfont" app:fontFamily="@font/newfont"

View File

@ -7,7 +7,11 @@
<color name="app_green">#00f855</color> <!--right answer--> <color name="app_green">#00f855</color> <!--right answer-->
<color name="wrong_color">#D32F2F</color> <!--wrong answer--> <color name="wrong_color">#D32F2F</color> <!--wrong answer-->
<color name="counttime_color">#D32F2F</color> <color name="counttime_color">#D32F2F</color>
<color name="circle_levels_color">#cd87be</color><!--levels item--> <color name="circle_levels_color">#CCA7E6</color><!--levels item-->
<color name="bg_start">#C8CD87</color>
<color name="bg_center">#C8CD87</color>
<color name="bg_end">#cd87be</color>
<color name="common_text_color">#2b2b2b</color> <color name="common_text_color">#2b2b2b</color>
<color name="splash_progress_color">#cd87be</color> <color name="splash_progress_color">#cd87be</color>