Skip to content

Commit 61961a7

Browse files
committed
v4.4
1 parent 50a0454 commit 61961a7

File tree

5 files changed

+218
-203
lines changed

5 files changed

+218
-203
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ android {
1111
applicationId "com.wirelessalien.zipxtract"
1212
minSdk 23
1313
targetSdk 33
14-
versionCode 13
15-
versionName "4.3.2"
14+
versionCode 14
15+
versionName "4.4"
1616

1717
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1818
}

app/src/main/java/com/wirelessalien/zipxtract/CreateZipFragment.kt

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

app/src/main/res/layout/seven_z_option_dialog.xml

Lines changed: 95 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -27,106 +27,112 @@
2727
android:orientation="vertical"
2828
android:padding="10dp">
2929

30-
<com.google.android.material.card.MaterialCardView
31-
android:layout_width="match_parent"
32-
app:cardCornerRadius="10dp"
33-
android:layout_margin="5dp"
34-
style="@style/Widget.Material3.CardView.Outlined"
35-
android:layout_height="wrap_content">
36-
<com.google.android.material.textfield.TextInputEditText
37-
android:id="@+id/archiveNameEditText"
30+
<com.google.android.material.card.MaterialCardView
3831
android:layout_width="match_parent"
32+
app:cardCornerRadius="10dp"
33+
android:layout_margin="5dp"
34+
style="@style/Widget.Material3.CardView.Outlined"
35+
android:layout_height="wrap_content">
36+
<com.google.android.material.textfield.TextInputEditText
37+
android:id="@+id/archiveNameEditText"
38+
android:layout_width="match_parent"
39+
android:layout_height="wrap_content"
40+
style="@style/Widget.Material3.TextInputEditText.OutlinedBox"
41+
android:hint="@string/enter_name_of_archive_optional"/>
42+
</com.google.android.material.card.MaterialCardView>
43+
<TextView
44+
android:layout_width="wrap_content"
3945
android:layout_height="wrap_content"
40-
style="@style/Widget.Material3.TextInputEditText.OutlinedBox"
41-
android:hint="@string/enter_name_of_archive_optional"/>
42-
</com.google.android.material.card.MaterialCardView>
43-
<TextView
44-
android:layout_width="wrap_content"
45-
android:layout_height="wrap_content"
46-
android:textSize="16sp"
47-
android:textStyle="bold"
48-
android:layout_marginTop="10dp"
49-
android:text="@string/enter_password"
50-
android:layout_margin="5dp"/>
51-
<com.google.android.material.card.MaterialCardView
52-
android:layout_width="match_parent"
53-
app:cardCornerRadius="10dp"
54-
android:layout_margin="5dp"
55-
style="@style/Widget.Material3.CardView.Outlined"
56-
android:layout_height="wrap_content">
57-
58-
<com.google.android.material.textfield.TextInputEditText
59-
android:id="@+id/passwordEditText"
60-
android:layout_width="match_parent"
61-
android:layout_height="wrap_content"
62-
android:inputType="textPassword"
63-
style="@style/Widget.Material3.TextInputEditText.OutlinedBox"
64-
android:hint="@string/enter_password"/>
65-
</com.google.android.material.card.MaterialCardView>
66-
67-
68-
<TextView
69-
android:layout_width="wrap_content"
70-
android:layout_height="wrap_content"
71-
android:textSize="16sp"
72-
android:textStyle="bold"
73-
android:text="@string/compression_level"
74-
android:layout_margin="5dp"/>
75-
<com.google.android.material.card.MaterialCardView
76-
android:layout_width="match_parent"
77-
app:cardCornerRadius="10dp"
78-
android:layout_margin="5dp"
79-
style="@style/Widget.Material3.CardView.Outlined"
80-
android:layout_height="wrap_content">
81-
<Spinner
82-
android:id="@+id/compressionSpinner"
46+
android:textSize="16sp"
47+
android:textStyle="bold"
48+
android:layout_marginTop="10dp"
49+
android:text="@string/enter_password"
50+
android:layout_margin="5dp"/>
51+
<com.google.android.material.card.MaterialCardView
8352
android:layout_width="match_parent"
84-
android:layout_height="48dp"
85-
android:padding="5dp"
86-
android:entries="@array/compression_levels"
87-
android:spinnerMode="dropdown"/>
88-
89-
</com.google.android.material.card.MaterialCardView>
53+
app:cardCornerRadius="10dp"
54+
android:layout_margin="5dp"
55+
style="@style/Widget.Material3.CardView.Outlined"
56+
android:layout_height="wrap_content">
57+
<LinearLayout
58+
android:layout_width="match_parent"
59+
android:layout_height="wrap_content"
60+
android:orientation="horizontal">
61+
<com.google.android.material.textfield.TextInputEditText
62+
android:id="@+id/passwordEditText"
63+
android:layout_width="match_parent"
64+
android:layout_height="wrap_content"
65+
android:inputType="textPassword"
66+
android:layout_weight="1"
67+
style="@style/Widget.Material3.TextInputEditText.OutlinedBox"
68+
android:hint="@string/enter_password"/>
69+
<ImageButton
70+
android:id="@+id/showPasswordButton"
71+
android:layout_width="wrap_content"
72+
android:layout_height="wrap_content"
73+
android:layout_gravity="center_vertical"
74+
style="@style/Widget.Material3.Button.IconButton"
75+
android:src="@drawable/ic_visibility_off"
76+
android:contentDescription="Show password" />
77+
</LinearLayout>
78+
</com.google.android.material.card.MaterialCardView>
79+
<TextView
80+
android:layout_width="wrap_content"
81+
android:layout_height="wrap_content"
82+
android:textSize="16sp"
83+
android:textStyle="bold"
84+
android:text="@string/compression_level"
85+
android:layout_margin="5dp"/>
86+
<com.google.android.material.card.MaterialCardView
87+
android:layout_width="match_parent"
88+
app:cardCornerRadius="10dp"
89+
android:layout_margin="5dp"
90+
style="@style/Widget.Material3.CardView.Outlined"
91+
android:layout_height="wrap_content">
92+
<Spinner
93+
android:id="@+id/compressionSpinner"
94+
android:layout_width="match_parent"
95+
android:layout_height="48dp"
96+
android:padding="5dp"
97+
android:entries="@array/compression_levels"
98+
android:spinnerMode="dropdown"/>
9099

91-
<com.google.android.material.card.MaterialCardView
92-
android:layout_width="match_parent"
93-
app:cardCornerRadius="10dp"
94-
android:layout_margin="5dp"
95-
style="@style/Widget.Material3.CardView.Outlined"
96-
android:layout_height="wrap_content">
97-
<com.google.android.material.checkbox.MaterialCheckBox
98-
android:id="@+id/solidCheckBox"
99-
android:layout_width="wrap_content"
100-
android:layout_height="wrap_content"
101-
android:text="@string/solid_compression"/>
102-
</com.google.android.material.card.MaterialCardView>
100+
</com.google.android.material.card.MaterialCardView>
103101

102+
<com.google.android.material.card.MaterialCardView
103+
android:layout_width="match_parent"
104+
app:cardCornerRadius="10dp"
105+
android:layout_margin="5dp"
106+
style="@style/Widget.Material3.CardView.Outlined"
107+
android:layout_height="wrap_content">
108+
<com.google.android.material.checkbox.MaterialCheckBox
109+
android:id="@+id/solidCheckBox"
110+
android:layout_width="wrap_content"
111+
android:layout_height="wrap_content"
112+
android:text="@string/solid_compression"/>
113+
</com.google.android.material.card.MaterialCardView>
104114
<TextView
105115
android:layout_width="wrap_content"
106116
android:layout_height="wrap_content"
107117
android:textSize="16sp"
108118
android:textStyle="bold"
109119
android:text="@string/thread_count"
110120
android:layout_margin="5dp"/>
121+
<com.google.android.material.card.MaterialCardView
122+
android:layout_width="match_parent"
123+
app:cardCornerRadius="10dp"
124+
android:layout_margin="5dp"
125+
style="@style/Widget.Material3.CardView.Outlined"
126+
android:layout_height="wrap_content">
111127

112-
<com.google.android.material.card.MaterialCardView
113-
android:layout_width="match_parent"
114-
app:cardCornerRadius="10dp"
115-
android:layout_margin="5dp"
116-
style="@style/Widget.Material3.CardView.Outlined"
117-
android:layout_height="wrap_content">
118-
119-
120-
<com.google.android.material.textfield.TextInputEditText
121-
android:id="@+id/threadCountEditText"
122-
android:layout_width="match_parent"
123-
android:layout_height="wrap_content"
124-
android:layout_margin="5dp"
125-
style="@style/Widget.Material3.TextInputEditText.OutlinedBox.Dense"
126-
android:hint="@string/max_available_thread"
127-
android:inputType="number"/>
128-
</com.google.android.material.card.MaterialCardView>
129-
130-
</LinearLayout>
131-
128+
<com.google.android.material.textfield.TextInputEditText
129+
android:id="@+id/threadCountEditText"
130+
android:layout_width="match_parent"
131+
android:layout_height="wrap_content"
132+
android:layout_margin="5dp"
133+
style="@style/Widget.Material3.TextInputEditText.OutlinedBox.Dense"
134+
android:hint="@string/max_available_thread"
135+
android:inputType="number"/>
136+
</com.google.android.material.card.MaterialCardView>
137+
</LinearLayout>
132138
</ScrollView>

0 commit comments

Comments
 (0)