Skip to content

Commit 744d98a

Browse files
committed
Update
1 parent d04da42 commit 744d98a

File tree

4 files changed

+30
-26
lines changed

4 files changed

+30
-26
lines changed

app/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,17 @@ dependencies {
5959
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2"
6060
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
6161
implementation 'androidx.appcompat:appcompat:1.7.1'
62-
implementation 'com.google.android.material:material:1.13.0'
62+
implementation 'com.google.android.material:material:1.14.0'
6363
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
64-
implementation "androidx.activity:activity-ktx:1.9.3"
65-
implementation 'androidx.core:core:1.17.0'
64+
implementation "androidx.activity:activity-ktx:1.10.0"
65+
implementation 'androidx.core:core:1.18.0'
6666
implementation 'androidx.recyclerview:recyclerview:1.4.0'
67-
implementation "androidx.viewpager2:viewpager2:1.0.0"
68-
implementation "com.google.android.material:material:1.9.0"
69-
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.2"
70-
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
67+
implementation "androidx.viewpager2:viewpager2:1.1.0"
68+
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.7"
69+
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7"
7170
}
7271
repositories {
7372
google()
7473
mavenCentral()
7574
}
75+

app/src/main/res/layout/kr_dialog_log.xml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,9 @@
3838
style="@style/dialogDesc" />
3939

4040
</LinearLayout>
41-
<ProgressBar
42-
android:id="@+id/action_progress"
43-
android:layout_marginTop="2dp"
44-
style="?android:attr/progressBarStyleHorizontal"
45-
android:layout_width="match_parent"
46-
android:layout_height="8dp"
47-
android:paddingStart="1dp"
48-
android:paddingEnd="1dp"
49-
android:layout_below="@+id/btn_hide"
50-
android:indeterminate="true"
51-
android:max="100"
52-
android:progress="0" />
41+
5342
<com.omarea.common.ui.OverScrollView
54-
android:layout_marginTop="12dp"
43+
android:layout_marginTop="16dp"
5544
android:background="@drawable/krscript_item_ripple_kon"
5645
android:layout_width="match_parent"
5746
android:layout_height="match_parent"
@@ -94,4 +83,18 @@
9483
android:text="@string/btn_exit" />
9584

9685
</LinearLayout>
86+
87+
<com.google.android.material.progressindicator.LinearProgressIndicator
88+
android:id="@+id/action_progress"
89+
android:layout_width="match_parent"
90+
android:layout_height="wrap_content"
91+
android:layout_below="@+id/btn_hide"
92+
android:layout_marginTop="14dp"
93+
android:layout_marginStart="10dp"
94+
android:layout_marginEnd="10dp"
95+
android:indeterminate="true"
96+
app:trackThickness="4dp"
97+
app:trackCornerRadius="2dp"
98+
app:indicatorColor="?attr/colorPrimary" />
99+
97100
</RelativeLayout>

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '2.3.0'
4+
ext.kotlin_version = '2.3.20'
55

66
repositories {
7-
mavenCentral()
87
google()
8+
mavenCentral()
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:8.13.2'
11+
classpath 'com.android.tools.build:gradle:9.1.0'
1212
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1313
}
1414
}
1515

1616
allprojects {
1717
repositories {
18+
google()
19+
mavenCentral()
1820
maven {
1921
url 'https://jitpack.io'
2022
}
21-
google()
22-
mavenCentral()
2323
}
2424
}
2525

2626
tasks.register('clean', Delete) {
27-
delete rootProject.buildDir
27+
delete rootProject.layout.buildDirectory
2828
}

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
android.enableJetifier=true
33
android.useAndroidX=true
44
android.builder.dexing.noTimestamps=true
5+
org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=1024m

0 commit comments

Comments
 (0)