From 92e31944f16bddcc8833d9899cc13d66bbf93812 Mon Sep 17 00:00:00 2001 From: NehemiahAklil Date: Fri, 5 Apr 2024 09:19:20 +0300 Subject: [PATCH 1/2] ui: Fixed oversized buttons in every screen except call screen --- .../src/main/res/layout/brief_contact.xml | 18 +++++++++++++++- chooloolib/src/main/res/layout/dialpad.xml | 2 ++ chooloolib/src/main/res/layout/recent.xml | 10 ++++++++- chooloolib/src/main/res/xml/call_scene.xml | 4 ++-- koler/src/main/res/xml/main_scene.xml | 21 +++++++++++-------- 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/chooloolib/src/main/res/layout/brief_contact.xml b/chooloolib/src/main/res/layout/brief_contact.xml index b677d575..1751e255 100644 --- a/chooloolib/src/main/res/layout/brief_contact.xml +++ b/chooloolib/src/main/res/layout/brief_contact.xml @@ -68,6 +68,12 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/brief_contact_text_name" app:shapeAppearanceOverlay="@style/Chooloo.Image.Profile" /> + + + + + \ No newline at end of file diff --git a/chooloolib/src/main/res/layout/dialpad.xml b/chooloolib/src/main/res/layout/dialpad.xml index 49fae187..26ffe261 100644 --- a/chooloolib/src/main/res/layout/dialpad.xml +++ b/chooloolib/src/main/res/layout/dialpad.xml @@ -117,6 +117,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="@dimen/default_spacing" + android:scaleX="0.75" + android:scaleY="0.75" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/chooloolib/src/main/res/layout/recent.xml b/chooloolib/src/main/res/layout/recent.xml index 0238cfdf..e2701aa1 100644 --- a/chooloolib/src/main/res/layout/recent.xml +++ b/chooloolib/src/main/res/layout/recent.xml @@ -78,7 +78,15 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_margin="@dimen/default_spacing" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@+id/guideline4" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/recent_name_layout" /> + + diff --git a/chooloolib/src/main/res/xml/call_scene.xml b/chooloolib/src/main/res/xml/call_scene.xml index 252a6a18..f6113ba9 100644 --- a/chooloolib/src/main/res/xml/call_scene.xml +++ b/chooloolib/src/main/res/xml/call_scene.xml @@ -61,7 +61,7 @@ android:layout_marginBottom="@dimen/default_spacing_big" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintWidth_percent="0.26" /> + app:layout_constraintWidth_percent="0.2" /> + app:layout_constraintWidth_percent="0.2" /> diff --git a/koler/src/main/res/xml/main_scene.xml b/koler/src/main/res/xml/main_scene.xml index b6a9cce9..72c015d5 100644 --- a/koler/src/main/res/xml/main_scene.xml +++ b/koler/src/main/res/xml/main_scene.xml @@ -62,12 +62,14 @@ + app:layout_constraintEnd_toEndOf="parent" + android:scaleX="0.6" + android:scaleY="0.6" + /> @@ -87,8 +89,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="@dimen/default_spacing" - android:scaleX="0.7" - android:scaleY="0.7" android:transformPivotY="20sp" app:layout_constraintBottom_toBottomOf="@id/main_menu_button" app:layout_constraintStart_toStartOf="parent" @@ -121,9 +121,12 @@ android:id="@+id/main_dialpad_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/default_spacing_medium" - android:layout_marginBottom="@dimen/default_spacing_medium" + android:layout_marginEnd="@dimen/default_spacing_small" + android:layout_marginBottom="@dimen/default_spacing_small" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" /> + app:layout_constraintEnd_toEndOf="parent" + android:scaleX="0.65" + android:scaleY="0.65" + /> From c42e6340e6ec2eb82ca4daab875ac2ecc1449e96 Mon Sep 17 00:00:00 2001 From: NehemiahAklil Date: Fri, 5 Apr 2024 10:21:45 +0300 Subject: [PATCH 2/2] staging: bumped up gradle to 8.4 --- build.gradle | 2 +- gradle.properties | 2 ++ gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index c73ebcd7..f2cd2fea 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:7.4.0" + classpath 'com.android.tools.build:gradle:8.3.1' classpath "com.google.dagger:hilt-android-gradle-plugin:2.44.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" } diff --git a/gradle.properties b/gradle.properties index 43ac3e62..76458db9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,6 +11,8 @@ android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m kotlin.code.style=official org.gradle.unsafe.configuration-cache=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5251aca1..9e47d7bc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ #Wed Dec 21 23:51:01 IST 2022 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip org.gradle.jvmargs=-Xmx1536M --add-exports\=java.base/sun.nio.ch\=ALL-UNNAMED --add-opens\=java.base/java.lang\=ALL-UNNAMED --add-opens\=java.base/java.lang.reflect\=ALL-UNNAMED --add-opens\=java.base/java.io\=ALL-UNNAMED --add-exports\=jdk.unsupported/sun.misc\=ALL-UNNAMED zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists