Skip to content

Commit

Permalink
Fix: Grey Screen Modal (#13)
Browse files Browse the repository at this point in the history
* create models for Artikel and create get-post method

* refactor method get and post

* create myartikel.dart for artikel page

* create artikel_by_id.dart

* create floating action button for tambah artikel

* create form_tambah_artikel.dart for form tambah artikel page

* delete keyboard type in form tambah artikel

* Implement auth: done (#3)

* Init authentication page

* Add bottom navbar

* Implement login and signup UI

* Authentication: done

* edit _bacabund.dart

* add conditional for floating action button in myartikel.dart

* changed widget name into MyArtikel

* add BacaBundPage to routes_factory.dart, but still got an error

* form + list diary

* fixed bug string got null

* fixed bug in models and method get artikel

* change button color into red

* fixed overflow in login page

* fixed overflow in signup page

* date & fetch belom :(

* use the postArtikel method in form page

* styling only without features & fetch

* change the login and signup url & changed models attribute variable names

* trash #1

* create new post method using request.post, but still got an error

* build method get & post but didnt work

* fixed bugs in post artikel

* fixed bugs in button simpan form artikel

* delete unnecessary comments

* add configuration for deployment

* use circular progress indicator while fetching artikel

* add state while fetching data

* fetch data to django without filter

* last revision, failed to fetch with login required

* roles handled, still clueless abt filter-delete-post

* Periksabund ui

* Create Home, Onboarding, and TanyaBund Page (#4)

* Feat: TanyaBund Post Question and Answer (#5)

* Create Home, Onboarding, and TanyaBund Page

* Feat: Implement Functionality to Add Question and Answer

* implement get & post, but not applicable in railway

* add delete method, but still get authentication problem

* new branch

* Temporary commit

* get post

* Commit

* Add Functionality to Delete Question and Answer (#6)

* Create Home, Onboarding, and TanyaBund Page

* Feat: Implement Functionality to Add Question and Answer

* Add Functionality to Delete Question and Answer

* Fix: Conflict

* Finishing TanyaBund

* PeriksaBund Get, Post #1

* solve merge

* Pubspec commit

* change appbar color

* merge development

* delete codes for debugging

* Commit pubspec

* Change Api to Railway

* get, post, delete done :')

* add if else for faskes

* railway

* scrollview

* PeriksaBund Delete Feature #1

* scrollview

* Implementing Logout

* Commit

* PeriksaBund Final

* Add Role Greetings

* Finishing

* solve listdiary flex

* Fix: Greyscreen

* solve error widget

* Fix: Grey Screen Modal

* Change Logo and App Name

Co-authored-by: iqbalpa <[email protected]>
Co-authored-by: Mayfa Shadrina Siddi <[email protected]>
Co-authored-by: shafanjw <[email protected]>
Co-authored-by: dionavarastika <[email protected]>
Co-authored-by: Mayfa Shadrina Siddi <[email protected]>
  • Loading branch information
6 people authored Dec 12, 2022
1 parent d4cab85 commit e8dab21
Show file tree
Hide file tree
Showing 33 changed files with 122 additions and 17 deletions.
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.endterm_project">
<application
android:label="endterm_project"
android:label="HalowBund"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
<activity
Expand Down
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/halowbund_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
2 changes: 1 addition & 1 deletion ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>endterm_project</string>
<string>HalowBund</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
Expand Down
13 changes: 5 additions & 8 deletions lib/views/pages/tanyabund/tanyabund_detail_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ class TanyaBundDetailPage extends HookWidget {
decoration: BoxDecoration(
color: AppColors.merahTua,
borderRadius: BorderRadius.circular(10),

),
child: Text(
'${data.roleUser}',
Expand Down Expand Up @@ -173,13 +172,11 @@ class TanyaBundDetailPage extends HookWidget {
padding: const EdgeInsets.symmetric(
vertical: 10,
),
child: Expanded(
child: MultiLineTextField(
label: '',
maxLines: 10,
bordercolor: AppColors.white,
controller: answerController,
),
child: MultiLineTextField(
label: '',
maxLines: 10,
bordercolor: AppColors.white,
controller: answerController,
),
),
ElevatedButton(
Expand Down
12 changes: 5 additions & 7 deletions lib/views/pages/tanyabund/tanyabund_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,11 @@ class TanyaBundPage extends HookWidget {
),
Padding(
padding: const EdgeInsets.symmetric(vertical: 10),
child: Expanded(
child: MultiLineTextField(
label: '',
maxLines: 10,
bordercolor: AppColors.white,
controller: questionController,
),
child: MultiLineTextField(
label: '',
maxLines: 10,
bordercolor: AppColors.white,
controller: questionController,
),
),
ElevatedButton(
Expand Down
104 changes: 104 additions & 0 deletions pubspec.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
archive:
dependency: transitive
description:
name: archive
sha256: ed7cc591a948744994714375caf9a2ce89e1d82e8243997c8a2994d57181c212
url: "https://pub.dev"
source: hosted
version: "3.3.5"
args:
dependency: transitive
description:
name: args
sha256: b003c3098049a51720352d219b0bb5f219b60fbfb68e7a4748139a06a5676515
url: "https://pub.dev"
source: hosted
version: "2.3.1"
async:
dependency: transitive
description:
Expand All @@ -25,6 +41,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.2.1"
checked_yaml:
dependency: transitive
description:
name: checked_yaml
sha256: dd007e4fb8270916820a0d66e24f619266b60773cddd082c6439341645af2659
url: "https://pub.dev"
source: hosted
version: "2.0.1"
cli_util:
dependency: transitive
description:
name: cli_util
sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c"
url: "https://pub.dev"
source: hosted
version: "0.3.5"
clock:
dependency: transitive
description:
Expand All @@ -41,6 +73,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.17.0"
convert:
dependency: transitive
description:
name: convert
sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
url: "https://pub.dev"
source: hosted
version: "3.1.1"
crypto:
dependency: transitive
description:
name: crypto
sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
url: "https://pub.dev"
source: hosted
version: "3.0.2"
cupertino_icons:
dependency: "direct main"
description:
Expand Down Expand Up @@ -102,6 +150,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.18.5+1"
flutter_launcher_icons:
dependency: "direct dev"
description:
name: flutter_launcher_icons
sha256: ce0e501cfc258907842238e4ca605e74b7fd1cdf04b3b43e86c43f3e40a1592c
url: "https://pub.dev"
source: hosted
version: "0.11.0"
flutter_lints:
dependency: "direct dev"
description:
Expand Down Expand Up @@ -152,6 +208,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.2"
image:
dependency: transitive
description:
name: image
sha256: f6ffe2895e3c86c6ad5a27e6302cf807403463e397cb2f0c580f619ac2fa588b
url: "https://pub.dev"
source: hosted
version: "3.2.2"
intl:
dependency: "direct main"
description:
Expand All @@ -168,6 +232,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.6.5"
json_annotation:
dependency: transitive
description:
name: json_annotation
sha256: "3520fa844009431b5d4491a5a778603520cdc399ab3406332dcc50f93547258c"
url: "https://pub.dev"
source: hosted
version: "4.7.0"
lints:
dependency: transitive
description:
Expand Down Expand Up @@ -256,6 +328,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.2.3"
petitparser:
dependency: transitive
description:
name: petitparser
sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4"
url: "https://pub.dev"
source: hosted
version: "5.1.0"
platform:
dependency: transitive
description:
Expand All @@ -272,6 +352,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.3"
pointycastle:
dependency: transitive
description:
name: pointycastle
sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346
url: "https://pub.dev"
source: hosted
version: "3.6.2"
process:
dependency: transitive
description:
Expand Down Expand Up @@ -445,6 +533,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.2.0+2"
xml:
dependency: transitive
description:
name: xml
sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5"
url: "https://pub.dev"
source: hosted
version: "6.2.2"
yaml:
dependency: transitive
description:
name: yaml
sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
url: "https://pub.dev"
source: hosted
version: "3.1.1"
sdks:
dart: ">=2.18.5 <4.0.0"
flutter: ">=3.0.0"
6 changes: 6 additions & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ dev_dependencies:
# package. See that file for information about deactivating specific lint
# rules and activating additional ones.
flutter_lints: ^2.0.0
flutter_launcher_icons: "^0.11.0"

flutter_icons:
android: true
ios: true
image_path: "assets/images/halowbund_logo.png"

# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec
Expand Down

0 comments on commit e8dab21

Please sign in to comment.