primeiro commit
This commit is contained in:
@@ -0,0 +1,20 @@
|
||||
#Wed Apr 15 12:15:52 WEST 2026
|
||||
com.fluxup.app-main-54\:/drawable/circle_bg.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/drawable_circle_bg.xml.flat
|
||||
com.fluxup.app-main-54\:/drawable/circle_dashed_bg.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/drawable_circle_dashed_bg.xml.flat
|
||||
com.fluxup.app-main-54\:/drawable/dark_card_bg.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/drawable_dark_card_bg.xml.flat
|
||||
com.fluxup.app-main-54\:/drawable/edit_text_bg.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/drawable_edit_text_bg.xml.flat
|
||||
com.fluxup.app-main-54\:/drawable/ic_launcher_background.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/drawable_ic_launcher_background.xml.flat
|
||||
com.fluxup.app-main-54\:/drawable/ic_launcher_foreground.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/drawable_ic_launcher_foreground.xml.flat
|
||||
com.fluxup.app-main-54\:/drawable/ic_nav_home.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/drawable_ic_nav_home.xml.flat
|
||||
com.fluxup.app-main-54\:/drawable/ic_nav_profile.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/drawable_ic_nav_profile.xml.flat
|
||||
com.fluxup.app-main-54\:/drawable/rounded_timer_bg.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/drawable_rounded_timer_bg.xml.flat
|
||||
com.fluxup.app-main-54\:/layout/activity_forgot_password.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_forgot_password.xml.flat
|
||||
com.fluxup.app-main-54\:/layout/activity_login.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_login.xml.flat
|
||||
com.fluxup.app-main-54\:/layout/activity_main.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_main.xml.flat
|
||||
com.fluxup.app-main-54\:/layout/activity_modal.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_modal.xml.flat
|
||||
com.fluxup.app-main-54\:/layout/activity_register.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_activity_register.xml.flat
|
||||
com.fluxup.app-main-54\:/layout/fragment_inicio.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_fragment_inicio.xml.flat
|
||||
com.fluxup.app-main-54\:/layout/fragment_profile.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/layout_fragment_profile.xml.flat
|
||||
com.fluxup.app-main-54\:/menu/bottom_nav_menu.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/menu_bottom_nav_menu.xml.flat
|
||||
com.fluxup.app-main-54\:/mipmap-anydpi-v26/ic_launcher.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-anydpi-v26_ic_launcher.xml.flat
|
||||
com.fluxup.app-main-54\:/mipmap-anydpi-v26/ic_launcher_round.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/merged_res/debug/mergeDebugResources/mipmap-anydpi-v26_ic_launcher_round.xml.flat
|
||||
15649
app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
Normal file
15649
app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
Normal file
File diff suppressed because one or more lines are too long
@@ -0,0 +1,20 @@
|
||||
#Wed Apr 15 12:15:52 WEST 2026
|
||||
com.fluxup.app-main-6\:/drawable/circle_bg.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/circle_bg.xml
|
||||
com.fluxup.app-main-6\:/drawable/circle_dashed_bg.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/circle_dashed_bg.xml
|
||||
com.fluxup.app-main-6\:/drawable/dark_card_bg.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/dark_card_bg.xml
|
||||
com.fluxup.app-main-6\:/drawable/edit_text_bg.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/edit_text_bg.xml
|
||||
com.fluxup.app-main-6\:/drawable/ic_launcher_background.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/ic_launcher_background.xml
|
||||
com.fluxup.app-main-6\:/drawable/ic_launcher_foreground.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/ic_launcher_foreground.xml
|
||||
com.fluxup.app-main-6\:/drawable/ic_nav_home.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/ic_nav_home.xml
|
||||
com.fluxup.app-main-6\:/drawable/ic_nav_profile.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/ic_nav_profile.xml
|
||||
com.fluxup.app-main-6\:/drawable/rounded_timer_bg.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/drawable/rounded_timer_bg.xml
|
||||
com.fluxup.app-main-6\:/layout/activity_forgot_password.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_forgot_password.xml
|
||||
com.fluxup.app-main-6\:/layout/activity_login.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_login.xml
|
||||
com.fluxup.app-main-6\:/layout/activity_main.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_main.xml
|
||||
com.fluxup.app-main-6\:/layout/activity_modal.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_modal.xml
|
||||
com.fluxup.app-main-6\:/layout/activity_register.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/activity_register.xml
|
||||
com.fluxup.app-main-6\:/layout/fragment_inicio.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/fragment_inicio.xml
|
||||
com.fluxup.app-main-6\:/layout/fragment_profile.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/layout/fragment_profile.xml
|
||||
com.fluxup.app-main-6\:/menu/bottom_nav_menu.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/menu/bottom_nav_menu.xml
|
||||
com.fluxup.app-main-6\:/mipmap-anydpi-v26/ic_launcher.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-anydpi-v26/ic_launcher.xml
|
||||
com.fluxup.app-main-6\:/mipmap-anydpi-v26/ic_launcher_round.xml=/Users/230407/Desktop/FluxupP/app/build/intermediates/packaged_res/debug/packageDebugResources/mipmap-anydpi-v26/ic_launcher_round.xml
|
||||
@@ -0,0 +1,45 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/230407/Desktop/FluxupP/app/src/main/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~:!<dir>navigation"><source path="/Users/230407/Desktop/FluxupP/app/src/main/res"><file name="edit_text_bg" path="/Users/230407/Desktop/FluxupP/app/src/main/res/drawable/edit_text_bg.xml" qualifiers="" type="drawable"/><file name="ic_launcher_foreground" path="/Users/230407/Desktop/FluxupP/app/src/main/res/drawable/ic_launcher_foreground.xml" qualifiers="" type="drawable"/><file name="rounded_timer_bg" path="/Users/230407/Desktop/FluxupP/app/src/main/res/drawable/rounded_timer_bg.xml" qualifiers="" type="drawable"/><file name="ic_launcher_background" path="/Users/230407/Desktop/FluxupP/app/src/main/res/drawable/ic_launcher_background.xml" qualifiers="" type="drawable"/><file name="activity_login" path="/Users/230407/Desktop/FluxupP/app/src/main/res/layout/activity_login.xml" qualifiers="" type="layout"/><file name="activity_forgot_password" path="/Users/230407/Desktop/FluxupP/app/src/main/res/layout/activity_forgot_password.xml" qualifiers="" type="layout"/><file name="activity_register" path="/Users/230407/Desktop/FluxupP/app/src/main/res/layout/activity_register.xml" qualifiers="" type="layout"/><file name="activity_modal" path="/Users/230407/Desktop/FluxupP/app/src/main/res/layout/activity_modal.xml" qualifiers="" type="layout"/><file name="fragment_inicio" path="/Users/230407/Desktop/FluxupP/app/src/main/res/layout/fragment_inicio.xml" qualifiers="" type="layout"/><file path="/Users/230407/Desktop/FluxupP/app/src/main/res/values/colors.xml" qualifiers=""><color name="white">#FFFFFF</color><color name="black">#11181C</color><color name="purple_200">#FFBB86FC</color><color name="purple_500">#6a00fa</color><color name="purple_700">#3700B3</color><color name="teal_200">#03DAC5</color><color name="teal_700">#018786</color><color name="background_purple">#F3E5F5</color><color name="text_light">#11181C</color><color name="text_muted_light">#6B7280</color><color name="background_light">#FFFFFF</color><color name="surface_light">#F8FAFC</color><color name="card_light">#FFFFFF</color><color name="border_light">#E5E7EB</color><color name="icon_light">#687076</color><color name="primary_light">#6a00fa</color><color name="secondary_light">#64748B</color><color name="success_light">#16A34A</color><color name="error_light">#DC2626</color><color name="warning_light">#F59E0B</color><color name="info_light">#0EA5E9</color><color name="text_dark">#ECEDEE</color><color name="text_muted_dark">#94A3B8</color><color name="background_dark">#0F172A</color><color name="surface_dark">#1E293B</color><color name="card_dark">#111827</color><color name="border_dark">#334155</color><color name="icon_dark">#9BA1A6</color><color name="primary_dark">#38bdf8</color><color name="secondary_dark">#94A3B8</color><color name="success_dark">#22C55E</color></file><file path="/Users/230407/Desktop/FluxupP/app/src/main/res/values/dimens.xml" qualifiers=""><dimen name="spacing_xxs">4dp</dimen><dimen name="spacing_xs">8dp</dimen><dimen name="spacing_sm">12dp</dimen><dimen name="spacing_md">16dp</dimen><dimen name="spacing_lg">20dp</dimen><dimen name="spacing_xl">24dp</dimen><dimen name="spacing_xxl">32dp</dimen><dimen name="radius_sm">4dp</dimen><dimen name="radius_md">8dp</dimen><dimen name="radius_lg">12dp</dimen><dimen name="radius_xl">16dp</dimen><dimen name="font_heading1">32sp</dimen><dimen name="font_heading2">28sp</dimen><dimen name="font_heading3">24sp</dimen><dimen name="font_subtitle">20sp</dimen><dimen name="font_body">16sp</dimen><dimen name="font_caption">12sp</dimen></file><file path="/Users/230407/Desktop/FluxupP/app/src/main/res/values/themes.xml" qualifiers=""><style name="Theme.Fluxup" parent="Theme.MaterialComponents.DayNight.NoActionBar">
|
||||
|
||||
<item name="colorPrimary">@color/purple_500</item>
|
||||
<item name="colorPrimaryVariant">@color/purple_700</item>
|
||||
<item name="colorOnPrimary">@color/white</item>
|
||||
|
||||
<item name="colorSecondary">@color/teal_200</item>
|
||||
<item name="colorSecondaryVariant">@color/teal_200</item>
|
||||
<item name="colorOnSecondary">@color/black</item>
|
||||
|
||||
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
|
||||
|
||||
</style></file><file path="/Users/230407/Desktop/FluxupP/app/src/main/res/values/styles.xml" qualifiers=""><style name="ThemedText">
|
||||
<item name="android:textColor">@color/text_light</item>
|
||||
</style><style name="ThemedText.Heading1">
|
||||
<item name="android:textSize">@dimen/font_heading1</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
<item name="android:textColor">@color/text_light</item>
|
||||
</style><style name="ThemedText.Heading2">
|
||||
<item name="android:textSize">@dimen/font_heading2</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
<item name="android:textColor">@color/text_light</item>
|
||||
</style><style name="ThemedText.Body">
|
||||
<item name="android:textSize">@dimen/font_body</item>
|
||||
<item name="android:textColor">@color/text_light</item>
|
||||
</style><style name="FluxupButton" parent="Widget.MaterialComponents.Button">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_height">56dp</item>
|
||||
<item name="android:insetTop">0dp</item>
|
||||
<item name="android:insetBottom">0dp</item>
|
||||
<item name="cornerRadius">@dimen/radius_lg</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<item name="android:letterSpacing">0</item>
|
||||
<item name="android:textSize">@dimen/font_body</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
</style><style name="FluxupInput">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_height">56dp</item>
|
||||
<item name="android:background">@drawable/edit_text_bg</item>
|
||||
<item name="android:paddingHorizontal">@dimen/spacing_md</item>
|
||||
<item name="android:textSize">@dimen/font_body</item>
|
||||
<item name="android:textColor">@color/text_light</item>
|
||||
<item name="android:layout_marginBottom">@dimen/spacing_md</item>
|
||||
</style></file><file path="/Users/230407/Desktop/FluxupP/app/src/main/res/values/strings.xml" qualifiers=""><string name="app_name">Fluxup</string><string name="greeting">Hoje é um bom dia</string><string name="subtitle">Olá, Matheus! Preparado para o seu dia de produtividade?</string></file><file name="ic_launcher" path="/Users/230407/Desktop/FluxupP/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" qualifiers="anydpi-v26" type="mipmap"/><file name="ic_launcher_round" path="/Users/230407/Desktop/FluxupP/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" qualifiers="anydpi-v26" type="mipmap"/><file name="circle_bg" path="/Users/230407/Desktop/FluxupP/app/src/main/res/drawable/circle_bg.xml" qualifiers="" type="drawable"/><file name="circle_dashed_bg" path="/Users/230407/Desktop/FluxupP/app/src/main/res/drawable/circle_dashed_bg.xml" qualifiers="" type="drawable"/><file name="dark_card_bg" path="/Users/230407/Desktop/FluxupP/app/src/main/res/drawable/dark_card_bg.xml" qualifiers="" type="drawable"/><file name="ic_nav_home" path="/Users/230407/Desktop/FluxupP/app/src/main/res/drawable/ic_nav_home.xml" qualifiers="" type="drawable"/><file name="ic_nav_profile" path="/Users/230407/Desktop/FluxupP/app/src/main/res/drawable/ic_nav_profile.xml" qualifiers="" type="drawable"/><file name="activity_main" path="/Users/230407/Desktop/FluxupP/app/src/main/res/layout/activity_main.xml" qualifiers="" type="layout"/><file name="fragment_profile" path="/Users/230407/Desktop/FluxupP/app/src/main/res/layout/fragment_profile.xml" qualifiers="" type="layout"/><file name="bottom_nav_menu" path="/Users/230407/Desktop/FluxupP/app/src/main/res/menu/bottom_nav_menu.xml" qualifiers="" type="menu"/></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/230407/Desktop/FluxupP/app/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~:!<dir>navigation"><source path="/Users/230407/Desktop/FluxupP/app/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/230407/Desktop/FluxupP/app/build/generated/res/resValues/debug"/><source path="/Users/230407/Desktop/FluxupP/app/build/generated/res/processDebugGoogleServices"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~:!<dir>navigation"><source path="/Users/230407/Desktop/FluxupP/app/build/generated/res/resValues/debug"/><source path="/Users/230407/Desktop/FluxupP/app/build/generated/res/processDebugGoogleServices"><file path="/Users/230407/Desktop/FluxupP/app/build/generated/res/processDebugGoogleServices/values/values.xml" qualifiers=""><string name="gcm_defaultSenderId" translatable="false">659566714595</string><string name="google_api_key" translatable="false">AIzaSyDzpQM5ewUlGCb1gROzSxBXJYavyDrm1kk</string><string name="google_app_id" translatable="false">1:659566714595:android:e2dba99e1738528d966fd6</string><string name="google_crash_reporting_api_key" translatable="false">AIzaSyDzpQM5ewUlGCb1gROzSxBXJYavyDrm1kk</string><string name="google_storage_bucket" translatable="false">fluxupp.firebasestorage.app</string><string name="project_id" translatable="false">fluxupp</string></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="res-processDebugGoogleServices$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="res-processDebugGoogleServices" generated-set="res-processDebugGoogleServices$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~:!<dir>navigation"/><mergedItems/></merger>
|
||||
Reference in New Issue
Block a user