게시글 웹뷰 다크모드, 마이스터 상벌점 확인 추가

BSSM-BSM · Nov 4, 2021 · 43e1183 · 43e1183
1 parent b929c29
commit 43e1183
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.zzz2757.bsm"
         minSdk 21
         targetSdk 30
-        versionCode 5
-        versionName "Beta 0.2.2"
+        versionCode 6
+        versionName "Beta 0.3.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -37,6 +37,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.webkit:webkit:1.4.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

diff --git a/app/src/main/java/com/zzz2757/bsm/Board/BoardViewActivity.java b/app/src/main/java/com/zzz2757/bsm/Board/BoardViewActivity.java
@@ -4,9 +4,11 @@
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.webkit.WebSettingsCompat;
+import androidx.webkit.WebViewFeature;
 
 import android.content.Intent;
-import android.graphics.Color;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.View;
 import android.webkit.WebSettings;
@@ -72,6 +74,12 @@ protected void onCreate(Bundle savedInstanceState) {
         webSet.setDomStorageEnabled(true);
         webSet.setSupportZoom(false);
         webSet.setDefaultTextEncodingName("utf-8");
+        int nightModeFlags = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+        if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
+            if (nightModeFlags == Configuration.UI_MODE_NIGHT_YES) {
+                WebSettingsCompat.setForceDark(webSet, WebSettingsCompat.FORCE_DARK_ON);
+            }
+        }
 
         Intent intent = getIntent();
         BoardData boardData = (BoardData) intent.getSerializableExtra("boardData");

diff --git a/app/src/main/java/com/zzz2757/bsm/MainActivity.java b/app/src/main/java/com/zzz2757/bsm/MainActivity.java
@@ -37,8 +37,7 @@ public class MainActivity extends AppCompatActivity{
     private FragmentTransaction fragmentTransaction;
     private LoginFrag loginFrag;
     private SettingFrag settingFrag;
-    private WebviewFrag mealFrag;
-    private WebviewFrag timetableFrag;
+    private WebviewFrag mealFrag, timetableFrag, meisterFrag;
     private Bundle bundle;
 
     @Override
@@ -59,12 +58,15 @@ public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
                     case R.id.action_timetable:
                         setFrag(1);
                         break;
-                    case R.id.action_board:
+                    case R.id.action_meister:
                         setFrag(2);
                         break;
-                    case R.id.action_login:
+                    case R.id.action_board:
                         setFrag(3);
                         break;
+                    case R.id.action_login:
+                        setFrag(4);
+                        break;
                 }
                 return true;
             }
@@ -73,6 +75,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
         settingFrag = new SettingFrag();
         mealFrag = new WebviewFrag();
         timetableFrag = new WebviewFrag();
+        meisterFrag = new WebviewFrag();
 
         setFrag(0);
         version();
@@ -95,10 +98,16 @@ private void setFrag(int n){
                 fragmentTransaction.commit();
                 break;
             case 2:
+                bundle.putString("page", "meister");
+                meisterFrag.setArguments(bundle);
+                fragmentTransaction.replace(R.id.Main_Frame, meisterFrag);
+                fragmentTransaction.commit();
+                break;
+            case 3:
                 Intent intent = new Intent(this, BoardActivity.class);
                 startActivity(intent);
                 break;
-            case 3:
+            case 4:
                 fragmentTransaction.replace(R.id.Main_Frame, loginFrag);
                 fragmentTransaction.commit();
                 break;

diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
@@ -9,6 +9,10 @@
         android:id="@+id/action_timetable"
         android:title="시간표"/>
 
+    <item
+        android:id="@+id/action_meister"
+        android:title="상벌점"/>
+
     <item
         android:id="@+id/action_board"
         android:title="커뮤니티"/>