Skip to content

Commit 27ee8cf

Browse files
renattelerenattele
renattele
authored and
renattele
committed
added dimens, removed some strings, added welcome demo, button little redesign
1 parent 3c5af40 commit 27ee8cf

24 files changed

+546
-208
lines changed

‎app/src/main/java/com/colorata/st/MainActivity.kt‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,14 @@ class MainActivity : AppCompatActivity() {
108108
//Configuring SHAREDPREFS
109109
sharedPreference = getSharedPreferences("PREFERENCE_NAME", Context.MODE_PRIVATE)
110110

111+
if (sharedPreference.getInt("welcome", 0) < 100) {
112+
val editor = sharedPreference.edit()
113+
editor.putInt("welcome", sharedPreference.getInt("welcome", 0) + 1)
114+
editor.apply()
115+
welcome()
116+
}
117+
118+
111119
//Showing Accessibility SNACKBAR
112120
if (sharedPreference.getInt("accessibilitySnack", 0) < 2) {
113121
val snackBar = Snackbar.make(
@@ -772,6 +780,46 @@ class MainActivity : AppCompatActivity() {
772780
}
773781
}
774782

783+
//Fun for the WELCOME
784+
@SuppressLint("InflateParams")
785+
private fun welcome(){
786+
val materialBuilder = BottomSheetDialog(this)
787+
val inflater = layoutInflater
788+
val dialogLayout: View = inflater.inflate(R.layout.welcome_alert, null)
789+
790+
//Founding BUTTONS
791+
val bubble = dialogLayout.findViewById<Button>(R.id.bubble)
792+
val power = dialogLayout.findViewById<Button>(R.id.power)
793+
val logo = dialogLayout.findViewById<ImageView>(R.id.image_logo_shorttasks)
794+
val imageBubble = dialogLayout.findViewById<ImageView>(R.id.image_bubble)
795+
796+
//Configuring pictures
797+
if(nightMode){
798+
logo.setImageResource(R.drawable.ic_logo_main_dark)
799+
imageBubble.setImageResource(R.drawable.ic_bubble_manager_3_dark)
800+
}
801+
//Configuring BACKGROUND
802+
configBack(dialogLayout)
803+
804+
//Showing BOTTOM SHEET
805+
materialBuilder.setContentView(dialogLayout)
806+
materialBuilder.show()
807+
808+
//Click listener for BUBBLE BUTTON
809+
bubble.setOnClickListener {
810+
if(materialBuilder.isShowing){
811+
materialBuilder.dismiss()
812+
}
813+
}
814+
815+
//Click listener for POWER BUTTON
816+
power.setOnClickListener {
817+
if(materialBuilder.isShowing){
818+
materialBuilder.dismiss()
819+
}
820+
}
821+
}
822+
775823
//Fun for get LABELS
776824
private fun getAppsLabel(): MutableList<String> {
777825
val manager = packageManager

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

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="891dp"
3+
android:height="251dp"
4+
android:viewportWidth="891"
5+
android:viewportHeight="251">
6+
<path
7+
android:pathData="M0.25,0.528h890v250h-890z"
8+
android:fillColor="#22221A"/>
9+
<path
10+
android:pathData="M100.25,100.528m-100,0a100,100 0,1 1,200 0a100,100 0,1 1,-200 0"
11+
android:fillColor="#007FFF"/>
12+
<path
13+
android:pathData="M100.25,100.528m-80,0a80,80 0,1 1,160 0a80,80 0,1 1,-160 0"
14+
android:fillColor="#22221A"/>
15+
<path
16+
android:pathData="M100.25,0.528h100v200h-100z"
17+
android:fillColor="#22221A"/>
18+
<path
19+
android:pathData="M100.25,100.528m-100,0a100,100 0,1 1,200 0a100,100 0,1 1,-200 0"
20+
android:fillColor="#007FFF"/>
21+
<path
22+
android:pathData="M100.25,100.528m-80,0a80,80 0,1 1,160 0a80,80 0,1 1,-160 0"
23+
android:fillColor="#22221A"/>
24+
<path
25+
android:pathData="M100.25,0.528h100v200h-100z"
26+
android:fillColor="#22221A"/>
27+
<path
28+
android:pathData="M100.25,190.528m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
29+
android:fillColor="#007FFF"/>
30+
<path
31+
android:pathData="M100.25,10.528m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
32+
android:fillColor="#007FFF"/>
33+
<path
34+
android:pathData="M180.25,150.528m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0"
35+
android:fillColor="#007FFF"/>
36+
<path
37+
android:pathData="M180.25,150.528m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
38+
android:fillColor="#22221A"/>
39+
<path
40+
android:pathData="M340.25,150.528m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0"
41+
android:fillColor="#007FFF"/>
42+
<path
43+
android:pathData="M340.25,150.528m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
44+
android:fillColor="#22221A"/>
45+
<path
46+
android:pathData="M580.25,150.528m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0"
47+
android:fillColor="#007FFF"/>
48+
<path
49+
android:pathData="M580.25,150.528m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
50+
android:fillColor="#22221A"/>
51+
<path
52+
android:pathData="M710.25,200.528m50,-0a50,50 0,1 1,-100 -0a50,50 0,1 1,100 -0"
53+
android:fillColor="#007FFF"/>
54+
<path
55+
android:pathData="M710.25,200.528m30,-0a30,30 0,1 1,-60 -0a30,30 0,1 1,60 -0"
56+
android:fillColor="#22221A"/>
57+
<path
58+
android:pathData="M760.25,200.528l-80,-0l-0,-50l80,-0z"
59+
android:fillColor="#22221A"/>
60+
<path
61+
android:pathData="M710.25,100.528m50,-0a50,50 0,1 1,-100 -0a50,50 0,1 1,100 -0"
62+
android:fillColor="#007FFF"/>
63+
<path
64+
android:pathData="M710.25,100.528m30,-0a30,30 0,1 1,-60 -0a30,30 0,1 1,60 -0"
65+
android:fillColor="#22221A"/>
66+
<path
67+
android:pathData="M760.25,100.528l-80,-0l-0,-50l80,-0z"
68+
android:fillColor="#22221A"/>
69+
<path
70+
android:pathData="M260.25,0.528L260.25,0.528A10,10 0,0 1,270.25 10.528L270.25,240.528A10,10 0,0 1,260.25 250.528L260.25,250.528A10,10 0,0 1,250.25 240.528L250.25,10.528A10,10 0,0 1,260.25 0.528z"
71+
android:fillColor="#007FFF"/>
72+
<path
73+
android:pathData="M670.25,0.528L670.25,0.528A10,10 0,0 1,680.25 10.528L680.25,200.528A10,10 0,0 1,670.25 210.528L670.25,210.528A10,10 0,0 1,660.25 200.528L660.25,10.528A10,10 0,0 1,670.25 0.528z"
74+
android:fillColor="#007FFF"/>
75+
<path
76+
android:pathData="M630.25,100.528L630.25,100.528A10,10 0,0 1,640.25 110.528L640.25,190.528A10,10 0,0 1,630.25 200.528L630.25,200.528A10,10 0,0 1,620.25 190.528L620.25,110.528A10,10 0,0 1,630.25 100.528z"
77+
android:fillColor="#007FFF"/>
78+
<path
79+
android:pathData="M830.25,150.528m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0"
80+
android:fillColor="#007FFF"/>
81+
<path
82+
android:pathData="M830.25,150.528m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
83+
android:fillColor="#22221A"/>
84+
<path
85+
android:pathData="M880.25,100.528L880.25,100.528A10,10 0,0 1,890.25 110.528L890.25,190.528A10,10 0,0 1,880.25 200.528L880.25,200.528A10,10 0,0 1,870.25 190.528L870.25,110.528A10,10 0,0 1,880.25 100.528z"
86+
android:fillColor="#007FFF"/>
87+
<path
88+
android:pathData="M750.25,200.528m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
89+
android:fillColor="#007FFF"/>
90+
<path
91+
android:pathData="M750.25,100.528m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
92+
android:fillColor="#007FFF"/>
93+
<path
94+
android:pathData="M460.25,150.528m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0"
95+
android:fillColor="#007FFF"/>
96+
<path
97+
android:pathData="M460.25,150.528m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
98+
android:fillColor="#22221A"/>
99+
<path
100+
android:pathData="M430.25,150.528h80v50h-80z"
101+
android:fillColor="#22221A"/>
102+
<path
103+
android:pathData="M420.25,100.528L420.25,100.528A10,10 0,0 1,430.25 110.528L430.25,240.528A10,10 0,0 1,420.25 250.528L420.25,250.528A10,10 0,0 1,410.25 240.528L410.25,110.528A10,10 0,0 1,420.25 100.528z"
104+
android:fillColor="#007FFF"/>
105+
<path
106+
android:pathData="M500.25,150.528m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
107+
android:fillColor="#007FFF"/>
108+
</vector>

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

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="891dp"
3+
android:height="251dp"
4+
android:viewportWidth="891"
5+
android:viewportHeight="251">
6+
<path
7+
android:pathData="M0.25,0.528h890v250h-890z"
8+
android:fillColor="#CDCDC5"/>
9+
<path
10+
android:pathData="M100.25,100.528m-100,0a100,100 0,1 1,200 0a100,100 0,1 1,-200 0"
11+
android:fillColor="#007FFF"/>
12+
<path
13+
android:pathData="M100.25,100.528m-80,0a80,80 0,1 1,160 0a80,80 0,1 1,-160 0"
14+
android:fillColor="#CDCDC5"/>
15+
<path
16+
android:pathData="M100.25,0.528h100v200h-100z"
17+
android:fillColor="#CDCDC5"/>
18+
<path
19+
android:pathData="M100.25,100.528m-100,0a100,100 0,1 1,200 0a100,100 0,1 1,-200 0"
20+
android:fillColor="#007FFF"/>
21+
<path
22+
android:pathData="M100.25,100.528m-80,0a80,80 0,1 1,160 0a80,80 0,1 1,-160 0"
23+
android:fillColor="#CDCDC5"/>
24+
<path
25+
android:pathData="M100.25,0.528h100v200h-100z"
26+
android:fillColor="#CDCDC5"/>
27+
<path
28+
android:pathData="M100.25,190.528m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
29+
android:fillColor="#007FFF"/>
30+
<path
31+
android:pathData="M100.25,10.528m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
32+
android:fillColor="#007FFF"/>
33+
<path
34+
android:pathData="M180.25,150.528m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0"
35+
android:fillColor="#007FFF"/>
36+
<path
37+
android:pathData="M180.25,150.528m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
38+
android:fillColor="#CDCDC5"/>
39+
<path
40+
android:pathData="M340.25,150.528m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0"
41+
android:fillColor="#007FFF"/>
42+
<path
43+
android:pathData="M340.25,150.528m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
44+
android:fillColor="#CDCDC5"/>
45+
<path
46+
android:pathData="M580.25,150.528m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0"
47+
android:fillColor="#007FFF"/>
48+
<path
49+
android:pathData="M580.25,150.528m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
50+
android:fillColor="#CDCDC5"/>
51+
<path
52+
android:pathData="M710.25,200.528m50,-0a50,50 0,1 1,-100 -0a50,50 0,1 1,100 -0"
53+
android:fillColor="#007FFF"/>
54+
<path
55+
android:pathData="M710.25,200.528m30,-0a30,30 0,1 1,-60 -0a30,30 0,1 1,60 -0"
56+
android:fillColor="#CDCDC5"/>
57+
<path
58+
android:pathData="M760.25,200.528l-80,-0l-0,-50l80,-0z"
59+
android:fillColor="#CDCDC5"/>
60+
<path
61+
android:pathData="M710.25,100.528m50,-0a50,50 0,1 1,-100 -0a50,50 0,1 1,100 -0"
62+
android:fillColor="#007FFF"/>
63+
<path
64+
android:pathData="M710.25,100.528m30,-0a30,30 0,1 1,-60 -0a30,30 0,1 1,60 -0"
65+
android:fillColor="#CDCDC5"/>
66+
<path
67+
android:pathData="M760.25,100.528l-80,-0l-0,-50l80,-0z"
68+
android:fillColor="#CDCDC5"/>
69+
<path
70+
android:pathData="M260.25,0.528L260.25,0.528A10,10 0,0 1,270.25 10.528L270.25,240.528A10,10 0,0 1,260.25 250.528L260.25,250.528A10,10 0,0 1,250.25 240.528L250.25,10.528A10,10 0,0 1,260.25 0.528z"
71+
android:fillColor="#007FFF"/>
72+
<path
73+
android:pathData="M670.25,0.528L670.25,0.528A10,10 0,0 1,680.25 10.528L680.25,200.528A10,10 0,0 1,670.25 210.528L670.25,210.528A10,10 0,0 1,660.25 200.528L660.25,10.528A10,10 0,0 1,670.25 0.528z"
74+
android:fillColor="#007FFF"/>
75+
<path
76+
android:pathData="M630.25,100.528L630.25,100.528A10,10 0,0 1,640.25 110.528L640.25,190.528A10,10 0,0 1,630.25 200.528L630.25,200.528A10,10 0,0 1,620.25 190.528L620.25,110.528A10,10 0,0 1,630.25 100.528z"
77+
android:fillColor="#007FFF"/>
78+
<path
79+
android:pathData="M830.25,150.528m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0"
80+
android:fillColor="#007FFF"/>
81+
<path
82+
android:pathData="M830.25,150.528m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
83+
android:fillColor="#CDCDC5"/>
84+
<path
85+
android:pathData="M880.25,100.528L880.25,100.528A10,10 0,0 1,890.25 110.528L890.25,190.528A10,10 0,0 1,880.25 200.528L880.25,200.528A10,10 0,0 1,870.25 190.528L870.25,110.528A10,10 0,0 1,880.25 100.528z"
86+
android:fillColor="#007FFF"/>
87+
<path
88+
android:pathData="M750.25,200.528m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
89+
android:fillColor="#007FFF"/>
90+
<path
91+
android:pathData="M750.25,100.528m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
92+
android:fillColor="#007FFF"/>
93+
<path
94+
android:pathData="M460.25,150.528m-50,0a50,50 0,1 1,100 0a50,50 0,1 1,-100 0"
95+
android:fillColor="#007FFF"/>
96+
<path
97+
android:pathData="M460.25,150.528m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
98+
android:fillColor="#CDCDC5"/>
99+
<path
100+
android:pathData="M430.25,150.528h80v50h-80z"
101+
android:fillColor="#CDCDC5"/>
102+
<path
103+
android:pathData="M420.25,100.528L420.25,100.528A10,10 0,0 1,430.25 110.528L430.25,240.528A10,10 0,0 1,420.25 250.528L420.25,250.528A10,10 0,0 1,410.25 240.528L410.25,110.528A10,10 0,0 1,420.25 100.528z"
104+
android:fillColor="#007FFF"/>
105+
<path
106+
android:pathData="M500.25,150.528m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
107+
android:fillColor="#007FFF"/>
108+
</vector>

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

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,48 +14,42 @@
1414
app:layout_constraintBottom_toTopOf="@id/support"
1515
app:layout_constraintStart_toStartOf="parent"
1616
app:layout_constraintEnd_toEndOf="parent"
17-
android:textSize="40sp"
17+
android:textSize="@dimen/size_title_text"
1818
android:text="@string/about"
19-
android:layout_margin="10dp"/>
19+
android:layout_margin="@dimen/margin_text"/>
2020

2121
<!-- Button SOURCE CODE -->
2222
<Button
2323
android:id="@+id/sourcecode"
24-
android:layout_width="0dp"
24+
android:layout_width="@dimen/width"
2525
android:layout_height="wrap_content"
2626
app:layout_constraintBottom_toTopOf="@id/cancel_version"
2727
app:layout_constraintEnd_toStartOf="@id/support"
2828
app:layout_constraintStart_toStartOf="parent"
2929
app:layout_constraintTop_toBottomOf="@id/text_about"
30-
android:text="@string/source_code"
31-
android:layout_margin="10dp"
32-
android:padding="5dp"/>
30+
android:text="@string/source_code"/>
3331

3432
<!-- Button SUPPORT US -->
3533
<Button
3634
android:id="@+id/support"
37-
android:layout_width="0dp"
38-
android:layout_height="wrap_content"
35+
android:layout_width="@dimen/width"
36+
android:layout_height="@dimen/height"
3937
app:layout_constraintBottom_toBottomOf="@id/sourcecode"
4038
app:layout_constraintEnd_toStartOf="@id/version"
4139
app:layout_constraintStart_toEndOf="@id/sourcecode"
4240
app:layout_constraintTop_toTopOf="@id/sourcecode"
43-
android:text="@string/support_us"
44-
android:layout_margin="10dp"
45-
android:padding="5dp"/>
41+
android:text="@string/support_us"/>
4642

4743
<!-- Button VERSION -->
4844
<Button
4945
android:id="@+id/version"
50-
android:layout_width="0dp"
51-
android:layout_height="wrap_content"
46+
android:layout_width="@dimen/width"
47+
android:layout_height="@dimen/height"
5248
app:layout_constraintBottom_toBottomOf="@id/support"
5349
app:layout_constraintEnd_toEndOf="parent"
5450
app:layout_constraintStart_toEndOf="@id/support"
5551
app:layout_constraintTop_toTopOf="@id/support"
56-
android:text="@string/version_azure"
57-
android:layout_margin="10dp"
58-
android:padding="5dp"/>
52+
android:text="@string/version_sunray"/>
5953

6054
<!-- Button CANCEL -->
6155
<Button
@@ -66,8 +60,6 @@
6660
app:layout_constraintStart_toStartOf="parent"
6761
app:layout_constraintTop_toBottomOf="@id/support"
6862
app:layout_constraintBottom_toBottomOf="parent"
69-
android:text="@string/cancel"
70-
android:layout_margin="10dp"
71-
android:padding="5dp"/>
63+
android:text="@string/cancel"/>
7264

7365
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)