[taler-wallet-android] branch master updated: bump version, hide unfinished UI parts

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository wallet-android.

The following commit(s) were added to refs/heads/master by this push:
     new 4d275ae  bump version, hide unfinished UI parts
4d275ae is described below

commit 4d275aef7b61e0c67d65246be93321e3e086feda
Author: Florian Dold <address@hidden>
AuthorDate: Fri Dec 20 02:13:23 2019 +0100

    bump version, hide unfinished UI parts
---
 app/build.gradle                              |  4 +--
 app/src/main/res/layout/fragment_settings.xml | 41 ++++++++++-----------------
 2 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1e8d039..8f8e4a7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "net.taler.wallet"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 4
-        versionName "0.6.0pre5"
+        versionCode 5
+        versionName "0.6.0pre6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/res/layout/fragment_settings.xml 
b/app/src/main/res/layout/fragment_settings.xml
index 6873ff4..0dcc721 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -11,6 +11,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
+
         <TextView
                 android:id="@+id/editText2"
                 android:layout_width="match_parent"
@@ -21,27 +22,6 @@
                 android:textSize="18sp" />
 
 
-        <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-            <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="Android Wallet" />
-
-
-            <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="0.6.0pre4 (Mon 9 Dec 2019, update 1)" />
-
-        </LinearLayout>
-
-
         <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -52,19 +32,23 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="Wallet Backend" />
-
+                    android:text="Android Wallet" />
 
             <TextView
                     android:id="@+id/textView4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:text="0.6.0pre4 (Mon 9 Dec 2019, update 1)" />
+                    android:text="0.6.0pre5 (Fri 20 Dec 2019" />
 
         </LinearLayout>
 
+        <Space
+                android:layout_width="0dp"
+                android:layout_height="15dp" />
+
         <TextView
+                android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ems="10"
@@ -72,33 +56,38 @@
                 android:textSize="18sp" />
 
         <Button
+                android:visibility="gone"
                 android:text="Export wallet to file"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/button_backup_export"/>
 
         <Button
+                android:visibility="gone"
                 android:text="Import from file"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/button_backup_import"/>
 
+
         <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ems="10"
-                android:text="Developer Settings (be careful!)"
+                android:text="Developer Settings (use with caution!)"
                 android:textSize="18sp" />
 
+        <!--
         <Button
                 android:text="Withdraw TESTKUDOS"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:id="@+id/button_withdraw_testkudos"/>
+                android:id="@+id/button_withdraw_testkudos"/>-->
 
         <Button
                 android:text="Reset Wallet (dangerous!)"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" 
android:id="@+id/button_reset_wallet_dangerously"/>
+
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
address@hidden.