liangsheng8708
/
FoldCraftLauncher
mirror of https://mirror.ghproxy.com/https://github.com/FCL-Team/FoldCraftLauncher.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update splash activity ui

This commit is contained in:
Tungstend 2023-07-03 18:10:55 +08:00
parent 50e32b9f8c
commit b2c823d9f8
4 changed files with 60 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FCL/src/main/java/com/tungsten/fcl/fragment/RuntimeFragment.java
View File

@ -144,7 +144,13 @@ public class RuntimeFragment extends FCLFragment implements View.OnClickListener
}
}
private boolean installing = false;
private void install() {
if (installing)
return;
installing = true;
if (!lwjgl2) {
lwjgl2State.setVisibility(View.GONE);
lwjgl2Progress.setVisibility(View.VISIBLE);

15
FCL/src/main/res/layout/activity_splash.xml
View File

@ -7,16 +7,15 @@
android:id="@+id/background"
tools:context=".activity.SplashActivity">
<com.tungsten.fcllibrary.component.view.FCLTitleView
<com.tungsten.fcllibrary.component.view.FCLTextView
android:id="@+id/title"
app:title="@string/splash_title"
android:text="@string/splash_title"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintVertical_bias="0"
app:layout_constraintWidth_percent="0.75"
app:layout_constraintHeight_percent="0.10"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_height="wrap_content"
android:padding="10dp"
android:background="@color/white"
app:auto_text_background_tint="true"
app:auto_text_tint="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>

63
FCL/src/main/res/layout/fragment_eula.xml
View File

@ -8,18 +8,18 @@
android:id="@+id/eula_parent"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintWidth_percent="0.6"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintWidth_percent="0.7"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/next">
app:layout_constraintBottom_toBottomOf="parent">
<com.tungsten.fcllibrary.component.view.FCLTextView
android:id="@+id/eula"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="15dp"/>
android:padding="10dp"/>
</ScrollView>
@ -27,43 +27,32 @@
android:id="@+id/progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_bias="0.35"
app:layout_constraintVertical_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/next"/>
<View
android:id="@+id/split_left"
android:background="@android:color/darker_gray"
android:layout_width="1dp"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/next"
app:layout_constraintEnd_toStartOf="@id/eula_parent"/>
<View
android:id="@+id/split_right"
android:background="@android:color/darker_gray"
android:layout_width="1dp"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/next"
app:layout_constraintStart_toEndOf="@id/eula_parent"/>
<com.tungsten.fcllibrary.component.view.FCLButton
android:enabled="false"
android:text="@string/splash_eula_next"
app:auto_padding="false"
android:id="@+id/next"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintVertical_bias="1"
app:layout_constraintHeight_percent="0.12"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<View
android:id="@+id/split"
android:background="@android:color/darker_gray"
android:layout_width="1dp"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/eula_parent"/>
<com.tungsten.fcllibrary.component.view.FCLButton
android:enabled="false"
android:text="@string/splash_eula_next"
android:id="@+id/next"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
app:layout_constraintStart_toEndOf="@id/split"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>

55
FCL/src/main/res/layout/fragment_runtime.xml
View File

@ -8,31 +8,18 @@
android:id="@+id/runtime_parent"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintWidth_percent="0.6"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintWidth_percent="0.7"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/install">
app:layout_constraintBottom_toBottomOf="parent">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<com.tungsten.fcllibrary.component.view.FCLTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="16sp"
android:padding="10dp"
android:gravity="center"
android:text="@string/splash_runtime_title"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@android:color/darker_gray"/>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -279,34 +266,34 @@
</ScrollView>
<View
android:id="@+id/split_left"
android:id="@+id/split"
android:background="@android:color/darker_gray"
android:layout_width="1dp"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/install"
app:layout_constraintEnd_toStartOf="@id/runtime_parent"/>
<View
android:id="@+id/split_right"
android:background="@android:color/darker_gray"
android:layout_width="1dp"
android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/install"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/runtime_parent"/>
<com.tungsten.fcllibrary.component.view.FCLTextView
android:layout_marginTop="10dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:text="@string/splash_runtime_title"
app:layout_constraintStart_toEndOf="@id/split"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<com.tungsten.fcllibrary.component.view.FCLButton
android:text="@string/splash_runtime_install"
app:auto_padding="false"
android:id="@+id/install"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintVertical_bias="1"
app:layout_constraintHeight_percent="0.12"
app:layout_constraintStart_toStartOf="parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
app:layout_constraintStart_toEndOf="@id/split"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>