Merge pull request #79 from team-JMT/fix/prohibit_dark_mode_landscape

다크 모드 및 가로 모드 금지
team-JMT · Sep 25, 2023 · c3282fe · c3282fe
2 parents 08b722e + 8c4500d
commit c3282fe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="org.gdsc.jmt">
 
     <application
@@ -16,6 +15,7 @@
         <activity
             android:name="org.gdsc.presentation.login.SplashActivity"
             android:windowSoftInputMode="adjustResize"
+            android:screenOrientation="portrait"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="org.gdsc.presentation">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -14,13 +13,16 @@
     <application>
         <activity android:name=".login.LoginActivity"
             android:windowSoftInputMode="adjustResize"
+            android:screenOrientation="portrait"
             android:exported="true" />
         <activity
             android:name=".view.MainActivity"
             android:windowSoftInputMode="adjustResize"
+            android:screenOrientation="portrait"
             android:exported="false" />
         <activity
             android:name="org.gdsc.presentation.view.WebViewActivity"
+            android:screenOrientation="portrait"
             android:exported="false" />
 
         <meta-data

diff --git a/presentation/src/main/res/values-night/themes.xml b/presentation/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
-    <style name="Theme.JMT" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="Theme.JMT" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>