Skip to content

Commit 5e6419e

Browse files
kekayankekayan
authored
Merge pull request #11 from kekayan/master
All downgraded to desgin support library v27 from v28 alpha
2 parents 80a32a4 + e14b0ae commit 5e6419e

13 files changed

Lines changed: 94 additions & 96 deletions

‎.idea/caches/build_file_checksums.ser‎

0 Bytes
Binary file not shown.

‎.idea/misc.xml‎

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 43 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion "android-P"
4+
compileSdkVersion 27
55
defaultConfig {
66
applicationId "lk.paradox.kekayan.fabfit"
77
minSdkVersion 19
@@ -24,36 +24,54 @@ android {
2424

2525
dependencies {
2626
implementation fileTree(dir: 'libs', include: ['*.jar'])
27-
implementation 'com.android.support:appcompat-v7:28.0.0-alpha1'
28-
implementation 'com.android.support:palette-v7:28.0.0-alpha1'
29-
implementation 'com.android.support:customtabs:28.0.0-alpha1'
30-
implementation 'com.android.support:animated-vector-drawable:28.0.0-alpha1'
31-
implementation 'com.android.support:cardview-v7:28.0.0-alpha1'
32-
implementation 'com.android.support:design:28.0.0-alpha1'
27+
implementation 'com.android.support:appcompat-v7:27.1.1'
28+
implementation 'com.android.support:customtabs:27.1.1'
29+
implementation 'com.android.support:palette-v7:27.1.1'
30+
implementation 'com.android.support:cardview-v7:27.1.1'
31+
implementation 'com.android.support:design:27.1.1'
3332
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
34-
implementation 'com.android.support:support-vector-drawable:28.0.0-alpha1'
35-
implementation 'com.android.support:support-v4:28.0.0-alpha1'
33+
implementation ('com.android.support:support-v4:27.1.1'){
34+
transitive = true
35+
}
3636

3737

38-
implementation 'com.google.firebase:firebase-storage:11.4.2'
38+
implementation ('com.google.firebase:firebase-storage:15.0.2'){
39+
transitive = true
40+
}
3941
testImplementation 'junit:junit:4.12'
4042
androidTestImplementation 'com.android.support.test:runner:1.0.2'
4143
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
42-
implementation 'com.github.blackfizz:eazegraph:1.2.5l@aar'
43-
implementation 'com.nineoldandroids:library:2.4.0'
44-
implementation 'com.google.android.apps.dashclock:dashclock-api:2.0.0'
45-
implementation 'com.github.j4velin.colorpicker:colorpicker:1.20.6'
46-
implementation 'com.twitter.sdk.android:twitter:3.3.0'
47-
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
48-
implementation 'com.squareup.picasso:picasso:2.5.2'
49-
implementation 'com.airbnb.android:lottie:2.5.4'
50-
implementation 'com.mikhaellopez:circularimageview:3.0.2'
51-
52-
implementation 'com.google.firebase:firebase-core:11.4.2'
53-
implementation 'com.google.firebase:firebase-auth:11.4.2'
54-
implementation 'com.google.firebase:firebase-database:11.4.2'
55-
implementation 'com.firebaseui:firebase-ui-auth:3.0.0'
56-
implementation 'com.github.bumptech.glide:glide:4.7.1'
44+
implementation ('com.github.blackfizz:eazegraph:1.2.5l@aar'){
45+
transitive = true
46+
}
47+
implementation ('com.google.android.apps.dashclock:dashclock-api:2.0.0'){
48+
transitive = true
49+
}
50+
implementation ('com.github.j4velin.colorpicker:colorpicker:1.20.6'){
51+
transitive = true
52+
}
53+
implementation ('com.twitter.sdk.android:twitter:3.3.0'){
54+
transitive = true
55+
}
56+
57+
58+
implementation( 'com.mikhaellopez:circularimageview:3.0.2'){
59+
transitive = true
60+
}
61+
62+
implementation ('com.google.firebase:firebase-auth:15.1.0'){
63+
transitive = true
64+
}
65+
implementation ('com.google.firebase:firebase-database:15.0.1'){
66+
transitive = true
67+
}
68+
implementation ('com.firebaseui:firebase-ui-auth:3.3.1'){
69+
transitive = true
70+
}
71+
implementation ('com.github.bumptech.glide:glide:4.7.1'){
72+
exclude group: "com.android.support"
73+
transitive = true
74+
}
5775
annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
5876
}
5977

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
android:supportsRtl="true"
2020
android:theme="@style/AppTheme">
2121
<activity
22-
android:screenOrientation="portrait"
2322
android:name=".MainActivity"
24-
android:label="@string/app_name" />
23+
android:label="@string/app_name"
24+
android:screenOrientation="portrait" />
2525
<activity
2626
android:name=".widget.WidgetConfig"
2727
android:theme="@android:style/Theme.Holo.Dialog.NoActionBar">

‎app/src/main/res/drawable/ic_camera.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
android:width="24dp"
3-
android:height="24dp"
4-
android:viewportWidth="24.0"
5-
android:viewportHeight="24.0">
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportHeight="24.0"
5+
android:viewportWidth="24.0">
66
<path
77
android:fillColor="#FF000000"
8-
android:pathData="M3,4L3,1h2v3h3v2L5,6v3L3,9L3,6L0,6L0,4h3zM6,10L6,7h3L9,4h7l1.83,2L21,6c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2L5,22c-1.1,0 -2,-0.9 -2,-2L3,10h3zM13,19c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5 -5,2.24 -5,5 2.24,5 5,5zM9.8,14c0,1.77 1.43,3.2 3.2,3.2s3.2,-1.43 3.2,-3.2 -1.43,-3.2 -3.2,-3.2 -3.2,1.43 -3.2,3.2z"/>
8+
android:pathData="M3,4L3,1h2v3h3v2L5,6v3L3,9L3,6L0,6L0,4h3zM6,10L6,7h3L9,4h7l1.83,2L21,6c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2L5,22c-1.1,0 -2,-0.9 -2,-2L3,10h3zM13,19c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5 -5,2.24 -5,5 2.24,5 5,5zM9.8,14c0,1.77 1.43,3.2 3.2,3.2s3.2,-1.43 3.2,-3.2 -1.43,-3.2 -3.2,-3.2 -3.2,1.43 -3.2,3.2z" />
99
</vector>

‎app/src/main/res/layout/activity_editprofile.xml‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,99 +19,97 @@
1919
app:civ_border_width="10dp" />
2020

2121
<android.support.design.widget.TextInputLayout
22-
style="@style/Widget.MaterialComponents.TextInputLayout.OutlineBox"
22+
2323
android:layout_width="match_parent"
2424
android:layout_height="wrap_content"
2525
android:textColor="@color/colorWhite"
2626
android:textColorHint="@android:color/white">
2727

2828
<android.support.design.widget.TextInputEditText
2929
android:id="@+id/name"
30-
android:autoSizeTextType="uniform"
3130
android:layout_width="match_parent"
3231
android:layout_height="wrap_content"
33-
android:layout_marginTop="16dp"
3432
android:layout_marginBottom="8dp"
33+
android:layout_marginTop="16dp"
34+
android:autoSizeTextType="uniform"
3535
android:hint="Name"
3636
android:inputType="text"
3737
android:textColor="@color/colorWhite"
3838
android:textColorHint="@android:color/white" />
3939
</android.support.design.widget.TextInputLayout>
4040

4141
<android.support.design.widget.TextInputLayout
42-
style="@style/Widget.MaterialComponents.TextInputLayout.OutlineBox"
42+
4343
android:layout_width="match_parent"
4444
android:layout_height="wrap_content"
4545
android:textColor="@color/colorWhite"
4646
android:textColorHint="@android:color/white">
4747

4848
<android.support.design.widget.TextInputEditText
49-
android:autoSizeTextType="uniform"
5049
android:id="@+id/age"
5150
android:layout_width="match_parent"
5251
android:layout_height="wrap_content"
5352
android:layout_marginBottom="8dp"
53+
android:autoSizeTextType="uniform"
5454
android:hint="Age"
5555
android:inputType="number"
5656
android:textColor="@color/colorWhite"
5757
android:textColorHint="@android:color/white" />
5858
</android.support.design.widget.TextInputLayout>
5959

6060
<android.support.design.widget.TextInputLayout
61-
style="@style/Widget.MaterialComponents.TextInputLayout.OutlineBox"
6261
android:layout_width="match_parent"
6362
android:layout_height="wrap_content"
6463
android:textColor="@color/colorWhite"
6564
android:textColorHint="@android:color/white">
6665

6766
<android.support.design.widget.TextInputEditText
68-
android:autoSizeTextType="uniform"
6967
android:id="@+id/weight"
7068
android:layout_width="match_parent"
7169
android:layout_height="wrap_content"
7270
android:layout_marginBottom="8dp"
71+
android:autoSizeTextType="uniform"
7372
android:hint="Weight"
7473
android:inputType="numberDecimal"
7574
android:textColor="@color/colorWhite"
7675
android:textColorHint="@android:color/white" />
7776
</android.support.design.widget.TextInputLayout>
77+
7878
<android.support.design.widget.TextInputLayout
79-
style="@style/Widget.MaterialComponents.TextInputLayout.OutlineBox"
8079
android:layout_width="match_parent"
8180
android:layout_height="wrap_content"
8281
android:textColor="@color/colorWhite"
8382
android:textColorHint="@android:color/white">
8483

8584
<android.support.design.widget.TextInputEditText
86-
android:autoSizeTextType="uniform"
8785
android:id="@+id/height"
8886
android:layout_width="match_parent"
8987
android:layout_height="wrap_content"
9088
android:layout_marginBottom="8dp"
89+
android:autoSizeTextType="uniform"
9190
android:hint="@string/height"
9291
android:inputType="numberDecimal"
9392
android:textColor="@color/colorWhite"
9493
android:textColorHint="@android:color/white" />
9594
</android.support.design.widget.TextInputLayout>
95+
9696
<Button
9797
android:id="@+id/confirm"
98-
android:autoSizeTextType="uniform"
99-
style="@style/Widget.MaterialComponents.Button"
10098
android:layout_width="match_parent"
99+
101100
android:layout_height="wrap_content"
102101
android:layout_gravity="bottom"
103102
android:layout_marginTop="50dp"
103+
android:autoSizeTextType="uniform"
104104
android:text="save" />
105105

106106
<Button
107107
android:id="@+id/back"
108-
android:autoSizeTextType="uniform"
109-
style="@style/Widget.MaterialComponents.Button"
110108
android:layout_width="match_parent"
111109
android:layout_height="wrap_content"
112110
android:layout_gravity="bottom"
113-
android:text="back"
114-
/>
111+
android:autoSizeTextType="uniform"
112+
android:text="back" />
115113

116114

117115
</LinearLayout>

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
</FrameLayout>
2222

2323
<android.support.design.widget.BottomNavigationView
24-
style="@style/Widget.MaterialComponents.BottomNavigationView.Colored"
2524
android:id="@+id/navigation"
2625
android:layout_width="0dp"
2726
android:layout_height="wrap_content"

‎app/src/main/res/layout/fragment_profile.xml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
tools:context=".fragments.ProfileFragment">
88

99
<RelativeLayout
10-
android:id="@+id/background"
11-
android:layout_width="match_parent"
12-
android:layout_height="300dp"
10+
android:id="@+id/background"
11+
android:layout_width="match_parent"
12+
android:layout_height="300dp"
1313
android:background="@drawable/background" />
1414

1515
<LinearLayout
@@ -38,20 +38,20 @@
3838
android:orientation="vertical">
3939

4040
<TextView
41-
android:autoSizeTextType="uniform"
4241
android:id="@+id/nametxt"
4342
android:layout_width="wrap_content"
4443
android:layout_height="wrap_content"
44+
android:autoSizeTextType="uniform"
4545
android:fontFamily="sans-serif-light"
4646
android:text="Kekayan"
4747
android:textColor="@android:color/black"
4848
android:textSize="30sp" />
4949

5050
<TextView
51-
android:autoSizeTextType="uniform"
5251
android:id="@+id/emailtxt"
5352
android:layout_width="wrap_content"
5453
android:layout_height="wrap_content"
54+
android:autoSizeTextType="uniform"
5555
android:fontFamily="sans-serif-light"
5656
android:text="SE"
5757
android:textSize="14sp" />
@@ -68,22 +68,23 @@
6868
android:orientation="horizontal">
6969

7070
<Button
71-
style="@style/Widget.MaterialComponents.Button"
72-
android:autoSizeTextType="uniform"
7371
android:id="@+id/editinfobtn"
72+
style="?android:attr/borderlessButtonStyle"
7473
android:layout_width="wrap_content"
7574
android:layout_height="match_parent"
7675
android:layout_weight="1"
76+
android:autoSizeTextType="uniform"
7777
android:text="EditInfo" />
7878

7979
<Button
80-
style="@style/Widget.MaterialComponents.Button"
81-
android:autoSizeTextType="uniform"
8280
android:id="@+id/signoutbtn"
81+
82+
style="?android:attr/borderlessButtonStyle"
8383
android:layout_width="wrap_content"
8484
android:layout_height="match_parent"
8585
android:layout_margin="4dp"
8686
android:layout_weight="1"
87+
android:autoSizeTextType="uniform"
8788

8889
android:text="Logout" />
8990

‎app/src/main/res/layout/fragment_settings.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99

1010
<android.support.design.widget.TextInputLayout
1111
android:id="@+id/textInputLayout"
12-
style="@style/Widget.MaterialComponents.TextInputLayout.OutlineBox"
1312
android:layout_width="match_parent"
1413
android:layout_height="wrap_content"
14+
android:layout_marginEnd="16dp"
1515
android:layout_marginStart="16dp"
1616
android:layout_marginTop="32dp"
17-
android:layout_marginEnd="16dp"
1817
android:textColor="@color/colorWhite"
1918
android:textColorHint="@android:color/white"
2019
app:layout_constraintEnd_toEndOf="parent"
@@ -34,14 +33,13 @@
3433
</android.support.design.widget.TextInputLayout>
3534

3635
<Button
37-
android:autoSizeTextType="uniform"
38-
style="@style/Widget.MaterialComponents.Button"
3936
android:id="@+id/savegoalbtn"
4037
android:layout_width="wrap_content"
4138
android:layout_height="wrap_content"
39+
android:layout_marginEnd="16dp"
4240
android:layout_marginStart="16dp"
4341
android:layout_marginTop="24dp"
44-
android:layout_marginEnd="16dp"
42+
android:autoSizeTextType="uniform"
4543
android:text="@string/save"
4644
app:layout_constraintEnd_toEndOf="parent"
4745
app:layout_constraintStart_toStartOf="parent"

0 commit comments

Comments
 (0)