Skip to content

Commit ced7900

Browse files
w2svw2sv
committed
Rename resources
1 parent b7e9efd commit ced7900

File tree

10 files changed

+25
-26
lines changed

10 files changed

+25
-26
lines changed

‎app/src/main/res/layout-land/fragment_flowfield.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
android:id="@+id/layout"
54
android:layout_width="match_parent"
65
android:layout_height="match_parent">
76

@@ -56,12 +55,12 @@
5655
android:layout_height="143dp"
5756
android:layout_centerInParent="true"
5857

59-
android:background="@drawable/shape_imageselection_button"
58+
android:background="@drawable/shape_button_screenshotselection"
6059

6160
android:lineSpacingExtra="10dp"
6261
android:text="@string/select_images"
6362
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
64-
android:textColor="@color/image_selection_button_foreground" />
63+
android:textColor="@color/image_selection_button" />
6564

6665
<androidx.coordinatorlayout.widget.CoordinatorLayout
6766
android:layout_width="match_parent"
@@ -104,7 +103,7 @@
104103

105104
app:headerLayout="@layout/navigation_view_header"
106105
app:itemIconTint="@color/highlight"
107-
app:menu="@menu/flowfield" />
106+
app:menu="@menu/navigation_view" />
108107

109108
</com.w2sv.autocrop.activities.main.fragments.flowfield.views.FlowFieldDrawerLayout>
110109

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
android:layout_gravity="bottom|center_horizontal"
1212
android:layout_margin="12dp"
1313

14-
android:background="@drawable/shape_oval_w_border_white"
14+
android:background="@drawable/shape_button_enable_ssl"
1515
android:paddingHorizontal="3dp"
1616
android:text="@string/enable"
17+
android:textColor="@android:color/white"
1718
android:textSize="18sp" />
1819

1920
<com.airbnb.lottie.LottieAnimationView

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
android:layout_centerHorizontal="true"
3838
android:layout_marginBottom="50dp"
3939

40-
android:background="@drawable/shape_rounded_rectangle"
40+
android:background="@drawable/shape_rounded_rectangle_w_button_background"
4141
android:gravity="center"
4242

4343
android:textColor="@android:color/white"
@@ -53,7 +53,7 @@
5353
android:layout_marginEnd="@dimen/margin_horizontal"
5454
android:layout_marginBottom="62dp"
5555

56-
android:background="@drawable/shape_oval_btn"
56+
android:background="@drawable/shape_oval_w_button_background"
5757

5858
android:contentDescription="@string/go_back_to_crop_pager"
5959
android:padding="@dimen/padding_image_button_w_background"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
android:layout_centerHorizontal="true"
7171
android:layout_marginBottom="50dp"
7272

73-
android:background="@drawable/shape_oval_w_border"
73+
android:background="@drawable/shape_button_cancel_autoscroll"
7474
android:paddingHorizontal="3dp"
7575

7676
android:text="@string/cancel_autoscroll"

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
4-
android:id="@+id/layout"
54
android:layout_width="match_parent"
65
android:layout_height="match_parent">
76

@@ -43,7 +42,7 @@
4342
android:layout_width="@dimen/size_lottie_button"
4443
android:layout_height="@dimen/size_lottie_button"
4544
android:layout_marginStart="@dimen/margin_horizontal"
46-
android:layout_marginTop="46dp"
45+
android:layout_marginTop="@dimen/margin_top_portrait"
4746

4847
android:contentDescription="@string/main_menu_toggle"
4948

@@ -56,12 +55,12 @@
5655
android:layout_height="143dp"
5756
android:layout_centerInParent="true"
5857

59-
android:background="@drawable/shape_imageselection_button"
58+
android:background="@drawable/shape_button_screenshotselection"
6059

6160
android:lineSpacingExtra="10dp"
6261
android:text="@string/select_images"
6362
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
64-
android:textColor="@color/image_selection_button_foreground" />
63+
android:textColor="@color/image_selection_button" />
6564

6665
<androidx.coordinatorlayout.widget.CoordinatorLayout
6766
android:layout_width="match_parent"
@@ -104,7 +103,7 @@
104103

105104
app:headerLayout="@layout/navigation_view_header"
106105
app:itemIconTint="@color/highlight"
107-
app:menu="@menu/flowfield" />
106+
app:menu="@menu/navigation_view" />
108107

109108
</com.w2sv.autocrop.activities.main.fragments.flowfield.views.FlowFieldDrawerLayout>
110109

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
android:layout_width="@dimen/width_button"
2323
android:layout_height="@dimen/height_button"
2424
android:layout_marginHorizontal="@dimen/margin_horizontal_manual_crop_fragment_top_button"
25-
android:background="@drawable/shape_rounded_rectangle"
25+
android:background="@drawable/shape_rounded_rectangle_w_button_background"
2626
android:gravity="center"
2727
android:textStyle="bold" />
2828

@@ -31,7 +31,7 @@
3131
android:layout_width="@dimen/width_button"
3232
android:layout_height="@dimen/height_button"
3333
android:layout_marginHorizontal="@dimen/margin_horizontal_manual_crop_fragment_top_button"
34-
android:background="@drawable/shape_rounded_rectangle"
34+
android:background="@drawable/shape_rounded_rectangle_w_button_background"
3535
android:gravity="center"
3636
android:textStyle="bold" />
3737

@@ -40,7 +40,7 @@
4040
android:layout_width="@dimen/width_button"
4141
android:layout_height="@dimen/height_button"
4242
android:layout_marginHorizontal="@dimen/margin_horizontal_manual_crop_fragment_top_button"
43-
android:background="@drawable/shape_rounded_rectangle"
43+
android:background="@drawable/shape_rounded_rectangle_w_button_background"
4444
android:gravity="center"
4545
android:textStyle="bold" />
4646

@@ -49,7 +49,7 @@
4949
android:layout_width="@dimen/width_button"
5050
android:layout_height="@dimen/height_button"
5151
android:layout_marginHorizontal="@dimen/margin_horizontal_manual_crop_fragment_top_button"
52-
android:background="@drawable/shape_rounded_rectangle"
52+
android:background="@drawable/shape_rounded_rectangle_w_button_background"
5353
android:gravity="center"
5454
android:textStyle="bold" />
5555

@@ -74,7 +74,7 @@
7474
android:layout_marginTop="-30dp"
7575
android:layout_marginEnd="10dp"
7676

77-
android:background="@drawable/shape_manual_crop_reset_btn"
77+
android:background="@drawable/shape_button_reset_crop_adjustment"
7878
android:text="@string/reset"
7979
android:textColor="@color/highlight"
8080
android:textSize="15sp"
@@ -101,7 +101,7 @@
101101
android:layout_gravity="center"
102102
android:layout_marginHorizontal="18dp"
103103

104-
android:background="@drawable/shape_oval_btn"
104+
android:background="@drawable/shape_oval_w_button_background"
105105
android:contentDescription="@string/discard_changes"
106106
android:padding="@dimen/padding_image_button_w_background"
107107

@@ -115,7 +115,7 @@
115115
android:layout_gravity="center"
116116
android:layout_marginHorizontal="18dp"
117117

118-
android:background="@drawable/shape_oval_btn"
118+
android:background="@drawable/shape_oval_w_button_background"
119119
android:contentDescription="@string/apply_adjusted_crop_edges"
120120

121121
android:padding="@dimen/padding_image_button_w_background"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
android:layout_centerInParent="true"
3030

31-
android:indeterminateDrawable="@drawable/shape_circular_progress_bar_save_all" />
31+
android:indeterminateDrawable="@drawable/shape_progress_bar_save_all" />
3232

3333
<com.w2sv.autocrop.activities.examination.fragments.saveall.SaveAllProgressTextView
3434
android:id="@+id/progress_tv"

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@
99
<color name="magenta_saturated">#FF911945</color>
1010
<color name="red">#FFB00020</color>
1111
<color name="ocean_blue">#ff1a0ac7</color>
12-
<color name="turquoise_greenish">#FF008577</color>
1312

1413
<color name="highlight">@color/magenta_bright</color>
1514
<color name="higher_light">@android:color/holo_purple</color>
16-
<color name="success">@color/turquoise_greenish</color>
15+
<color name="success">#FF008577</color>
1716
<color name="neutral_background">#000000</color>
1817
<color name="crop_mask">#AB1C1C1E</color>
1918
<color name="button_background">#80303033</color>
20-
<color name="image_selection_button_foreground">@android:color/white</color>
21-
19+
<color name="image_selection_button">@android:color/white</color>
20+
<color name="enable_ssl_button">#FF00c233</color>
2221
<color name="onboarding_description">@color/light_gray</color>
2322
</resources>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
<dimen name="margin_horizontal">35dp</dimen>
88
<dimen name="margin_horizontal_manual_crop_fragment_top_button">4dp</dimen>
9+
<dimen name="margin_top_portrait">46dp</dimen>
910
<dimen name="margin_crop_progress_bar">-80dp</dimen>
1011
<dimen name="size_lottie_button">46dp</dimen>
1112
<dimen name="size_image_button">28dp</dimen>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<integer name="duration_snackbar_long">4000</integer>
66
<integer name="duration_snackbar_extra_long">5000</integer>
77
<integer name="duration_backpress_confirmation_window">2500</integer>
8+
<integer name="duration_view_animation">@integer/delay_large</integer>
89

910
<integer name="delay_small">200</integer>
1011
<integer name="delay_medium">500</integer>
1112
<integer name="delay_large">1000</integer>
1213

13-
<integer name="duration_view_animation">@integer/delay_large</integer>
1414
<integer name="period_auto_scroll">@integer/delay_large</integer>
1515

1616
</resources>

0 commit comments

Comments
 (0)