Skip to content

Commit 71dfc45

Browse files
committed
Lock to portrait orientation
1 parent 5d38f3c commit 71dfc45

5 files changed

Lines changed: 14 additions & 45 deletions

File tree

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ android {
2222
applicationId = "dev.randombits.intervaltimer"
2323
minSdk = 24
2424
targetSdk = 33
25-
versionCode = 7
26-
versionName = "1.0.7"
25+
versionCode = 8
26+
versionName = "1.0.8"
2727

2828
vectorDrawables {
2929
useSupportLibrary = true

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<activity
1616
android:name="dev.randombits.intervaltimer.MainActivity"
1717
android:exported="true"
18-
android:theme="@style/AppTheme">
18+
android:theme="@style/AppTheme"
19+
android:screenOrientation="portrait">
1920
<intent-filter>
2021
<action android:name="android.intent.action.MAIN"/>
2122

app/src/main/java/dev/randombits/intervaltimer/MainActivity.kt

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@ import android.os.Bundle
66
import android.os.Handler
77
import android.os.Looper
88
import androidx.appcompat.app.AppCompatActivity
9-
import androidx.fragment.app.Fragment
109

1110

1211
class MainActivity : AppCompatActivity() {
1312
private var alarmSound = 0
14-
private var settingsFrag: Fragment? = null;
15-
private var timerFrag: Fragment? = null;
1613
private var playingSound = 0;
1714

1815
val attributes = AudioAttributes.Builder()
@@ -33,34 +30,23 @@ class MainActivity : AppCompatActivity() {
3330
val activeTime = prefs.getInt("activeTime", 45);
3431
val restTime = prefs.getInt("restTime", 15);
3532

36-
val ft = supportFragmentManager.beginTransaction();
37-
settingsFrag = SettingsFragment.newInstance(activeTime, restTime);
38-
ft.add(R.id.mainFrame, settingsFrag as Fragment);
39-
ft.commit();
33+
if (savedInstanceState == null) {
34+
supportFragmentManager.beginTransaction()
35+
.replace(R.id.mainFrame, SettingsFragment.newInstance(activeTime, restTime))
36+
.commit();
37+
}
4038
alarmSound = soundPool.load(this, R.raw.threesecbeep, 1);
4139
}
4240

4341
fun startTimer(activeTime: Int, restTime: Int) {
4442
savePreferences(activeTime, restTime);
45-
val ft = supportFragmentManager.beginTransaction()
46-
ft.hide(settingsFrag as Fragment);
47-
48-
timerFrag = TimerFragment.newInstance(activeTime, restTime);
49-
ft.add(R.id.mainFrame, timerFrag as Fragment)
50-
51-
ft.commit()
52-
43+
supportFragmentManager.beginTransaction()
44+
.replace(R.id.mainFrame, TimerFragment.newInstance(activeTime, restTime))
45+
.addToBackStack("start").commit()
5346
}
5447

5548
fun backToSettings() {
56-
val ft = supportFragmentManager.beginTransaction()
57-
if (timerFrag != null) {
58-
ft.remove(timerFrag as Fragment);
59-
}
60-
61-
ft.show(settingsFrag as Fragment)
62-
63-
ft.commit()
49+
supportFragmentManager.popBackStack();
6450
}
6551

6652
fun savePreferences(activeTime: Int, restTime: Int) {

app/src/main/java/dev/randombits/intervaltimer/SettingsFragment.kt

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,8 @@ class SettingsFragment : Fragment() {
3737
inflater: LayoutInflater, container: ViewGroup?,
3838
savedInstanceState: Bundle?
3939
): View? {
40-
41-
// view.
42-
// Inflate the layout for this fragment
4340
val view = inflater.inflate(R.layout.fragment_settings, container, false) as View;
4441

45-
// if (savedInstanceState == null) {
46-
// view.findViewById<EditText>(R.id.activeTime)
47-
// .setText(savedInstanceState.getInt("settings.activeTime", 45).toString());
48-
// } else {
49-
// activePeriod = savedInstanceState.getLong("settings.activePeriod", 20000)
50-
// restPeriod = savedInstanceState.getLong("settings.restPeriod", 10000)
51-
// delay = savedInstanceState.getLong("settings.delay", 2000)
52-
// }
53-
54-
// if (savedInstanceState != null) {
55-
// view.findViewById<EditText>(R.id.activeTime)
56-
// .setText(savedInstanceState.getInt("settings.activeTime", 45).toString());
57-
// view.findViewById<EditText>(R.id.restTime)
58-
// .setText(savedInstanceState.getInt("settings.restTime", 15).toString());
59-
// }
60-
6142
activeInput = view.findViewById(R.id.activeTime)
6243
activeInput!!.setText(activeTime.toString())
6344
restInput = view.findViewById(R.id.restTime)

metadata/en-US/changelogs/8.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lock screen to portrait orientation

0 commit comments

Comments
 (0)