Skip to content

Commit 1e06213

Browse files
committed
Fixed Bug in text edit mode
- [issue] issue causing note text to overlay the company name located at the bottom/center. - [fix] relocated the company name to top between back and save button to prevent interference
1 parent 18410df commit 1e06213

4 files changed

Lines changed: 22 additions & 42 deletions

File tree

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ android {
1010
applicationId "com.btn.pronotes"
1111
minSdk 21
1212
targetSdk 33
13-
versionCode 2
14-
versionName "2.0"
13+
versionCode 4
14+
versionName "4.0 beta"
1515

1616
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1717
}

app/debug/app-debug.aab

9.84 MB
Binary file not shown.

app/release/app-release.aab

-370 Bytes
Binary file not shown.

app/src/main/res/layout-v26/activity_notes_taker.xml

Lines changed: 20 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@
4141
android:padding="9dp"
4242
android:src="@drawable/ic_back"
4343
android:visibility="visible" />
44+
<!-- +++++++++++++++++++ "Brett Tech Networking ++++++++++++++++++ -->
45+
<TextView
46+
android:id="@+id/textView_EditNotes"
47+
android:layout_width="match_parent"
48+
android:layout_height="wrap_content"
49+
android:layout_marginTop="@dimen/_15sdp"
50+
android:text="@string/brett_tech_networking"
51+
android:gravity="center"
52+
android:textColor="@color/white"
53+
/>
4454
</RelativeLayout>
4555
</Toolbar>
4656

@@ -77,10 +87,8 @@
7787
android:textOff=""
7888
android:textOn=""
7989
android:layout_marginHorizontal="5dp"
80-
8190
/>
8291

83-
8492
<androidx.appcompat.widget.AppCompatToggleButton
8593
android:id="@+id/underlinebutton"
8694
android:layout_width="30dp"
@@ -92,7 +100,6 @@
92100
android:textOff=""
93101
android:textOn=""
94102
android:layout_marginHorizontal="5dp"
95-
96103
/>
97104
</Toolbar>
98105

@@ -131,32 +138,6 @@
131138
app:layout_constraintBottom_toTopOf="@id/rv_media"
132139
/>
133140

134-
135-
<!-- <EditText-->
136-
<!-- android:id="@+id/editText_notes"-->
137-
<!-- android:layout_width="match_parent"-->
138-
<!-- android:layout_height="wrap_content"-->
139-
<!-- android:layout_marginStart="@dimen/_25sdp"-->
140-
<!-- android:layout_marginTop="@dimen/_15sdp"-->
141-
<!-- android:layout_marginEnd="@dimen/_12sdp"-->
142-
<!-- android:background="@null"-->
143-
<!-- android:hint="@string/add_notes"-->
144-
<!-- android:importantForAutofill="no"-->
145-
<!-- android:includeFontPadding="false"-->
146-
<!-- android:inputType="textMultiLine"-->
147-
<!-- android:padding="8dp"-->
148-
<!-- android:paddingTop="@dimen/_8sdp"-->
149-
<!-- android:paddingBottom="@dimen/_8sdp"-->
150-
<!-- android:textColor="@color/white"-->
151-
<!-- android:textColorHint="@color/white"-->
152-
<!-- android:textSize="18sp"-->
153-
<!-- android:textStyle="normal"-->
154-
<!-- -->
155-
<!-- app:layout_constraintEnd_toEndOf="parent"-->
156-
<!-- app:layout_constraintStart_toStartOf="parent"-->
157-
<!-- app:layout_constraintTop_toBottomOf="@+id/editText_title"-->
158-
<!-- />-->
159-
160141
<View
161142
android:id="@+id/editNoteIndicator"
162143
android:layout_width="10dp"
@@ -177,23 +158,22 @@
177158
app:layout_constraintStart_toStartOf="parent"
178159
app:layout_constraintEnd_toEndOf="parent"
179160
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
180-
app:layout_constraintBottom_toTopOf="@+id/textView_EditNotes"
181-
161+
app:layout_constraintBottom_toTopOf="@+id/layout_miscellaneous"
182162
android:layout_marginEnd="10dp"
183163
/>
184-
185-
<TextView
164+
<!-- Footer "Brett Tech Networking 2023 -->
165+
<!-- <TextView
186166
android:id="@+id/textView_EditNotes"
187167
android:layout_width="match_parent"
188-
android:layout_height="0dp"
168+
android:layout_height="wrap_content"
189169
android:layout_weight="1"
190170
android:text="@string/brett_tech_networking_2023"
191171
android:textAlignment="center"
192172
android:textColor="@color/white"
193-
app:layout_constraintBottom_toTopOf="@id/layout_miscellaneous"
173+
app:layout_constraintBottom_toTopOf="@id/rv_media"
194174
app:layout_constraintEnd_toEndOf="parent"
195175
app:layout_constraintStart_toStartOf="parent"
196-
/>
176+
/>-->
197177

198178
<include
199179
android:id="@+id/layout_miscellaneous"
@@ -204,16 +184,17 @@
204184
app:layout_constraintEnd_toEndOf="parent"
205185
app:layout_constraintStart_toStartOf="parent" />
206186

187+
207188
<com.nambimobile.widgets.efab.ExpandableFabLayout
208189
android:id="@+id/expandable_fab_layout"
209190
android:layout_width="match_parent"
210191
android:layout_height="0dp"
211-
android:layout_marginStart="16dp"
212192
android:layout_marginTop="16dp"
213-
android:layout_marginEnd="16dp"
214193
android:layout_marginBottom="-120dp"
194+
app:layout_constraintBottom_toTopOf="@id/layout_miscellaneous"
215195
app:layout_constraintTop_toTopOf="parent"
216-
app:layout_constraintBottom_toTopOf="@id/layout_miscellaneous">
196+
app:layout_constraintVertical_bias="0.0"
197+
tools:layout_editor_absoluteX="16dp">
217198

218199
<com.nambimobile.widgets.efab.ExpandableFab
219200
android:id="@+id/expandable_fab"
@@ -227,7 +208,6 @@
227208
app:efab_iconAnimationRotationDeg="-225" />
228209

229210

230-
231211
<com.nambimobile.widgets.efab.FabOption
232212
android:id="@+id/fab_picture"
233213
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)