diff --git a/android/.idea/codeStyles/Project.xml b/android/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626c23142d59e94cc76327172301f159b618..0000000000000000000000000000000000000000 --- 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 26873500d51159fcdb099bd71fc4e800382ea12a..23a28b76dd7bf0331630520a11571cb93a7f7af4 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 eec055c11bc44bf2845ca761897a10ef1965db93..43a2aea1df3c1f9e2792bc90576c7fd626d18d9c 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 0e21a85ff0926a019bfdb2f54c693294f3d5bfc7..c7b7ea2afde886973aac5ffb627abb8b03f4b236 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 93d481f58ce27e8942efd6712747c58c15655290..45969b0643ab918ff3484ca6df0beef7e0e30194 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"