Merge pull request #28 from koji-1009/fix

Fix
koji-1009 · Dec 29, 2022 · d916b04 · d916b04
2 parents 5e31962 + ae95fd2
commit d916b04
Showing 1 changed file with 0 additions and 30 deletions.
diff --git a/lib/view/home/history/history_widget.dart b/lib/view/home/history/history_widget.dart
@@ -44,38 +44,8 @@ class HistoryWidget extends ConsumerWidget {
           itemBuilder: (context, index) {
             final history = histories[index];
             return Card(
-<<<<<<< Updated upstream
-              child: ListTile(
-                title: Text('ワード: ${history.params.any}'),
-                subtitle: Text(
-                  _formatter.format(history.updatedAt),
-                ),
-                trailing: IconButton(
-                  icon: const Icon(Icons.more_vert),
-                  onPressed: () {
-                    showDialog(
-                      context: context,
-                      builder: (context) => SimpleDialog(
-                        title: const Text('オプション'),
-                        children: [
-                          SimpleDialogOption(
-                            child: const Text('削除'),
-                            onPressed: () {
-                              // delete
-                              box.delete(history.indexKey);
-
-                              Navigator.of(context).pop();
-                            },
-                          )
-                        ],
-                      ),
-                    );
-                  },
-                ),
-=======
               clipBehavior: Clip.hardEdge,
               child: InkWell(
->>>>>>> Stashed changes
                 onTap: () {
                   context.pushNamed(
                     SearchSpeechScreen.screenName,