Skip to content

Commit 2dc9c18

Browse files
committed
add a toggle for forcing portrait mode, enabled by default
1 parent 1c5b98b commit 2dc9c18

File tree

6 files changed

+45
-3
lines changed

6 files changed

+45
-3
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ android {
4141
}
4242

4343
dependencies {
44-
implementation 'com.simplemobiletools:commons:3.18.8'
44+
implementation 'com.simplemobiletools:commons:3.19.0'
4545
implementation 'com.squareup:otto:1.3.8'
46-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
46+
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
4747
}
4848

4949
Properties props = new Properties()

app/src/main/kotlin/com/simplemobiletools/flashlight/activities/BrightDisplayActivity.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.simplemobiletools.flashlight.activities
22

3+
import android.content.pm.ActivityInfo
34
import android.graphics.drawable.ColorDrawable
45
import android.os.Bundle
56
import android.view.WindowManager
@@ -34,6 +35,10 @@ class BrightDisplayActivity : SimpleActivity() {
3435
super.onResume()
3536
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
3637
toggleBrightness(true)
38+
39+
if (config.forcePortrait) {
40+
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
41+
}
3742
}
3843

3944
override fun onPause() {

app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.simplemobiletools.flashlight.activities
22

33
import android.content.Intent
4+
import android.content.pm.ActivityInfo
45
import android.os.Bundle
56
import android.view.Menu
67
import android.view.MenuItem
@@ -68,6 +69,10 @@ class MainActivity : SimpleActivity() {
6869
if (stroboscope_bar.isInvisible()) {
6970
changeIconColor(config.backgroundColor.getContrastColor(), stroboscope_btn)
7071
}
72+
73+
if (config.forcePortrait) {
74+
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
75+
}
7176
}
7277

7378
override fun onStart() {

app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class SettingsActivity : SimpleActivity() {
2323
setupTurnFlashlightOn()
2424
setupBrightDisplay()
2525
setupStroboscope()
26+
setupForcePortrait()
2627
updateTextColors(settings_holder)
2728
}
2829

@@ -73,4 +74,12 @@ class SettingsActivity : SimpleActivity() {
7374
config.stroboscope = settings_stroboscope.isChecked
7475
}
7576
}
77+
78+
private fun setupForcePortrait() {
79+
settings_force_portrait.isChecked = config.forcePortrait
80+
settings_force_portrait_holder.setOnClickListener {
81+
settings_force_portrait.toggle()
82+
config.forcePortrait = settings_force_portrait.isChecked
83+
}
84+
}
7685
}

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,5 +147,28 @@
147147
android:text="@string/show_stroboscope"/>
148148

149149
</RelativeLayout>
150+
151+
<RelativeLayout
152+
android:id="@+id/settings_force_portrait_holder"
153+
android:layout_width="match_parent"
154+
android:layout_height="wrap_content"
155+
android:layout_marginTop="@dimen/medium_margin"
156+
android:background="?attr/selectableItemBackground"
157+
android:paddingBottom="@dimen/activity_margin"
158+
android:paddingLeft="@dimen/normal_margin"
159+
android:paddingRight="@dimen/normal_margin"
160+
android:paddingTop="@dimen/activity_margin">
161+
162+
<com.simplemobiletools.commons.views.MySwitchCompat
163+
android:id="@+id/settings_force_portrait"
164+
android:layout_width="match_parent"
165+
android:layout_height="wrap_content"
166+
android:background="@null"
167+
android:clickable="false"
168+
android:paddingLeft="@dimen/medium_margin"
169+
android:paddingStart="@dimen/medium_margin"
170+
android:text="@string/force_portrait_mode"/>
171+
172+
</RelativeLayout>
150173
</LinearLayout>
151174
</ScrollView>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.1.0'
12+
classpath 'com.android.tools.build:gradle:3.1.1'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414

1515
// NOTE: Do not place your application dependencies here; they belong

0 commit comments

Comments
 (0)