Skip to content
Permalink
Browse files

Merge pull request #2 from MilosKozak/AdrianLxM-12pm-fix

12pm fix
  • Loading branch information...
jotomo committed Apr 22, 2018
2 parents cf73bd0 + af3eedd commit cccba35aa5a462280c03e4135c731ef6fc157b15
Showing with 5 additions and 5 deletions.
  1. +5 −5 app/src/main/java/org/monkey/d/ruffy/ruffy/driver/display/menu/MenuFactory.java
@@ -584,7 +584,7 @@ else if (isSymbol(p, Symbol.DOT))
CharacterPattern p1 = (CharacterPattern) clock.removeFirst();
if(p0.getCharacter()=='A' && p1.getCharacter()=='M' && hour10==1 && hour1 == 2)
timeadd-=12;
else if(p0.getCharacter()=='P' && p1.getCharacter()=='M')
else if(p0.getCharacter()=='P' && p1.getCharacter()=='M' && !(hour10==1 && hour1 == 2))
timeadd+=12;
}
m.setAttribute(MenuAttribute.TIME,new MenuTime((hour10*10)+hour1+timeadd,(minute10*10)+minute1));
@@ -986,7 +986,7 @@ else if (isSymbol(p, Symbol.DOT))
CharacterPattern p1 = (CharacterPattern) clock.removeFirst();
if(p0.getCharacter()=='A' && p1.getCharacter()=='M' && hour10==1 && hour1 == 2)
timeadd-=12;
else if(p0.getCharacter()=='P' && p1.getCharacter()=='M')
else if(p0.getCharacter()=='P' && p1.getCharacter()=='M' && !(hour10==1 && hour1 == 2))
timeadd+=12;
}
m.setAttribute(MenuAttribute.TIME,new MenuTime((hour10*10)+hour1+timeadd,(minute10*10)+minute1));
@@ -1164,7 +1164,7 @@ else if (isSymbol(p, Symbol.DOT))
CharacterPattern p1 = (CharacterPattern) clock.removeFirst();
if(p0.getCharacter()=='A' && p1.getCharacter()=='M' && hour10==1 && hour1 == 2)
timeadd-=12;
else if(p0.getCharacter()=='P' && p1.getCharacter()=='M')
else if(p0.getCharacter()=='P' && p1.getCharacter()=='M' && !(hour10==1 && hour1 == 2))
timeadd+=12;
}
m.setAttribute(MenuAttribute.TIME,new MenuTime((hour10*10)+hour1+timeadd,(minute10*10)+minute1));
@@ -1468,7 +1468,7 @@ else if (isSymbol(p, Symbol.SEPERATOR))
CharacterPattern p1 = (CharacterPattern) clock.removeFirst();
if(p0.getCharacter()=='A' && p1.getCharacter()=='M' && hour10==1 && hour1 == 2)
timeadd-=12;
else if(p0.getCharacter()=='P' && p1.getCharacter()=='M')
else if(p0.getCharacter()=='P' && p1.getCharacter()=='M' && !(hour10==1 && hour1 == 2))
timeadd+=12;
}
m.setAttribute(MenuAttribute.RUNTIME,new MenuTime((hour10*10)+hour1+timeadd,(minute10*10)+minute1));
@@ -1532,7 +1532,7 @@ else if (isSymbol(p, Symbol.DOT))
CharacterPattern p1 = (CharacterPattern) clock.removeFirst();
if(p0.getCharacter()=='A' && p1.getCharacter()=='M' && hour10==1 && hour1 == 2)
timeadd-=12;
else if(p0.getCharacter()=='P' && p1.getCharacter()=='M')
else if(p0.getCharacter()=='P' && p1.getCharacter()=='M' && !(hour10==1 && hour1 == 2))
timeadd+=12;
}
m.setAttribute(MenuAttribute.TIME,new MenuTime((hour10*10)+hour1+timeadd,(minute10*10)+minute1));

0 comments on commit cccba35

Please sign in to comment.
You can’t perform that action at this time.