2-group-adbrush-android/Brain_Test
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V1.0.2(3)

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -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")
}

8
app/src/main/java/com/braintest/brain/test/InfoActivity.java
View File

@ -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);
}

2
app/src/main/java/com/braintest/brain/test/MyAdapter.java
View File

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

7
app/src/main/java/com/braintest/brain/test/WelcomeActivity.java
View File

@ -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);
}

9
app/src/main/res/drawable/dilaog_button.xml
View File

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

BIN
app/src/main/res/font/newfont.ttf
View File

Binary file not shown.

8
app/src/main/res/layout/activity_game.xml
View File

@ -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"

2
app/src/main/res/layout/activity_set.xml
View File

@ -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">

29
app/src/main/res/layout/activity_welcome.xml
View File

@ -1,37 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<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_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:layout_width="130dp"
android:layout_height="130dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="230dp"
android:elevation="5dp"
android:src="@mipmap/logo" />
app:cardCornerRadius="10dp">
<ImageView
android:layout_width="130dp"
android:layout_height="130dp"
android:src="@mipmap/logo" />
</androidx.cardview.widget.CardView>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/common_text_color"
android:layout_below="@id/logo"
android:layout_centerHorizontal="true"
android:layout_marginTop="40dp"
android:textSize="25sp"
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
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="40dp"
android:layout_alignParentBottom="true"
android:indeterminateTint="@color/splash_progress_color" />
</RelativeLayout>

5
app/src/main/res/layout/layout_win.xml
View File

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

6
app/src/main/res/values/colors.xml
View File

@ -7,7 +7,11 @@
<color name="app_green">#00f855</color> <!--right answer-->
<color name="wrong_color">#D32F2F</color> <!--wrong answer-->
<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="splash_progress_color">#cd87be</color>