fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2025-06-05 22:19:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

updating commons, gradle and some style formatting

Browse Source
This commit is contained in:
tibbi
2020-06-19 16:42:52 +02:00
parent 68cc337f4c
commit 01df875e38
6 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -67,9 +67,9 @@ android {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:5.28.24' implementation 'com.simplemobiletools:commons:5.29.13'
implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.facebook.stetho:stetho:1.5.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta7'
implementation 'com.shawnlin:number-picker:2.4.6' implementation 'com.shawnlin:number-picker:2.4.6'
implementation "androidx.preference:preference:1.1.0" implementation "androidx.preference:preference:1.1.0"
implementation "androidx.work:work-runtime-ktx:2.3.2" implementation "androidx.work:work-runtime-ktx:2.3.2"

23
app/src/main/res/layout/fragment_stopwatch.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/stopwatch_fragment" android:id="@+id/stopwatch_fragment"
@@ -19,7 +18,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="00.00"/> tools:text="00.00" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/stopwatch_sorting_indicators_holder" android:id="@+id/stopwatch_sorting_indicators_holder"
@@ -35,7 +34,7 @@
android:visibility="invisible" android:visibility="invisible"
app:layout_constraintEnd_toStartOf="@+id/stopwatch_sorting_indicator_2" app:layout_constraintEnd_toStartOf="@+id/stopwatch_sorting_indicator_2"
app:layout_constraintHorizontal_chainStyle="packed" app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintStart_toStartOf="parent" />
<ImageView <ImageView
android:id="@+id/stopwatch_sorting_indicator_2" android:id="@+id/stopwatch_sorting_indicator_2"
@@ -44,7 +43,7 @@
android:visibility="invisible" android:visibility="invisible"
app:layout_constraintEnd_toStartOf="@+id/stopwatch_sorting_indicator_3" app:layout_constraintEnd_toStartOf="@+id/stopwatch_sorting_indicator_3"
app:layout_constraintStart_toEndOf="@+id/stopwatch_sorting_indicator_1" app:layout_constraintStart_toEndOf="@+id/stopwatch_sorting_indicator_1"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent" />
<ImageView <ImageView
android:id="@+id/stopwatch_sorting_indicator_3" android:id="@+id/stopwatch_sorting_indicator_3"
@@ -53,7 +52,7 @@
android:visibility="invisible" android:visibility="invisible"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/stopwatch_sorting_indicator_2" app:layout_constraintStart_toEndOf="@+id/stopwatch_sorting_indicator_2"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -69,7 +68,7 @@
app:layout_constraintBottom_toTopOf="@+id/stopwatch_play_pause" app:layout_constraintBottom_toTopOf="@+id/stopwatch_play_pause"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/stopwatch_sorting_indicators_holder"/> app:layout_constraintTop_toBottomOf="@+id/stopwatch_sorting_indicators_holder" />
<ImageView <ImageView
android:id="@+id/stopwatch_play_pause" android:id="@+id/stopwatch_play_pause"
@@ -78,18 +77,18 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/big_margin" android:layout_marginBottom="@dimen/big_margin"
android:padding="@dimen/normal_margin" android:padding="@dimen/activity_margin"
android:src="@drawable/ic_play_vector" android:src="@drawable/ic_play_vector"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintStart_toStartOf="parent" />
<ImageView <ImageView
android:id="@+id/stopwatch_reset" android:id="@+id/stopwatch_reset"
android:layout_width="@dimen/stopwatch_button_small_size" android:layout_width="@dimen/stopwatch_button_small_size"
android:layout_height="@dimen/stopwatch_button_small_size" android:layout_height="@dimen/stopwatch_button_small_size"
android:layout_toLeftOf="@+id/stopwatch_play_pause" android:layout_toStartOf="@+id/stopwatch_play_pause"
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:padding="@dimen/normal_margin" android:padding="@dimen/normal_margin"
android:src="@drawable/ic_reset_vector" android:src="@drawable/ic_reset_vector"
@@ -97,7 +96,7 @@
app:layout_constraintBottom_toBottomOf="@+id/stopwatch_play_pause" app:layout_constraintBottom_toBottomOf="@+id/stopwatch_play_pause"
app:layout_constraintEnd_toStartOf="@+id/stopwatch_play_pause" app:layout_constraintEnd_toStartOf="@+id/stopwatch_play_pause"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/stopwatch_play_pause"/> app:layout_constraintTop_toTopOf="@+id/stopwatch_play_pause" />
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/stopwatch_lap" android:id="@+id/stopwatch_lap"
@@ -115,6 +114,6 @@
app:layout_constraintBottom_toBottomOf="@+id/stopwatch_play_pause" app:layout_constraintBottom_toBottomOf="@+id/stopwatch_play_pause"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/stopwatch_play_pause" app:layout_constraintStart_toEndOf="@+id/stopwatch_play_pause"
app:layout_constraintTop_toTopOf="@+id/stopwatch_play_pause"/> app:layout_constraintTop_toTopOf="@+id/stopwatch_play_pause" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

8
app/src/main/res/layout/fragment_timer.xml
View File

@@ -16,6 +16,7 @@
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/timer_constraint"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@@ -80,6 +81,7 @@
tools:text="Default alarm" /> tools:text="Default alarm" />
<LinearLayout <LinearLayout
android:id="@+id/timer_label_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
@@ -120,7 +122,7 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/big_margin" android:layout_marginBottom="@dimen/big_margin"
android:padding="@dimen/normal_margin" android:padding="@dimen/activity_margin"
android:src="@drawable/ic_play_vector" android:src="@drawable/ic_play_vector"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@@ -134,11 +136,11 @@
android:padding="@dimen/normal_margin" android:padding="@dimen/normal_margin"
android:src="@drawable/ic_reset_vector" android:src="@drawable/ic_reset_vector"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"
app:layout_constraintBottom_toBottomOf="@+id/timer_play_pause" app:layout_constraintBottom_toBottomOf="@+id/timer_play_pause"
app:layout_constraintEnd_toStartOf="@+id/timer_play_pause" app:layout_constraintEnd_toStartOf="@+id/timer_play_pause"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/timer_play_pause" /> app:layout_constraintTop_toTopOf="@+id/timer_play_pause"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/layout/item_add_time_zone.xml
View File

@@ -13,7 +13,7 @@
android:id="@+id/add_time_zone_title" android:id="@+id/add_time_zone_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/add_time_zone_checkbox" android:layout_toStartOf="@+id/add_time_zone_checkbox"
android:ellipsize="end" android:ellipsize="end"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
@@ -27,8 +27,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignTop="@+id/add_time_zone_title" android:layout_alignTop="@+id/add_time_zone_title"
android:layout_alignBottom="@+id/add_time_zone_title" android:layout_alignBottom="@+id/add_time_zone_title"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_marginRight="@dimen/activity_margin" android:layout_marginEnd="@dimen/activity_margin"
android:clickable="false" android:clickable="false"
android:gravity="center"/> android:gravity="center"/>

2
build.gradle
View File

@@ -9,7 +9,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.6.3' classpath 'com.android.tools.build:gradle:4.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Wed Mar 18 12:31:29 CET 2020 #Fri Jun 19 16:25:51 CEST 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip