zhanghaochen / ParentControl

Download as
Browse Code »

Commit e33341bbcc65106c5d575fc71b8669e49143e0cc

Authored by shixianjie
1 parent 7bcb60ecb9
Exists in master

规范theme使用; 优化录入作业dialog字体

Showing 3 changed files with 36 additions and 52 deletions   Show diff stats
app/src/main/AndroidManifest.xml
Diff comments   View file @e33341b
... ... @@ -38,7 +38,7 @@
38 38 android:label="@string/app_name"
39 39 android:networkSecurityConfig="@xml/network_security_config"
40 40 android:supportsRtl="true"
41   - android:theme="@style/Theme.AppCompat.Light.NoActionBar">
  41 + android:theme="@style/AppTheme">
42 42 <activity
43 43 android:name=".LoginActivity"
44 44 android:exported="true"
... ... @@ -52,105 +52,81 @@
52 52 <activity
53 53 android:name=".MainActivity"
54 54 android:launchMode="singleTask"
55   - android:screenOrientation="portrait"
56   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  55 + android:screenOrientation="portrait" />
57 56 <activity
58 57 android:name=".RegisterActivity"
59 58 android:screenOrientation="portrait"
60 59 android:theme="@style/ThemeSplash" />
61 60 <activity
62 61 android:name=".UserActivity"
63   - android:screenOrientation="portrait"
64   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  62 + android:screenOrientation="portrait" />
65 63 <activity
66 64 android:name=".YinsiActivity"
67   - android:screenOrientation="portrait"
68   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  65 + android:screenOrientation="portrait" />
69 66 <activity
70 67 android:name=".QRActivity"
71   - android:screenOrientation="portrait"
72   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  68 + android:screenOrientation="portrait" />
73 69 <activity
74 70 android:name=".AddStudentActivity"
75   - android:screenOrientation="portrait"
76   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  71 + android:screenOrientation="portrait" />
77 72 <activity
78 73 android:name=".NickActivity"
79   - android:screenOrientation="portrait"
80   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  74 + android:screenOrientation="portrait" />
81 75 <activity
82 76 android:name=".SexActivity"
83   - android:screenOrientation="portrait"
84   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  77 + android:screenOrientation="portrait" />
85 78 <activity
86 79 android:name=".NianActivity"
87   - android:screenOrientation="portrait"
88   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  80 + android:screenOrientation="portrait" />
89 81 <activity
90 82 android:name=".ShenActivity"
91   - android:screenOrientation="portrait"
92   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  83 + android:screenOrientation="portrait" />
93 84 <activity
94 85 android:name=".UserAgreementActivity"
95   - android:screenOrientation="portrait"
96   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  86 + android:screenOrientation="portrait" />
97 87 <activity
98 88 android:name=".AccountActivity"
99   - android:screenOrientation="portrait"
100   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  89 + android:screenOrientation="portrait" />
101 90  
102 91 <activity
103 92 android:name=".ChangePwdActivity"
104   - android:screenOrientation="portrait"
105   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  93 + android:screenOrientation="portrait" />
106 94 <activity
107 95 android:name=".EditStudentActivity"
108   - android:screenOrientation="portrait"
109   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  96 + android:screenOrientation="portrait" />
110 97 <activity
111 98 android:name=".ChooseActivity"
112   - android:screenOrientation="portrait"
113   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  99 + android:screenOrientation="portrait" />
114 100 <activity
115 101 android:name=".AddTeacherActivity"
116   - android:screenOrientation="portrait"
117   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  102 + android:screenOrientation="portrait" />
118 103 <activity
119 104 android:name=".ErrorBookActivity"
120   - android:screenOrientation="portrait"
121   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  105 + android:screenOrientation="portrait" />
122 106 <activity
123 107 android:name=".ImageActivity"
124   - android:screenOrientation="portrait"
125   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  108 + android:screenOrientation="portrait" />
126 109 <activity
127 110 android:name=".ImageEditActivity"
128   - android:screenOrientation="portrait"
129   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  111 + android:screenOrientation="portrait" />
130 112 <activity
131 113 android:name=".ImageSelectActivity"
132   - android:screenOrientation="portrait"
133   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  114 + android:screenOrientation="portrait" />
134 115 <activity
135 116 android:name=".AddSuccessActivity"
136   - android:screenOrientation="portrait"
137   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  117 + android:screenOrientation="portrait" />
138 118 <activity
139 119 android:name=".ErrorListActivity"
140   - android:screenOrientation="portrait"
141   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  120 + android:screenOrientation="portrait" />
142 121 <activity
143 122 android:name=".ErrorDetailActivity"
144   - android:screenOrientation="portrait"
145   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  123 + android:screenOrientation="portrait" />
146 124 <activity
147 125 android:name=".TeacherChooseActivity"
148   - android:screenOrientation="portrait"
149   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  126 + android:screenOrientation="portrait" />
150 127 <activity
151 128 android:name=".TeacherMainActivity"
152   - android:screenOrientation="portrait"
153   - android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
  129 + android:screenOrientation="portrait" />
154 130 <activity android:name=".StuHomeworkActivity" />
155 131 <activity android:name=".HomeworkDetailActivity" />
156 132 <activity android:name=".HomeworkSelectActivity" />
... ...
app/src/main/res/layout/dialog_add_homework.xml
Diff comments   View file @e33341b
... ... @@ -146,7 +146,7 @@
146 146 <TextView
147 147 android:id="@+id/tvDate"
148 148 tools:text="2024-09-18"
149   - android:textSize="16sp"
  149 + android:textSize="13sp"
150 150 android:textColor="#333"
151 151 android:gravity="center_vertical"
152 152 android:paddingHorizontal="16dp"
... ...
app/src/main/res/values/styles.xml
Diff comments   View file @e33341b
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <resources>
  3 + <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
  4 + <!-- 全局应用的 Spinner 样式 -->
  5 + <item name="android:spinnerItemStyle">@style/CustomSpinnerItemStyle</item>
  6 + </style>
3 7  
  8 + <style name="CustomSpinnerItemStyle" parent="@style/Widget.AppCompat.TextView.SpinnerItem">
  9 + <item name="android:textSize">13sp</item>
  10 + </style>
4 11  
5   - <style name="ThemeSplash" parent="Theme.AppCompat.Light.NoActionBar">
  12 +
  13 + <style name="ThemeSplash" parent="AppTheme">
6 14 <item name="android:windowBackground">@drawable/welcome_bg</item>
7 15 <item name="colorPrimaryDark">@android:color/transparent</item>
8 16 <item name="windowActionBar">false</item>
... ... @@ -50,7 +58,7 @@
50 58 <item name="divider">@color/border</item>
51 59 <item name="android:scrollbars">none</item>
52 60 <item name="android:dividerHeight">1dp</item>
53   - <item name="android:textSize">15sp</item>
  61 + <item name="android:textSize">13sp</item>
54 62 </style>
55 63  
56 64 <style name="empty_space">
... ...