Skip to content

Normalized Oversized buttons in app and bumped up grade version #564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NehemiahAklil wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Normalized Oversized buttons in app and bumped up grade version #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92e3194
ui: Fixed oversized buttons in every screen except call screen
NehemiahAklil Apr 5, 2024
c42e634
staging: bumped up gradle to 8.4
NehemiahAklil Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
Expand Down
18 changes: 17 additions & 1 deletion chooloolib/src/main/res/layout/brief_contact.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/brief_contact_text_name"
app:shapeAppearanceOverlay="@style/Chooloo.Image.Profile" />

<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical" />
</androidx.constraintlayout.widget.ConstraintLayout>

<include
Expand All @@ -76,10 +82,19 @@
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/guideline3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/brief_contact_name_layout" />

<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintGuide_begin="320dp"
app:layout_constraintStart_toStartOf="parent" />

<androidx.fragment.app.FragmentContainerView
android:id="@+id/brief_contact_phones_fragment_container"
android:layout_width="0dp"
Expand All @@ -99,5 +114,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/brief_contact_phones_fragment_container" />

</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
2 changes: 2 additions & 0 deletions chooloolib/src/main/res/layout/dialpad.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 9 additions & 1 deletion chooloolib/src/main/res/layout/recent.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintGuide_begin="320dp" />
</androidx.constraintlayout.widget.ConstraintLayout>
4 changes: 2 additions & 2 deletions chooloolib/src/main/res/xml/call_scene.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
<Constraint
android:id="@+id/call_reject_button"
android:layout_width="0dp"
Expand All @@ -71,7 +71,7 @@
android:layout_marginBottom="@dimen/default_spacing_big"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintWidth_percent="0.26" />
app:layout_constraintWidth_percent="0.2" />
</ConstraintSet>

<ConstraintSet android:id="@+id/constraint_set_active_call">
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
21 changes: 12 additions & 9 deletions koler/src/main/res/xml/main_scene.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,14 @@
<!-- dialpad button -->
<Constraint
android:id="@+id/main_dialpad_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/default_spacing_big"
android:layout_marginBottom="@dimen/default_spacing_big"
android:layout_marginEnd="@dimen/default_spacing_medium"
android:layout_marginBottom="@dimen/default_spacing_medium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
android:scaleX="0.6"
android:scaleY="0.6"
/>
</ConstraintSet>

<ConstraintSet android:id="@+id/constraint_set_main_collapsed">
Expand All @@ -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"
Expand Down Expand Up @@ -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"
/>
</ConstraintSet>
</MotionScene>