Skip to content

Commit 0188c48

Browse files
winstonsungwinstonsung
committed
Fix various color, overflow and margin/padding issues
Bug: #106 Bug: #98 Bug: #99 Change-Id: I05c11c273bad401a891f10ddce6e71dffa4a7a41
1 parent 93ab899 commit 0188c48

14 files changed

+69
-19
lines changed

‎app/src/main/java/app/opass/ccip/ui/LanguagePreferenceFragment.kt

+9
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.fragment.app.FragmentManager
1515
import androidx.recyclerview.widget.LinearLayoutManager
1616
import androidx.recyclerview.widget.RecyclerView
1717
import app.opass.ccip.R
18+
import app.opass.ccip.extension.updateMargin
1819
import com.google.android.material.dialog.MaterialAlertDialogBuilder
1920

2021
class LanguagePreferenceFragment : DialogFragment() {
@@ -140,6 +141,14 @@ class LanguagePreferenceAdapter(
140141
holder.localName.text = item.localName
141142
holder.translatedName.text = item.translatedName
142143

144+
if (position == 0) {
145+
holder.optionItem.updateMargin(top = 36)
146+
}
147+
148+
if (position == items.size - 1) {
149+
holder.optionItem.updateMargin(bottom = 36)
150+
}
151+
143152
if (!isSelected) {
144153
holder.selectedIcon.setImageDrawable(null)
145154
} else {

‎app/src/main/java/app/opass/ccip/ui/wifi/WiFiNetworkAdapter.kt

+12
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ package app.opass.ccip.ui.wifi
33
import android.view.LayoutInflater
44
import android.view.View
55
import android.view.ViewGroup
6+
import android.widget.LinearLayout
67
import android.widget.TextView
78
import androidx.core.view.isGone
9+
import androidx.core.view.marginTop
810
import androidx.recyclerview.widget.RecyclerView
911
import app.opass.ccip.R
12+
import app.opass.ccip.extension.updateMargin
1013
import app.opass.ccip.model.WifiNetworkInfo
1114

1215
class WifiNetworkAdapter(
@@ -38,10 +41,19 @@ class WifiNetworkAdapter(
3841

3942
holder.password.text = item.password
4043
holder.password.isGone = false
44+
45+
if (position == 0) {
46+
holder.networkItem.updateMargin(top = 36)
47+
}
48+
49+
if (position == items.size - 1) {
50+
holder.networkItem.updateMargin(bottom = 36)
51+
}
4152
}
4253
}
4354

4455
class WifiNetworkViewHolder(view: View) : RecyclerView.ViewHolder(view) {
56+
val networkItem: LinearLayout = view.findViewById(R.id.network_item)
4557
val name: TextView = view.findViewById(R.id.network_name)
4658
val password: TextView = view.findViewById(R.id.network_password)
4759
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
33
<item>
44
<shape android:shape="oval">
5-
<solid android:color="@color/colorPrimary" />
5+
<solid android:color="@color/backgroundColorAccent" />
66
</shape>
77
</item>
88
</selector>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<shape xmlns:android="http://schemas.android.com/apk/res/android"
33
android:shape="rectangle">
44

5-
<solid android:color="?attr/colorAccent" />
5+
<solid android:color="@color/colorAccentDark" />
66

77
<corners android:radius="16dp" />
88
</shape>

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

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
android:layout_height="wrap_content"
6666
android:layout_margin="@dimen/fab_margin"
6767
android:src="@drawable/ic_star_border_white_48dp"
68+
app:backgroundTint="@color/colorPrimary"
6869
app:layout_anchor="@id/app_bar"
6970
app:layout_anchorGravity="bottom|end" />
7071

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
android:layout_gravity="bottom|end"
2727
android:layout_margin="16dp"
2828
android:contentDescription="@string/filter"
29-
android:tint="?attr/colorOnSecondary"
29+
app:backgroundTint="@color/colorPrimary"
30+
android:tint="?attr/colorOnPrimary"
3031
android:visibility="invisible"
3132
app:srcCompat="@drawable/ic_baseline_filter_list_24" />
3233

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<Button
2020
android:id="@+id/not_this_event"
21-
style="@style/Widget.MaterialComponents.Button.TextButton"
21+
style="@style/TextButton"
2222
android:layout_width="wrap_content"
2323
android:layout_height="wrap_content"
2424
android:layout_gravity="center_horizontal"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
<RelativeLayout
2424
android:layout_width="match_parent"
2525
android:layout_height="150dp"
26-
android:background="?attr/colorSecondary">
26+
android:background="@color/backgroundColorAccent">
2727

2828
<ImageView
2929
android:id="@+id/event_logo"
3030
android:layout_width="wrap_content"
3131
android:layout_height="wrap_content"
3232
android:layout_centerInParent="true"
3333
android:padding="10dp"
34-
card_view:srcCompat="?attr/colorSecondary" />
34+
card_view:srcCompat="@color/backgroundColorAccent" />
3535
</RelativeLayout>
3636

3737
<TextView

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@
99
android:background="?attr/selectableItemBackground"
1010
android:focusable="true"
1111
android:orientation="horizontal"
12-
android:paddingStart="32dp"
13-
android:paddingTop="16dp"
14-
android:paddingEnd="16dp"
15-
android:paddingBottom="16dp">
12+
android:paddingTop="8dp"
13+
android:paddingBottom="8dp"
14+
android:paddingStart="24dp"
15+
android:paddingEnd="24dp">
1616

1717
<LinearLayout
1818
android:layout_weight="1"
1919
android:layout_width="0dp"
2020
android:layout_height="wrap_content"
21-
android:background="?attr/selectableItemBackground"
22-
android:focusable="true"
2321
android:orientation="vertical">
2422
<TextView
2523
android:id="@+id/option_local_name"

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@
2929
android:layout_marginStart="12dp"
3030
android:layout_marginTop="8dp"
3131
android:autoSizeTextType="uniform"
32+
android:autoSizeMinTextSize="8dp"
3233
android:maxLines="1"
3334
android:padding="2dp"
34-
android:text="New Text"
35+
android:text="TR412-1"
3536
app:layout_constraintBottom_toTopOf="@id/tagsBarrier"
3637
app:layout_constraintStart_toStartOf="parent"
3738
app:layout_constraintTop_toTopOf="parent" />

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
4+
android:id="@+id/network_item"
45
android:layout_width="match_parent"
56
android:layout_height="wrap_content"
67
android:background="?attr/selectableItemBackground"
78
android:focusable="true"
89
android:orientation="vertical"
9-
android:paddingStart="32dp"
10-
android:paddingTop="16dp"
11-
android:paddingEnd="8dp"
12-
android:paddingBottom="16dp">
10+
android:paddingTop="8dp"
11+
android:paddingBottom="8dp"
12+
android:paddingStart="24dp"
13+
android:paddingEnd="24dp">
1314

1415
<TextView
1516
android:id="@+id/network_name"

‎app/src/main/res/values-night/colors.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<resources>
33
<color name="colorPrimary">#3C2354</color>
44
<color name="colorPrimaryDark">#1D162B</color>
5-
<color name="colorAccent">#765987</color>
5+
<color name="colorAccent">#b4a0c0</color>
6+
<color name="colorAccentDark">#694f78</color>
67
<color name="colorDietMeat">#FFA000</color>
78
<color name="colorDietVegetarian">#298A08</color>
89
<color name="colorWhite">#FFFFFF</color>
@@ -11,5 +12,6 @@
1112
<color name="textColorPrimary">@android:color/white</color>
1213
<color name="textColorSecondary">@color/colorAccent</color>
1314
<color name="backgroundColorPrimary">@color/background_material_dark</color>
15+
<color name="backgroundColorAccent">@color/colorAccentDark</color>
1416
<color name="secondaryContainer">#4A4458</color>
1517
</resources>

‎app/src/main/res/values/colors.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<resources>
33
<color name="colorPrimary">#3C2354</color>
44
<color name="colorPrimaryDark">#1D162B</color>
5-
<color name="colorAccent">#765987</color>
5+
<color name="colorAccent">#b4a0c0</color>
6+
<color name="colorAccentDark">#694f78</color>
67
<color name="colorDietMeat">#FFA000</color>
78
<color name="colorDietVegetarian">#298A08</color>
89
<color name="colorWhite">#FFFFFF</color>
@@ -11,5 +12,6 @@
1112
<color name="textColorPrimary">@android:color/black</color>
1213
<color name="textColorSecondary">@color/colorPrimary</color>
1314
<color name="backgroundColorPrimary">@color/background_material_light</color>
15+
<color name="backgroundColorAccent">@color/colorPrimary</color>
1416
<color name="secondaryContainer">#E8DEF8</color>
1517
</resources>

‎app/src/main/res/values/styles.xml

+23
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,32 @@
1515
<item name="android:textColorSecondary">@color/textColorSecondary</item>
1616
<item name="android:colorBackground">@color/backgroundColorPrimary</item>
1717
<item name="android:navigationBarColor">@color/navigationBarColor</item>
18+
<item name="materialAlertDialogTheme">@style/AlertDialogTheme</item>
1819
<item name="textAppearanceButton">@style/ButtonTextAppearance</item>
1920
</style>
2021

2122
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar" />
2223

2324
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.MaterialComponents.Light" />
2425

26+
<style name="AlertDialogTheme" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
27+
<item name="buttonBarNeutralButtonStyle">@style/NeutralButtonStyle</item>
28+
<item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
29+
<item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
30+
</style>
31+
32+
<style name="NeutralButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
33+
<item name="android:textColor">@color/textColorSecondary</item>
34+
</style>
35+
36+
<style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
37+
<item name="android:textColor">@color/textColorSecondary</item>
38+
</style>
39+
40+
<style name="PositiveButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
41+
<item name="android:textColor">@color/textColorSecondary</item>
42+
</style>
43+
2544
<style name="Widget.CardContent" parent="android:Widget">
2645
<item name="android:paddingLeft">16dp</item>
2746
<item name="android:paddingRight">16dp</item>
@@ -55,4 +74,8 @@
5574
<style name="ButtonTextAppearance" parent="TextAppearance.MaterialComponents.Button">
5675
<item name="android:letterSpacing">0</item>
5776
</style>
77+
78+
<style name="TextButton" parent="Widget.MaterialComponents.Button.TextButton">
79+
<item name="android:textColor">@color/textColorSecondary</item>
80+
</style>
5881
</resources>

0 commit comments

Comments
 (0)