From 37531b9d40b34e15240c3d43c15532959768c8db Mon Sep 17 00:00:00 2001
From: massimiliano <massimiliano@disroot.org>
Date: Fri, 21 Dec 2018 09:19:06 +0100
Subject: [PATCH] Ready for v1.1.0 Fixed notes icon + layout
---
.idea/assetWizardSettings.xml | 4 +--
.idea/caches/build_file_checksums.ser | Bin 534 -> 534 bytes
app/build.gradle | 4 +--
app/src/main/res/drawable/ic_notes.xml | 2 +-
app/src/main/res/layout/activity_main.xml | 25 ++++++++++++++++++
app/src/main/res/layout/activity_state.xml | 1 +
.../res/layout/activity_state_messages.xml | 1 +
app/src/main/res/xml/changelog_master.xml | 15 ++++-------
8 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index aff8ae7..1da7075 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -14,8 +14,8 @@
<option name="values">
<map>
<entry key="assetSourceType" value="FILE" />
- <entry key="outputName" value="ic_note" />
- <entry key="sourceFile" value="$PROJECT_DIR$/../DisIcons/ic_note.svg" />
+ <entry key="outputName" value="ic_notes" />
+ <entry key="sourceFile" value="$PROJECT_DIR$/../DisIcons/ic_notes.svg" />
</map>
</option>
</PersistentState>
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 63c2ad32c84056fff84530be51f3c36ff50135cc..659516557835ada6d03b059e5c115cc591e0e917 100644
GIT binary patch
delta 33
pcmbQnGL2=z43_iPaxQP2lgTL9?|wt;gN8@bRr4~1pWX)Y6#)DW4s-wj
delta 33
rcmV++0N($W1eOGlm;_R0Y=^O&X#o+9<doh7k?t$D`ss&-(7il(_74zC
diff --git a/app/build.gradle b/app/build.gradle
index a9b8807..ce76baa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
applicationId "org.disroot.disrootapp"
minSdkVersion 15
targetSdkVersion 28
- versionCode 12
- versionName "1.0.2"
+ versionCode 13
+ versionName "1.1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
diff --git a/app/src/main/res/drawable/ic_notes.xml b/app/src/main/res/drawable/ic_notes.xml
index 67351c0..9ece90f 100644
--- a/app/src/main/res/drawable/ic_notes.xml
+++ b/app/src/main/res/drawable/ic_notes.xml
@@ -1,5 +1,5 @@
<vector android:height="24dp" android:viewportHeight="48"
android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="1" android:fillColor="#ffffff"
- android:pathData="m12.625,30.625 l4.75,4.75L15.75,37L14,37L14,34L11,34L11,32.25ZM25.5625,18.4375c0.25,0.2188 0.1875,0.6563 -0.0938,0.9375L16.375,28.4688C16.0938,28.75 15.6563,28.8125 15.4375,28.5625 15.1875,28.3437 15.25,27.9062 15.5313,27.625L24.625,18.5312c0.2813,-0.2813 0.7188,-0.3438 0.9375,-0.0937zM17,40 L34,23 25,14 8,31v9zM27,12 L29.875,9.125c1.1563,-1.1563 1.1563,-3.0938 0,-4.25l-4.75,-4.75c-1.1563,-1.1563 -3.0938,-1.1563 -4.25,0L27,12ZM48,9v30c0,4.9688 -4.0313,9 -9,9L9,48C4.0313,48 0,43.9688 0,39L0,9C0,4.0313 4.0313,0 9,0h30c4.9688,0 9,4.0313 9,9z" android:strokeWidth="0.03125"/>
+ android:pathData="m12.625,30.625c1.5833,1.5833 3.1667,3.1667 4.75,4.75C16.7225,35.8675 16.2613,36.8221 15.4785,37 14.5298,37.0938 13.6445,37.1243 14,35.9139 13.7931,35.3018 14.5052,33.7707 13.4569,34 12.638,34 11.819,34 11,34c0.0717,-0.8252 -0.2959,-1.8323 0.576,-2.326 0.3497,-0.3497 0.6993,-0.6993 1.049,-1.049zM25.5625,18.4375c0.4404,1.0323 -1.0119,1.6236 -1.5338,2.3775 -2.6393,2.5957 -5.1984,5.2858 -7.8881,7.8222 -1.765,0.1116 -0.1326,-1.6613 0.5426,-2.1643 2.7353,-2.6917 5.3904,-5.4778 8.1761,-8.1102 0.2171,-0.112 0.5279,-0.1278 0.7031,0.0748zM17,40C22.6667,34.3333 28.3333,28.6667 34,23 31,20 28,17 25,14 19.3333,19.6667 13.6667,25.3333 8,31c0,3 0,6 0,9 3,0 6,0 9,0zM36,21c1.1623,-1.2963 2.6604,-2.3418 3.5254,-3.8643C40.299,15.4271 39.0538,13.8707 37.819,12.819 36.3312,11.431 35.0305,9.8131 33.4025,8.5966 31.787,7.6805 30.0358,8.6954 29.011,9.989 28.3407,10.6593 27.6703,11.3297 27,12c3,3 6,6 9,9zM48,9c-0.0078,10.1543 0.0155,20.3089 -0.0117,30.463 -0.1188,4.9069 -4.8029,8.9754 -9.6671,8.537 -9.928,-0.0078 -19.8564,0.0155 -29.7842,-0.0117C3.6301,47.8695 -0.4383,43.1854 0,38.3212 0.0078,28.3932 -0.0155,18.4648 0.0117,8.537 0.1305,3.6301 4.8146,-0.4383 9.6788,0 19.6068,0.0078 29.5352,-0.0155 39.463,0.0117 44.1261,0.1593 48.0932,4.3318 48,9Z" android:strokeWidth="0.03125"/>
</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 08d9d32..0557a15 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -238,6 +238,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
android:id="@+id/group5"
android:layout_below="@+id/group4"><!-- android:gravity="center_horizontal" -->
<Button
@@ -249,6 +250,30 @@
android:drawableTop="@drawable/ic_about"
android:text="@string/action_about"
android:textColor="#ffffff" />
+ <Button
+ android:id="@+id/Placeholder2"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxWidth="24dp"
+ android:text=""
+ android:textColor="#ffffff" />
+ <Button
+ android:id="@+id/Placeholder3"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxWidth="24dp"
+ android:text=""
+ android:textColor="#ffffff" />
+ <Button
+ android:id="@+id/Placeholder4"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxWidth="24dp"
+ android:text=""
+ android:textColor="#ffffff" />
</LinearLayout>
</RelativeLayout>
</ScrollView>
diff --git a/app/src/main/res/layout/activity_state.xml b/app/src/main/res/layout/activity_state.xml
index 50abcec..4c39e50 100644
--- a/app/src/main/res/layout/activity_state.xml
+++ b/app/src/main/res/layout/activity_state.xml
@@ -29,6 +29,7 @@
<android.support.v7.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
android:background="#203140">
<Button
android:id="@+id/StateBtn"
diff --git a/app/src/main/res/layout/activity_state_messages.xml b/app/src/main/res/layout/activity_state_messages.xml
index 9173da2..7678a47 100644
--- a/app/src/main/res/layout/activity_state_messages.xml
+++ b/app/src/main/res/layout/activity_state_messages.xml
@@ -29,6 +29,7 @@
<android.support.v7.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
android:background="#203140">
<Button
android:id="@+id/StateBtn"
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index b37c86a..3031b13 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -2,18 +2,13 @@
<changelog>
<release version="1.1.0" versioncode="13" >
<change>State page is api based instead of webview</change>
- <change>In State page is possible to view state messages</change>
- <change>State page is ordered by status</change>
+ <change>In State page is possible to view state messages on separate tab</change>
+ <change>State page ordered by status</change>
<change>Fixed app crashing when launching Pix-art messenger</change>
- <change>Fixed app lanuch in state on fresh install</change>
- <change>Refresh state data to update state events</change>
- <change>Added app notification on new state events</change>
- <change>Notifications make sound</change>
- <change>Notification text comes from json data</change>
- <change>Tapping on notification launches StateMessagesActivity</change>
- <change>Made as much strings translatable as possible</change>
+ <change>Fixed app launch in state on fresh install</change>
+ <change>Added app notification on new state events with sound and vibration</change>
<change>Added Notes app</change>
- <change>A lot of smal fixes</change>
+ <change>A few other small fixes</change>
</release>
<release version="1.0.2" versioncode="12" >
<change>Third partie cookies disabled</change>
--
GitLab