From 88dc9e7f2cc34e77a8e2d7cd35b333b9d867d0d6 Mon Sep 17 00:00:00 2001
From: Ilham Firdausi Putra <ilhamfputra31@gmail.com>
Date: Tue, 23 Apr 2019 08:05:50 +0700
Subject: [PATCH] update bot
---
android/.idea/codeStyles/Project.xml | 29 -------------------
.../com/chatman/activity/AuthActivity.java | 4 ++-
.../com/chatman/fragment/ProfileFragment.java | 2 +-
.../app/src/main/res/layout/activity_auth.xml | 3 +-
.../src/main/res/layout/fragment_profile.xml | 3 +-
5 files changed, 8 insertions(+), 33 deletions(-)
delete mode 100644 android/.idea/codeStyles/Project.xml
diff --git a/android/.idea/codeStyles/Project.xml b/android/.idea/codeStyles/Project.xml
deleted file mode 100644
index 30aa626..0000000
--- a/android/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
- <code_scheme name="Project" version="173">
- <Objective-C-extensions>
- <file>
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
- </file>
- <class>
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
- </class>
- <extensions>
- <pair source="cpp" header="h" fileNamingConvention="NONE" />
- <pair source="c" header="h" fileNamingConvention="NONE" />
- </extensions>
- </Objective-C-extensions>
- </code_scheme>
-</component>
\ No newline at end of file
diff --git a/android/app/src/main/java/com/chatman/activity/AuthActivity.java b/android/app/src/main/java/com/chatman/activity/AuthActivity.java
index 2687350..23a28b7 100644
--- a/android/app/src/main/java/com/chatman/activity/AuthActivity.java
+++ b/android/app/src/main/java/com/chatman/activity/AuthActivity.java
@@ -87,7 +87,9 @@ public class AuthActivity extends AppCompatActivity {
loadingDialog = new LoadingDialogFragment(this);
loadingDialog.setCancelable(false);
loadingDialog.setCanceledOnTouchOutside(false);
- Glide.with(this).load(getImage("logo")).fitCenter().into(authImageView);
+
+
+
}
// do login
diff --git a/android/app/src/main/java/com/chatman/fragment/ProfileFragment.java b/android/app/src/main/java/com/chatman/fragment/ProfileFragment.java
index eec055c..43a2aea 100644
--- a/android/app/src/main/java/com/chatman/fragment/ProfileFragment.java
+++ b/android/app/src/main/java/com/chatman/fragment/ProfileFragment.java
@@ -85,7 +85,7 @@ public class ProfileFragment extends Fragment {
}
});
- Glide.with(this).load(getImage("ic_android_black_96dp")).fitCenter().into(profileImage);
+
profileName.setText(PreferencesHelper.getUserName(getContext()));
}
diff --git a/android/app/src/main/res/layout/activity_auth.xml b/android/app/src/main/res/layout/activity_auth.xml
index 0e21a85..c7b7ea2 100644
--- a/android/app/src/main/res/layout/activity_auth.xml
+++ b/android/app/src/main/res/layout/activity_auth.xml
@@ -27,7 +27,8 @@
android:id="@+id/auth_logo"
android:layout_width="250dp"
android:layout_height="120dp"
- android:scaleType="fitCenter"/>
+ android:scaleType="fitCenter"
+ android:src="@drawable/logo"/>
</LinearLayout>
diff --git a/android/app/src/main/res/layout/fragment_profile.xml b/android/app/src/main/res/layout/fragment_profile.xml
index 93d481f..45969b0 100644
--- a/android/app/src/main/res/layout/fragment_profile.xml
+++ b/android/app/src/main/res/layout/fragment_profile.xml
@@ -19,7 +19,8 @@
android:layout_margin="20dp"
android:layout_width="100dp"
android:layout_height="100dp"
- android:layout_gravity="center"/>
+ android:layout_gravity="center"
+ android:src="@mipmap/ic_launcher_round"/>
<TextView
android:id="@+id/profile_name"
--
GitLab