IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Branch detail added

master
preyearegmi 6 years ago
parent
3f78d134bb
commit
79e3163e60
10 changed files with 134 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/gateway/AgentListV2Gateway.java
  2. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/settings/view/SettingsView.java
  3. 2
      app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/gateway/SplashScreenGateway.java
  4. 5
      app/src/main/res/layout/alert_example_layout.xml
  5. 21
      app/src/main/res/layout/dialog_auto_debit_account_listing.xml
  6. 20
      app/src/main/res/layout/dialog_branch_listing.xml
  7. 20
      app/src/main/res/layout/dialog_country_listing.xml
  8. 22
      app/src/main/res/layout/dialog_gender_listing.xml
  9. 24
      app/src/main/res/layout/dialog_generic_text_listing_layout.xml
  10. 20
      app/src/main/res/layout/language_selection_dialog.xml

46
app/src/main/java/com/gmeremit/online/gmeremittance_native/agentsV2/gateway/AgentListV2Gateway.java
View File

@ -1,5 +1,7 @@
package com.gmeremit.online.gmeremittance_native.agentsV2.gateway;
import android.util.Log;
import com.gmeremit.online.gmeremittance_native.agentsV2.model.AgentsListApiResponse;
import com.gmeremit.online.gmeremittance_native.agentsV2.presenter.AgentListV2InteractorInterface;
import com.gmeremit.online.gmeremittance_native.base.PrivilegedGateway;
@ -27,34 +29,46 @@ public class AgentListV2Gateway extends PrivilegedGateway implements AgentListV2
" \"Id\": \"\",\n" +
" \"Data\": [\n" +
" {\n" +
" \"title\": \"Head Office\",\n" +
" \"address\": \"325, Jong-ro, Jongno-gu, 03104 Seoul\",\n" +
" \"contactNumber\": \"15886864\",\n" +
" \"language\": \"\"\n" +
" \"title\": \"Dongdaemun CIS Branch\",\n" +
" \"address\": \"2nd floor, 281, Changgyeonggunag-ro Jongno-gu, Seoul\\n(Upper floor of Dongdaemun Mart)\",\n" +
" \"contactNumber\": \"02 2138 6429\\n010-3015-6864\",\n" +
" \"language\": \"서울 중구 을지로 42길 5 2층 \"\n" +
" },\n" +
" {\n" +
" \"title\": \"Dongdaemun Branch\",\n" +
" \"address\": \"315, Jong-ro, Jongno-gu, 03105 Seoul (Near Dongdaemun Station Gate 3)\",\n" +
" \"contactNumber\": \"027635559\",\n" +
" \"language\": \"\"\n" +
" \"address\": \"315, Jong-ro Jongno-gu, Seoul \\n(Dongdaemun Station - Exit 3)\",\n" +
" \"contactNumber\": \"02 763 5559\",\n" +
" \"language\": \"서울시 종로구 종로 315 \"\n" +
" },\n" +
" {\n" +
" \"title\": \"Ansan Branch\",\n" +
" \"address\": \"Ansan-si, Gyeonggido Dan-Wongu, Wongogdong Jung-Angdaero 445 (798-12 beonji) 2nd floor\",\n" +
" \"address\": \"2nd floor, 455, Jungang-daero, Danwon-gu, Ansan -si, Gyeonggi-do \\n(Entrance of Asian Street)\",\n" +
" \"contactNumber\": \"0313626740\",\n" +
" \"language\": \"\"\n" +
" \"language\": \"경기도 안산시 단원구 중앙대로 455 2층\"\n" +
" },\n" +
" {\n" +
" \"title\": \"Hwaseong Branch\",\n" +
" \"address\": \"1101-1, 3.1 Manse-ro Hyangnam-eup, Hwaseong-si, Gyeonggi-do \\n(Baran Market Place)\",\n" +
" \"contactNumber\": \"031 354 0450\",\n" +
" \"language\": \"경기도 화성시 향남읍 3.1만세로 1101-1\"\n" +
" },\n" +
" {\n" +
" \"title\": \"Gimhae Branch\",\n" +
" \"address\": \"84, Garak-ro, Gimhae-si, Gyeongsangnam-do\",\n" +
" \"contactNumber\": \"0313626740\",\n" +
" \"language\": \"\"\n" +
" \"address\": \"84, Garak-ro, Gimhae-si, Gyeongsangnam-do,\\n(Opposite to Top Mart)\",\n" +
" \"contactNumber\": \"055 329 5559\",\n" +
" \"language\": \"경상남도 김해시 가락로 84 \"\n" +
" },\n" +
" {\n" +
" \"title\": \"Songu-ri Branch\",\n" +
" \"address\": \"91, Solmoru-ro, Soheul-eup, Pocheon-si, Gyeonggi-do, Korea 11175 (Across from K-Mart)\",\n" +
" \"contactNumber\": \"0315411856\",\n" +
" \"language\": \"\"\n" +
" \"address\": \"91, Solmoru-ro, Soheul-eup, Pocheon-si, Gyeonggi-do, Korea\\nNext to Nonghyub Bank) \",\n" +
" \"contactNumber\": \"031 541 1856\",\n" +
" \"language\": \"경기도 포천시 소흘읍 솔모루로 91\"\n" +
" },\n" +
" {\n" +
" \"title\": \"Hyehwa Branch\",\n" +
" \"address\": \"281, Changgyeonggung-ro, Jongno-gu, Seoul Hyehwa Rotary\\n(Right across from Catholic Church) \",\n" +
" \"contactNumber\": \"02 2138 6429\\n010 2970 6864 \",\n" +
" \"language\": \"경기도 포천시 소흘읍 솔모루로 91\"\n" +
" }\n" +
" ]\n" +
"}";
@ -68,7 +82,7 @@ public class AgentListV2Gateway extends PrivilegedGateway implements AgentListV2
public Observable<AgentsListApiResponse> getAgentInfoListFromNetwork(String auth) {
Gson gson=new GsonBuilder().create();
AgentsListApiResponse agentsListApiResponse=gson.fromJson(agentListMocked,AgentsListApiResponse.class);
Log.d("AgentList",agentListMocked);
return Observable.just(agentsListApiResponse);
}
}

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/settings/view/SettingsView.java
View File

@ -107,7 +107,7 @@ public class SettingsView extends BaseActivity {
models.add(new LanguageModel("NP", "ne", GmeApplication.getStringExtractor().getStringFromStringId(R.string.nepali_language_text),"Nepali"));
models.add(new LanguageModel("ID", "in", GmeApplication.getStringExtractor().getStringFromStringId(R.string.indonesia_language_text),"Indonesia"));
models.add(new LanguageModel("BD", "bn", GmeApplication.getStringExtractor().getStringFromStringId(R.string.bengali_language_text),"Bangladesh"));
models.add(new LanguageModel("VN", "vi", GmeApplication.getStringExtractor().getStringFromStringId(R.string.vietnam_language_text),"Vietnam"));
// models.add(new LanguageModel("VN", "vi", GmeApplication.getStringExtractor().getStringFromStringId(R.string.vietnam_language_text),"Vietnam"));
return models;

2
app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/gateway/SplashScreenGateway.java
View File

@ -55,7 +55,7 @@ public class SplashScreenGateway extends PrivilegedGateway implements SplashScre
models.add(new LanguageModel("NP", "ne", GmeApplication.getStringExtractor().getStringFromStringId(R.string.nepali_language_text),"Nepali"));
models.add(new LanguageModel("ID", "in", GmeApplication.getStringExtractor().getStringFromStringId(R.string.indonesia_language_text),"Indonesia"));
models.add(new LanguageModel("BD", "bn", GmeApplication.getStringExtractor().getStringFromStringId(R.string.bengali_language_text),"Bangladesh"));
models.add(new LanguageModel("VN", "vi", GmeApplication.getStringExtractor().getStringFromStringId(R.string.vietnam_language_text),"Vietnam"));
// models.add(new LanguageModel("VN", "vi", GmeApplication.getStringExtractor().getStringFromStringId(R.string.vietnam_language_text),"Vietnam"));
return models;

5
app/src/main/res/layout/alert_example_layout.xml
View File

@ -13,8 +13,7 @@
android:paddingRight="12dp"
android:paddingTop="12dp"
android:paddingBottom="8dp"
android:textColor="@color/darkgray"
android:text="National/Alien Reg ID Front"/>
android:textColor="@color/darkgray" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
@ -36,7 +35,7 @@
android:id="@+id/btn_ok"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Ok"
android:text="@string/ok_text"
android:textSize="20sp"
android:textColor="@color/cs_red"
android:gravity="center"

21
app/src/main/res/layout/dialog_auto_debit_account_listing.xml
View File

@ -5,18 +5,31 @@
android:layout_height="match_parent"
android:minHeight="400dp"
android:orientation="vertical">
<FrameLayout
<LinearLayout
android:background="#FAFAFA"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="10dp"
android:gravity="center"
android:layout_gravity="end"
android:text="@string/cancel_text"
android:visibility="invisible"
android:textColor="@color/colorAccent" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/dialog_title_txt"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="Select Country"
android:textColor="@color/darkgray"
android:textSize="18sp"
android:gravity="center"
android:padding="20dp" />
android:paddingTop="20dp"
android:paddingBottom="20dp"/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/iv_cancel"
android:layout_width="wrap_content"
@ -26,7 +39,7 @@
android:layout_gravity="end"
android:textColor="@color/colorAccent"
android:text="@string/cancel_text" />
</FrameLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/searchViewContainer"
android:layout_width="match_parent"

20
app/src/main/res/layout/dialog_branch_listing.xml
View File

@ -4,19 +4,31 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
<LinearLayout
android:background="#FAFAFA"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="10dp"
android:gravity="center"
android:layout_gravity="end"
android:text="@string/cancel_text"
android:visibility="invisible"
android:textColor="@color/colorAccent" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/dialog_title_txt"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="Select Country"
android:textColor="@color/darkgray"
android:textSize="18sp"
android:gravity="center"
android:padding="20dp" />
android:paddingTop="20dp"
android:paddingBottom="20dp"/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/iv_cancel"
android:layout_width="wrap_content"
@ -26,7 +38,7 @@
android:layout_gravity="end"
android:textColor="@color/colorAccent"
android:text="@string/cancel_text" />
</FrameLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/searchViewContainer"
android:layout_width="match_parent"

20
app/src/main/res/layout/dialog_country_listing.xml
View File

@ -4,19 +4,31 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
<LinearLayout
android:background="#FAFAFA"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="10dp"
android:gravity="center"
android:layout_gravity="end"
android:text="@string/cancel_text"
android:visibility="invisible"
android:textColor="@color/colorAccent" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/dialog_title_txt"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="Select Country"
android:textColor="@color/darkgray"
android:textSize="18sp"
android:gravity="center"
android:padding="20dp" />
android:paddingTop="20dp"
android:paddingBottom="20dp"/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/iv_cancel"
android:layout_width="wrap_content"
@ -26,7 +38,7 @@
android:layout_gravity="end"
android:textColor="@color/colorAccent"
android:text="@string/cancel_text" />
</FrameLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/searchViewContainer"
android:layout_width="match_parent"

22
app/src/main/res/layout/dialog_gender_listing.xml
View File

@ -4,19 +4,31 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
<LinearLayout
android:background="#FAFAFA"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="10dp"
android:gravity="center"
android:layout_gravity="end"
android:text="@string/cancel_text"
android:visibility="invisible"
android:textColor="@color/colorAccent" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/dialog_title_txt"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="Select Country"
android:textColor="@color/darkgray"
android:textSize="18sp"
android:gravity="center"
android:padding="20dp" />
android:paddingTop="20dp"
android:paddingBottom="20dp"/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/iv_cancel"
android:layout_width="wrap_content"
@ -25,8 +37,8 @@
android:gravity="center"
android:layout_gravity="end"
android:textColor="@color/colorAccent"
android:text="Cancel" />
</FrameLayout>
android:text="@string/cancel_text" />
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"

24
app/src/main/res/layout/dialog_generic_text_listing_layout.xml
View File

@ -4,19 +4,31 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
<LinearLayout
android:background="#FAFAFA"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="10dp"
android:gravity="center"
android:layout_gravity="end"
android:text="@string/cancel_text"
android:visibility="invisible"
android:textColor="@color/colorAccent" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/dialog_title_txt"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="Select From List"
android:text="Select Country"
android:textColor="@color/darkgray"
android:textSize="18sp"
android:gravity="center"
android:padding="20dp" />
android:paddingTop="20dp"
android:paddingBottom="20dp"/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/iv_cancel"
android:layout_width="wrap_content"
@ -25,8 +37,8 @@
android:gravity="center"
android:layout_gravity="end"
android:textColor="@color/colorAccent"
android:text="Cancel" />
</FrameLayout>
android:text="@string/cancel_text" />
</LinearLayout>
<LinearLayout
android:id="@+id/searchViewContainer"
android:layout_width="match_parent"

20
app/src/main/res/layout/language_selection_dialog.xml
View File

@ -4,19 +4,31 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
<LinearLayout
android:background="#FAFAFA"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="10dp"
android:gravity="center"
android:layout_gravity="end"
android:text="@string/cancel_text"
android:visibility="invisible"
android:textColor="@color/colorAccent" />
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/dialog_title_txt"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/select_language_text"
android:textColor="@color/darkgray"
android:textSize="18sp"
android:gravity="center"
android:padding="20dp" />
android:paddingTop="20dp"
android:paddingBottom="20dp"/>
<com.gmeremit.online.gmeremittance_native.customwidgets.GmeTextView
android:id="@+id/iv_cancel"
android:layout_width="wrap_content"
@ -26,7 +38,7 @@
android:layout_gravity="end"
android:textColor="@color/colorAccent"
android:text="@string/cancel_text" />
</FrameLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/searchViewContainer"
android:layout_width="match_parent"

Write Preview
Loading…
Cancel
Save