Compare commits

...
2 Commits
Author SHA1 Message Date
Li ZongYing 51d9c4c2a7 fix gson crash 2024-05-26 20:16:10 +08:00
Li ZongYing 70da1d8241 fix the settings options are not displayed 2024-05-26 09:36:24 +08:00
3 changed files with 19 additions and 13 deletions
+3 -1
View File
@@ -89,7 +89,7 @@ static def VersionName() {
process.waitFor()
def versionName = process.text.trim() - "v"
if (versionName.isEmpty()) {
versionName = "1.0.0"
versionName = "1.0.0"
}
return versionName
} catch (ignored) {
@@ -114,6 +114,8 @@ dependencies {
def retrofit2_version = "2.6.4"
implementation 'com.google.protobuf:protobuf-kotlin:3.25.1'
// Gson 2.10.1 and older: API level 19
implementation("com.google.code.gson:gson:2.10.1")
implementation "com.squareup.retrofit2:converter-gson:$retrofit2_version"
implementation "com.squareup.retrofit2:converter-protobuf:$retrofit2_version"
implementation "com.squareup.retrofit2:retrofit:$retrofit2_version"
@@ -45,7 +45,7 @@ class MainActivity : FragmentActivity(), Request.RequestListener, OnSharedPrefer
private val handler = Handler()
private val delayHideMain: Long = 10000
private val delayHideSetting: Long = 10000
private val delayHideSetting: Long = 15000
init {
Utils.setRequestListener(this)
+15 -11
View File
@@ -1,18 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/setting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
>
<LinearLayout
<ScrollView
android:id="@+id/container"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_height="match_parent"
android:fillViewport="true"
>
<LinearLayout
android:id="@+id/content"
android:layout_width="300dp"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="20dp"
android:paddingBottom="20dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:background="@drawable/rounded_dark_left"
@@ -105,11 +109,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<ImageView
android:id="@+id/appreciate"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:src="@drawable/appreciate"
android:background="@drawable/rounded_white_right" />
</LinearLayout>
</FrameLayout>
</ScrollView>
<ImageView
android:id="@+id/appreciate"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:src="@drawable/appreciate"
android:background="@drawable/rounded_white_right" />
</LinearLayout>