Skip to content

fix: issue #167 #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
edo-bari-ikutsu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: issue #167 #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ kotlinxCoroutines = "1.6.4"
ksp = "1.9.20-1.0.14"
ktlint = "11.1.0"
markwon = "4.6.2"
material = "1.8.0"
material = "1.14.0"
mockk = "1.13.13"
moshi = "1.15.2"
patternlockview = "a90b0d4bf0"
Expand Down
4 changes: 1 addition & 3 deletions opencloudApp/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,7 @@

<activity
android:name=".presentation.security.passcode.PassCodeActivity"
android:label="@string/passcode_label"
android:screenOrientation="portrait" />
android:label="@string/passcode_label" />
<activity
android:name=".presentation.conflicts.ConflictsResolveActivity" />
<activity
Expand Down Expand Up @@ -234,7 +233,6 @@
</activity>
<activity
android:name=".presentation.security.pattern.PatternActivity"
android:screenOrientation="portrait"
android:label="@string/pattern_label" />
<activity android:name=".presentation.security.biometric.BiometricActivity" />
<!-- Own taskAffinity + singleTask so LoginActivity always runs in its own task.
Expand Down
7 changes: 5 additions & 2 deletions opencloudApp/src/main/java/eu/opencloud/android/ui/preview/PreviewImageActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import android.view.Menu
import android.view.MenuItem
import android.view.View
import android.view.Window
import androidx.core.content.ContextCompat
import androidx.drawerlayout.widget.DrawerLayout
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import androidx.viewpager.widget.ViewPager
Expand All @@ -61,6 +60,7 @@ import eu.opencloud.android.presentation.files.operations.FileOperationsViewMode
import eu.opencloud.android.presentation.spaces.SpacesListViewModel
import eu.opencloud.android.ui.activity.FileActivity
import eu.opencloud.android.ui.activity.FileDisplayActivity
import eu.opencloud.android.ui.activity.enableEdgeToEdgePreSetContentView
import eu.opencloud.android.ui.fragment.FileFragment
import eu.opencloud.android.usecases.transfers.DOWNLOAD_ADDED_MESSAGE
import eu.opencloud.android.usecases.transfers.DOWNLOAD_FINISH_MESSAGE
Expand Down Expand Up @@ -99,6 +99,10 @@ class PreviewImageActivity : FileActivity(),
override fun onCreate(savedInstanceState: Bundle?) {
requestWindowFeature(Window.FEATURE_ACTION_BAR_OVERLAY)
super.onCreate(savedInstanceState)

// edge-to-edge
enableEdgeToEdgePreSetContentView(true)

setContentView(R.layout.preview_image_activity)

// ActionBar
Expand All @@ -122,7 +126,6 @@ class PreviewImageActivity : FileActivity(),
setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
}
}
window.statusBarColor = ContextCompat.getColor(this, R.color.opencloud_petrol_dark_transparent)
localBroadcastManager = LocalBroadcastManager.getInstance(this)
}

Expand Down
53 changes: 17 additions & 36 deletions opencloudApp/src/main/res/layout-w600dp/activity_pattern_lock.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,58 +42,53 @@
<TextView
android:id="@+id/header_pattern"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_margin"
android:layout_height="0dp"
android:text="@string/pass_code_enter_pass_code"
android:textColor="@android:color/black"
android:textSize="16sp"
android:gravity="bottom"
app:layout_constraintVertical_weight="1"
app:layout_constraintBottom_toTopOf="@id/explanation_pattern"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed" />
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/explanation_pattern"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/standard_margin"
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:text="@string/pattern_configure_your_pattern_explanation"
android:textAppearance="@android:style/TextAppearance.Small"
android:textSize="14sp"
android:gravity="bottom"
app:layout_constraintVertical_weight="1"
app:layout_constraintBottom_toTopOf="@id/error_pattern"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/header_pattern" />

<TextView
android:id="@+id/error_pattern"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_margin"
android:layout_height="0dp"
android:textColor="@color/warning"
android:textSize="16sp"
android:gravity="bottom"
app:layout_constraintVertical_weight="1"
app:layout_constraintBottom_toTopOf="@id/patternContainer"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/explanation_pattern" />

<eu.opencloud.android.presentation.security.passcode.SquareFrameLayout
android:id="@+id/patternContainer"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/standard_margin"
android:layout_marginVertical="@dimen/standard_margin"
android:layout_width="wrap_content"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/rightGuideline"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="@id/leftGuideline"
app:layout_constraintTop_toBottomOf="@id/error_pattern">
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/error_pattern"
app:layout_constraintVertical_weight="8">

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

</com.andrognito.patternlockview.PatternLockView>
</eu.opencloud.android.presentation.security.passcode.SquareFrameLayout>

<androidx.constraintlayout.widget.Guideline
android:id="@+id/leftGuideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.3" />

<androidx.constraintlayout.widget.Guideline
android:id="@+id/rightGuideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.7" />
</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
58 changes: 22 additions & 36 deletions opencloudApp/src/main/res/layout-w600dp/passcodelock.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/background_color"
android:layout_marginHorizontal="@dimen/passcode_standard_margin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar"
Expand All @@ -47,41 +46,40 @@
<TextView
android:id="@+id/header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/passcode_standard_margin"
android:layout_height="0dp"
android:text="@string/pass_code_enter_pass_code"
android:textColor="@android:color/black"
android:textSize="16sp"
android:gravity="bottom"
app:layout_constraintVertical_weight="1"
app:layout_constraintBottom_toTopOf="@id/explanation"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="spread_inside" />
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/explanation"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:text="@string/pass_code_configure_your_pass_code_explanation"
android:textAppearance="@android:style/TextAppearance.Small"
android:textSize="14sp"
android:gravity="bottom"
app:layout_constraintVertical_weight="1"
app:layout_constraintBottom_toTopOf="@id/layout_code"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/header" />

<LinearLayout
android:id="@+id/layout_code"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:layout_height="0dp"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintVertical_weight="2"
app:layout_constraintBottom_toTopOf="@id/error"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/explanation">

Expand All @@ -92,52 +90,40 @@
<TextView
android:id="@+id/error"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:textColor="@color/warning"
android:textSize="16sp"
android:gravity="bottom"
app:layout_constraintVertical_weight="1"
app:layout_constraintBottom_toTopOf="@id/lock_time"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/layout_code" />

<TextView
android:id="@+id/lock_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:textColor="@android:color/black"
android:textSize="16sp"
android:visibility="invisible"
android:gravity="bottom"
app:layout_constraintVertical_weight="1"
app:layout_constraintBottom_toTopOf="@id/numberKeyboard"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/error" />

<eu.opencloud.android.presentation.security.passcode.NumberKeyboard
android:id="@+id/numberKeyboard"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/passcode_margin_bottom"
android:layout_height="0dp"
app:layout_constraintDimensionRatio="0.75"
app:layout_constraintVertical_weight="12"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/rightGuideline"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="@id/leftGuideline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/lock_time" />

<androidx.constraintlayout.widget.Guideline
android:id="@+id/leftGuideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.35" />

<androidx.constraintlayout.widget.Guideline
android:id="@+id/rightGuideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.65" />
</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
Loading