Merge branch 'master' into 'disapp-sr'
# Conflicts: # app/src/main/res/values-sr/strings.xml
Showing
- .idea/assetWizardSettings.xml 32 additions, 0 deletions.idea/assetWizardSettings.xml
- .idea/caches/build_file_checksums.ser 0 additions, 0 deletions.idea/caches/build_file_checksums.ser
- README.md 7 additions, 3 deletionsREADME.md
- app/build.gradle 6 additions, 2 deletionsapp/build.gradle
- app/release/output.json 0 additions, 1 deletionapp/release/output.json
- app/src/main/AndroidManifest.xml 20 additions, 18 deletionsapp/src/main/AndroidManifest.xml
- app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java 397 additions, 37 deletions...src/main/java/org/disroot/disrootapp/ui/MainActivity.java
- app/src/main/java/org/disroot/disrootapp/ui/StateActivity.java 310 additions, 0 deletions...rc/main/java/org/disroot/disrootapp/ui/StateActivity.java
- app/src/main/java/org/disroot/disrootapp/ui/StateMessagesActivity.java 269 additions, 0 deletions...java/org/disroot/disrootapp/ui/StateMessagesActivity.java
- app/src/main/java/org/disroot/disrootapp/utils/Constants.java 2 additions, 1 deletion...src/main/java/org/disroot/disrootapp/utils/Constants.java
- app/src/main/java/org/disroot/disrootapp/utils/HttpHandler.java 66 additions, 0 deletions...c/main/java/org/disroot/disrootapp/utils/HttpHandler.java
- app/src/main/res/drawable/ic_clear_cookies.xml 5 additions, 0 deletionsapp/src/main/res/drawable/ic_clear_cookies.xml
- app/src/main/res/drawable/ic_notes.xml 5 additions, 0 deletionsapp/src/main/res/drawable/ic_notes.xml
- app/src/main/res/layout/activity_main.xml 50 additions, 9 deletionsapp/src/main/res/layout/activity_main.xml
- app/src/main/res/layout/activity_state.xml 70 additions, 0 deletionsapp/src/main/res/layout/activity_state.xml
- app/src/main/res/layout/activity_state_messages.xml 70 additions, 0 deletionsapp/src/main/res/layout/activity_state_messages.xml
- app/src/main/res/layout/list_item.xml 57 additions, 0 deletionsapp/src/main/res/layout/list_item.xml
- app/src/main/res/menu/menu_main.xml 4 additions, 0 deletionsapp/src/main/res/menu/menu_main.xml
- app/src/main/res/values-es/strings.xml 41 additions, 13 deletionsapp/src/main/res/values-es/strings.xml
- app/src/main/res/values-fr/strings.xml 100 additions, 42 deletionsapp/src/main/res/values-fr/strings.xml
Please register or sign in to comment