Skip to content

Commit 7371e41

Browse files
Eiichi Yoshikawaguruz
Eiichi Yoshikawa
authored and
guruz
committed
fix: issue #167
* update `com.google.android.material:material` to suppress warning about deprecated API of Google Play * remove usage of deprecated API `setStatusBarColor` in `previewImageActivity` * remove screen orientation restrictions on the pattern and passcode lock screens
1 parent c0c59c5 commit 7371e41

5 files changed

Lines changed: 46 additions & 78 deletions

File tree

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ kotlinxCoroutines = "1.6.4"
3737
ksp = "1.9.20-1.0.14"
3838
ktlint = "11.1.0"
3939
markwon = "4.6.2"
40-
material = "1.8.0"
40+
material = "1.14.0"
4141
mockk = "1.13.13"
4242
moshi = "1.15.2"
4343
patternlockview = "a90b0d4bf0"

‎opencloudApp/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@
194194

195195
<activity
196196
android:name=".presentation.security.passcode.PassCodeActivity"
197-
android:label="@string/passcode_label"
198-
android:screenOrientation="portrait" />
197+
android:label="@string/passcode_label" />
199198
<activity
200199
android:name=".presentation.conflicts.ConflictsResolveActivity" />
201200
<activity
@@ -234,7 +233,6 @@
234233
</activity>
235234
<activity
236235
android:name=".presentation.security.pattern.PatternActivity"
237-
android:screenOrientation="portrait"
238236
android:label="@string/pattern_label" />
239237
<activity android:name=".presentation.security.biometric.BiometricActivity" />
240238
<!-- Own taskAffinity + singleTask so LoginActivity always runs in its own task.

‎opencloudApp/src/main/java/eu/opencloud/android/ui/preview/PreviewImageActivity.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import android.view.Menu
3737
import android.view.MenuItem
3838
import android.view.View
3939
import android.view.Window
40-
import androidx.core.content.ContextCompat
4140
import androidx.drawerlayout.widget.DrawerLayout
4241
import androidx.localbroadcastmanager.content.LocalBroadcastManager
4342
import androidx.viewpager.widget.ViewPager
@@ -61,6 +60,7 @@ import eu.opencloud.android.presentation.files.operations.FileOperationsViewMode
6160
import eu.opencloud.android.presentation.spaces.SpacesListViewModel
6261
import eu.opencloud.android.ui.activity.FileActivity
6362
import eu.opencloud.android.ui.activity.FileDisplayActivity
63+
import eu.opencloud.android.ui.activity.enableEdgeToEdgePreSetContentView
6464
import eu.opencloud.android.ui.fragment.FileFragment
6565
import eu.opencloud.android.usecases.transfers.DOWNLOAD_ADDED_MESSAGE
6666
import eu.opencloud.android.usecases.transfers.DOWNLOAD_FINISH_MESSAGE
@@ -99,6 +99,10 @@ class PreviewImageActivity : FileActivity(),
9999
override fun onCreate(savedInstanceState: Bundle?) {
100100
requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY)
101101
super.onCreate(savedInstanceState)
102+
103+
// edge-to-edge
104+
enableEdgeToEdgePreSetContentView(true)
105+
102106
setContentView(R.layout.preview_image_activity)
103107

104108
// ActionBar
@@ -122,7 +126,6 @@ class PreviewImageActivity : FileActivity(),
122126
setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
123127
}
124128
}
125-
window.statusBarColor = ContextCompat.getColor(this, R.color.opencloud_petrol_dark_transparent)
126129
localBroadcastManager = LocalBroadcastManager.getInstance(this)
127130
}
128131

‎opencloudApp/src/main/res/layout-w600dp/activity_pattern_lock.xml‎

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -42,58 +42,53 @@
4242
<TextView
4343
android:id="@+id/header_pattern"
4444
android:layout_width="wrap_content"
45-
android:layout_height="wrap_content"
46-
android:layout_marginTop="@dimen/standard_margin"
45+
android:layout_height="0dp"
4746
android:text="@string/pass_code_enter_pass_code"
4847
android:textColor="@android:color/black"
4948
android:textSize="16sp"
49+
android:gravity="bottom"
50+
app:layout_constraintVertical_weight="1"
5051
app:layout_constraintBottom_toTopOf="@id/explanation_pattern"
5152
app:layout_constraintEnd_toEndOf="parent"
52-
app:layout_constraintHorizontal_bias="0.5"
5353
app:layout_constraintStart_toStartOf="parent"
54-
app:layout_constraintTop_toTopOf="parent"
55-
app:layout_constraintVertical_chainStyle="packed" />
54+
app:layout_constraintTop_toTopOf="parent" />
5655

5756
<TextView
5857
android:id="@+id/explanation_pattern"
59-
android:layout_width="match_parent"
60-
android:layout_height="wrap_content"
61-
android:layout_margin="@dimen/standard_margin"
62-
android:gravity="center"
58+
android:layout_width="wrap_content"
59+
android:layout_height="0dp"
6360
android:text="@string/pattern_configure_your_pattern_explanation"
6461
android:textAppearance="@android:style/TextAppearance.Small"
6562
android:textSize="14sp"
63+
android:gravity="bottom"
64+
app:layout_constraintVertical_weight="1"
6665
app:layout_constraintBottom_toTopOf="@id/error_pattern"
6766
app:layout_constraintEnd_toEndOf="parent"
68-
app:layout_constraintHorizontal_bias="0.5"
6967
app:layout_constraintStart_toStartOf="parent"
7068
app:layout_constraintTop_toBottomOf="@id/header_pattern" />
7169

7270
<TextView
7371
android:id="@+id/error_pattern"
7472
android:layout_width="wrap_content"
75-
android:layout_height="wrap_content"
76-
android:layout_marginTop="@dimen/standard_margin"
73+
android:layout_height="0dp"
7774
android:textColor="@color/warning"
7875
android:textSize="16sp"
76+
android:gravity="bottom"
77+
app:layout_constraintVertical_weight="1"
7978
app:layout_constraintBottom_toTopOf="@id/patternContainer"
8079
app:layout_constraintEnd_toEndOf="parent"
81-
app:layout_constraintHorizontal_bias="0.5"
8280
app:layout_constraintStart_toStartOf="parent"
8381
app:layout_constraintTop_toBottomOf="@id/explanation_pattern" />
8482

8583
<eu.opencloud.android.presentation.security.passcode.SquareFrameLayout
8684
android:id="@+id/patternContainer"
87-
android:layout_width="0dp"
88-
android:layout_height="wrap_content"
89-
android:layout_marginHorizontal="@dimen/standard_margin"
90-
android:layout_marginVertical="@dimen/standard_margin"
85+
android:layout_width="wrap_content"
86+
android:layout_height="0dp"
9187
app:layout_constraintBottom_toBottomOf="parent"
92-
app:layout_constraintEnd_toEndOf="@id/rightGuideline"
93-
app:layout_constraintHorizontal_bias="0.5"
94-
app:layout_constraintHorizontal_chainStyle="packed"
95-
app:layout_constraintStart_toStartOf="@id/leftGuideline"
96-
app:layout_constraintTop_toBottomOf="@id/error_pattern">
88+
app:layout_constraintEnd_toEndOf="parent"
89+
app:layout_constraintStart_toStartOf="parent"
90+
app:layout_constraintTop_toBottomOf="@id/error_pattern"
91+
app:layout_constraintVertical_weight="8">
9792

9893
<com.andrognito.patternlockview.PatternLockView
9994
android:id="@+id/pattern_lock_view"
@@ -109,20 +104,6 @@
109104

110105
</com.andrognito.patternlockview.PatternLockView>
111106
</eu.opencloud.android.presentation.security.passcode.SquareFrameLayout>
112-
113-
<androidx.constraintlayout.widget.Guideline
114-
android:id="@+id/leftGuideline"
115-
android:layout_width="wrap_content"
116-
android:layout_height="wrap_content"
117-
android:orientation="vertical"
118-
app:layout_constraintGuide_percent="0.3" />
119-
120-
<androidx.constraintlayout.widget.Guideline
121-
android:id="@+id/rightGuideline"
122-
android:layout_width="wrap_content"
123-
android:layout_height="wrap_content"
124-
android:orientation="vertical"
125-
app:layout_constraintGuide_percent="0.7" />
126107
</androidx.constraintlayout.widget.ConstraintLayout>
127108

128109
</androidx.constraintlayout.widget.ConstraintLayout>

‎opencloudApp/src/main/res/layout-w600dp/passcodelock.xml‎

Lines changed: 22 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
android:layout_width="match_parent"
3939
android:layout_height="0dp"
4040
android:background="@color/background_color"
41-
android:layout_marginHorizontal="@dimen/passcode_standard_margin"
4241
app:layout_constraintEnd_toEndOf="parent"
4342
app:layout_constraintStart_toStartOf="parent"
4443
app:layout_constraintTop_toBottomOf="@id/toolbar"
@@ -47,41 +46,40 @@
4746
<TextView
4847
android:id="@+id/header"
4948
android:layout_width="wrap_content"
50-
android:layout_height="wrap_content"
51-
android:layout_marginTop="@dimen/passcode_standard_margin"
49+
android:layout_height="0dp"
5250
android:text="@string/pass_code_enter_pass_code"
5351
android:textColor="@android:color/black"
5452
android:textSize="16sp"
53+
android:gravity="bottom"
54+
app:layout_constraintVertical_weight="1"
5555
app:layout_constraintBottom_toTopOf="@id/explanation"
5656
app:layout_constraintEnd_toEndOf="parent"
57-
app:layout_constraintHorizontal_bias="0.5"
5857
app:layout_constraintStart_toStartOf="parent"
59-
app:layout_constraintTop_toTopOf="parent"
60-
app:layout_constraintVertical_chainStyle="spread_inside" />
58+
app:layout_constraintTop_toTopOf="parent" />
6159

6260
<TextView
6361
android:id="@+id/explanation"
64-
android:layout_width="match_parent"
65-
android:layout_height="wrap_content"
66-
android:gravity="center"
62+
android:layout_width="wrap_content"
63+
android:layout_height="0dp"
6764
android:text="@string/pass_code_configure_your_pass_code_explanation"
6865
android:textAppearance="@android:style/TextAppearance.Small"
6966
android:textSize="14sp"
67+
android:gravity="bottom"
68+
app:layout_constraintVertical_weight="1"
7069
app:layout_constraintBottom_toTopOf="@id/layout_code"
7170
app:layout_constraintEnd_toEndOf="parent"
72-
app:layout_constraintHorizontal_bias="0.5"
7371
app:layout_constraintStart_toStartOf="parent"
7472
app:layout_constraintTop_toBottomOf="@id/header" />
7573

7674
<LinearLayout
7775
android:id="@+id/layout_code"
7876
android:layout_width="match_parent"
79-
android:layout_height="wrap_content"
80-
android:gravity="center_horizontal"
77+
android:layout_height="0dp"
78+
android:gravity="center"
8179
android:orientation="horizontal"
80+
app:layout_constraintVertical_weight="2"
8281
app:layout_constraintBottom_toTopOf="@id/error"
8382
app:layout_constraintEnd_toEndOf="parent"
84-
app:layout_constraintHorizontal_bias="0.5"
8583
app:layout_constraintStart_toStartOf="parent"
8684
app:layout_constraintTop_toBottomOf="@id/explanation">
8785

@@ -92,52 +90,40 @@
9290
<TextView
9391
android:id="@+id/error"
9492
android:layout_width="wrap_content"
95-
android:layout_height="wrap_content"
93+
android:layout_height="0dp"
9694
android:textColor="@color/warning"
9795
android:textSize="16sp"
96+
android:gravity="bottom"
97+
app:layout_constraintVertical_weight="1"
9898
app:layout_constraintBottom_toTopOf="@id/lock_time"
9999
app:layout_constraintEnd_toEndOf="parent"
100-
app:layout_constraintHorizontal_bias="0.5"
101100
app:layout_constraintStart_toStartOf="parent"
102101
app:layout_constraintTop_toBottomOf="@id/layout_code" />
103102

104103
<TextView
105104
android:id="@+id/lock_time"
106105
android:layout_width="wrap_content"
107-
android:layout_height="wrap_content"
106+
android:layout_height="0dp"
108107
android:textColor="@android:color/black"
109108
android:textSize="16sp"
110-
android:visibility="invisible"
109+
android:gravity="bottom"
110+
app:layout_constraintVertical_weight="1"
111111
app:layout_constraintBottom_toTopOf="@id/numberKeyboard"
112112
app:layout_constraintEnd_toEndOf="parent"
113-
app:layout_constraintHorizontal_bias="0.5"
114113
app:layout_constraintStart_toStartOf="parent"
115114
app:layout_constraintTop_toBottomOf="@id/error" />
116115

117116
<eu.opencloud.android.presentation.security.passcode.NumberKeyboard
118117
android:id="@+id/numberKeyboard"
119118
android:layout_width="0dp"
120-
android:layout_height="wrap_content"
121-
android:layout_marginBottom="@dimen/passcode_margin_bottom"
119+
android:layout_height="0dp"
120+
app:layout_constraintDimensionRatio="0.75"
121+
app:layout_constraintVertical_weight="12"
122122
app:layout_constraintBottom_toBottomOf="parent"
123-
app:layout_constraintEnd_toEndOf="@id/rightGuideline"
124-
app:layout_constraintHorizontal_bias="0.5"
125-
app:layout_constraintStart_toStartOf="@id/leftGuideline"
123+
app:layout_constraintEnd_toEndOf="parent"
124+
app:layout_constraintStart_toStartOf="parent"
126125
app:layout_constraintTop_toBottomOf="@id/lock_time" />
127126

128-
<androidx.constraintlayout.widget.Guideline
129-
android:id="@+id/leftGuideline"
130-
android:layout_width="wrap_content"
131-
android:layout_height="wrap_content"
132-
android:orientation="vertical"
133-
app:layout_constraintGuide_percent="0.35" />
134-
135-
<androidx.constraintlayout.widget.Guideline
136-
android:id="@+id/rightGuideline"
137-
android:layout_width="wrap_content"
138-
android:layout_height="wrap_content"
139-
android:orientation="vertical"
140-
app:layout_constraintGuide_percent="0.65" />
141127
</androidx.constraintlayout.widget.ConstraintLayout>
142128

143129
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)