primeiro commit
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -2,6 +2,164 @@
|
||||
"logs": [
|
||||
{
|
||||
"outputFile": "com.fluxup.app-mergeDebugResources-50:/values-es/values-es.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "/Users/230407/.gradle/caches/9.3.1/transforms/c29594edf1561d8450e33b857eb23640/transformed/jetified-credentials-1.6.0/res/values-es/values-es.xml",
|
||||
"from": {
|
||||
"startLines": "-1,-1",
|
||||
"startColumns": "-1,-1",
|
||||
"startOffsets": "-1,-1"
|
||||
},
|
||||
"to": {
|
||||
"startLines": "34,35",
|
||||
"startColumns": "4,4",
|
||||
"startOffsets": "3102,3216",
|
||||
"endColumns": "113,121",
|
||||
"endOffsets": "3211,3333"
|
||||
}
|
||||
},
|
||||
{
|
||||
"source": "/Users/230407/.gradle/caches/9.3.1/transforms/6303d030bc2b668fe935516086d6d611/transformed/jetified-play-services-basement-18.5.0/res/values-es/values.xml",
|
||||
"from": {
|
||||
"startLines": "-1",
|
||||
"startColumns": "-1",
|
||||
"startOffsets": "-1"
|
||||
},
|
||||
"to": {
|
||||
"startLines": "63",
|
||||
"startColumns": "4",
|
||||
"startOffsets": "6048",
|
||||
"endColumns": "159",
|
||||
"endOffsets": "6203"
|
||||
}
|
||||
},
|
||||
{
|
||||
"source": "/Users/230407/.gradle/caches/9.3.1/transforms/089d26351c4fa7af84ac8da2376ce8cf/transformed/biometric-1.1.0/res/values-es/values-es.xml",
|
||||
"from": {
|
||||
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
|
||||
"startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
|
||||
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
|
||||
},
|
||||
"to": {
|
||||
"startLines": "73,76,83,84,85,86,87,88,89,90,91,92",
|
||||
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4",
|
||||
"startOffsets": "7349,7615,8230,8350,8493,8643,8789,8925,9071,9171,9317,9459",
|
||||
"endColumns": "108,93,119,142,149,145,135,145,99,145,141,127",
|
||||
"endOffsets": "7453,7704,8345,8488,8638,8784,8920,9066,9166,9312,9454,9582"
|
||||
}
|
||||
},
|
||||
{
|
||||
"source": "/Users/230407/.gradle/caches/9.3.1/transforms/c7f5ee22cb7681b7f161a75dca570143/transformed/navigation-ui-2.6.0/res/values-es/values-es.xml",
|
||||
"from": {
|
||||
"startLines": "-1,-1",
|
||||
"startColumns": "-1,-1",
|
||||
"startOffsets": "-1,-1"
|
||||
},
|
||||
"to": {
|
||||
"startLines": "147,148",
|
||||
"startColumns": "4,4",
|
||||
"startOffsets": "13794,13913",
|
||||
"endColumns": "118,119",
|
||||
"endOffsets": "13908,14028"
|
||||
}
|
||||
},
|
||||
{
|
||||
"source": "/Users/230407/Desktop/FluxupP/app/src/main/res/values-es/strings.xml",
|
||||
"from": {
|
||||
"startLines": "9,1,16,19,12,8,11,2,17,18,15,7,13,14,6,3,10",
|
||||
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
|
||||
"startOffsets": "392,16,746,883,520,342,480,60,790,834,689,289,583,630,236,116,435",
|
||||
"endColumns": "42,43,43,39,62,49,39,55,43,48,56,52,46,58,52,84,44",
|
||||
"endOffsets": "430,55,785,918,578,387,515,111,829,878,741,337,625,684,284,196,475"
|
||||
},
|
||||
"to": {
|
||||
"startLines": "33,36,37,38,51,75,77,93,96,97,149,151,152,153,155,157,158",
|
||||
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
|
||||
"startOffsets": "3059,3338,3382,3426,4642,7565,7709,9587,9787,9831,14033,14173,14226,14273,14415,14569,14654",
|
||||
"endColumns": "42,43,43,39,62,49,39,55,43,48,56,52,46,58,52,84,44",
|
||||
"endOffsets": "3097,3377,3421,3461,4700,7610,7744,9638,9826,9875,14085,14221,14268,14327,14463,14649,14694"
|
||||
}
|
||||
},
|
||||
{
|
||||
"source": "/Users/230407/.gradle/caches/9.3.1/transforms/56f65fb2c3a4f0ca2c62b00eb16c5c87/transformed/appcompat-1.6.1/res/values-es/values-es.xml",
|
||||
"from": {
|
||||
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
|
||||
"startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
|
||||
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
|
||||
},
|
||||
"to": {
|
||||
"startLines": "6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,154",
|
||||
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
|
||||
"startOffsets": "328,430,543,651,736,837,965,1051,1132,1224,1318,1415,1509,1609,1703,1799,1895,1987,2079,2161,2268,2379,2478,2586,2694,2801,2960,14332",
|
||||
"endColumns": "101,112,107,84,100,127,85,80,91,93,96,93,99,93,95,95,91,91,81,106,110,98,107,107,106,158,98,82",
|
||||
"endOffsets": "425,538,646,731,832,960,1046,1127,1219,1313,1410,1504,1604,1698,1794,1890,1982,2074,2156,2263,2374,2473,2581,2689,2796,2955,3054,14410"
|
||||
}
|
||||
},
|
||||
{
|
||||
"source": "/Users/230407/.gradle/caches/9.3.1/transforms/83b25b6fc9ff9f44d67664194450e332/transformed/core-1.15.0/res/values-es/values-es.xml",
|
||||
"from": {
|
||||
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1",
|
||||
"startColumns": "-1,-1,-1,-1,-1,-1,-1,-1",
|
||||
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1"
|
||||
},
|
||||
"to": {
|
||||
"startLines": "44,45,46,47,48,49,50,156",
|
||||
"startColumns": "4,4,4,4,4,4,4,4",
|
||||
"startOffsets": "3910,4009,4111,4211,4309,4416,4522,14468",
|
||||
"endColumns": "98,101,99,97,106,105,119,100",
|
||||
"endOffsets": "4004,4106,4206,4304,4411,4517,4637,14564"
|
||||
}
|
||||
},
|
||||
{
|
||||
"source": "/Users/230407/.gradle/caches/9.3.1/transforms/693e51a3e547c5aa8cecaa888d4bf95b/transformed/material-1.9.0/res/values-es/values-es.xml",
|
||||
"from": {
|
||||
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
|
||||
"startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
|
||||
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
|
||||
},
|
||||
"to": {
|
||||
"startLines": "2,39,40,41,42,43,52,53,54,78,79,94,95,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,150",
|
||||
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
|
||||
"startOffsets": "150,3466,3547,3626,3713,3814,4705,4809,4931,7749,7814,9643,9724,9880,9969,10033,10102,10165,10239,10303,10359,10477,10535,10597,10653,10733,10872,10961,11043,11184,11265,11345,11435,11491,11547,11613,11692,11774,11862,11936,12013,12083,12162,12246,12330,12422,12522,12596,12677,12779,12832,12899,12992,13081,13143,13207,13270,13383,13476,13580,13674,13734,14090",
|
||||
"endLines": "5,39,40,41,42,43,52,53,54,78,79,94,95,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,150",
|
||||
"endColumns": "12,80,78,86,100,95,103,121,80,64,94,80,62,88,63,68,62,73,63,55,117,57,61,55,79,138,88,81,140,80,79,89,55,55,65,78,81,87,73,76,69,78,83,83,91,99,73,80,101,52,66,92,88,61,63,62,112,92,103,93,59,59,82",
|
||||
"endOffsets": "323,3542,3621,3708,3809,3905,4804,4926,5007,7809,7904,9719,9782,9964,10028,10097,10160,10234,10298,10354,10472,10530,10592,10648,10728,10867,10956,11038,11179,11260,11340,11430,11486,11542,11608,11687,11769,11857,11931,12008,12078,12157,12241,12325,12417,12517,12591,12672,12774,12827,12894,12987,13076,13138,13202,13265,13378,13471,13575,13669,13729,13789,14168"
|
||||
}
|
||||
},
|
||||
{
|
||||
"source": "/Users/230407/.gradle/caches/9.3.1/transforms/d22374d328560f3dc27c3ddfd975e8a7/transformed/jetified-play-services-base-18.5.0/res/values-es/values.xml",
|
||||
"from": {
|
||||
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
|
||||
"startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
|
||||
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
|
||||
},
|
||||
"to": {
|
||||
"startLines": "55,56,57,58,59,60,61,62,64,65,66,67,68,69,70,71,72",
|
||||
"startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4",
|
||||
"startOffsets": "5012,5120,5283,5414,5522,5683,5816,5938,6208,6400,6509,6674,6806,6971,7128,7195,7264",
|
||||
"endColumns": "107,162,130,107,160,132,121,109,191,108,164,131,164,156,66,68,84",
|
||||
"endOffsets": "5115,5278,5409,5517,5678,5811,5933,6043,6395,6504,6669,6801,6966,7123,7190,7259,7344"
|
||||
}
|
||||
},
|
||||
{
|
||||
"source": "/Users/230407/.gradle/caches/9.3.1/transforms/310b47417b295f543bba5b29f399ba03/transformed/browser-1.4.0/res/values-es/values-es.xml",
|
||||
"from": {
|
||||
"startLines": "-1,-1,-1,-1",
|
||||
"startColumns": "-1,-1,-1,-1",
|
||||
"startOffsets": "-1,-1,-1,-1"
|
||||
},
|
||||
"to": {
|
||||
"startLines": "74,80,81,82",
|
||||
"startColumns": "4,4,4,4",
|
||||
"startOffsets": "7458,7909,8010,8125",
|
||||
"endColumns": "106,100,114,104",
|
||||
"endOffsets": "7560,8005,8120,8225"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"outputFile": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-mergeDebugResources-50:/values-es/values-es.xml",
|
||||
"map": [
|
||||
{
|
||||
"source": "/Users/230407/.gradle/caches/9.3.1/transforms/c29594edf1561d8450e33b857eb23640/transformed/jetified-credentials-1.6.0/res/values-es/values-es.xml",
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -7,22 +7,18 @@
|
||||
"merged": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-debug-52:/layout_fragment_profile.xml.flat",
|
||||
"source": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-main-54:/layout/fragment_profile.xml"
|
||||
},
|
||||
{
|
||||
"merged": "com.fluxup.app-debug-52:/drawable_circle_dashed_bg.xml.flat",
|
||||
"source": "com.fluxup.app-main-54:/drawable/circle_dashed_bg.xml"
|
||||
},
|
||||
{
|
||||
"merged": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-debug-52:/drawable_edit_text_bg.xml.flat",
|
||||
"source": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-main-54:/drawable/edit_text_bg.xml"
|
||||
},
|
||||
{
|
||||
"merged": "com.fluxup.app-debug-52:/layout_fragment_profile.xml.flat",
|
||||
"source": "com.fluxup.app-main-54:/layout/fragment_profile.xml"
|
||||
},
|
||||
{
|
||||
"merged": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-debug-52:/layout_activity_register.xml.flat",
|
||||
"source": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-main-54:/layout/activity_register.xml"
|
||||
},
|
||||
{
|
||||
"merged": "com.fluxup.app-debug-52:/layout_activity_login.xml.flat",
|
||||
"source": "com.fluxup.app-main-54:/layout/activity_login.xml"
|
||||
},
|
||||
{
|
||||
"merged": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-debug-52:/drawable_circle_dashed_bg.xml.flat",
|
||||
"source": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-main-54:/drawable/circle_dashed_bg.xml"
|
||||
@@ -31,6 +27,10 @@
|
||||
"merged": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-debug-52:/layout_activity_forgot_password.xml.flat",
|
||||
"source": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-main-54:/layout/activity_forgot_password.xml"
|
||||
},
|
||||
{
|
||||
"merged": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-debug-52:/drawable_ic_back.xml.flat",
|
||||
"source": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-main-54:/drawable/ic_back.xml"
|
||||
},
|
||||
{
|
||||
"merged": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-debug-52:/drawable_ic_launcher_background.xml.flat",
|
||||
"source": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-main-54:/drawable/ic_launcher_background.xml"
|
||||
@@ -39,10 +39,6 @@
|
||||
"merged": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-debug-52:/drawable_ic_nav_home.xml.flat",
|
||||
"source": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-main-54:/drawable/ic_nav_home.xml"
|
||||
},
|
||||
{
|
||||
"merged": "com.fluxup.app-debug-52:/drawable_dark_card_bg.xml.flat",
|
||||
"source": "com.fluxup.app-main-54:/drawable/dark_card_bg.xml"
|
||||
},
|
||||
{
|
||||
"merged": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-debug-52:/menu_bottom_nav_menu.xml.flat",
|
||||
"source": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-main-54:/menu/bottom_nav_menu.xml"
|
||||
@@ -55,6 +51,14 @@
|
||||
"merged": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-debug-52:/layout_activity_login.xml.flat",
|
||||
"source": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-main-54:/layout/activity_login.xml"
|
||||
},
|
||||
{
|
||||
"merged": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-debug-52:/layout_activity_settings.xml.flat",
|
||||
"source": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-main-54:/layout/activity_settings.xml"
|
||||
},
|
||||
{
|
||||
"merged": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-debug-52:/drawable_ic_settings.xml.flat",
|
||||
"source": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-main-54:/drawable/ic_settings.xml"
|
||||
},
|
||||
{
|
||||
"merged": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-debug-52:/drawable_ic_launcher_foreground.xml.flat",
|
||||
"source": "/Users/230407/.gradle/daemon/9.3.1/com.fluxup.app-main-54:/drawable/ic_launcher_foreground.xml"
|
||||
|
||||
Reference in New Issue
Block a user