Skip to content

Commit 0e2f467

Browse files
jamakr4jamakr4
committed
refactor: settingstab
1 parent f86c887 commit 0e2f467

7 files changed

Lines changed: 41 additions & 76 deletions

File tree

‎app/src/main/java/com/drivehub/kamera/settings/SettingsAppearanceController.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ void bindSettingsAppearance(
7171
TextView tabSettings,
7272
TextView tabSignalCamera,
7373
TextView tabDashcam,
74-
TextView tabOptik,
7574
TextView tabCredits,
7675
TextView tabDev,
7776
TextView tabDevStatus
@@ -97,7 +96,6 @@ void bindSettingsAppearance(
9796
tabSettings,
9897
tabSignalCamera,
9998
tabDashcam,
100-
tabOptik,
10199
tabCredits,
102100
tabDev,
103101
tabDevStatus
@@ -110,7 +108,6 @@ void bindSettingsAppearance(
110108
seekCorner.setProgress(savedRadius);
111109
etCorner.setText(String.valueOf(savedRadius));
112110
etAccentColor.setText(UiPrefs.getAccentColorSetting(prefs));
113-
syncAccentRowToSliderInset();
114111
accentPreview.setOnClickListener(v -> showAccentColorPicker());
115112

116113
applyAccentColorToSettingsDialog(accentColor);
@@ -330,16 +327,6 @@ private ColorStateList buildToggleTrackTint(int accentColor) {
330327
);
331328
}
332329

333-
private void syncAccentRowToSliderInset() {
334-
if (accentRow == null || seekCorner == null) return;
335-
accentRow.post(() -> accentRow.setPaddingRelative(
336-
seekCorner.getPaddingLeft(),
337-
accentRow.getPaddingTop(),
338-
accentRow.getPaddingEnd(),
339-
accentRow.getPaddingBottom()
340-
));
341-
}
342-
343330
private float dp(float value) {
344331
return value * activity.getResources().getDisplayMetrics().density;
345332
}

‎app/src/main/java/com/drivehub/kamera/settings/SettingsDialogController.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
public final class SettingsDialogController {
4242

4343
private static final int DEFAULT_TAB_INDEX = 1; // Settings
44-
private static final int DEV_TAB_INDEX = 6;
45-
private static final int DEV_STATUS_TAB_INDEX = 7;
44+
private static final int DEV_TAB_INDEX = 5;
45+
private static final int DEV_STATUS_TAB_INDEX = 6;
4646
private static final int DEV_UNLOCK_TAPS = 5;
4747
private static final int EXPECTED_TOTAL_CAMERAS = 4;
4848
private static final int CAMERA_PROBE_MAX_INDEX = 18;
@@ -189,25 +189,23 @@ private Views bindViews(SharedPreferences prefs) {
189189
v.tabSettings = dialog.findViewById(R.id.tabSettings);
190190
v.tabSignalCamera = dialog.findViewById(R.id.tabSignalCamera);
191191
v.tabDashcam = dialog.findViewById(R.id.tabDashcam);
192-
v.tabOptik = dialog.findViewById(R.id.tabOptik);
193192
v.tabCredits = dialog.findViewById(R.id.tabCredits);
194193
v.tabDev = dialog.findViewById(R.id.tabDev);
195194
v.tabDevStatus = dialog.findViewById(R.id.tabDevStatus);
196195
v.settingsTabs = new TextView[]{
197196
v.tabUpdate, v.tabSettings, v.tabSignalCamera, v.tabDashcam,
198-
v.tabOptik, v.tabCredits, v.tabDev, v.tabDevStatus
197+
v.tabCredits, v.tabDev, v.tabDevStatus
199198
};
200199
v.sectionUpdate = dialog.findViewById(R.id.sectionUpdate);
201200
v.sectionSettings = dialog.findViewById(R.id.sectionSettings);
202201
v.sectionSignalCamera = dialog.findViewById(R.id.sectionSignalCamera);
203202
v.sectionDashcam = dialog.findViewById(R.id.sectionDashcam);
204-
v.sectionOptik = dialog.findViewById(R.id.sectionOptik);
205203
v.sectionCredits = dialog.findViewById(R.id.sectionCredits);
206204
v.sectionDev = dialog.findViewById(R.id.sectionDev);
207205
v.sectionDevStatus = dialog.findViewById(R.id.sectionDevStatus);
208206
v.settingsSections = new View[]{
209207
v.sectionUpdate, v.sectionSettings, v.sectionSignalCamera, v.sectionDashcam,
210-
v.sectionOptik, v.sectionCredits, v.sectionDev, v.sectionDevStatus
208+
v.sectionCredits, v.sectionDev, v.sectionDevStatus
211209
};
212210
v.accentRow = dialog.findViewById(R.id.rowAccentColor);
213211
v.accentPreview = dialog.findViewById(R.id.viewAccentPreview);
@@ -285,7 +283,6 @@ private void wireAppearance(SharedPreferences prefs) {
285283
views.tabSettings,
286284
views.tabSignalCamera,
287285
views.tabDashcam,
288-
views.tabOptik,
289286
views.tabCredits,
290287
views.tabDev,
291288
views.tabDevStatus
@@ -477,7 +474,6 @@ private static final class Views {
477474
TextView tabSettings;
478475
TextView tabSignalCamera;
479476
TextView tabDashcam;
480-
TextView tabOptik;
481477
TextView tabCredits;
482478
TextView tabDev;
483479
TextView tabDevStatus;
@@ -486,7 +482,6 @@ private static final class Views {
486482
View sectionSettings;
487483
View sectionSignalCamera;
488484
View sectionDashcam;
489-
View sectionOptik;
490485
View sectionCredits;
491486
View sectionDev;
492487
View sectionDevStatus;

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@
5656
style="@style/DrivehubSettingsTabInactive"
5757
android:text="@string/settings_tab_dashcam" />
5858

59-
<TextView
60-
android:id="@+id/tabOptik"
61-
style="@style/DrivehubSettingsTabInactive"
62-
android:text="@string/settings_tab_optik" />
63-
6459
<TextView
6560
android:id="@+id/tabUpdate"
6661
style="@style/DrivehubSettingsTabInactive"
@@ -161,8 +156,6 @@
161156

162157
<include layout="@layout/dialog_settings_section_dashcam" />
163158

164-
<include layout="@layout/dialog_settings_section_optik" />
165-
166159
<include layout="@layout/dialog_settings_section_credits" />
167160

168161
<include layout="@layout/dialog_settings_section_dev" />

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

Lines changed: 0 additions & 45 deletions
This file was deleted.

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,41 @@
3737

3838
</LinearLayout>
3939

40+
<TextView
41+
style="@style/DrivehubSettingsCardLabel"
42+
android:layout_width="wrap_content"
43+
android:layout_height="wrap_content"
44+
android:layout_marginTop="22dp"
45+
android:layout_marginBottom="8dp"
46+
android:text="@string/settings_accent_color" />
47+
48+
<LinearLayout
49+
android:id="@+id/rowAccentColor"
50+
android:layout_width="match_parent"
51+
android:layout_height="wrap_content"
52+
android:background="@drawable/bg_settings_inline_card"
53+
android:gravity="center_vertical"
54+
android:minHeight="64dp"
55+
android:orientation="horizontal"
56+
android:paddingStart="18dp"
57+
android:paddingTop="12dp"
58+
android:paddingEnd="18dp"
59+
android:paddingBottom="12dp">
60+
61+
<View
62+
android:id="@+id/viewAccentPreview"
63+
android:layout_width="34dp"
64+
android:layout_height="34dp"
65+
android:background="@drawable/bg_accent_color_preview" />
66+
67+
<EditText
68+
android:id="@+id/etAccentColor"
69+
style="@style/DrivehubSettingsAccentValue"
70+
android:layout_width="110dp"
71+
android:layout_height="wrap_content"
72+
android:layout_marginStart="14dp"
73+
android:hint="@string/settings_accent_color_hint" />
74+
75+
</LinearLayout>
76+
4077
</LinearLayout>

‎app/src/main/res/values-de/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
<string name="main_recording_starting">REC startet</string>
107107
<string name="main_recording_paused_oem">REC pausiert (OEM-Start)</string>
108108
<string name="main_recording_error">REC Fehler: %1$s</string>
109-
<string name="settings_tab_optik">Darstellung</string>
110109
<string name="settings_section_tileview">Blinker-Kamera</string>
111110
<string name="settings_tile_corner_radius">Rundung</string>
112111
<string name="settings_tile_corner_square">Eckig</string>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
<string name="main_recording_starting">REC starting</string>
107107
<string name="main_recording_paused_oem">REC paused (OEM launch)</string>
108108
<string name="main_recording_error">REC error: %1$s</string>
109-
<string name="settings_tab_optik">Appearance</string>
110109
<string name="settings_section_tileview">Signal Camera</string>
111110
<string name="settings_tile_corner_radius">Corner radius</string>
112111
<string name="settings_tile_corner_square">Square</string>

0 commit comments

Comments
 (0)