Skip to content

Commit

Permalink
Move app into sub-folder. Rename app to Weather, and package to weath…
Browse files Browse the repository at this point in the history
…er_app.
  • Loading branch information
dam5s committed Aug 1, 2023
1 parent 3e01f64 commit fd276de
Show file tree
Hide file tree
Showing 97 changed files with 155 additions and 200 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
.packages
.pub-cache/
.pub/
/build/
build/

# Symbolication related
app.*.symbols
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ tasks: ## Print available tasks

.PHONY: format
format: ## Format code
dart format lib --line-length 100 --set-exit-if-changed
cd weather_app; dart format lib --line-length 100 --set-exit-if-changed

.PHONY: test
test: ## Run tests
flutter test
cd weather_app; flutter test

.PHONY: check
check: format test ## Check formatting and run tests
36 changes: 0 additions & 36 deletions android/app/src/main/AndroidManifest.xml

This file was deleted.

29 changes: 0 additions & 29 deletions android/flutter_starter_android.iml

This file was deleted.

51 changes: 0 additions & 51 deletions ios/Runner/Info.plist

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace "io.initialcapacity.flutter_starter"
namespace "io.initialcapacity.weather_app"
compileSdkVersion flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

Expand All @@ -44,8 +44,7 @@ android {
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "io.initialcapacity.flutter_starter"
applicationId "io.initialcapacity.weather_app"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
minSdkVersion flutter.minSdkVersion
Expand Down
File renamed without changes.
21 changes: 21 additions & 0 deletions weather_app/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET"/>

<application android:label="Weather" android:name="${applicationName}" android:icon="@mipmap/ic_launcher">
<activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
<!-- Specifies an Android theme to apply to this Activity as soon as
the Android process has started. This theme is visible to the user
while the Flutter UI initializes. After that, this theme continues
to determine the Window background behind the Flutter UI. -->
<meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme"/>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
<meta-data android:name="flutterEmbedding" android:value="2"/>
</application>
</manifest>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.initialcapacity.flutter_starter
package io.initialcapacity.weather_app

import io.flutter.embedding.android.FlutterActivity

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
51 changes: 51 additions & 0 deletions weather_app/ios/Runner/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>Weather</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Weather</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>$(FLUTTER_BUILD_NAME)</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
</dict>
</plist>
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/widgets.dart' as widgets;
import 'package:flutter_starter/networking/async_compute.dart';
import 'package:flutter_starter/networking/http_client_provider.dart';
import 'package:flutter_starter/prelude/time_source.dart';
import 'package:weather_app/networking/async_compute.dart';
import 'package:weather_app/networking/http_client_provider.dart';
import 'package:weather_app/prelude/time_source.dart';
import 'package:provider/provider.dart';

final class AppDependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_starter/app_dependencies.dart';
import 'package:flutter_starter/forecast/forecast_page.dart';
import 'package:flutter_starter/forecast/forecasts_repository.dart';
import 'package:flutter_starter/location_search/location_search_api.dart';
import 'package:flutter_starter/location_search/location_search_page.dart';
import 'package:weather_app/app_dependencies.dart';
import 'package:weather_app/forecast/forecast_page.dart';
import 'package:weather_app/forecast/forecasts_repository.dart';
import 'package:weather_app/location_search/location_search_api.dart';
import 'package:weather_app/location_search/location_search_page.dart';

import 'paging_indicator.dart';

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:math';

import 'package:flutter_starter/prelude/iterable.dart';
import 'package:flutter_starter/prelude/time_source.dart';
import 'package:weather_app/prelude/iterable.dart';
import 'package:weather_app/prelude/time_source.dart';
import 'package:intl/intl.dart';

import 'forecast_api.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:flutter_starter/location_search/location_search_api.dart';
import 'package:flutter_starter/networking/async_compute.dart';
import 'package:flutter_starter/networking/http.dart';
import 'package:flutter_starter/networking/http_client_provider.dart';
import 'package:flutter_starter/networking/json_decoder.dart';
import 'package:weather_app/location_search/location_search_api.dart';
import 'package:weather_app/networking/async_compute.dart';
import 'package:weather_app/networking/http.dart';
import 'package:weather_app/networking/http_client_provider.dart';
import 'package:weather_app/networking/json_decoder.dart';

final class ApiForecast {
final ApiHourlyForecast hourly;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_starter/app_dependencies.dart';
import 'package:flutter_starter/location_search/location_search_api.dart';
import 'package:flutter_starter/networking/http.dart';
import 'package:flutter_starter/widgets/card_header.dart';
import 'package:flutter_starter/widgets/http_future_builder.dart';
import 'package:weather_app/app_dependencies.dart';
import 'package:weather_app/location_search/location_search_api.dart';
import 'package:weather_app/networking/http.dart';
import 'package:weather_app/widgets/card_header.dart';
import 'package:weather_app/widgets/http_future_builder.dart';

import 'forecast.dart';
import 'forecast_api.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import 'dart:collection';

import 'package:flutter_starter/forecast/forecast_api.dart';
import 'package:flutter_starter/location_search/location_search_api.dart';
import 'package:flutter_starter/networking/async_compute.dart';
import 'package:flutter_starter/networking/http.dart';
import 'package:flutter_starter/networking/http_client_provider.dart';
import 'package:weather_app/forecast/forecast_api.dart';
import 'package:weather_app/location_search/location_search_api.dart';
import 'package:weather_app/networking/async_compute.dart';
import 'package:weather_app/networking/http.dart';
import 'package:weather_app/networking/http_client_provider.dart';

class ForecastsRepository {
final HttpClientProvider httpClientProvider;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter_starter/networking/async_compute.dart';
import 'package:flutter_starter/networking/http.dart';
import 'package:flutter_starter/networking/http_client_provider.dart';
import 'package:flutter_starter/networking/json_decoder.dart';
import 'package:weather_app/networking/async_compute.dart';
import 'package:weather_app/networking/http.dart';
import 'package:weather_app/networking/http_client_provider.dart';
import 'package:weather_app/networking/json_decoder.dart';

final class ApiLocation {
final String name;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_starter/app_dependencies.dart';
import 'package:flutter_starter/networking/http.dart';
import 'package:flutter_starter/widgets/http_future_builder.dart';
import 'package:weather_app/app_dependencies.dart';
import 'package:weather_app/networking/http.dart';
import 'package:weather_app/widgets/http_future_builder.dart';

import 'location_search_api.dart';

Expand Down
8 changes: 4 additions & 4 deletions lib/main.dart → weather_app/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_starter/app_pages/app_pages.dart';
import 'package:flutter_starter/networking/async_compute.dart';
import 'package:flutter_starter/networking/http_client_provider.dart';
import 'package:flutter_starter/prelude/time_source.dart';
import 'package:weather_app/app_pages/app_pages.dart';
import 'package:weather_app/networking/async_compute.dart';
import 'package:weather_app/networking/http_client_provider.dart';
import 'package:weather_app/prelude/time_source.dart';
import 'package:provider/provider.dart';

import 'app_dependencies.dart';
Expand Down
File renamed without changes.
Loading

0 comments on commit fd276de

Please sign in to comment.