logos and fixes

Mihrimah · Sep 17, 2020 · 85a4fbc · 85a4fbc
1 parent 0003b76
commit 85a4fbc
Show file tree

Hide file tree

Showing 29 changed files with 219 additions and 38 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -7,7 7,7 @@
  FlutterApplication and put your custom class here. -->
  <application
  android:name="io.flutter.app.FlutterApplication"
- android:label="retrospektif"
  android:label="retrospective"
  android:icon="@mipmap/ic_launcher">
  <activity
  android:name=".MainActivity"

diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/assets/images/r_logo.png b/assets/images/r_logo.png
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -496,4 496,4 @@
 /* End XCConfigurationList section */
  };
  rootObject = 97C146E61CF9500F007C117D /* Project object */;
-}
 }
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] b/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -11,7 11,7 @@
  <key>CFBundleInfoDictionaryVersion</key>
  <string>6.0</string>
  <key>CFBundleName</key>
- <string>retrospektif</string>
  <string>retrospective</string>
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>

diff --git a/lib/localization/retrospective_localization.dart b/lib/localization/retrospective_localization.dart
@@ -25,7 25,8 @@ class RetrospectiveLocalization{
  'chooseTemplate' : 'Choose Template',
  'historyList':'History',
  'maxSavedDataMessage' : 'Maximum number of saved data limit exceeded',
- 'save': 'Saved'
  'save': 'Saved',
  'nocontent' : 'No content yet'
  },
  'tr': {
  'title': 'Başlık',
@@ -42,12 43,16 @@ class RetrospectiveLocalization{
  'chooseTemplate' : 'Şablon Seç',
  'historyList':'Geçmiş',
  'maxSavedDataMessage' : 'Maksimum kayıtlı olan oda limiti aşılamaz',
- 'save': 'Kaydedildi'
  'save': 'Kaydedildi',
  'nocontent' : 'Henüz veri yok'
  },
  };
  String get save {
  return _localizedValues[locale.languageCode]['save'];
  }
  String get nocontent {
  return _localizedValues[locale.languageCode]['nocontent'];
  }
  String get maxSavedDataMessage {
  return _localizedValues[locale.languageCode]['maxSavedDataMessage'];
  }

diff --git a/lib/pages/start_page.dart b/lib/pages/start_page.dart
@@ -38,16 38,13 @@ class _StartPageState extends State<StartPage> {
  margin: EdgeInsets.only(right: 50, left: 50),
  child: Column(
  children: [
- Row(
- children: [
- Text(RetrospectiveLocalization.of(context).theme),
- Switch(
- value: themeProvider.isLightTheme,
- onChanged: (val) {
- themeProvider.setThemeData = val;
- },
- ),
- ],
  Center(
  child: Switch(
  value: themeProvider.isLightTheme,
  onChanged: (val) {
  themeProvider.setThemeData = val;
  },
  ),
  ),
  SizedBox(
  height: 60,
@@ -56,7 53,8 @@ class _StartPageState extends State<StartPage> {
  onPressed: () {
  Navigator.pushNamed(context, "/choose_template");
  },
- child: Text(RetrospectiveLocalization.of(context).createRoom,
  child: Text(
  RetrospectiveLocalization.of(context).createRoom,
  style: Theme.of(context).textTheme.headline6),
  ),
  ),
@@ -68,12 66,15 @@ class _StartPageState extends State<StartPage> {
  width: double.infinity,
  child: TextFormField(
  decoration: InputDecoration(
- hintText: RetrospectiveLocalization.of(context).roomCode,
  hintText:
  RetrospectiveLocalization.of(context).roomCode,
  enabledBorder: OutlineInputBorder(
- borderSide: BorderSide(color: Theme.of(context).accentColor),
  borderSide: BorderSide(
  color: Theme.of(context).accentColor),
  ),
  focusedBorder: OutlineInputBorder(
- borderSide: BorderSide(color: Theme.of(context).accentColor),
  borderSide: BorderSide(
  color: Theme.of(context).accentColor),
  ),
  ),
  controller: _textEditingController,
@@ -87,23 88,36 @@ class _StartPageState extends State<StartPage> {
  height: 60,
  width: double.infinity,
  child: RaisedButton(
- onPressed: isEnabled ? (){
- Navigator.pushNamed(context, "/retro", arguments: RetroPageParams(_parseRoomCode(_textEditingController.text), _textEditingController.text));
- } : null,
- child: Text(RetrospectiveLocalization.of(context).joinRoom, style: Theme.of(context).textTheme.headline6,),
  onPressed: isEnabled
  ? () {
  Navigator.pushNamed(context, "/retro",
  arguments: RetroPageParams(
  _parseRoomCode(
  _textEditingController.text),
  _textEditingController.text));
  }
  : null,
  child: Text(
  RetrospectiveLocalization.of(context).joinRoom,
  style: Theme.of(context).textTheme.headline6,
  ),
  ),
- ),SizedBox(
  ),
  SizedBox(
  height: 10,
  width: double.infinity,
  ),
  SizedBox(
  height: 60,
  width: double.infinity,
  child: RaisedButton(
- onPressed: (){
  onPressed: () {
  Navigator.pushNamed(context, "/saved_history");
  },
- child: Text(RetrospectiveLocalization.of(context).historyList, style: Theme.of(context).textTheme.headline6,),
  child: Text(
  RetrospectiveLocalization.of(context).historyList,
  style: Theme.of(context).textTheme.headline6,
  ),
  ),
  ),
  ],
@@ -144,16 158,25 @@ class _StartPageState extends State<StartPage> {
  }
  }
 
- AbstractBaseTemplate _parseRoomCode(String roomCode){
- int firstNumber =int.parse(roomCode.substring(0,1));
- if (firstNumber == 1) return MadGladSad();
- else if (firstNumber == 2) return Starfish();
- else if (firstNumber == 3) return Sailorboat();
- else if (firstNumber == 4) return FourLs();
- else if (firstNumber == 5) return StopStartContinue();
- else if (firstNumber == 6) return WhatWentWell();
- else if (firstNumber == 7) return LeanCoffee();
- else if (firstNumber == 8) return WrapTechnique();
- else return MadGladSad();
  AbstractBaseTemplate _parseRoomCode(String roomCode) {
  int firstNumber = int.parse(roomCode.substring(0, 1));
  if (firstNumber == 1)
  return MadGladSad();
  else if (firstNumber == 2)
  return Starfish();
  else if (firstNumber == 3)
  return Sailorboat();
  else if (firstNumber == 4)
  return FourLs();
  else if (firstNumber == 5)
  return StopStartContinue();
  else if (firstNumber == 6)
  return WhatWentWell();
  else if (firstNumber == 7)
  return LeanCoffee();
  else if (firstNumber == 8)
  return WrapTechnique();
  else
  return MadGladSad();
  }
 }
diff --git a/lib/pages/waiting_content_page.dart b/lib/pages/waiting_content_page.dart
@@ -1,8 1,9 @@
 import 'package:flutter/material.dart';
 import 'package:retrospektive/localization/retrospective_localization.dart';
 
 class WaitingContentPage extends StatelessWidget{
  @override
  Widget build(BuildContext context) {
- return Center(child: Text("No content yet", style: TextStyle(fontSize: 25),));
  return Center(child: Text(RetrospectiveLocalization.of(context).nocontent, style: TextStyle(fontSize: 25),));
  }
 }