Skip to content

Commit 407c70e

Browse files
sepp89117sepp89117
committed
- Added multiple mode and preset selection to Multi-Cam-Control-field
- Added single preset selection in device menu
1 parent 41050a4 commit 407c70e

File tree

9 files changed

+425
-281
lines changed

9 files changed

+425
-281
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ android {
1010
applicationId 'com.sepp89117.goeasypro_android'
1111
minSdk 27
1212
targetSdk 33
13-
versionCode 157
14-
versionName "1.5.7"
13+
versionCode 160
14+
versionName "1.6.0"
1515

1616
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1717
vectorDrawables.useSupportLibrary = true

‎app/src/main/java/com/sepp89117/goeasypro_android/GoPreset.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class GoPreset {
1212
private final String title;
1313
private final Map<Integer, String> presets = new HashMap<>();
1414

15-
public GoPreset(Context context){
15+
public GoPreset(Context context) {
1616
this.context = context;
1717

1818
this.id = -1;
@@ -27,7 +27,7 @@ public GoPreset(Context context, int id) {
2727
this.title = presets.getOrDefault(this.id, getStr(R.string.str_UNK) + " " + this.id);
2828
}
2929

30-
private void putValuesToMap(){
30+
private void putValuesToMap() {
3131
presets.put(-2, getStr(R.string.str_NA));
3232
presets.put(-1, getStr(R.string.str_NC));
3333
presets.put(0x00000000, getStr(R.string.str_Standard));
@@ -49,7 +49,7 @@ private void putValuesToMap(){
4949
presets.put(0x00040000, getStr(R.string.str_Max_Photo));
5050
presets.put(0x00050000, getStr(R.string.str_Max_Time_Warp));
5151
}
52-
52+
5353
private String getStr(int resId) {
5454
return context.getResources().getString(resId);
5555
}

‎app/src/main/java/com/sepp89117/goeasypro_android/GoProDevice.java‎

Lines changed: 110 additions & 132 deletions
Large diffs are not rendered by default.

‎app/src/main/java/com/sepp89117/goeasypro_android/MainActivity.java‎

Lines changed: 183 additions & 138 deletions
Large diffs are not rendered by default.

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<vector android:height="24dp" android:tint="#00A6FF"
2+
android:viewportHeight="24" android:viewportWidth="24"
3+
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
4+
<path android:fillColor="@android:color/white" android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM11,17H7v-4h4V17zM11,11H7V7h4V11zM17,17h-4v-4h4V17zM17,11h-4V7h4V11z"/>
5+
</vector>

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,32 @@
159159
app:icon="@drawable/highlight_symbol" />
160160
</TableRow>
161161

162+
<TableRow
163+
android:layout_width="match_parent"
164+
android:layout_height="match_parent"
165+
android:gravity="center_horizontal">
166+
167+
<Button
168+
android:id="@+id/button6"
169+
android:layout_width="wrap_content"
170+
android:layout_height="wrap_content"
171+
android:layout_margin="5dp"
172+
android:onClick="onClickSetMode"
173+
android:text="Set Mode"
174+
android:textAllCaps="false"
175+
app:icon="@drawable/mode_select_symbol" />
176+
177+
<Button
178+
android:id="@+id/button7"
179+
android:layout_width="wrap_content"
180+
android:layout_height="wrap_content"
181+
android:layout_margin="5dp"
182+
android:onClick="onClickSetPreset"
183+
android:text="Set Preset"
184+
android:textAllCaps="false"
185+
app:icon="@drawable/preset_symbol" />
186+
</TableRow>
187+
162188
</TableLayout>
163189

164190
</RelativeLayout>

‎app/src/main/res/menu/connected_dev_menu.xml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,54 @@
6363
</item>
6464
</menu>
6565
</item>
66+
67+
<item android:id="@+id/preset_select"
68+
android:icon="@drawable/preset_symbol"
69+
android:title="Preset">
70+
<menu>
71+
<item
72+
android:id="@+id/preset_standard"
73+
android:title="Standard">
74+
</item>
75+
<item
76+
android:id="@+id/preset_activity"
77+
android:title="Activity">
78+
</item>
79+
<item
80+
android:id="@+id/preset_cinematic"
81+
android:title="Cinematic">
82+
</item>
83+
<item
84+
android:id="@+id/preset_photo"
85+
android:title="Photo">
86+
</item>
87+
<item
88+
android:id="@+id/preset_liveBurst"
89+
android:title="Live Burst">
90+
</item>
91+
<item
92+
android:id="@+id/preset_burstPhoto"
93+
android:title="Burst Photo">
94+
</item>
95+
<item
96+
android:id="@+id/preset_nightPhoto"
97+
android:title="Night Photo">
98+
</item>
99+
<item
100+
android:id="@+id/preset_timeWarp"
101+
android:title="Time Warp">
102+
</item>
103+
<item
104+
android:id="@+id/preset_timeLapse"
105+
android:title="Time Lapse">
106+
</item>
107+
<item
108+
android:id="@+id/preset_nightLapse"
109+
android:title="Night Lapse">
110+
</item>
111+
</menu>
112+
</item>
113+
66114
<item
67115
android:id="@+id/locate_on"
68116
android:icon="@drawable/radar_symbol"

‎app/src/main/res/menu/mode_menu.xml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<menu xmlns:android="http://schemas.android.com/apk/res/android">
3-
43
<item
54
android:id="@+id/mode_video"
6-
android:title="@string/str_video" >
5+
android:title="@string/str_video">
76
<menu>
87
<item
98
android:id="@+id/mode_video_single"
@@ -13,10 +12,9 @@
1312
android:title="@string/str_time_lapse" />
1413
</menu>
1514
</item>
16-
1715
<item
1816
android:id="@+id/mode_photo"
19-
android:title="@string/str_photo" >
17+
android:title="@string/str_photo">
2018
<menu>
2119
<item
2220
android:id="@+id/mode_photo_single"
@@ -26,10 +24,9 @@
2624
android:title="@string/str_night" />
2725
</menu>
2826
</item>
29-
3027
<item
3128
android:id="@+id/mode_multishot"
32-
android:title="@string/str_multishot" >
29+
android:title="@string/str_multishot">
3330
<menu>
3431
<item
3532
android:id="@+id/mode_multishot_burst"

‎app/src/main/res/menu/preset_menu.xml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<menu xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
tools:context=".activities.MainActivity" >
5+
<item
6+
android:id="@+id/preset_standard"
7+
android:title="Standard">
8+
</item>
9+
<item
10+
android:id="@+id/preset_activity"
11+
android:title="Activity">
12+
</item>
13+
<item
14+
android:id="@+id/preset_cinematic"
15+
android:title="Cinematic">
16+
</item>
17+
<item
18+
android:id="@+id/preset_photo"
19+
android:title="Photo">
20+
</item>
21+
<item
22+
android:id="@+id/preset_liveBurst"
23+
android:title="Live Burst">
24+
</item>
25+
<item
26+
android:id="@+id/preset_burstPhoto"
27+
android:title="Burst Photo">
28+
</item>
29+
<item
30+
android:id="@+id/preset_nightPhoto"
31+
android:title="Night Photo">
32+
</item>
33+
<item
34+
android:id="@+id/preset_timeWarp"
35+
android:title="Time Warp">
36+
</item>
37+
<item
38+
android:id="@+id/preset_timeLapse"
39+
android:title="Time Lapse">
40+
</item>
41+
<item
42+
android:id="@+id/preset_nightLapse"
43+
android:title="Night Lapse">
44+
</item>
45+
</menu>

0 commit comments

Comments
 (0)