Skip to content

Commit a0ff656

Browse files
committed
update script to get local ip for android dev
1 parent f1cbaa5 commit a0ff656

File tree

7 files changed

+10
-12
lines changed

7 files changed

+10
-12
lines changed

android-app/app/src/main/java/com/example/androidapp/components/feed/FeedViewModel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.example.androidapp.components.feed
33
import android.content.Context
44
import android.util.Log
55
import androidx.lifecycle.*
6-
import com.example.androidapp.FEED_TEMPLATE_ENDPOINT
6+
import com.example.androidapp.config.FEED_TEMPLATE_ENDPOINT
77
import com.example.androidapp.data.feed.Feed
88
import com.example.androidapp.data.feed.FeedDatabase
99
import com.example.androidapp.data.feed.FeedRepo

android-app/app/src/main/java/com/example/androidapp/components/hackernews/HackerNewsViewModel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import androidx.lifecycle.LiveData
66
import androidx.lifecycle.MutableLiveData
77
import androidx.lifecycle.ViewModel
88
import androidx.lifecycle.viewModelScope
9-
import com.example.androidapp.HACKER_NEWS_TEMPLATE_ENDPOINT
9+
import com.example.androidapp.config.HACKER_NEWS_TEMPLATE_ENDPOINT
1010
import com.example.androidapp.data.hackernews.HackerNews
1111
import com.example.androidapp.data.hackernews.HackerNewsDatabase
1212
import com.example.androidapp.data.hackernews.HackerNewsRepo

android-app/app/src/main/java/com/example/androidapp/components/kitchensink/KitchenSinkViewModel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import androidx.lifecycle.viewModelScope
88
import com.android.volley.Request
99
import com.android.volley.toolbox.StringRequest
1010
import com.android.volley.toolbox.Volley
11-
import com.example.androidapp.KITCHEN_SINK_TEMPLATE_ENDPOINT
11+
import com.example.androidapp.config.KITCHEN_SINK_TEMPLATE_ENDPOINT
1212
import com.example.androidapp.data.kitchensink.KitchenSink
1313
import com.example.androidapp.data.kitchensink.KitchenSinkDatabase
1414
import com.example.androidapp.data.kitchensink.KitchenSinkRepo

android-app/app/src/main/java/com/example/androidapp/config/endpoints.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package com.example.androidapp
2-
3-
import com.example.androidapp.config.IP
1+
package com.example.androidapp.config
42

53
const val FEED_TEMPLATE_ENDPOINT = "ws://" + IP + ":9090/feed"
64
const val HACKER_NEWS_TEMPLATE_ENDPOINT = "ws://" + IP + ":9090/hacker-news"

android-app/scripts/graphql-template-file.kt

-3
This file was deleted.
+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package com.example.androidapp.config
2+
3+
const val IP = "ipaddress"

android-app/scripts/graphql-endpoint.sh android-app/scripts/update-ip.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ then
55
LOCAL_IP=$1
66
fi
77

8-
cp scripts/graphql-template-file.kt app/src/main/java/com/example/androidapp/config/GraphQLEndpoint.kt
8+
cp scripts/ip-template-file.kt app/src/main/java/com/example/androidapp/config/ip.kt
99

1010
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
1111
# linux
1212
if [ -z "$0" ]
1313
then
1414
LOCAL_IP=$(ifconfig getifaddr en0)
1515
fi
16-
sed -i 's/ipaddress/'$LOCAL_IP'/g' app/src/main/java/com/example/androidapp/config/GraphQLEndpoint.kt
16+
sed -i 's/ipaddress/'$LOCAL_IP'/g' app/src/main/java/com/example/androidapp/config/ip.kt
1717
elif [[ "$OSTYPE" == "darwin"* ]]; then
1818
# Mac OSX
1919
if [ -z "$0" ]
2020
then
2121
LOCAL_IP=$(ipconfig getifaddr en0)
2222
fi
23-
sed -i '' 's/ipaddress/'$LOCAL_IP'/g' app/src/main/java/com/example/androidapp/config/GraphQLEndpoint.kt
23+
sed -i '' 's/ipaddress/'$LOCAL_IP'/g' app/src/main/java/com/example/androidapp/config/ip.kt
2424
fi

0 commit comments

Comments
 (0)