Skip to content

Commit 0af6133

Browse files
aashishksahuaashishksahu
authored
Merge pull request #101 from aashishksahu/bug-fix
Bug fix
2 parents fa39916 + 6630c5c commit 0af6133

9 files changed

Lines changed: 42 additions & 21 deletions

File tree

‎.idea/compiler.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations.xml‎

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ android {
1616

1717
minSdk 29
1818
targetSdk 34
19-
versionCode 37
20-
versionName "2.0.6"
19+
versionCode 38
20+
versionName "2.0.7"
2121

2222
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2323
vectorDrawables {

‎app/src/main/java/org/privacymatters/safespace/main/ui/ItemList.kt‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class ItemList(private val activity: MainnActivity) {
9999
Row(
100100
verticalAlignment = Alignment.CenterVertically,
101101
modifier = Modifier
102-
.padding(top = 5.dp)
102+
// .padding(10.dp)
103103
.combinedClickable(
104104
onClick = {
105105
openItem(item)
@@ -114,9 +114,9 @@ class ItemList(private val activity: MainnActivity) {
114114
) {
115115
GlideImage(
116116
modifier = Modifier
117-
.size(64.dp)
117+
.size(84.dp)
118118
.padding(10.dp)
119-
.clip(RoundedCornerShape(8.dp))
119+
.clip(RoundedCornerShape(12.dp))
120120
.background(MaterialTheme.colorScheme.primary),
121121
model = File(activity.viewModel.getIconPath(item.name)).canonicalPath,
122122
contentDescription = activity.getString(R.string.file_icon_description),
@@ -126,14 +126,14 @@ class ItemList(private val activity: MainnActivity) {
126126
)
127127
Column(
128128
modifier = Modifier
129-
.padding(10.dp)
129+
.padding(end=10.dp, top = 10.dp, bottom = 10.dp)
130130
) {
131131
val (name, ext) = Utils.getFileNameAndExtension(item.name)
132132

133133
Text(
134134
text = name,
135135
style = MaterialTheme.typography.titleMedium,
136-
maxLines = 2,
136+
maxLines = 1,
137137
overflow = TextOverflow.Ellipsis,
138138
color = if (item.isSelected) MaterialTheme.colorScheme.onSecondary else MaterialTheme.colorScheme.onBackground
139139
)
@@ -143,6 +143,10 @@ class ItemList(private val activity: MainnActivity) {
143143
.fillMaxWidth()
144144
.padding(top = 10.dp)
145145
) {
146+
Text(
147+
text = Utils.convertLongToDate(item.lastModified),
148+
color = if (item.isSelected) MaterialTheme.colorScheme.onSecondary else MaterialTheme.colorScheme.onBackground,
149+
)
146150
Row(verticalAlignment = Alignment.CenterVertically) {
147151
Text(
148152
text = Utils.getSize(item.size),
@@ -163,10 +167,6 @@ class ItemList(private val activity: MainnActivity) {
163167
fontWeight = FontWeight.Bold
164168
)
165169
}
166-
Text(
167-
text = Utils.convertLongToDate(item.lastModified),
168-
color = if (item.isSelected) MaterialTheme.colorScheme.onSecondary else MaterialTheme.colorScheme.onBackground,
169-
)
170170
}
171171
}
172172
}
@@ -179,7 +179,7 @@ class ItemList(private val activity: MainnActivity) {
179179
Row(
180180
verticalAlignment = Alignment.CenterVertically,
181181
modifier = Modifier
182-
.padding(top = 5.dp)
182+
// .padding(10.dp)
183183
.combinedClickable(
184184
onClick = {
185185
openItem(item)
@@ -194,21 +194,22 @@ class ItemList(private val activity: MainnActivity) {
194194
) {
195195
Image(
196196
modifier = Modifier
197-
.size(64.dp)
197+
.size(84.dp)
198198
.padding(10.dp)
199-
.clip(RoundedCornerShape(8.dp))
199+
.clip(RoundedCornerShape(12.dp))
200+
.clip(RoundedCornerShape(12.dp))
200201
.background(MaterialTheme.colorScheme.primary),
201202
painter = painterResource(R.drawable.folder_36dp),
202203
contentDescription = activity.getString(R.string.file_folder_placeholder)
203204
)
204205
Column(
205206
modifier = Modifier
206-
.padding(10.dp)
207+
.padding(end=10.dp, top = 10.dp, bottom = 10.dp)
207208
) {
208209
Text(
209210
text = item.name,
210211
style = MaterialTheme.typography.titleMedium,
211-
maxLines = 2,
212+
maxLines = 1,
212213
overflow = TextOverflow.Ellipsis,
213214
color = if (item.isSelected) MaterialTheme.colorScheme.onSecondary else MaterialTheme.colorScheme.onBackground
214215
)

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id 'com.android.application' version '8.6.0' apply false
4-
id 'com.android.library' version '8.6.0' apply false
3+
id 'com.android.application' version '8.7.1' apply false
4+
id 'com.android.library' version '8.7.1' apply false
55
id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
66
}

‎fastlane/metadata/android/en-US/changelogs/38.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Minor UI changes and bug fixes

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#Sat Apr 20 11:27:52 IST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
55
networkTimeout=10000
66
zipStoreBase=GRADLE_USER_HOME
77
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)